diff --git a/packages/actor-core/src/actor/router_endpoints.ts b/packages/actor-core/src/actor/router-endpoints.ts
similarity index 100%
rename from packages/actor-core/src/actor/router_endpoints.ts
rename to packages/actor-core/src/actor/router-endpoints.ts
diff --git a/packages/actor-core/src/actor/router.ts b/packages/actor-core/src/actor/router.ts
index 2ea7fc0d1..9ab9521be 100644
--- a/packages/actor-core/src/actor/router.ts
+++ b/packages/actor-core/src/actor/router.ts
@@ -27,7 +27,7 @@ import {
 	handleSseConnect,
 	handleRpc,
 	handleConnectionMessage,
-} from "./router_endpoints";
+} from "./router-endpoints";
 
 export type {
 	ConnectWebSocketOpts,
diff --git a/packages/actor-core/src/client/actor_common.ts b/packages/actor-core/src/client/actor-common.ts
similarity index 100%
rename from packages/actor-core/src/client/actor_common.ts
rename to packages/actor-core/src/client/actor-common.ts
diff --git a/packages/actor-core/src/client/actor_conn.ts b/packages/actor-core/src/client/actor-conn.ts
similarity index 99%
rename from packages/actor-core/src/client/actor_conn.ts
rename to packages/actor-core/src/client/actor-conn.ts
index 1bbf3b677..3aea77237 100644
--- a/packages/actor-core/src/client/actor_conn.ts
+++ b/packages/actor-core/src/client/actor-conn.ts
@@ -10,7 +10,7 @@ import { importWebSocket } from "@/common/websocket";
 import type { ActorQuery } from "@/manager/protocol/query";
 import * as cbor from "cbor-x";
 import pRetry from "p-retry";
-import type { ActorDefinitionRpcs as ActorDefinitionRpcsImport } from "./actor_common";
+import type { ActorDefinitionRpcs as ActorDefinitionRpcsImport } from "./actor-common";
 import { ACTOR_CONNS_SYMBOL, type ClientRaw, TRANSPORT_SYMBOL } from "./client";
 import * as errors from "./errors";
 import { logger } from "./log";
diff --git a/packages/actor-core/src/client/actor_handle.ts b/packages/actor-core/src/client/actor-handle.ts
similarity index 98%
rename from packages/actor-core/src/client/actor_handle.ts
rename to packages/actor-core/src/client/actor-handle.ts
index f252c1992..96f9c75f0 100644
--- a/packages/actor-core/src/client/actor_handle.ts
+++ b/packages/actor-core/src/client/actor-handle.ts
@@ -2,8 +2,8 @@ import type { AnyActorDefinition } from "@/actor/definition";
 import type { RpcRequest, RpcResponse } from "@/actor/protocol/http/rpc";
 import type { Encoding } from "@/actor/protocol/serde";
 import type { ActorQuery } from "@/manager/protocol/query";
-import { type ActorDefinitionRpcs, resolveActorId } from "./actor_common";
-import { type ActorConn, ActorConnRaw } from "./actor_conn";
+import { type ActorDefinitionRpcs, resolveActorId } from "./actor-common";
+import { type ActorConn, ActorConnRaw } from "./actor-conn";
 import { CREATE_ACTOR_CONN_PROXY, type ClientRaw } from "./client";
 import { logger } from "./log";
 import { sendHttpRequest } from "./utils";
diff --git a/packages/actor-core/src/client/client.ts b/packages/actor-core/src/client/client.ts
index 912cdaadf..0078818a2 100644
--- a/packages/actor-core/src/client/client.ts
+++ b/packages/actor-core/src/client/client.ts
@@ -2,9 +2,9 @@ import type { Transport } from "@/actor/protocol/message/mod";
 import type { Encoding } from "@/actor/protocol/serde";
 import type { ActorQuery } from "@/manager/protocol/query";
 import * as errors from "./errors";
-import { ActorConn, ActorConnRaw, CONNECT_SYMBOL } from "./actor_conn";
-import { ActorHandle, ActorHandleRaw } from "./actor_handle";
-import { ActorRPCFunction, resolveActorId } from "./actor_common";
+import { ActorConn, ActorConnRaw, CONNECT_SYMBOL } from "./actor-conn";
+import { ActorHandle, ActorHandleRaw } from "./actor-handle";
+import { ActorRPCFunction, resolveActorId } from "./actor-common";
 import { logger } from "./log";
 import type { ActorCoreApp } from "@/mod";
 import type { AnyActorDefinition } from "@/actor/definition";
diff --git a/packages/actor-core/src/client/mod.ts b/packages/actor-core/src/client/mod.ts
index 1b913f574..31ff067af 100644
--- a/packages/actor-core/src/client/mod.ts
+++ b/packages/actor-core/src/client/mod.ts
@@ -12,12 +12,12 @@ export type {
 	ExtractAppFromClient,
 	ClientRaw,
 } from "./client";
-export type { ActorConn } from "./actor_conn";
-export { ActorConnRaw } from "./actor_conn";
-export type { EventUnsubscribe } from "./actor_conn";
-export type { ActorHandle } from "./actor_handle";
-export { ActorHandleRaw } from "./actor_handle";
-export type { ActorRPCFunction } from "./actor_common";
+export type { ActorConn } from "./actor-conn";
+export { ActorConnRaw } from "./actor-conn";
+export type { EventUnsubscribe } from "./actor-conn";
+export type { ActorHandle } from "./actor-handle";
+export { ActorHandleRaw } from "./actor-handle";
+export type { ActorRPCFunction } from "./actor-common";
 export type { Transport } from "@/actor/protocol/message/mod";
 export type { Encoding } from "@/actor/protocol/serde";
 export type { CreateRequest } from "@/manager/protocol/query";
diff --git a/packages/actor-core/src/common/router.ts b/packages/actor-core/src/common/router.ts
index 2ef77eaf1..66f66a749 100644
--- a/packages/actor-core/src/common/router.ts
+++ b/packages/actor-core/src/common/router.ts
@@ -1,7 +1,7 @@
 import type { Context as HonoContext, Next } from "hono";
 import { getLogger, Logger } from "./log";
 import { deconstructError } from "./utils";
-import { getRequestEncoding } from "@/actor/router_endpoints";
+import { getRequestEncoding } from "@/actor/router-endpoints";
 import { serialize } from "@/actor/protocol/serde";
 import { ResponseError } from "@/actor/protocol/http/error";
 
diff --git a/packages/actor-core/src/manager/router.ts b/packages/actor-core/src/manager/router.ts
index b1b5d7fc3..727e511bf 100644
--- a/packages/actor-core/src/manager/router.ts
+++ b/packages/actor-core/src/manager/router.ts
@@ -9,7 +9,7 @@ import {
 	handleRpc,
 	handleSseConnect,
 	handleWebSocketConnect,
-} from "@/actor/router_endpoints";
+} from "@/actor/router-endpoints";
 import { assertUnreachable } from "@/actor/utils";
 import type { AppConfig } from "@/app/config";
 import {
diff --git a/packages/actor-core/src/test/driver/actor.ts b/packages/actor-core/src/test/driver/actor.ts
index 4840e9f81..7088f7970 100644
--- a/packages/actor-core/src/test/driver/actor.ts
+++ b/packages/actor-core/src/test/driver/actor.ts
@@ -1,5 +1,5 @@
 import type { ActorDriver, AnyActorInstance } from "@/driver-helpers/mod";
-import type { TestGlobalState } from "./global_state";
+import type { TestGlobalState } from "./global-state";
 
 export interface ActorDriverContext {
 	// Used to test that the actor context works from tests
diff --git a/packages/actor-core/src/test/driver/global_state.ts b/packages/actor-core/src/test/driver/global-state.ts
similarity index 100%
rename from packages/actor-core/src/test/driver/global_state.ts
rename to packages/actor-core/src/test/driver/global-state.ts
diff --git a/packages/actor-core/src/test/driver/manager.ts b/packages/actor-core/src/test/driver/manager.ts
index eaeb77755..9c2f8f1c3 100644
--- a/packages/actor-core/src/test/driver/manager.ts
+++ b/packages/actor-core/src/test/driver/manager.ts
@@ -6,7 +6,7 @@ import type {
 	GetWithKeyInput,
 	ManagerDriver,
 } from "@/driver-helpers/mod";
-import type { TestGlobalState } from "./global_state";
+import type { TestGlobalState } from "./global-state";
 import { ManagerInspector } from "@/inspector/manager";
 import type { ActorCoreApp } from "@/app/mod";
 
diff --git a/packages/actor-core/src/test/driver/mod.ts b/packages/actor-core/src/test/driver/mod.ts
index 6939019d8..51438dd00 100644
--- a/packages/actor-core/src/test/driver/mod.ts
+++ b/packages/actor-core/src/test/driver/mod.ts
@@ -1,3 +1,3 @@
-export { TestGlobalState } from "./global_state";
+export { TestGlobalState } from "./global-state";
 export { TestActorDriver } from "./actor";
 export { TestManagerDriver } from "./manager";
diff --git a/packages/actor-core/src/topologies/coordinate/topology.ts b/packages/actor-core/src/topologies/coordinate/topology.ts
index 3b1cd0ab1..fe7df7041 100644
--- a/packages/actor-core/src/topologies/coordinate/topology.ts
+++ b/packages/actor-core/src/topologies/coordinate/topology.ts
@@ -21,7 +21,7 @@ import type {
 	ConnectSseOutput,
 	RpcOutput,
 	ConnectionHandlers,
-} from "@/actor/router_endpoints";
+} from "@/actor/router-endpoints";
 
 export interface GlobalState {
 	nodeId: string;
diff --git a/packages/actor-core/src/topologies/partition/toplogy.ts b/packages/actor-core/src/topologies/partition/toplogy.ts
index 6ac0366a2..73eb2308a 100644
--- a/packages/actor-core/src/topologies/partition/toplogy.ts
+++ b/packages/actor-core/src/topologies/partition/toplogy.ts
@@ -38,7 +38,7 @@ import type {
 	ConnectWebSocketOutput,
 	ConnectSseOutput,
 	RpcOutput,
-} from "@/actor/router_endpoints";
+} from "@/actor/router-endpoints";
 
 export class PartitionTopologyManager {
 	router: Hono;
diff --git a/packages/actor-core/src/topologies/standalone/topology.ts b/packages/actor-core/src/topologies/standalone/topology.ts
index 0f5a095c7..65f34ccb9 100644
--- a/packages/actor-core/src/topologies/standalone/topology.ts
+++ b/packages/actor-core/src/topologies/standalone/topology.ts
@@ -31,7 +31,7 @@ import type {
 	RpcOpts,
 	RpcOutput,
 	ConnectionHandlers,
-} from "@/actor/router_endpoints";
+} from "@/actor/router-endpoints";
 
 class ActorHandler {
 	/** Will be undefined if not yet loaded. */
diff --git a/packages/drivers/file-system/src/actor.ts b/packages/drivers/file-system/src/actor.ts
index 27d7871b5..791816bd6 100644
--- a/packages/drivers/file-system/src/actor.ts
+++ b/packages/drivers/file-system/src/actor.ts
@@ -1,5 +1,5 @@
 import type { ActorDriver, AnyActorInstance } from "actor-core/driver-helpers";
-import type { FileSystemGlobalState } from "./global_state";
+import type { FileSystemGlobalState } from "./global-state";
 
 export type ActorDriverContext = Record<never, never>;
 
diff --git a/packages/drivers/file-system/src/global_state.ts b/packages/drivers/file-system/src/global-state.ts
similarity index 100%
rename from packages/drivers/file-system/src/global_state.ts
rename to packages/drivers/file-system/src/global-state.ts
diff --git a/packages/drivers/file-system/src/manager.ts b/packages/drivers/file-system/src/manager.ts
index 1fad92cc0..0124d1bda 100644
--- a/packages/drivers/file-system/src/manager.ts
+++ b/packages/drivers/file-system/src/manager.ts
@@ -8,7 +8,7 @@ import type {
 	ManagerDriver,
 } from "actor-core/driver-helpers";
 import { logger } from "./log";
-import type { FileSystemGlobalState } from "./global_state";
+import type { FileSystemGlobalState } from "./global-state";
 import type { ActorCoreApp } from "actor-core";
 import { ManagerInspector } from "actor-core/inspector";
 
diff --git a/packages/drivers/file-system/src/mod.ts b/packages/drivers/file-system/src/mod.ts
index 41d2183fb..e2edfc32d 100644
--- a/packages/drivers/file-system/src/mod.ts
+++ b/packages/drivers/file-system/src/mod.ts
@@ -1,5 +1,5 @@
 export { getStoragePath } from "./utils";
 export { FileSystemActorDriver } from "./actor";
 export { FileSystemManagerDriver } from "./manager";
-export { FileSystemGlobalState } from "./global_state";
+export { FileSystemGlobalState } from "./global-state";
 
diff --git a/packages/drivers/memory/src/actor.ts b/packages/drivers/memory/src/actor.ts
index 2f8f2659f..069d513bc 100644
--- a/packages/drivers/memory/src/actor.ts
+++ b/packages/drivers/memory/src/actor.ts
@@ -1,5 +1,5 @@
 import type { ActorDriver, AnyActorInstance } from "actor-core/driver-helpers";
-import type { MemoryGlobalState } from "./global_state";
+import type { MemoryGlobalState } from "./global-state";
 
 export type ActorDriverContext = Record<never, never>;
 
diff --git a/packages/drivers/memory/src/global_state.ts b/packages/drivers/memory/src/global-state.ts
similarity index 100%
rename from packages/drivers/memory/src/global_state.ts
rename to packages/drivers/memory/src/global-state.ts
diff --git a/packages/drivers/memory/src/manager.ts b/packages/drivers/memory/src/manager.ts
index 66ba1e7d2..4db4fa344 100644
--- a/packages/drivers/memory/src/manager.ts
+++ b/packages/drivers/memory/src/manager.ts
@@ -6,7 +6,7 @@ import type {
 	GetWithKeyInput,
 	ManagerDriver,
 } from "actor-core/driver-helpers";
-import type { MemoryGlobalState } from "./global_state";
+import type { MemoryGlobalState } from "./global-state";
 import { ManagerInspector } from "actor-core/inspector";
 import type { ActorCoreApp } from "actor-core";
 
diff --git a/packages/drivers/memory/src/mod.ts b/packages/drivers/memory/src/mod.ts
index 532759fdb..522714b88 100644
--- a/packages/drivers/memory/src/mod.ts
+++ b/packages/drivers/memory/src/mod.ts
@@ -1,3 +1,3 @@
-export { MemoryGlobalState } from "./global_state";
+export { MemoryGlobalState } from "./global-state";
 export { MemoryActorDriver } from "./actor";
 export { MemoryManagerDriver } from "./manager";
diff --git a/packages/platforms/cloudflare-workers/src/actor_driver.ts b/packages/platforms/cloudflare-workers/src/actor-driver.ts
similarity index 100%
rename from packages/platforms/cloudflare-workers/src/actor_driver.ts
rename to packages/platforms/cloudflare-workers/src/actor-driver.ts
diff --git a/packages/platforms/cloudflare-workers/src/actor_handler_do.ts b/packages/platforms/cloudflare-workers/src/actor-handler-do.ts
similarity index 99%
rename from packages/platforms/cloudflare-workers/src/actor_handler_do.ts
rename to packages/platforms/cloudflare-workers/src/actor-handler-do.ts
index 7f465b259..647fa9f04 100644
--- a/packages/platforms/cloudflare-workers/src/actor_handler_do.ts
+++ b/packages/platforms/cloudflare-workers/src/actor-handler-do.ts
@@ -6,7 +6,7 @@ import { PartitionTopologyActor } from "actor-core/topologies/partition";
 import {
 	CloudflareDurableObjectGlobalState,
 	CloudflareWorkersActorDriver,
-} from "./actor_driver";
+} from "./actor-driver";
 import { upgradeWebSocket } from "./websocket";
 
 const KEYS = {
diff --git a/packages/platforms/cloudflare-workers/src/handler.ts b/packages/platforms/cloudflare-workers/src/handler.ts
index a7b0f62f8..a40c16c02 100644
--- a/packages/platforms/cloudflare-workers/src/handler.ts
+++ b/packages/platforms/cloudflare-workers/src/handler.ts
@@ -2,13 +2,13 @@ import {
 	type DurableObjectConstructor,
 	type ActorHandlerInterface,
 	createActorDurableObject,
-} from "./actor_handler_do";
+} from "./actor-handler-do";
 import { ConfigSchema, type InputConfig } from "./config";
 import { assertUnreachable } from "actor-core/utils";
 import type { Hono } from "hono";
 import { PartitionTopologyManager } from "actor-core/topologies/partition";
 import { logger } from "./log";
-import { CloudflareWorkersManagerDriver } from "./manager_driver";
+import { CloudflareWorkersManagerDriver } from "./manager-driver";
 import { ActorCoreApp } from "actor-core";
 import { upgradeWebSocket } from "./websocket";
 
diff --git a/packages/platforms/cloudflare-workers/src/manager_driver.ts b/packages/platforms/cloudflare-workers/src/manager-driver.ts
similarity index 100%
rename from packages/platforms/cloudflare-workers/src/manager_driver.ts
rename to packages/platforms/cloudflare-workers/src/manager-driver.ts
diff --git a/packages/platforms/cloudflare-workers/tests/id-generation.test.ts b/packages/platforms/cloudflare-workers/tests/id-generation.test.ts
index 77b14632e..00550f851 100644
--- a/packages/platforms/cloudflare-workers/tests/id-generation.test.ts
+++ b/packages/platforms/cloudflare-workers/tests/id-generation.test.ts
@@ -1,6 +1,6 @@
 import { describe, test, expect, vi } from "vitest";
 import { serializeNameAndKey } from "../src/util";
-import { CloudflareWorkersManagerDriver } from "../src/manager_driver";
+import { CloudflareWorkersManagerDriver } from "../src/manager-driver";
 
 describe("Deterministic ID generation", () => {
   test("should generate consistent IDs for the same name and key", () => {
diff --git a/packages/platforms/rivet/src/actor_driver.ts b/packages/platforms/rivet/src/actor-driver.ts
similarity index 100%
rename from packages/platforms/rivet/src/actor_driver.ts
rename to packages/platforms/rivet/src/actor-driver.ts
diff --git a/packages/platforms/rivet/src/actor_handler.ts b/packages/platforms/rivet/src/actor-handler.ts
similarity index 97%
rename from packages/platforms/rivet/src/actor_handler.ts
rename to packages/platforms/rivet/src/actor-handler.ts
index 157cace2c..e42ca51f3 100644
--- a/packages/platforms/rivet/src/actor_handler.ts
+++ b/packages/platforms/rivet/src/actor-handler.ts
@@ -6,8 +6,8 @@ import type { RivetHandler } from "./util";
 import { deserializeKeyFromTag } from "./util";
 import { PartitionTopologyActor } from "actor-core/topologies/partition";
 import { ConfigSchema, type InputConfig } from "./config";
-import { RivetActorDriver } from "./actor_driver";
-import { rivetRequest } from "./rivet_client";
+import { RivetActorDriver } from "./actor-driver";
+import { rivetRequest } from "./rivet-client";
 import invariant from "invariant";
 
 export function createActorHandler(inputConfig: InputConfig): RivetHandler {
diff --git a/packages/platforms/rivet/src/manager_driver.ts b/packages/platforms/rivet/src/manager-driver.ts
similarity index 99%
rename from packages/platforms/rivet/src/manager_driver.ts
rename to packages/platforms/rivet/src/manager-driver.ts
index 8bd52aba4..e90ba5956 100644
--- a/packages/platforms/rivet/src/manager_driver.ts
+++ b/packages/platforms/rivet/src/manager-driver.ts
@@ -7,7 +7,7 @@ import type {
 	GetActorOutput,
 } from "actor-core/driver-helpers";
 import { logger } from "./log";
-import { type RivetClientConfig, rivetRequest } from "./rivet_client";
+import { type RivetClientConfig, rivetRequest } from "./rivet-client";
 import { serializeKeyForTag, deserializeKeyFromTag } from "./util";
 
 export interface ActorState {
diff --git a/packages/platforms/rivet/src/manager_handler.ts b/packages/platforms/rivet/src/manager-handler.ts
similarity index 95%
rename from packages/platforms/rivet/src/manager_handler.ts
rename to packages/platforms/rivet/src/manager-handler.ts
index 0243c33b9..eb3d40e4a 100644
--- a/packages/platforms/rivet/src/manager_handler.ts
+++ b/packages/platforms/rivet/src/manager-handler.ts
@@ -1,10 +1,10 @@
 import { setupLogging } from "actor-core/log";
 import type { ActorContext } from "@rivet-gg/actor-core";
 import { logger } from "./log";
-import { GetActorMeta, RivetManagerDriver } from "./manager_driver";
-import type { RivetClientConfig } from "./rivet_client";
+import { GetActorMeta, RivetManagerDriver } from "./manager-driver";
+import type { RivetClientConfig } from "./rivet-client";
 import type { RivetHandler } from "./util";
-import { createWebSocketProxy } from "./ws_proxy";
+import { createWebSocketProxy } from "./ws-proxy";
 import { PartitionTopologyManager } from "actor-core/topologies/partition";
 import { type InputConfig, ConfigSchema } from "./config";
 import { proxy } from "hono/proxy";
diff --git a/packages/platforms/rivet/src/mod.ts b/packages/platforms/rivet/src/mod.ts
index 5f101b11f..3d2d3febc 100644
--- a/packages/platforms/rivet/src/mod.ts
+++ b/packages/platforms/rivet/src/mod.ts
@@ -1,3 +1,3 @@
-export { createActorHandler } from "./actor_handler";
-export { createManagerHandler } from "./manager_handler";
+export { createActorHandler } from "./actor-handler";
+export { createManagerHandler } from "./manager-handler";
 export type { InputConfig as Config } from "./config";
diff --git a/packages/platforms/rivet/src/rivet_client.ts b/packages/platforms/rivet/src/rivet-client.ts
similarity index 100%
rename from packages/platforms/rivet/src/rivet_client.ts
rename to packages/platforms/rivet/src/rivet-client.ts
diff --git a/packages/platforms/rivet/src/ws_proxy.ts b/packages/platforms/rivet/src/ws-proxy.ts
similarity index 100%
rename from packages/platforms/rivet/src/ws_proxy.ts
rename to packages/platforms/rivet/src/ws-proxy.ts