diff --git a/packages/cli-v3/src/entryPoints/dev-run-worker.ts b/packages/cli-v3/src/entryPoints/dev-run-worker.ts
index 3baf55519..e88107b30 100644
--- a/packages/cli-v3/src/entryPoints/dev-run-worker.ts
+++ b/packages/cli-v3/src/entryPoints/dev-run-worker.ts
@@ -455,8 +455,8 @@ const zodIpc = new ZodIpcConnection({
     FLUSH: async ({ timeoutInMs }, sender) => {
       await flushAll(timeoutInMs);
     },
-    WAITPOINT_COMPLETED: async ({ waitpoint }) => {
-      sharedWorkerRuntime.completeWaitpoints([waitpoint]);
+    RESOLVE_WAITPOINT: async ({ waitpoint }) => {
+      sharedWorkerRuntime.resolveWaitpoints([waitpoint]);
     },
   },
 });
diff --git a/packages/cli-v3/src/entryPoints/managed-run-worker.ts b/packages/cli-v3/src/entryPoints/managed-run-worker.ts
index 5d192e81b..2553573a1 100644
--- a/packages/cli-v3/src/entryPoints/managed-run-worker.ts
+++ b/packages/cli-v3/src/entryPoints/managed-run-worker.ts
@@ -448,8 +448,8 @@ const zodIpc = new ZodIpcConnection({
     FLUSH: async ({ timeoutInMs }, sender) => {
       await flushAll(timeoutInMs);
     },
-    WAITPOINT_COMPLETED: async ({ waitpoint }) => {
-      sharedWorkerRuntime.completeWaitpoints([waitpoint]);
+    RESOLVE_WAITPOINT: async ({ waitpoint }) => {
+      sharedWorkerRuntime.resolveWaitpoints([waitpoint]);
     },
   },
 });
diff --git a/packages/core/src/v3/runtime/sharedRuntimeManager.ts b/packages/core/src/v3/runtime/sharedRuntimeManager.ts
index 855866e12..f28214282 100644
--- a/packages/core/src/v3/runtime/sharedRuntimeManager.ts
+++ b/packages/core/src/v3/runtime/sharedRuntimeManager.ts
@@ -146,12 +146,12 @@ export class SharedRuntimeManager implements RuntimeManager {
     });
   }
 
-  async completeWaitpoints(waitpoints: CompletedWaitpoint[]): Promise<void> {
-    await Promise.all(waitpoints.map((waitpoint) => this.completeWaitpoint(waitpoint)));
+  async resolveWaitpoints(waitpoints: CompletedWaitpoint[]): Promise<void> {
+    await Promise.all(waitpoints.map((waitpoint) => this.resolveWaitpoint(waitpoint)));
   }
 
-  private completeWaitpoint(waitpoint: CompletedWaitpoint): void {
-    this.log("completeWaitpoint", waitpoint);
+  private resolveWaitpoint(waitpoint: CompletedWaitpoint): void {
+    this.log("resolveWaitpoint", waitpoint);
 
     let waitId: string | undefined;
 
diff --git a/packages/core/src/v3/schemas/messages.ts b/packages/core/src/v3/schemas/messages.ts
index cffcb7c15..47e6cfadf 100644
--- a/packages/core/src/v3/schemas/messages.ts
+++ b/packages/core/src/v3/schemas/messages.ts
@@ -225,7 +225,7 @@ export const WorkerToExecutorMessageCatalog = {
     }),
     callback: z.void(),
   },
-  WAITPOINT_COMPLETED: {
+  RESOLVE_WAITPOINT: {
     message: z.object({
       version: z.literal("v1").default("v1"),
       waitpoint: CompletedWaitpoint,