diff --git a/packages/core/src/plugin/internal.ts b/packages/core/src/plugin/internal.ts
index 40715378e1..ad5553928a 100644
--- a/packages/core/src/plugin/internal.ts
+++ b/packages/core/src/plugin/internal.ts
@@ -31,7 +31,7 @@ import { SessionInstructions } from "../session/instructions"
 import { SessionTodo } from "../session/todo"
 import { Shell } from "../shell"
 import { SkillV2 } from "../skill"
-import { ApplyPatchTool } from "../tool/apply-patch"
+import { PatchTool } from "../tool/patch"
 import { EditTool } from "../tool/edit"
 import { GlobTool } from "../tool/glob"
 import { GrepTool } from "../tool/grep"
@@ -127,7 +127,7 @@ const pre = [
   SkillPlugin.Plugin,
   ModelsDevPlugin,
   ...ProviderPlugins,
-  ApplyPatchTool.Plugin,
+  PatchTool.Plugin,
   EditTool.Plugin,
   GlobTool.Plugin,
   GrepTool.Plugin,
diff --git a/packages/core/src/tool/apply-patch.ts b/packages/core/src/tool/patch.ts
similarity index 98%
rename from packages/core/src/tool/apply-patch.ts
rename to packages/core/src/tool/patch.ts
index a1ae7dc808..e6a043a0dd 100644
--- a/packages/core/src/tool/apply-patch.ts
+++ b/packages/core/src/tool/patch.ts
@@ -1,4 +1,4 @@
-export * as ApplyPatchTool from "./apply-patch"
+export * as PatchTool from "./patch"
 
 import type { Context as PluginContext } from "@opencode-ai/plugin/v2/effect/plugin"
 import { ToolFailure } from "@opencode-ai/llm"
@@ -55,8 +55,8 @@ type Prepared =
     })
 
 export const Plugin = {
-  id: "opencode.tool.apply-patch",
-  effect: Effect.fn("ApplyPatchTool.Plugin")(function* (ctx: PluginContext) {
+  id: "opencode.tool.patch",
+  effect: Effect.fn("PatchTool.Plugin")(function* (ctx: PluginContext) {
     const mutation = yield* LocationMutation.Service
     const files = yield* FileMutation.Service
     const fs = yield* FSUtil.Service
diff --git a/packages/core/test/tool-apply-patch.test.ts b/packages/core/test/tool-patch.test.ts
similarity index 98%
rename from packages/core/test/tool-apply-patch.test.ts
rename to packages/core/test/tool-patch.test.ts
index cb6745af32..43b20d0cbf 100644
--- a/packages/core/test/tool-apply-patch.test.ts
+++ b/packages/core/test/tool-patch.test.ts
@@ -13,16 +13,16 @@ import { AbsolutePath } from "@opencode-ai/core/schema"
 import { SessionV2 } from "@opencode-ai/core/session"
 import { ToolRegistry } from "@opencode-ai/core/tool/registry"
 import { ToolOutputStore } from "@opencode-ai/core/tool-output-store"
-import { ApplyPatchTool } from "@opencode-ai/core/tool/apply-patch"
+import { PatchTool } from "@opencode-ai/core/tool/patch"
 import { location } from "./fixture/location"
 import { tmpdir } from "./fixture/tmpdir"
 import { makeLocationNode } from "@opencode-ai/core/effect/app-node"
 import { testEffect } from "./lib/effect"
 import { toolIdentity, executeTool, registerToolPlugin, settleTool, toolDefinitions } from "./lib/tool"
 
-const applyPatchToolNode = makeLocationNode({
-  name: "test/apply-patch-tool-plugin",
-  layer: Layer.effectDiscard(registerToolPlugin(ApplyPatchTool.Plugin)),
+const patchToolNode = makeLocationNode({
+  name: "test/patch-tool-plugin",
+  layer: Layer.effectDiscard(registerToolPlugin(PatchTool.Plugin)),
   deps: [ToolRegistry.toolsNode, LocationMutation.node, FileMutation.node, FSUtil.node, PermissionV2.node],
 })
 
@@ -116,7 +116,7 @@ const withTool = <A, E, R>(directory: string, body: (registry: ToolRegistry.Inte
           ToolRegistry.toolsNode,
           LocationMutation.node,
           FileMutation.node,
-          applyPatchToolNode,
+          patchToolNode,
         ]),
         [
           [FSUtil.node, filesystem],
@@ -129,7 +129,7 @@ const withTool = <A, E, R>(directory: string, body: (registry: ToolRegistry.Inte
   )
 }
 
-const call = (patchText: string, id = "call-apply-patch") => ({
+const call = (patchText: string, id = "call-patch") => ({
   sessionID,
   ...toolIdentity,
   call: { type: "tool-call" as const, id, name: "patch", input: { patchText } },
@@ -147,7 +147,7 @@ const exists = (target: string) =>
   )
 const it = testEffect(Layer.empty)
 
-describe("ApplyPatchTool", () => {
+describe("PatchTool", () => {
   it.live("registers and sequentially applies add, update, and delete hunks", () =>
     Effect.acquireUseRelease(
       Effect.promise(() => tmpdir()),