diff --git a/src/entities/ShuttleRepositoryEntities.ts b/src/entities/ShuttleRepositoryEntities.ts
index f98faa5..e093eda 100644
--- a/src/entities/ShuttleRepositoryEntities.ts
+++ b/src/entities/ShuttleRepositoryEntities.ts
@@ -6,10 +6,6 @@ export interface IEntityWithId {
   id: string;
 }
 
-export interface IPassioSystem extends IEntityWithId, IEntityWithOptionalTimestamp {
-  name: string;
-}
-
 export interface ICoordinates {
   latitude: number;
   longitude: number;
diff --git a/test/resolvers/RouteResolverTests.test.ts b/test/resolvers/RouteResolverTests.test.ts
index 48022de..2b13583 100644
--- a/test/resolvers/RouteResolverTests.test.ts
+++ b/test/resolvers/RouteResolverTests.test.ts
@@ -5,14 +5,15 @@ import {
   addMockStopToRepository
 } from "../testHelpers/repositorySetupHelpers";
 import { generateMockOrderedStops, generateMockShuttles } from "../testHelpers/mockDataGenerators";
-import { IRoute, IStop, IPassioSystem } from "../../src/entities/ShuttleRepositoryEntities";
+import { IRoute, IStop } from "../../src/entities/ShuttleRepositoryEntities";
 import assert = require("node:assert");
+import { InterchangeSystem } from "../../src/entities/InterchangeSystem";
 
 describe("RouteResolvers", () => {
   const holder = setupTestServerHolder();
   const context = setupTestServerContext();
 
-  let mockSystem: IPassioSystem;
+  let mockSystem: InterchangeSystem;
   let mockRoute: IRoute;
   let mockStop: IStop;
 
diff --git a/test/resolvers/ShuttleResolverTests.test.ts b/test/resolvers/ShuttleResolverTests.test.ts
index 52a040a..bf8cc5d 100644
--- a/test/resolvers/ShuttleResolverTests.test.ts
+++ b/test/resolvers/ShuttleResolverTests.test.ts
@@ -1,16 +1,17 @@
 import { beforeEach, describe, expect, it } from "@jest/globals";
 import { generateMockEtas, generateMockRoutes } from "../testHelpers/mockDataGenerators";
-import { IShuttle, IPassioSystem } from "../../src/entities/ShuttleRepositoryEntities";
+import { IShuttle } from "../../src/entities/ShuttleRepositoryEntities";
 import { setupTestServerContext, setupTestServerHolder } from "../testHelpers/apolloTestServerHelpers";
 import { addMockShuttleToRepository } from "../testHelpers/repositorySetupHelpers";
 import assert = require("node:assert");
+import { InterchangeSystem } from "../../src/entities/InterchangeSystem";
 
 
 describe("ShuttleResolvers", () => {
   const holder = setupTestServerHolder();
   const context = setupTestServerContext();
 
-  let mockSystem: IPassioSystem;
+  let mockSystem: InterchangeSystem;
   let mockShuttle: IShuttle;
 
   beforeEach(async () => {
diff --git a/test/resolvers/SystemResolverTests.test.ts b/test/resolvers/SystemResolverTests.test.ts
index e185553..4333fef 100644
--- a/test/resolvers/SystemResolverTests.test.ts
+++ b/test/resolvers/SystemResolverTests.test.ts
@@ -6,14 +6,14 @@ import {
   addMockShuttleToRepository,
   addMockStopToRepository,
 } from "../testHelpers/repositorySetupHelpers";
-import { IPassioSystem } from "../../src/entities/ShuttleRepositoryEntities";
 import assert = require("node:assert");
+import { InterchangeSystem } from "../../src/entities/InterchangeSystem";
 
 describe("SystemResolvers", () => {
   const holder = setupTestServerHolder();
   const context = setupTestServerContext();
 
-  let mockSystem: IPassioSystem;
+  let mockSystem: InterchangeSystem;
 
   beforeEach(async () => {
     mockSystem = context.systems[0];
diff --git a/test/testHelpers/mockDataGenerators.ts b/test/testHelpers/mockDataGenerators.ts
index f146514..36d422f 100644
--- a/test/testHelpers/mockDataGenerators.ts
+++ b/test/testHelpers/mockDataGenerators.ts
@@ -1,16 +1,8 @@
-import { IEta, IOrderedStop, IRoute, IShuttle, IStop, IPassioSystem } from "../../src/entities/ShuttleRepositoryEntities";
+import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../../src/entities/ShuttleRepositoryEntities";
 
 // Use a single set of generators in case any of the
 // interfaces change in the future
 
-export function generateMockPassioSystems(): IPassioSystem[] {
-  return [
-    { id: "1", name: "System A" },
-    { id: "2", name: "System B" },
-    { id: "3", name: "System C" },
-  ];
-}
-
 export function generateMockShuttles(): IShuttle[] {
   return [
     {