diff --git a/src/vs/base/node/id.ts b/src/vs/base/node/id.ts
index 271c9aeb769..c74fcf4ae61 100644
--- a/src/vs/base/node/id.ts
+++ b/src/vs/base/node/id.ts
@@ -115,7 +115,7 @@ export async function getSqmMachineId(errorLogger: (error: any) => void): Promis
 	return '';
 }
 
-export async function getdevDeviceId(errorLogger: (error: any) => void): Promise<string> {
+export async function getDevDeviceId(errorLogger: (error: any) => void): Promise<string> {
 	try {
 		const deviceIdPackage = await import('@vscode/deviceid');
 		const id = await deviceIdPackage.getDeviceId();
diff --git a/src/vs/base/test/node/id.test.ts b/src/vs/base/test/node/id.test.ts
index 9c862cb324d..b8379233899 100644
--- a/src/vs/base/test/node/id.test.ts
+++ b/src/vs/base/test/node/id.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import assert from 'assert';
-import { getMachineId, getSqmMachineId, getdevDeviceId } from '../../node/id.js';
+import { getMachineId, getSqmMachineId, getDevDeviceId } from '../../node/id.js';
 import { getMac } from '../../node/macAddress.js';
 import { flakySuite } from './testUtils.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../common/utils.js';
@@ -26,9 +26,9 @@ flakySuite('ID', () => {
 		assert.strictEqual(errors.length, 0);
 	});
 
-	test('getdevDeviceId', async function () {
+	test('getDevDeviceId', async function () {
 		const errors = [];
-		const id = await getdevDeviceId(err => errors.push(err));
+		const id = await getDevDeviceId(err => errors.push(err));
 		assert.ok(typeof id === 'string');
 		assert.strictEqual(errors.length, 0);
 	});
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 3f772f5b332..9643512df76 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -101,7 +101,7 @@ import { ExtensionsScannerService } from '../../platform/extensionManagement/nod
 import { UserDataProfilesHandler } from '../../platform/userDataProfile/electron-main/userDataProfilesHandler.js';
 import { ProfileStorageChangesListenerChannel } from '../../platform/userDataProfile/electron-main/userDataProfileStorageIpc.js';
 import { Promises, RunOnceScheduler, runWhenGlobalIdle } from '../../base/common/async.js';
-import { resolveMachineId, resolveSqmId, resolvedevDeviceId, validatedevDeviceId } from '../../platform/telemetry/electron-main/telemetryUtils.js';
+import { resolveMachineId, resolveSqmId, resolveDevDeviceId, validateDevDeviceId } from '../../platform/telemetry/electron-main/telemetryUtils.js';
 import { ExtensionsProfileScannerService } from '../../platform/extensionManagement/node/extensionsProfileScannerService.js';
 import { LoggerChannel } from '../../platform/log/electron-main/logIpc.js';
 import { ILoggerMainService } from '../../platform/log/electron-main/loggerService.js';
@@ -565,13 +565,11 @@ export class CodeApplication extends Disposable {
 		});
 
 		// Resolve unique machine ID
-		this.logService.trace('Resolving machine identifier...');
 		const [machineId, sqmId, devDeviceId] = await Promise.all([
 			resolveMachineId(this.stateService, this.logService),
 			resolveSqmId(this.stateService, this.logService),
-			resolvedevDeviceId(this.stateService, this.logService)
+			resolveDevDeviceId(this.stateService, this.logService)
 		]);
-		this.logService.trace(`Resolved machine identifier: ${machineId}`);
 
 		// Shared process
 		const { sharedProcessReady, sharedProcessClient } = this.setupSharedProcess(machineId, sqmId, devDeviceId);
@@ -1469,6 +1467,6 @@ export class CodeApplication extends Disposable {
 
 		// Validate Device ID is up to date (delay this as it has shown significant perf impact)
 		// Refs: https://github.com/microsoft/vscode/issues/234064
-		validatedevDeviceId(this.stateService, this.logService);
+		validateDevDeviceId(this.stateService, this.logService);
 	}
 }
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index 590acab99ec..d8bf8bc3f24 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -57,7 +57,7 @@ import { IUriIdentityService } from '../../platform/uriIdentity/common/uriIdenti
 import { UriIdentityService } from '../../platform/uriIdentity/common/uriIdentityService.js';
 import { IUserDataProfile, IUserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfile.js';
 import { UserDataProfilesReadonlyService } from '../../platform/userDataProfile/node/userDataProfile.js';
-import { resolveMachineId, resolveSqmId, resolvedevDeviceId } from '../../platform/telemetry/node/telemetryUtils.js';
+import { resolveMachineId, resolveSqmId, resolveDevDeviceId } from '../../platform/telemetry/node/telemetryUtils.js';
 import { ExtensionsProfileScannerService } from '../../platform/extensionManagement/node/extensionsProfileScannerService.js';
 import { LogService } from '../../platform/log/common/logService.js';
 import { LoggerService } from '../../platform/log/node/loggerService.js';
@@ -202,7 +202,7 @@ class CliMain extends Disposable {
 			}
 		}
 		const sqmId = await resolveSqmId(stateService, logService);
-		const devDeviceId = await resolvedevDeviceId(stateService, logService);
+		const devDeviceId = await resolveDevDeviceId(stateService, logService);
 
 		// Initialize user data profiles after initializing the state
 		userDataProfilesService.init();
diff --git a/src/vs/platform/telemetry/electron-main/telemetryUtils.ts b/src/vs/platform/telemetry/electron-main/telemetryUtils.ts
index 3838c644986..a77b2186ed7 100644
--- a/src/vs/platform/telemetry/electron-main/telemetryUtils.ts
+++ b/src/vs/platform/telemetry/electron-main/telemetryUtils.ts
@@ -3,34 +3,39 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getdevDeviceId } from '../../../base/node/id.js';
+import { getDevDeviceId } from '../../../base/node/id.js';
 import { ILogService } from '../../log/common/log.js';
 import { IStateService } from '../../state/node/state.js';
 import { machineIdKey, sqmIdKey, devDeviceIdKey } from '../common/telemetry.js';
-import { resolveMachineId as resolveNodeMachineId, resolveSqmId as resolveNodeSqmId, resolvedevDeviceId as resolveNodedevDeviceId } from '../node/telemetryUtils.js';
+import { resolveMachineId as resolveNodeMachineId, resolveSqmId as resolveNodeSqmId, resolveDevDeviceId as resolveNodeDevDeviceId } from '../node/telemetryUtils.js';
 
 export async function resolveMachineId(stateService: IStateService, logService: ILogService): Promise<string> {
-	// Call the node layers implementation to avoid code duplication
+	logService.trace('Resolving machine identifier...');
 	const machineId = await resolveNodeMachineId(stateService, logService);
 	stateService.setItem(machineIdKey, machineId);
+	logService.trace(`Resolved machine identifier: ${machineId}`);
 	return machineId;
 }
 
 export async function resolveSqmId(stateService: IStateService, logService: ILogService): Promise<string> {
+	logService.trace('Resolving SQM identifier...');
 	const sqmId = await resolveNodeSqmId(stateService, logService);
 	stateService.setItem(sqmIdKey, sqmId);
+	logService.trace(`Resolved SQM identifier: ${sqmId}`);
 	return sqmId;
 }
 
-export async function resolvedevDeviceId(stateService: IStateService, logService: ILogService): Promise<string> {
-	const devDeviceId = await resolveNodedevDeviceId(stateService, logService);
+export async function resolveDevDeviceId(stateService: IStateService, logService: ILogService): Promise<string> {
+	logService.trace('Resolving devDevice identifier...');
+	const devDeviceId = await resolveNodeDevDeviceId(stateService, logService);
 	stateService.setItem(devDeviceIdKey, devDeviceId);
+	logService.trace(`Resolved devDevice identifier: ${devDeviceId}`);
 	return devDeviceId;
 }
 
-export async function validatedevDeviceId(stateService: IStateService, logService: ILogService): Promise<void> {
-	const actualDeviceId = await getdevDeviceId(logService.error.bind(logService));
-	const currentDeviceId = await resolveNodedevDeviceId(stateService, logService);
+export async function validateDevDeviceId(stateService: IStateService, logService: ILogService): Promise<void> {
+	const actualDeviceId = await getDevDeviceId(logService.error.bind(logService));
+	const currentDeviceId = await resolveNodeDevDeviceId(stateService, logService);
 	if (actualDeviceId !== currentDeviceId) {
 		stateService.setItem(devDeviceIdKey, actualDeviceId);
 	}
diff --git a/src/vs/platform/telemetry/node/telemetryUtils.ts b/src/vs/platform/telemetry/node/telemetryUtils.ts
index faca66149bc..fc77275289b 100644
--- a/src/vs/platform/telemetry/node/telemetryUtils.ts
+++ b/src/vs/platform/telemetry/node/telemetryUtils.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { isMacintosh } from '../../../base/common/platform.js';
-import { getMachineId, getSqmMachineId, getdevDeviceId } from '../../../base/node/id.js';
+import { getMachineId, getSqmMachineId, getDevDeviceId } from '../../../base/node/id.js';
 import { ILogService } from '../../log/common/log.js';
 import { IStateReadService } from '../../state/node/state.js';
 import { machineIdKey, sqmIdKey, devDeviceIdKey } from '../common/telemetry.js';
@@ -30,10 +30,10 @@ export async function resolveSqmId(stateService: IStateReadService, logService:
 	return sqmId;
 }
 
-export async function resolvedevDeviceId(stateService: IStateReadService, logService: ILogService): Promise<string> {
+export async function resolveDevDeviceId(stateService: IStateReadService, logService: ILogService): Promise<string> {
 	let devDeviceId = stateService.getItem<string>(devDeviceIdKey);
 	if (typeof devDeviceId !== 'string') {
-		devDeviceId = await getdevDeviceId(logService.error.bind(logService));
+		devDeviceId = await getDevDeviceId(logService.error.bind(logService));
 	}
 
 	return devDeviceId;
diff --git a/src/vs/server/node/serverServices.ts b/src/vs/server/node/serverServices.ts
index 58ea88654d1..469f5ab8824 100644
--- a/src/vs/server/node/serverServices.ts
+++ b/src/vs/server/node/serverServices.ts
@@ -9,7 +9,7 @@ import { DisposableStore, toDisposable } from '../../base/common/lifecycle.js';
 import { Schemas } from '../../base/common/network.js';
 import * as path from '../../base/common/path.js';
 import { IURITransformer } from '../../base/common/uriIpc.js';
-import { getMachineId, getSqmMachineId, getdevDeviceId } from '../../base/node/id.js';
+import { getMachineId, getSqmMachineId, getDevDeviceId } from '../../base/node/id.js';
 import { Promises } from '../../base/node/pfs.js';
 import { ClientConnectionEvent, IMessagePassingProtocol, IPCServer, StaticRouter } from '../../base/parts/ipc/common/ipc.js';
 import { ProtocolConstants } from '../../base/parts/ipc/common/ipc.net.js';
@@ -154,7 +154,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 		userDataProfilesService.init(),
 		getMachineId(logService.error.bind(logService)),
 		getSqmMachineId(logService.error.bind(logService)),
-		getdevDeviceId(logService.error.bind(logService))
+		getDevDeviceId(logService.error.bind(logService))
 	]);
 
 	const extensionHostStatusService = new ExtensionHostStatusService();