diff --git a/src/resolvers/ShuttleResolvers.ts b/src/resolvers/ShuttleResolvers.ts
index b755e83..da276ae 100644
--- a/src/resolvers/ShuttleResolvers.ts
+++ b/src/resolvers/ShuttleResolvers.ts
@@ -9,7 +9,7 @@ export const ShuttleResolvers: Resolvers<ServerContext> = {
       const system = contextValue.findSystemById(parent.systemId);
       if (!system) return null;
 
-      const etaForStopId = await system.shuttleRepository.getEtaForShuttleAndStopId(parent.id, args.forStopId);
+      const etaForStopId = await system.etaRepository.getEtaForShuttleAndStopId(parent.id, args.forStopId);
       if (etaForStopId === null) return null;
 
       return {
@@ -25,7 +25,7 @@ export const ShuttleResolvers: Resolvers<ServerContext> = {
       const system = contextValue.findSystemById(parent.systemId);
       if (!system) return null;
 
-      const etasForShuttle = await system.shuttleRepository.getEtasForShuttleId(parent.id);
+      const etasForShuttle = await system.etaRepository.getEtasForShuttleId(parent.id);
       if (!etasForShuttle) return null;
 
       const computedEtas = await Promise.all(
diff --git a/src/resolvers/StopResolvers.ts b/src/resolvers/StopResolvers.ts
index 05d0cb9..45507e0 100644
--- a/src/resolvers/StopResolvers.ts
+++ b/src/resolvers/StopResolvers.ts
@@ -16,7 +16,7 @@ export const StopResolvers: Resolvers<ServerContext> = {
       if (!system) {
         return [];
       }
-      const etas = await system.shuttleRepository.getEtasForStopId(parent.id);
+      const etas = await system.etaRepository.getEtasForStopId(parent.id);
       return etas.slice().sort((a, b) => a.secondsRemaining - b.secondsRemaining);
     },
   },