diff --git a/src/App.tsx b/src/App.tsx
index f62a9b1b5..d752fd650 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -39,7 +39,7 @@ import {
   tokenRefreshed,
 } from './state/scigateway.actions';
 import Systems from './systems/systems.component';
-import SystemsContainer from './systems/systemsContainer.component';
+import SystemsLayout from './systems/systemsLayout.component';
 import ViewTabs from './view/viewTabs.component';
 
 export const paths = {
@@ -114,7 +114,7 @@ const router = createBrowserRouter([
       },
       {
         path: paths.systems,
-        Component: SystemsContainer,
+        Component: SystemsLayout,
         children: [
           { index: true, Component: Systems },
           { path: paths.system, Component: Systems },
diff --git a/src/systems/__snapshots__/systemsContainer.component.test.tsx.snap b/src/systems/__snapshots__/systemsLayout.component.test.tsx.snap
similarity index 97%
rename from src/systems/__snapshots__/systemsContainer.component.test.tsx.snap
rename to src/systems/__snapshots__/systemsLayout.component.test.tsx.snap
index 4d31b83ad..4277cde66 100644
--- a/src/systems/__snapshots__/systemsContainer.component.test.tsx.snap
+++ b/src/systems/__snapshots__/systemsLayout.component.test.tsx.snap
@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`Systems Container > renders root systems correctly 1`] = `
+exports[`Systems Layout > renders root systems correctly 1`] = `
 <DocumentFragment>
   <div
     class="MuiBox-root css-10klw3m"
@@ -56,7 +56,7 @@ exports[`Systems Container > renders root systems correctly 1`] = `
 </DocumentFragment>
 `;
 
-exports[`Systems Container > renders units breadcrumbs correctly 1`] = `
+exports[`Systems Layout > renders units breadcrumbs correctly 1`] = `
 <DocumentFragment>
   <div
     class="MuiBox-root css-10klw3m"
diff --git a/src/systems/systems.component.tsx b/src/systems/systems.component.tsx
index 21e7c0012..0279490b0 100644
--- a/src/systems/systems.component.tsx
+++ b/src/systems/systems.component.tsx
@@ -49,7 +49,7 @@ import { DeleteSystemDialog } from './deleteSystemDialog.component';
 import SystemDetails from './systemDetails.component';
 import SystemDialog from './systemDialog.component';
 import { SystemDirectoryDialog } from './systemDirectoryDialog.component';
-import { useNavigateToSystem } from './systemsContainer.component';
+import { useNavigateToSystem } from './systemsLayout.component';
 
 export type SystemMenuDialogType = 'edit' | 'duplicate' | 'delete';
 
diff --git a/src/systems/systemsContainer.component.test.tsx b/src/systems/systemsLayout.component.test.tsx
similarity index 93%
rename from src/systems/systemsContainer.component.test.tsx
rename to src/systems/systemsLayout.component.test.tsx
index e893455e4..d51461aa2 100644
--- a/src/systems/systemsContainer.component.test.tsx
+++ b/src/systems/systemsLayout.component.test.tsx
@@ -2,7 +2,7 @@ import { screen, waitFor } from '@testing-library/react';
 import userEvent, { UserEvent } from '@testing-library/user-event';
 import { paths } from '../App';
 import { renderComponentWithRouterProvider } from '../testUtils';
-import SystemsContainer from './systemsContainer.component';
+import SystemsLayout from './systemsLayout.component';
 
 const mockedUseNavigate = vi.fn();
 
@@ -11,7 +11,7 @@ vi.mock('react-router-dom', async () => ({
   useNavigate: () => mockedUseNavigate,
 }));
 
-describe('Systems Container', () => {
+describe('Systems Layout', () => {
   let user: UserEvent;
 
   beforeEach(() => {
@@ -19,7 +19,7 @@ describe('Systems Container', () => {
   });
   const createView = (path: string, urlPathKey: keyof typeof paths) => {
     return renderComponentWithRouterProvider(
-      <SystemsContainer />,
+      <SystemsLayout />,
       urlPathKey,
       path
     );
diff --git a/src/systems/systemsContainer.component.tsx b/src/systems/systemsLayout.component.tsx
similarity index 96%
rename from src/systems/systemsContainer.component.tsx
rename to src/systems/systemsLayout.component.tsx
index 135725bb7..96f1bc9f3 100644
--- a/src/systems/systemsContainer.component.tsx
+++ b/src/systems/systemsLayout.component.tsx
@@ -17,7 +17,7 @@ export const useNavigateToSystem = () => {
   );
 };
 
-function SystemsContainer() {
+function SystemsLayout() {
   const { system_id: systemId } = useParams();
   const navigateToSystem = useNavigateToSystem();
 
@@ -57,4 +57,4 @@ function SystemsContainer() {
   );
 }
 
-export default SystemsContainer;
+export default SystemsLayout;