diff --git a/src/features/device-heartbeat/index.ts b/src/features/device-heartbeat/device-online-state-manager.ts
similarity index 100%
rename from src/features/device-heartbeat/index.ts
rename to src/features/device-heartbeat/device-online-state-manager.ts
diff --git a/src/index.ts b/src/index.ts
index b54281331..d5d096f77 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -120,7 +120,7 @@ import {
 	DeviceOnlineStates,
 	getPollInterval,
 	getInstance as getDeviceOnlineStateManager,
-} from './features/device-heartbeat';
+} from './features/device-heartbeat/device-online-state-manager';
 import { registryAuth } from './features/registry/certs';
 import {
 	ALLOWED_NAMES,
diff --git a/test/03_device-state.ts b/test/03_device-state.ts
index b2878c7ed..28f38f2f6 100644
--- a/test/03_device-state.ts
+++ b/test/03_device-state.ts
@@ -8,7 +8,7 @@ import { supertest, UserObjectParam } from './test-lib/supertest';
 import { version } from './test-lib/versions';
 import { pineTest } from './test-lib/pinetest';
 import * as configMock from '../src/lib/config';
-import * as stateMock from '../src/features/device-heartbeat';
+import * as stateMock from '../src/features/device-heartbeat/device-online-state-manager';
 import { waitFor } from './test-lib/common';
 import * as fixtures from './test-lib/fixtures';
 import { expectResourceToMatch } from './test-lib/api-helpers';
diff --git a/test/test-lib/init-tests.ts b/test/test-lib/init-tests.ts
index 2a6221aa3..d0344f0c8 100644
--- a/test/test-lib/init-tests.ts
+++ b/test/test-lib/init-tests.ts
@@ -13,7 +13,7 @@ export const preInit = async () => {
 
 	// override the interval used to emit the queue stats event...
 	const { DeviceOnlineStateManager } = await import(
-		'../../src/features/device-heartbeat'
+		'../../src/features/device-heartbeat/device-online-state-manager'
 	);
 	(DeviceOnlineStateManager as any)['QUEUE_STATS_INTERVAL_MSEC'] = 1000;
 };