diff --git a/server/src/api/controllers/authController.ts b/server/src/api/controllers/authController.ts
index 1eb992529..59afd4cc8 100755
--- a/server/src/api/controllers/authController.ts
+++ b/server/src/api/controllers/authController.ts
@@ -50,10 +50,6 @@ class AuthController implements IAuthController {
 		this.userService = userService;
 	}
 
-	get serviceName() {
-		return AuthController.SERVICE_NAME;
-	}
-
 	registerUser = catchAsync(async (req: Request, res: Response) => {
 		const newUser = req.body.user;
 		const newUserToken = req.body.token;
diff --git a/server/src/api/controllers/checkController.ts b/server/src/api/controllers/checkController.ts
index ccc91921d..525a00080 100755
--- a/server/src/api/controllers/checkController.ts
+++ b/server/src/api/controllers/checkController.ts
@@ -14,7 +14,6 @@ import { requireTeamId } from "@/api/controllers/controllerUtils.js";
 const SERVICE_NAME = "checkController";
 
 export interface ICheckController {
-	serviceName: string;
 	getChecksByMonitor: RequestHandler;
 	getChecksByTeam: RequestHandler;
 	getChecksSummaryByTeamId: RequestHandler;
@@ -30,10 +29,6 @@ class CheckController implements ICheckController {
 		this.checkService = checkService;
 	}
 
-	get serviceName() {
-		return CheckController.SERVICE_NAME;
-	}
-
 	getChecksByMonitor = catchAsync(async (req: Request, res: Response) => {
 		const validatedParams = getChecksParamValidation.parse(req.params);
 		const validatedQuery = getChecksQueryValidation.parse(req.query);
diff --git a/server/src/api/controllers/diagnosticController.ts b/server/src/api/controllers/diagnosticController.ts
index 0864f7237..382b4349a 100755
--- a/server/src/api/controllers/diagnosticController.ts
+++ b/server/src/api/controllers/diagnosticController.ts
@@ -17,10 +17,6 @@ class DiagnosticController implements IDiagnosticController {
 		this.diagnosticService = diagnosticService;
 	}
 
-	get serviceName() {
-		return DiagnosticController.SERVICE_NAME;
-	}
-
 	getSystemStats = catchAsync(async (req: Request, res: Response) => {
 		const diagnostics = await this.diagnosticService.getSystemStats();
 		return res.status(200).json({
diff --git a/server/src/api/controllers/geoCheckController.ts b/server/src/api/controllers/geoCheckController.ts
index 81082b6ed..0c7f62260 100644
--- a/server/src/api/controllers/geoCheckController.ts
+++ b/server/src/api/controllers/geoCheckController.ts
@@ -17,10 +17,6 @@ class GeoCheckController implements IGeoCheckController {
 		this.geoChecksService = geoChecksService;
 	}
 
-	get serviceName() {
-		return GeoCheckController.SERVICE_NAME;
-	}
-
 	getGeoChecksByMonitor = catchAsync(async (req: Request, res: Response) => {
 		const validatedParams = getChecksParamValidation.parse(req.params);
 		const validatedQuery = getChecksQueryValidation.parse(req.query);
diff --git a/server/src/api/controllers/inviteController.ts b/server/src/api/controllers/inviteController.ts
index 0efc1e0a7..5af172dfb 100755
--- a/server/src/api/controllers/inviteController.ts
+++ b/server/src/api/controllers/inviteController.ts
@@ -18,10 +18,6 @@ class InviteController implements IInviteController {
 		this.inviteService = inviteService;
 	}
 
-	get serviceName() {
-		return InviteController.SERVICE_NAME;
-	}
-
 	getInviteToken = catchAsync(async (req: Request, res: Response) => {
 		const teamId = requireTeamId(req.user?.teamId);
 		const userRoles = requireUserRoles(req.user?.role);
diff --git a/server/src/api/controllers/logController.ts b/server/src/api/controllers/logController.ts
index f0449bbf2..bbbeef2a9 100644
--- a/server/src/api/controllers/logController.ts
+++ b/server/src/api/controllers/logController.ts
@@ -14,9 +14,6 @@ class LogController {
 	constructor(logger: ILogger) {
 		this.logger = logger;
 	}
-	get serviceName() {
-		return LogController.SERVICE_NAME;
-	}
 
 	getLogs = catchAsync(async (req: Request, res: Response) => {
 		const logs = this.logger.getLogs();
diff --git a/server/src/api/controllers/monitorController.ts b/server/src/api/controllers/monitorController.ts
index 2ffb18802..f81e64f4a 100644
--- a/server/src/api/controllers/monitorController.ts
+++ b/server/src/api/controllers/monitorController.ts
@@ -57,10 +57,6 @@ class MonitorController implements IMonitorController {
 		this.notificationsService = notificationsService;
 	}
 
-	get serviceName() {
-		return MonitorController.SERVICE_NAME;
-	}
-
 	getMonitorCertificate = catchAsync(async (req: Request, res: Response) => {
 		const validatedParams = getCertificateParamValidation.parse(req.params);
 		const teamId = requireTeamId(req.user?.teamId);
diff --git a/server/src/api/controllers/queueController.ts b/server/src/api/controllers/queueController.ts
index 72c1463f9..09e0474e5 100755
--- a/server/src/api/controllers/queueController.ts
+++ b/server/src/api/controllers/queueController.ts
@@ -16,10 +16,6 @@ class JobQueueController implements IJobQueueController {
 	static SERVICE_NAME = SERVICE_NAME;
 	constructor(private scheduler: IJobScheduler) {}
 
-	get serviceName() {
-		return JobQueueController.SERVICE_NAME;
-	}
-
 	getMetrics = catchAsync(async (req: Request, res: Response) => {
 		const metrics = await this.scheduler.getMetrics();
 		res.status(200).json({
diff --git a/server/src/api/controllers/settingsController.ts b/server/src/api/controllers/settingsController.ts
index 06085c3f8..a3237d92b 100644
--- a/server/src/api/controllers/settingsController.ts
+++ b/server/src/api/controllers/settingsController.ts
@@ -10,7 +10,6 @@ import { Settings } from "@/domain/app-settings/app-settings.type.js";
 const SERVICE_NAME = "SettingsController";
 
 export interface ISettingsController {
-	serviceName: string;
 	getAppSettings: RequestHandler;
 	updateAppSettings: RequestHandler;
 	sendTestEmail: RequestHandler;
@@ -25,10 +24,6 @@ class SettingsController implements ISettingsController {
 		this.emailService = emailService;
 	}
 
-	get serviceName() {
-		return SettingsController.SERVICE_NAME;
-	}
-
 	buildAppSettings = (dbSettings: Settings) => {
 		const sanitizedSettings: Record<string, unknown> = { ...dbSettings };
 		delete sanitizedSettings.version;
diff --git a/server/src/api/controllers/statusPageController.ts b/server/src/api/controllers/statusPageController.ts
index f75c5e7fb..5ba1cf527 100644
--- a/server/src/api/controllers/statusPageController.ts
+++ b/server/src/api/controllers/statusPageController.ts
@@ -16,7 +16,6 @@ import { resolveStatusPageDomainFromRequest } from "@/utils/statusPageDomain.js"
 const SERVICE_NAME = "statusPageController";
 
 export interface IStatusPageController {
-	readonly serviceName: string;
 	createStatusPage: RequestHandler;
 	updateStatusPage: RequestHandler;
 	getStatusPageByUrl: RequestHandler;
@@ -32,10 +31,6 @@ class StatusPageController implements IStatusPageController {
 		this.statusPageService = statusPageService;
 	}
 
-	get serviceName() {
-		return StatusPageController.SERVICE_NAME;
-	}
-
 	createStatusPage = catchAsync(async (req: Request, res: Response) => {
 		createStatusPageBodyValidation.parse(req.body);
 		if (req.file) {
diff --git a/server/src/db/db.mongo.ts b/server/src/db/db.mongo.ts
index 5aca5550a..e0b39c188 100755
--- a/server/src/db/db.mongo.ts
+++ b/server/src/db/db.mongo.ts
@@ -21,10 +21,6 @@ class MongoDB implements IDb<Mongoose> {
 		this.db = null;
 	}
 
-	get serviceName() {
-		return MongoDB.SERVICE_NAME;
-	}
-
 	connect = async () => {
 		try {
 			const connectionString = this.envSettings.dbConnectionString || "mongodb://localhost:27017/uptime_db";
diff --git a/server/src/domain/app-settings/app-settings.service.ts b/server/src/domain/app-settings/app-settings.service.ts
index 92a54702e..12f75d1c8 100755
--- a/server/src/domain/app-settings/app-settings.service.ts
+++ b/server/src/domain/app-settings/app-settings.service.ts
@@ -20,7 +20,6 @@ export type EnvConfig = {
 };
 
 export interface ISettingsService {
-	readonly serviceName: string;
 	loadSettings(): EnvConfig;
 	getSettings(): EnvConfig;
 	areStatusPageThemesEnabled(): boolean;
@@ -57,10 +56,6 @@ export class SettingsService implements ISettingsService {
 		this.settingsRepository = settingsRepository;
 	}
 
-	get serviceName() {
-		return SettingsService.SERVICE_NAME;
-	}
-
 	loadSettings() {
 		return this.settings;
 	}
diff --git a/server/src/domain/checks/check.service.ts b/server/src/domain/checks/check.service.ts
index ca7fca457..f3c18ec91 100644
--- a/server/src/domain/checks/check.service.ts
+++ b/server/src/domain/checks/check.service.ts
@@ -50,10 +50,6 @@ export class CheckService implements ICheckService {
 		this.checksRepository = checksRepository;
 	}
 
-	get serviceName() {
-		return CheckService.SERVICE_NAME;
-	}
-
 	createChecks = async (checks: Check[]) => {
 		return this.checksRepository.createChecks(checks);
 	};
diff --git a/server/src/domain/diagnostics/diagnostic.service.ts b/server/src/domain/diagnostics/diagnostic.service.ts
index f26fa02e3..1f7a0314a 100644
--- a/server/src/domain/diagnostics/diagnostic.service.ts
+++ b/server/src/domain/diagnostics/diagnostic.service.ts
@@ -79,10 +79,6 @@ export class DiagnosticService implements IDiagnosticService {
 		obs.observe({ entryTypes: ["measure"] });
 	}
 
-	get serviceName() {
-		return DiagnosticService.SERVICE_NAME;
-	}
-
 	private getCPUUsagePercentage = async (): Promise<number> => {
 		const startUsage = process.cpuUsage();
 		const timingPeriod = 1000; // measured in ms
diff --git a/server/src/domain/geo-checks/geo-check.service.ts b/server/src/domain/geo-checks/geo-check.service.ts
index 0ace565fc..040383811 100644
--- a/server/src/domain/geo-checks/geo-check.service.ts
+++ b/server/src/domain/geo-checks/geo-check.service.ts
@@ -11,7 +11,6 @@ import { AppError } from "@/utils/AppError.js";
 const SERVICE_NAME = "GeoChecksService";
 
 export interface IGeoChecksService {
-	readonly serviceName: string;
 	buildGeoCheck(monitor: Monitor): Promise<GeoCheck | null>;
 	createGeoChecks(geoChecks: GeoCheck[]): Promise<GeoCheck[]>;
 	getGeoChecksByMonitor(args: {
@@ -50,10 +49,6 @@ export class GeoChecksService implements IGeoChecksService {
 		this.monitorsRepository = monitorsRepository;
 	}
 
-	get serviceName() {
-		return GeoChecksService.SERVICE_NAME;
-	}
-
 	async buildGeoCheck(monitor: Monitor): Promise<GeoCheck | null> {
 		try {
 			if (!monitor.url) {
diff --git a/server/src/domain/incidents/incident.service.ts b/server/src/domain/incidents/incident.service.ts
index 311fad567..98f092088 100644
--- a/server/src/domain/incidents/incident.service.ts
+++ b/server/src/domain/incidents/incident.service.ts
@@ -57,10 +57,6 @@ export class IncidentService implements IIncidentService {
 		this.notificationMessageBuilder = notificationMessageBuilder;
 	}
 
-	get serviceName() {
-		return IncidentService.SERVICE_NAME;
-	}
-
 	handleIncident = async (
 		monitor: Monitor,
 		code: number,
diff --git a/server/src/domain/invites/invite.service.ts b/server/src/domain/invites/invite.service.ts
index 76c5c6289..3dcffd9e0 100644
--- a/server/src/domain/invites/invite.service.ts
+++ b/server/src/domain/invites/invite.service.ts
@@ -35,10 +35,6 @@ export class InviteService implements IInviteService {
 		this.emailService = emailService;
 	}
 
-	get serviceName() {
-		return InviteService.SERVICE_NAME;
-	}
-
 	getInviteToken = async ({ invite, teamId, userRoles }: { invite: Partial<Invite>; teamId: string; userRoles: UserRole[] }) => {
 		invite.teamId = teamId;
 
diff --git a/server/src/domain/maintenance-windows/maintenance-window.service.ts b/server/src/domain/maintenance-windows/maintenance-window.service.ts
index 5551aef62..350e755aa 100644
--- a/server/src/domain/maintenance-windows/maintenance-window.service.ts
+++ b/server/src/domain/maintenance-windows/maintenance-window.service.ts
@@ -62,10 +62,6 @@ export class MaintenanceWindowService implements IMaintenanceWindowService {
 		this.scheduler = scheduler;
 	}
 
-	get serviceName() {
-		return MaintenanceWindowService.SERVICE_NAME;
-	}
-
 	private flipMonitorsLeavingMaintenance = async (monitorIds: string[], teamId: string, excludeWindowId: string, now: Date): Promise<void> => {
 		if (monitorIds.length === 0) return;
 
diff --git a/server/src/domain/monitors/monitor.service.ts b/server/src/domain/monitors/monitor.service.ts
index 66684c2ac..e7a79a161 100644
--- a/server/src/domain/monitors/monitor.service.ts
+++ b/server/src/domain/monitors/monitor.service.ts
@@ -31,8 +31,6 @@ const isUptimeChecksResult = (result: UptimeChecksResult | HardwareChecksResult
 	supportsUptimeDetails(result.monitorType);
 
 export interface IMonitorService {
-	readonly serviceName: string;
-
 	// create
 	createMonitor(teamId: string, userId: string, body: Partial<Monitor>): Promise<void>;
 	createMonitors(monitors: Array<Monitor>): Promise<Monitor[] | null>;
@@ -135,10 +133,6 @@ export class MonitorService implements IMonitorService {
 		this.incidentsRepository = incidentsRepository;
 	}
 
-	get serviceName(): string {
-		return MonitorService.SERVICE_NAME;
-	}
-
 	private getDateRange = (dateRange: DateRangeKey) => {
 		const startDates = {
 			recent: new Date(new Date().setHours(new Date().getHours() - 2)),
diff --git a/server/src/domain/users/user.service.ts b/server/src/domain/users/user.service.ts
index 78a884a51..f3db2f3b5 100644
--- a/server/src/domain/users/user.service.ts
+++ b/server/src/domain/users/user.service.ts
@@ -103,10 +103,6 @@ export class UserService implements IUserService {
 		this.teamsRepository = teamsRepository;
 	}
 
-	get serviceName() {
-		return UserService.SERVICE_NAME;
-	}
-
 	issueToken = (payload: Partial<User>, appSettings: EnvConfig) => {
 		return this.jwt.sign(payload, appSettings.jwtSecret, { expiresIn: appSettings.jwtTTL });
 	};
diff --git a/server/src/service/bufferService.ts b/server/src/service/bufferService.ts
index d47a6472e..2d10aebbb 100755
--- a/server/src/service/bufferService.ts
+++ b/server/src/service/bufferService.ts
@@ -51,10 +51,6 @@ export class BufferService implements IBufferService {
 		});
 	}
 
-	get serviceName() {
-		return BufferService.SERVICE_NAME;
-	}
-
 	addToBuffer(check: Check) {
 		try {
 			this.buffer.push(check);
diff --git a/server/src/service/emailService.ts b/server/src/service/emailService.ts
index c156cc18b..f057e955a 100755
--- a/server/src/service/emailService.ts
+++ b/server/src/service/emailService.ts
@@ -56,10 +56,6 @@ export class EmailService implements IEmailService {
 		this.init();
 	}
 
-	get serviceName() {
-		return EmailService.SERVICE_NAME;
-	}
-
 	init = () => {
 		const loadTemplate = (templateName: string) => {
 			try {
diff --git a/server/src/service/globalPingService.ts b/server/src/service/globalPingService.ts
index cebd95408..4b0257df4 100644
--- a/server/src/service/globalPingService.ts
+++ b/server/src/service/globalPingService.ts
@@ -61,7 +61,6 @@ interface GlobalPingProbeResult {
 }
 
 export interface IGlobalPingService {
-	readonly serviceName: string;
 	createMeasurement(monitorType: MonitorType, url: string, locations: GeoContinent[]): Promise<string | null>;
 	pollForResults(measurementId: string, timeoutMs?: number, customUpCodes?: HttpStatusCode[]): Promise<GeoCheckResult[]>;
 }
@@ -75,10 +74,6 @@ export class GlobalPingService implements IGlobalPingService {
 		this.logger = logger;
 	}
 
-	get serviceName() {
-		return GlobalPingService.SERVICE_NAME;
-	}
-
 	async createMeasurement(monitorType: MonitorType, url: string, locations: GeoContinent[]): Promise<string | null> {
 		try {
 			if (!supportsGeoCheck(monitorType)) {
diff --git a/server/src/service/networkService.ts b/server/src/service/networkService.ts
index 3470c6086..632a03141 100644
--- a/server/src/service/networkService.ts
+++ b/server/src/service/networkService.ts
@@ -8,7 +8,6 @@ import { IStatusProvider } from "./network/IStatusProvider.js";
 const SERVICE_NAME = "NetworkService";
 
 export interface INetworkService {
-	readonly serviceName: string;
 	requestStatus<T extends MonitorType>(monitor: Monitor & { type: T }): Promise<MonitorStatusResponse<MonitorPayloadMap[T]>>;
 	requestWebhook(
 		type: string,
@@ -39,10 +38,6 @@ export class NetworkService implements INetworkService {
 		this.logger = logger;
 	}
 
-	get serviceName(): string {
-		return NetworkService.SERVICE_NAME;
-	}
-
 	// Main entry point
 	async requestStatus<T extends MonitorType>(monitor: Monitor & { type: T }): Promise<MonitorStatusResponse<MonitorPayloadMap[T]>> {
 		const provider = this.providers.find((p) => p.supports(monitor.type));
diff --git a/server/src/service/statusService.ts b/server/src/service/statusService.ts
index ccda0c5d7..6435958cb 100755
--- a/server/src/service/statusService.ts
+++ b/server/src/service/statusService.ts
@@ -57,10 +57,6 @@ export class StatusService implements IStatusService {
 		this.monitorStatsRepository = monitorStatsRepository;
 	}
 
-	get serviceName() {
-		return StatusService.SERVICE_NAME;
-	}
-
 	async updateRunningStats(monitor: Monitor, networkResponse: MonitorStatusResponse) {
 		try {
 			await this.monitorStatsRepository.updateByMonitorId(monitor.id, {
diff --git a/server/src/utils/logger.ts b/server/src/utils/logger.ts
index 41142fd92..3cd8570ca 100755
--- a/server/src/utils/logger.ts
+++ b/server/src/utils/logger.ts
@@ -19,7 +19,6 @@ interface LogEntry extends LogConfig {
 }
 
 export interface ILogger {
-	readonly serviceName: string;
 	info(config: LogConfig): void;
 	warn(config: LogConfig): void;
 	error(config: LogConfig): void;
@@ -97,10 +96,6 @@ class Logger implements ILogger {
 		});
 	}
 
-	get serviceName() {
-		return Logger.SERVICE_NAME;
-	}
-
 	info(config: LogConfig) {
 		const logEntry = this.buildLogEntry("info", config);
 		this.cacheLog(logEntry);
diff --git a/server/src/worker/worker.db-queue.ts b/server/src/worker/worker.db-queue.ts
index 50e41a4f1..9420660c7 100644
--- a/server/src/worker/worker.db-queue.ts
+++ b/server/src/worker/worker.db-queue.ts
@@ -95,10 +95,6 @@ export class DBQueueWorker extends JobScheduler implements IQueueWorker {
 		this.isDbConnected = dependencies.isDbConnected;
 	}
 
-	get serviceName() {
-		return DBQueueWorker.SERVICE_NAME;
-	}
-
 	static async create(dependencies: DBQueueWorkerDependencies): Promise<DBQueueWorker> {
 		const instance = new DBQueueWorker(dependencies);
 		await instance.init();
diff --git a/server/src/worker/worker.helper.ts b/server/src/worker/worker.helper.ts
index 3d2d2e183..9f044763d 100644
--- a/server/src/worker/worker.helper.ts
+++ b/server/src/worker/worker.helper.ts
@@ -12,7 +12,6 @@ import { ITeamsRepository } from "@/domain/teams/team.repository.interface.js";
 import { ILogger } from "@/utils/logger.js";
 
 export interface IWorkerHelper {
-	readonly serviceName: string;
 	getCleanupOrphanedJob(): () => Promise<void>;
 	getCleanupRetentionJob(): () => Promise<void>;
 }
@@ -69,10 +68,6 @@ export class WorkerHelper implements IWorkerHelper {
 		this.geoChecksRepository = geoChecksRepository;
 	}
 
-	get serviceName() {
-		return WorkerHelper.SERVICE_NAME;
-	}
-
 	getCleanupOrphanedJob = () => {
 		return async () => {
 			try {
diff --git a/server/src/worker/worker.interface.ts b/server/src/worker/worker.interface.ts
index 98120fa47..e70af5f35 100644
--- a/server/src/worker/worker.interface.ts
+++ b/server/src/worker/worker.interface.ts
@@ -67,7 +67,6 @@ export type WorkerHealth = {
 	inFlight: number; // total in-flight jobs across types
 };
 export interface IJobScheduler {
-	readonly serviceName: string;
 	addJob(monitorId: string, monitor: Monitor): Promise<void>;
 	deleteJob(monitor: Monitor): Promise<void>;
 	pauseJob(monitor: Monitor): Promise<void>;
@@ -83,7 +82,6 @@ export interface IJobScheduler {
 }
 
 export interface IQueueWorker extends IJobScheduler {
-	readonly serviceName: string;
 	getHealth(): WorkerHealth;
 	countDueBacklog(): Promise<number>;
 	countAliveWorkers(): Promise<number>;
diff --git a/server/src/worker/worker.job-scheduler.ts b/server/src/worker/worker.job-scheduler.ts
index 458db1d08..0f04a39b7 100644
--- a/server/src/worker/worker.job-scheduler.ts
+++ b/server/src/worker/worker.job-scheduler.ts
@@ -26,9 +26,6 @@ export class JobScheduler implements IJobScheduler {
 		protected readonly workerId: string // same id MongoJobsRepository stamps into lockedBy
 	) {}
 
-	get serviceName() {
-		return JobScheduler.SERVICE_NAME;
-	}
 	private heartbeatInFlight: Promise<void> = Promise.resolve();
 
 	protected processesJobs = false; // scheduler-only by default; DBQueueWorker flips this on when it runs job loops
diff --git a/server/test/unit/services/bufferService.test.ts b/server/test/unit/services/bufferService.test.ts
index d994e5f24..90b5489bf 100644
--- a/server/test/unit/services/bufferService.test.ts
+++ b/server/test/unit/services/bufferService.test.ts
@@ -71,17 +71,6 @@ describe("BufferService", () => {
 
 	// ── Static / instance properties ─────────────────────────────────────
 
-	describe("serviceName", () => {
-		it("returns BufferService from static property", () => {
-			expect(BufferService.SERVICE_NAME).toBe("BufferService");
-		});
-
-		it("returns BufferService from instance getter", () => {
-			const { service } = createService();
-			expect(service.serviceName).toBe("BufferService");
-		});
-	});
-
 	// ── constructor ──────────────────────────────────────────────────────
 
 	describe("constructor", () => {
diff --git a/server/test/unit/services/checkService.test.ts b/server/test/unit/services/checkService.test.ts
index 104ccbaa2..587731951 100644
--- a/server/test/unit/services/checkService.test.ts
+++ b/server/test/unit/services/checkService.test.ts
@@ -48,13 +48,6 @@ const makeStatusResponse = (overrides?: Partial<MonitorStatusResponse>): Monitor
 // ── Tests ────────────────────────────────────────────────────────────────────
 
 describe("CheckService", () => {
-	describe("serviceName", () => {
-		it("returns checkService", () => {
-			const { service } = createService();
-			expect(service.serviceName).toBe("checkService");
-		});
-	});
-
 	// ── toCheck ──────────────────────────────────────────────────────────────
 
 	describe("toCheck", () => {
diff --git a/server/test/unit/services/diagnosticService.test.ts b/server/test/unit/services/diagnosticService.test.ts
index 07962a68e..d2512717f 100644
--- a/server/test/unit/services/diagnosticService.test.ts
+++ b/server/test/unit/services/diagnosticService.test.ts
@@ -56,17 +56,6 @@ describe("DiagnosticService", () => {
 		jest.useRealTimers();
 	});
 
-	describe("serviceName", () => {
-		it("returns diagnosticService from static property", () => {
-			expect(DiagnosticService.SERVICE_NAME).toBe("diagnosticService");
-		});
-
-		it("returns diagnosticService from instance getter", () => {
-			const service = new DiagnosticService(makeDb());
-			expect(service.serviceName).toBe("diagnosticService");
-		});
-	});
-
 	// ── constructor ─────────────────────────────────────────────────────────
 
 	describe("constructor", () => {
diff --git a/server/test/unit/services/emailService.test.ts b/server/test/unit/services/emailService.test.ts
index fbfdf15fd..c49d525b1 100644
--- a/server/test/unit/services/emailService.test.ts
+++ b/server/test/unit/services/emailService.test.ts
@@ -82,11 +82,6 @@ describe("EmailService", () => {
 		it("returns EmailService from static property", () => {
 			expect(EmailService.SERVICE_NAME).toBe("EmailService");
 		});
-
-		it("returns EmailService from instance getter", () => {
-			const { service } = createService();
-			expect(service.serviceName).toBe("EmailService");
-		});
 	});
 
 	// ── init / loadTemplate ──────────────────────────────────────────────
diff --git a/server/test/unit/services/geoChecksService.test.ts b/server/test/unit/services/geoChecksService.test.ts
index 8e50fa3e8..69bfff730 100644
--- a/server/test/unit/services/geoChecksService.test.ts
+++ b/server/test/unit/services/geoChecksService.test.ts
@@ -48,17 +48,6 @@ const createService = (overrides?: Record<string, unknown>) => {
 // ── Tests ────────────────────────────────────────────────────────────────────
 
 describe("GeoChecksService", () => {
-	describe("serviceName", () => {
-		it("returns GeoChecksService from static property", () => {
-			expect(GeoChecksService.SERVICE_NAME).toBe("GeoChecksService");
-		});
-
-		it("returns GeoChecksService from instance getter", () => {
-			const { service } = createService();
-			expect(service.serviceName).toBe("GeoChecksService");
-		});
-	});
-
 	// ── buildGeoCheck ───────────────────────────────────────────────────────
 
 	describe("buildGeoCheck", () => {
diff --git a/server/test/unit/services/globalPingService.test.ts b/server/test/unit/services/globalPingService.test.ts
index 376653110..5169f205b 100644
--- a/server/test/unit/services/globalPingService.test.ts
+++ b/server/test/unit/services/globalPingService.test.ts
@@ -66,17 +66,6 @@ describe("GlobalPingService", () => {
 
 	// ── Static / instance properties ─────────────────────────────────────
 
-	describe("serviceName", () => {
-		it("returns GlobalPingService from static property", () => {
-			expect(GlobalPingService.SERVICE_NAME).toBe("GlobalPingService");
-		});
-
-		it("returns GlobalPingService from instance getter", () => {
-			const { service } = createService();
-			expect(service.serviceName).toBe("GlobalPingService");
-		});
-	});
-
 	// ── createMeasurement ────────────────────────────────────────────────
 
 	describe("createMeasurement", () => {
diff --git a/server/test/unit/services/incidentService.test.ts b/server/test/unit/services/incidentService.test.ts
index aa4fffce8..27b2736df 100644
--- a/server/test/unit/services/incidentService.test.ts
+++ b/server/test/unit/services/incidentService.test.ts
@@ -91,13 +91,6 @@ const makeDecision = (overrides?: Partial<MonitorActionDecision>): MonitorAction
 // ── Tests ────────────────────────────────────────────────────────────────────
 
 describe("IncidentService", () => {
-	describe("serviceName", () => {
-		it("returns incidentService", () => {
-			const { service } = createService();
-			expect(service.serviceName).toBe("incidentService");
-		});
-	});
-
 	// ── handleIncident ───────────────────────────────────────────────────────
 
 	describe("handleIncident", () => {
diff --git a/server/test/unit/services/inviteService.test.ts b/server/test/unit/services/inviteService.test.ts
index c050d91e6..59d472539 100644
--- a/server/test/unit/services/inviteService.test.ts
+++ b/server/test/unit/services/inviteService.test.ts
@@ -39,17 +39,6 @@ const createService = (overrides?: Record<string, unknown>) => {
 // ── Tests ────────────────────────────────────────────────────────────────────
 
 describe("InviteService", () => {
-	describe("serviceName", () => {
-		it("returns inviteService from static property", () => {
-			expect(InviteService.SERVICE_NAME).toBe("inviteService");
-		});
-
-		it("returns inviteService from instance getter", () => {
-			const { service } = createService();
-			expect(service.serviceName).toBe("inviteService");
-		});
-	});
-
 	// ── getInviteToken ──────────────────────────────────────────────────────
 
 	describe("getInviteToken", () => {
diff --git a/server/test/unit/services/maintenanceWindowService.test.ts b/server/test/unit/services/maintenanceWindowService.test.ts
index 9547eaac8..e15f20d46 100644
--- a/server/test/unit/services/maintenanceWindowService.test.ts
+++ b/server/test/unit/services/maintenanceWindowService.test.ts
@@ -94,17 +94,6 @@ const defaultCreateParams = {
 // ── Tests ────────────────────────────────────────────────────────────────────
 
 describe("MaintenanceWindowService", () => {
-	describe("serviceName", () => {
-		it("returns maintenanceWindowService from static property", () => {
-			expect(MaintenanceWindowService.SERVICE_NAME).toBe("maintenanceWindowService");
-		});
-
-		it("returns maintenanceWindowService from instance getter", () => {
-			const { service } = createService();
-			expect(service.serviceName).toBe("maintenanceWindowService");
-		});
-	});
-
 	// ── createMaintenanceWindow ──────────────────────────────────────────────
 
 	describe("createMaintenanceWindow", () => {
diff --git a/server/test/unit/services/monitorService.test.ts b/server/test/unit/services/monitorService.test.ts
index 6a1cf8343..2b6f72d1d 100644
--- a/server/test/unit/services/monitorService.test.ts
+++ b/server/test/unit/services/monitorService.test.ts
@@ -111,13 +111,6 @@ const createService = (
 };
 
 describe("MonitorService", () => {
-	describe("serviceName", () => {
-		it("returns 'MonitorService'", () => {
-			const { service } = createService();
-			expect(service.serviceName).toBe("MonitorService");
-		});
-	});
-
 	describe("createMonitor", () => {
 		it("creates a monitor and adds a job", async () => {
 			const monitorsRepository = createMonitorsRepositoryMock();
diff --git a/server/test/unit/services/networkService.test.ts b/server/test/unit/services/networkService.test.ts
index 268b52e3a..0943b1f22 100644
--- a/server/test/unit/services/networkService.test.ts
+++ b/server/test/unit/services/networkService.test.ts
@@ -43,17 +43,6 @@ const createService = (providers: IStatusProvider<unknown>[] = []) => {
 describe("NetworkService", () => {
 	// ── Static / instance properties ─────────────────────────────────────────
 
-	describe("serviceName", () => {
-		it("returns NetworkService from static property", () => {
-			expect(NetworkService.SERVICE_NAME).toBe("NetworkService");
-		});
-
-		it("returns NetworkService from instance getter", () => {
-			const { service } = createService();
-			expect(service.serviceName).toBe("NetworkService");
-		});
-	});
-
 	// ── requestStatus ────────────────────────────────────────────────────────
 
 	describe("requestStatus", () => {
diff --git a/server/test/unit/services/settingsService.test.ts b/server/test/unit/services/settingsService.test.ts
index 43ea7fe18..e46472fac 100644
--- a/server/test/unit/services/settingsService.test.ts
+++ b/server/test/unit/services/settingsService.test.ts
@@ -56,17 +56,6 @@ const createService = (envOverrides?: Partial<ValidatedEnv>) => {
 // ── Tests ────────────────────────────────────────────────────────────────────
 
 describe("SettingsService", () => {
-	describe("serviceName", () => {
-		it("returns SettingsService from static property", () => {
-			expect(SettingsService.SERVICE_NAME).toBe("SettingsService");
-		});
-
-		it("returns SettingsService from instance getter", () => {
-			const { service } = createService();
-			expect(service.serviceName).toBe("SettingsService");
-		});
-	});
-
 	// ── loadSettings ────────────────────────────────────────────────────────
 
 	describe("loadSettings", () => {
diff --git a/server/test/unit/services/statusService.test.ts b/server/test/unit/services/statusService.test.ts
index 5712de301..4f4c0264a 100644
--- a/server/test/unit/services/statusService.test.ts
+++ b/server/test/unit/services/statusService.test.ts
@@ -143,13 +143,6 @@ const makeExistingStats = (overrides?: Record<string, unknown>) => ({
 // ── Tests ────────────────────────────────────────────────────────────────────
 
 describe("StatusService", () => {
-	describe("serviceName", () => {
-		it("returns StatusService", () => {
-			const { service } = createService();
-			expect(service.serviceName).toBe("StatusService");
-		});
-	});
-
 	// ── updateRunningStats ───────────────────────────────────────────────────
 
 	describe("updateRunningStats", () => {
diff --git a/server/test/unit/services/userService.test.ts b/server/test/unit/services/userService.test.ts
index 061003e7f..bce8769cf 100644
--- a/server/test/unit/services/userService.test.ts
+++ b/server/test/unit/services/userService.test.ts
@@ -98,13 +98,6 @@ const createService = (overrides?: Record<string, unknown>) => {
 // ── Tests ────────────────────────────────────────────────────────────────────
 
 describe("UserService", () => {
-	describe("serviceName", () => {
-		it("returns userService", () => {
-			const { service } = createService();
-			expect(service.serviceName).toBe("userService");
-		});
-	});
-
 	// ── issueToken ──────────────────────────────────────────────────────────
 
 	describe("issueToken", () => {
diff --git a/server/test/unit/services/workerHelper.test.ts b/server/test/unit/services/workerHelper.test.ts
index 96b45d3b3..fe7dca42d 100644
--- a/server/test/unit/services/workerHelper.test.ts
+++ b/server/test/unit/services/workerHelper.test.ts
@@ -71,13 +71,6 @@ const createHelper = (overrides?: Record<string, unknown>) => {
 // ── Tests ────────────────────────────────────────────────────────────────────
 
 describe("WorkerHelper", () => {
-	describe("serviceName", () => {
-		it("returns JobQueueHelper", () => {
-			const { helper } = createHelper();
-			expect(helper.serviceName).toBe("JobQueueHelper");
-		});
-	});
-
 	// ── getCleanupOrphanedJob ────────────────────────────────────────────────
 
 	describe("getCleanupOrphanedJob", () => {