diff --git a/src/app/App.tsx b/src/app/App.tsx
index 37a7d0ac..44bd112d 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -81,6 +81,16 @@ import {
   resolveSelectionActiveId,
   type EditorSelection
 } from "../core/selection";
+import {
+  clampTerrainBrushFalloff,
+  clampTerrainBrushRadius,
+  clampTerrainBrushStrength,
+  createDefaultTerrainBrushSettings,
+  getTerrainBrushToolLabel,
+  type ArmedTerrainBrushState,
+  type TerrainBrushStrokeCommit,
+  type TerrainBrushTool
+} from "../core/terrain-brush";
 import {
   createTransformSession,
   doesTransformSessionChangeTarget,
diff --git a/src/viewport-three/viewport-host.ts b/src/viewport-three/viewport-host.ts
index f7e5f716..4e1193ad 100644
--- a/src/viewport-three/viewport-host.ts
+++ b/src/viewport-three/viewport-host.ts
@@ -7358,7 +7358,7 @@ export class ViewportHost {
     const committed =
       this.terrainBrushCommitHandler?.({
         terrain: cloneTerrain(finalPreviewTerrain),
-        commandLabel: `${toolState.tool.charAt(0).toUpperCase()}${toolState.tool.slice(1)} terrain`,
+        commandLabel: getTerrainBrushCommandLabel(toolState.tool),
         tool: toolState.tool
       }) === true;