diff --git a/src/main.ts b/src/main.ts
index f5844d71c..ca951c61c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -16,9 +16,9 @@ import {logger, saveLogsToFile} from './logger.js';
 import {McpContext} from './McpContext.js';
 import {McpResponse} from './McpResponse.js';
 import {Mutex} from './Mutex.js';
-import {ClearcutLogger} from './telemetry/clearcut-logger.js';
-import {computeFlagUsage} from './telemetry/flag-utils.js';
-import {bucketizeLatency} from './telemetry/metric-utils.js';
+import {ClearcutLogger} from './telemetry/ClearcutLogger.js';
+import {computeFlagUsage} from './telemetry/flagUtils.js';
+import {bucketizeLatency} from './telemetry/metricUtils.js';
 import {
   McpServer,
   StdioServerTransport,
diff --git a/src/telemetry/clearcut-logger.ts b/src/telemetry/ClearcutLogger.ts
similarity index 98%
rename from src/telemetry/clearcut-logger.ts
rename to src/telemetry/ClearcutLogger.ts
index 6a1d6351d..7deadbf01 100644
--- a/src/telemetry/clearcut-logger.ts
+++ b/src/telemetry/ClearcutLogger.ts
@@ -11,7 +11,7 @@ import {logger} from '../logger.js';
 import type {LocalState, Persistence} from './persistence.js';
 import {FilePersistence} from './persistence.js';
 import {type FlagUsage, WatchdogMessageType, OsType} from './types.js';
-import {WatchdogClient} from './watchdog-client.js';
+import {WatchdogClient} from './WatchdogClient.js';
 
 const MS_PER_DAY = 24 * 60 * 60 * 1000;
 
diff --git a/src/telemetry/watchdog-client.ts b/src/telemetry/WatchdogClient.ts
similarity index 100%
rename from src/telemetry/watchdog-client.ts
rename to src/telemetry/WatchdogClient.ts
diff --git a/src/telemetry/flag-utils.ts b/src/telemetry/flagUtils.ts
similarity index 100%
rename from src/telemetry/flag-utils.ts
rename to src/telemetry/flagUtils.ts
diff --git a/src/telemetry/metric-utils.ts b/src/telemetry/metricUtils.ts
similarity index 100%
rename from src/telemetry/metric-utils.ts
rename to src/telemetry/metricUtils.ts
diff --git a/src/telemetry/watchdog/clearcut-sender.ts b/src/telemetry/watchdog/ClearcutSender.ts
similarity index 100%
rename from src/telemetry/watchdog/clearcut-sender.ts
rename to src/telemetry/watchdog/ClearcutSender.ts
diff --git a/src/telemetry/watchdog/main.ts b/src/telemetry/watchdog/main.ts
index 60536b583..21fbe8c36 100644
--- a/src/telemetry/watchdog/main.ts
+++ b/src/telemetry/watchdog/main.ts
@@ -13,7 +13,7 @@ import {logger, flushLogs, saveLogsToFile} from '../../logger.js';
 import type {OsType} from '../types.js';
 import {WatchdogMessageType} from '../types.js';
 
-import {ClearcutSender} from './clearcut-sender.js';
+import {ClearcutSender} from './ClearcutSender.js';
 
 interface WatchdogArgs {
   // Required arguments
diff --git a/tests/telemetry/clearcut-logger.test.ts b/tests/telemetry/ClearcutLogger.test.ts
similarity index 96%
rename from tests/telemetry/clearcut-logger.test.ts
rename to tests/telemetry/ClearcutLogger.test.ts
index 2c4912ba4..b8b1d1dc7 100644
--- a/tests/telemetry/clearcut-logger.test.ts
+++ b/tests/telemetry/ClearcutLogger.test.ts
@@ -9,11 +9,11 @@ import {describe, it, afterEach, beforeEach} from 'node:test';
 
 import sinon from 'sinon';
 
-import {ClearcutLogger} from '../../src/telemetry/clearcut-logger.js';
+import {ClearcutLogger} from '../../src/telemetry/ClearcutLogger.js';
 import type {Persistence} from '../../src/telemetry/persistence.js';
 import {FilePersistence} from '../../src/telemetry/persistence.js';
 import {WatchdogMessageType} from '../../src/telemetry/types.js';
-import {WatchdogClient} from '../../src/telemetry/watchdog-client.js';
+import {WatchdogClient} from '../../src/telemetry/WatchdogClient.js';
 
 describe('ClearcutLogger', () => {
   let mockPersistence: sinon.SinonStubbedInstance<Persistence>;
diff --git a/tests/telemetry/watchdog-client.test.ts b/tests/telemetry/WatchdogClient.test.ts
similarity index 98%
rename from tests/telemetry/watchdog-client.test.ts
rename to tests/telemetry/WatchdogClient.test.ts
index 258d3cac6..81b776577 100644
--- a/tests/telemetry/watchdog-client.test.ts
+++ b/tests/telemetry/WatchdogClient.test.ts
@@ -12,7 +12,7 @@ import {describe, it, afterEach, beforeEach} from 'node:test';
 import sinon from 'sinon';
 
 import {OsType, WatchdogMessageType} from '../../src/telemetry/types.js';
-import {WatchdogClient} from '../../src/telemetry/watchdog-client.js';
+import {WatchdogClient} from '../../src/telemetry/WatchdogClient.js';
 
 describe('WatchdogClient', () => {
   let spawnStub: sinon.SinonStub;
diff --git a/tests/telemetry/flag-utils.test.ts b/tests/telemetry/flagUtils.test.ts
similarity index 98%
rename from tests/telemetry/flag-utils.test.ts
rename to tests/telemetry/flagUtils.test.ts
index f7105ce14..76fa396c0 100644
--- a/tests/telemetry/flag-utils.test.ts
+++ b/tests/telemetry/flagUtils.test.ts
@@ -8,7 +8,7 @@ import assert from 'node:assert/strict';
 import {describe, it} from 'node:test';
 
 import type {cliOptions} from '../../src/cli.js';
-import {computeFlagUsage} from '../../src/telemetry/flag-utils.js';
+import {computeFlagUsage} from '../../src/telemetry/flagUtils.js';
 
 describe('computeFlagUsage', () => {
   const mockOptions = {
diff --git a/tests/telemetry/metric-utils.test.ts b/tests/telemetry/metricUtils.test.ts
similarity index 94%
rename from tests/telemetry/metric-utils.test.ts
rename to tests/telemetry/metricUtils.test.ts
index 789594f3c..36bda8683 100644
--- a/tests/telemetry/metric-utils.test.ts
+++ b/tests/telemetry/metricUtils.test.ts
@@ -7,7 +7,7 @@
 import assert from 'node:assert';
 import {describe, it} from 'node:test';
 
-import {bucketizeLatency} from '../../src/telemetry/metric-utils.js';
+import {bucketizeLatency} from '../../src/telemetry/metricUtils.js';
 
 describe('bucketizeLatency', () => {
   it('should bucketize values correctly', () => {
diff --git a/tests/telemetry/watchdog/clearcut-sender.test.ts b/tests/telemetry/watchdog/ClearcutSender.test.ts
similarity index 99%
rename from tests/telemetry/watchdog/clearcut-sender.test.ts
rename to tests/telemetry/watchdog/ClearcutSender.test.ts
index 8eca6a7f9..99e90f011 100644
--- a/tests/telemetry/watchdog/clearcut-sender.test.ts
+++ b/tests/telemetry/watchdog/ClearcutSender.test.ts
@@ -12,7 +12,7 @@ import sinon from 'sinon';
 
 import {OsType} from '../../../src/telemetry/types.js';
 import type {LogRequest} from '../../../src/telemetry/types.js';
-import {ClearcutSender} from '../../../src/telemetry/watchdog/clearcut-sender.js';
+import {ClearcutSender} from '../../../src/telemetry/watchdog/ClearcutSender.js';
 
 const FLUSH_INTERVAL_MS = 15 * 1000;