diff --git a/client/src/components/Tours/library/TourLibraryDialog.tsx b/client/src/components/Tours/library/TourLibraryDialog.tsx
index 7e35b4dab..f2d85a9e9 100644
--- a/client/src/components/Tours/library/TourLibraryDialog.tsx
+++ b/client/src/components/Tours/library/TourLibraryDialog.tsx
@@ -323,7 +323,7 @@ export function TourLibraryDialog({ library }: { library: TourLibrary }) {
           <ListState library={library} />
           {library.list && library.list.tours.length > 0 && (
             <ul
-              className={`m-0 flex max-h-[420px] list-none flex-col gap-0.5 overflow-y-auto py-0 ps-0 pe-2 transition-opacity [scrollbar-gutter:stable] ${library.listStatus === 'loading' ? 'opacity-60' : ''}`}
+              className={`m-0 flex max-h-[420px] list-none flex-col gap-0.5 overflow-y-auto py-0 pe-2 ps-0 transition-opacity [scrollbar-gutter:stable] ${library.listStatus === 'loading' ? 'opacity-60' : ''}`}
               data-testid="tour-library-list"
             >
               {library.list.tours.map((tour) => (
diff --git a/server/src/nest/ferratas/ferratas.service.ts b/server/src/nest/ferratas/ferratas.service.ts
index 053383509..3cc593442 100644
--- a/server/src/nest/ferratas/ferratas.service.ts
+++ b/server/src/nest/ferratas/ferratas.service.ts
@@ -6,7 +6,7 @@ import { logWarn } from '../audit/audit-log.logger';
 import { badRequest, DomainError } from '../common/domain-error';
 import { withRequestContext } from '../database/request-context';
 import { UnitOfWork } from '../database/unit-of-work';
-import { OverpassElementsClient } from '../overpass/overpass-elements.client';
+import { OverpassElementsClient } from '../overpass/overpass-elements.service';
 import {
   buildFerrataQuery,
   ferrataTileBlocks,
diff --git a/server/src/nest/overpass/overpass-elements.client.ts b/server/src/nest/overpass/overpass-elements.service.ts
similarity index 100%
rename from server/src/nest/overpass/overpass-elements.client.ts
rename to server/src/nest/overpass/overpass-elements.service.ts
diff --git a/server/src/nest/overpass/overpass.module.ts b/server/src/nest/overpass/overpass.module.ts
index ddc0f58d5..b7ac836da 100644
--- a/server/src/nest/overpass/overpass.module.ts
+++ b/server/src/nest/overpass/overpass.module.ts
@@ -1,4 +1,4 @@
-import { OverpassElementsClient } from './overpass-elements.client';
+import { OverpassElementsClient } from './overpass-elements.service';
 import { Module } from '@nestjs/common';
 
 /**
diff --git a/server/src/nest/tours/tour-trail-grade.service.ts b/server/src/nest/tours/tour-trail-grade.service.ts
index bf2f8fe4c..3591373a9 100644
--- a/server/src/nest/tours/tour-trail-grade.service.ts
+++ b/server/src/nest/tours/tour-trail-grade.service.ts
@@ -1,4 +1,4 @@
-import { OverpassElementsClient } from '../overpass/overpass-elements.client';
+import { OverpassElementsClient } from '../overpass/overpass-elements.service';
 import { Injectable } from '@nestjs/common';
 import type { TourTrailGrade, TourTrailGradeRequest, TourTrailGradeResponse } from '@trek/shared';
 
diff --git a/server/tests/e2e/tours-bike.e2e.test.ts b/server/tests/e2e/tours-bike.e2e.test.ts
index 5fd7de2a4..a0aadc8f3 100644
--- a/server/tests/e2e/tours-bike.e2e.test.ts
+++ b/server/tests/e2e/tours-bike.e2e.test.ts
@@ -16,7 +16,7 @@ import { TrekExceptionFilter } from '../../src/nest/common/trek-exception.filter
 import { ZodValidationPipe } from '../../src/nest/common/zod-validation.pipe';
 import { JourneyDomainService } from '../../src/nest/journey/journey-domain.service';
 import { MapsService } from '../../src/nest/maps/maps.service';
-import { OverpassElementsClient } from '../../src/nest/overpass/overpass-elements.client';
+import { OverpassElementsClient } from '../../src/nest/overpass/overpass-elements.service';
 import { PermissionsService } from '../../src/nest/permissions/permissions.service';
 import { RealtimeModule } from '../../src/nest/realtime/realtime.module';
 import { RealtimeService } from '../../src/nest/realtime/realtime.service';
diff --git a/server/tests/unit/nest/ferratas.service.test.ts b/server/tests/unit/nest/ferratas.service.test.ts
index 052a0d328..c8c9e4627 100644
--- a/server/tests/unit/nest/ferratas.service.test.ts
+++ b/server/tests/unit/nest/ferratas.service.test.ts
@@ -12,7 +12,7 @@ import {
   FERRATAS_UNAVAILABLE_MESSAGE,
   FerratasService,
 } from '../../../src/nest/ferratas/ferratas.service';
-import { OverpassElementsClient } from '../../../src/nest/overpass/overpass-elements.client';
+import { OverpassElementsClient } from '../../../src/nest/overpass/overpass-elements.service';
 import { createSnapshotTestDb } from '../../helpers/db-mock';
 import { countRows, deleteRows, findRow, findRows, insertRows } from '../../helpers/factories/rows';
 import { resetTestDb } from '../../helpers/test-db';
diff --git a/server/tests/unit/nest/overpass-elements.client.test.ts b/server/tests/unit/nest/overpass-elements.service.test.ts
similarity index 98%
rename from server/tests/unit/nest/overpass-elements.client.test.ts
rename to server/tests/unit/nest/overpass-elements.service.test.ts
index cbc472972..8a900b671 100644
--- a/server/tests/unit/nest/overpass-elements.client.test.ts
+++ b/server/tests/unit/nest/overpass-elements.service.test.ts
@@ -1,6 +1,6 @@
 import { RuntimeEnvService } from '../../../src/nest/app-config/runtime-env.service';
 import { parseOverpassEndpoints } from '../../../src/nest/maps/overpass.constants';
-import { OverpassElementsClient, overpassAnswerSchema } from '../../../src/nest/overpass/overpass-elements.client';
+import { OverpassElementsClient, overpassAnswerSchema } from '../../../src/nest/overpass/overpass-elements.service';
 import { Test } from '@nestjs/testing';
 
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
diff --git a/server/tests/unit/nest/tour-trail-grade.service.test.ts b/server/tests/unit/nest/tour-trail-grade.service.test.ts
index a94f2bfea..28eac0982 100644
--- a/server/tests/unit/nest/tour-trail-grade.service.test.ts
+++ b/server/tests/unit/nest/tour-trail-grade.service.test.ts
@@ -1,4 +1,4 @@
-import { OverpassElementsClient } from '../../../src/nest/overpass/overpass-elements.client';
+import { OverpassElementsClient } from '../../../src/nest/overpass/overpass-elements.service';
 import { TourTrailGradeService } from '../../../src/nest/tours/tour-trail-grade.service';
 import { Test } from '@nestjs/testing';