diff --git a/packages/translator/src/core/attrs.ts b/packages/translator/src/core/attrs.ts
index 403ca8296..ca341d257 100644
--- a/packages/translator/src/core/attrs.ts
+++ b/packages/translator/src/core/attrs.ts
@@ -7,7 +7,7 @@ import {
 import { ReserveType } from "../util/reserve";
 import { getOrCreateSectionId } from "../util/sections";
 import { currentProgramPath } from "../visitors/program";
-import { initSource } from "../util/apply-hydrate";
+import { initSource } from "../util/signals";
 
 declare module "@marko/compiler/dist/types" {
   export interface ProgramExtra {
diff --git a/packages/translator/src/core/condition/if.ts b/packages/translator/src/core/condition/if.ts
index 49cbdecf8..fded81b49 100644
--- a/packages/translator/src/core/condition/if.ts
+++ b/packages/translator/src/core/condition/if.ts
@@ -8,7 +8,7 @@ import {
   getSignal,
   setSubscriberBuilder,
   writeHTMLHydrateStatements,
-} from "../../util/apply-hydrate";
+} from "../../util/signals";
 import { callRuntime } from "../../util/runtime";
 import { isCoreTagName } from "../../util/is-core-tag";
 import toFirstStatementOrBlock from "../../util/to-first-statement-or-block";
diff --git a/packages/translator/src/core/const.ts b/packages/translator/src/core/const.ts
index 9b9ca72b2..f00f149a9 100644
--- a/packages/translator/src/core/const.ts
+++ b/packages/translator/src/core/const.ts
@@ -3,7 +3,7 @@ import { Tag, assertNoParams } from "@marko/babel-utils";
 import { assertNoBodyContent } from "../util/assert";
 import translateVar from "../util/translate-var";
 import { isOutputDOM } from "../util/marko-config";
-import { initDerivation } from "../util/apply-hydrate";
+import { initDerivation } from "../util/signals";
 
 export default {
   translate(tag) {
diff --git a/packages/translator/src/core/effect.ts b/packages/translator/src/core/effect.ts
index 41bb2ac22..20e7badbb 100644
--- a/packages/translator/src/core/effect.ts
+++ b/packages/translator/src/core/effect.ts
@@ -2,7 +2,7 @@ import { types as t } from "@marko/compiler";
 import { Tag, assertNoParams } from "@marko/babel-utils";
 import { assertNoBodyContent } from "../util/assert";
 import { isOutputDOM } from "../util/marko-config";
-import { addStatement, addHTMLHydrateCall } from "../util/apply-hydrate";
+import { addStatement, addHTMLHydrateCall } from "../util/signals";
 import { callRuntime } from "../util/runtime";
 import { getSectionId } from "../util/sections";
 import { ReserveType, reserveScope } from "../util/reserve";
diff --git a/packages/translator/src/core/for.ts b/packages/translator/src/core/for.ts
index d92cdbd08..5f5751cc1 100644
--- a/packages/translator/src/core/for.ts
+++ b/packages/translator/src/core/for.ts
@@ -15,7 +15,7 @@ import {
   subscribe,
   writeHTMLHydrateStatements,
   getComputeFn,
-} from "../util/apply-hydrate";
+} from "../util/signals";
 import { getOrCreateSectionId, getSectionId } from "../util/sections";
 import {
   ReserveType,
diff --git a/packages/translator/src/core/let.ts b/packages/translator/src/core/let.ts
index b914a4bcb..98b501555 100644
--- a/packages/translator/src/core/let.ts
+++ b/packages/translator/src/core/let.ts
@@ -3,7 +3,7 @@ import { Tag, assertNoParams } from "@marko/babel-utils";
 import { assertNoBodyContent } from "../util/assert";
 import translateVar from "../util/translate-var";
 import { isOutputDOM } from "../util/marko-config";
-import { initSource, queueSource, addStatement } from "../util/apply-hydrate";
+import { initSource, queueSource, addStatement } from "../util/signals";
 import { callRuntime } from "../util/runtime";
 import replaceAssignments from "../util/replace-assignments";
 import { getSectionId } from "../util/sections";
diff --git a/packages/translator/src/util/apply-hydrate.ts b/packages/translator/src/util/signals.ts
similarity index 99%
rename from packages/translator/src/util/apply-hydrate.ts
rename to packages/translator/src/util/signals.ts
index d3195a5de..b46a6bdb5 100644
--- a/packages/translator/src/util/apply-hydrate.ts
+++ b/packages/translator/src/util/signals.ts
@@ -1,12 +1,12 @@
 import { types as t } from "@marko/compiler";
-import type { ReferenceGroup } from "../util/references";
+import type { ReferenceGroup } from "./references";
 import {
   getSectionId,
   createSectionState,
   forEachSectionIdReverse,
   getOrCreateSectionId,
-} from "../util/sections";
-import { Reserve, insertReserve } from "../util/reserve";
+} from "./sections";
+import { Reserve, insertReserve } from "./reserve";
 import { currentProgramPath, scopeIdentifier } from "../visitors/program";
 import { callRuntime, callRead } from "./runtime";
 import { getTemplateId } from "@marko/babel-utils";
diff --git a/packages/translator/src/util/writer.ts b/packages/translator/src/util/writer.ts
index 576bc1840..d7d7479b4 100644
--- a/packages/translator/src/util/writer.ts
+++ b/packages/translator/src/util/writer.ts
@@ -5,7 +5,7 @@ import toTemplateOrStringLiteral, {
   appendLiteral,
 } from "./to-template-string-or-literal";
 import { getWalkString } from "./walks";
-import { getSetup } from "./apply-hydrate";
+import { getSetup } from "./signals";
 import { currentProgramPath } from "../visitors/program";
 
 const [getRenderer] = createSectionState<t.Identifier>(
diff --git a/packages/translator/src/visitors/placeholder.ts b/packages/translator/src/visitors/placeholder.ts
index 4f67a2840..c85ffffd1 100644
--- a/packages/translator/src/visitors/placeholder.ts
+++ b/packages/translator/src/visitors/placeholder.ts
@@ -5,7 +5,7 @@ import { callRuntime, getHTMLRuntime } from "../util/runtime";
 import evaluate from "../util/evaluate";
 import { getSectionId, getOrCreateSectionId } from "../util/sections";
 import { ReserveType, reserveScope } from "../util/reserve";
-import { addStatement } from "../util/apply-hydrate";
+import { addStatement } from "../util/signals";
 import * as writer from "../util/writer";
 import * as walks from "../util/walks";
 import { scopeIdentifier } from "./program";
diff --git a/packages/translator/src/visitors/program/dom.ts b/packages/translator/src/visitors/program/dom.ts
index 5f36d84eb..1ba294c0e 100644
--- a/packages/translator/src/visitors/program/dom.ts
+++ b/packages/translator/src/visitors/program/dom.ts
@@ -1,7 +1,7 @@
 import { types as t } from "@marko/compiler";
 import { callRuntime } from "../../util/runtime";
 import { forEachSectionIdReverse, getSectionId } from "../../util/sections";
-import { getClosures, getSignal, writeSignals } from "../../util/apply-hydrate";
+import { getClosures, getSignal, writeSignals } from "../../util/signals";
 import * as writer from "../../util/writer";
 import { visit } from "../../util/walks";
 import { scopeIdentifier } from ".";
diff --git a/packages/translator/src/visitors/program/html.ts b/packages/translator/src/visitors/program/html.ts
index 8162a4df7..3e9975e2a 100644
--- a/packages/translator/src/visitors/program/html.ts
+++ b/packages/translator/src/visitors/program/html.ts
@@ -1,5 +1,5 @@
 import { types as t } from "@marko/compiler";
-import { writeHTMLHydrateStatements } from "../../util/apply-hydrate";
+import { writeHTMLHydrateStatements } from "../../util/signals";
 import { callRuntime } from "../../util/runtime";
 import { flushInto } from "../../util/writer";
 import isStatic from "../../util/is-static";
diff --git a/packages/translator/src/visitors/scriptlet.ts b/packages/translator/src/visitors/scriptlet.ts
index f8c0e9fd7..baf3b369f 100644
--- a/packages/translator/src/visitors/scriptlet.ts
+++ b/packages/translator/src/visitors/scriptlet.ts
@@ -1,5 +1,5 @@
 import type { types as t } from "@marko/compiler";
-import { addStatement } from "../util/apply-hydrate";
+import { addStatement } from "../util/signals";
 import { isOutputHTML } from "../util/marko-config";
 import type { ReferenceGroup } from "../util/references";
 import { getSectionId } from "../util/sections";
diff --git a/packages/translator/src/visitors/tag/custom-tag.ts b/packages/translator/src/visitors/tag/custom-tag.ts
index 5a175286c..25bb23e3c 100644
--- a/packages/translator/src/visitors/tag/custom-tag.ts
+++ b/packages/translator/src/visitors/tag/custom-tag.ts
@@ -25,7 +25,7 @@ import {
   addStatement,
   getSignal,
   writeHTMLHydrateStatements,
-} from "../../util/apply-hydrate";
+} from "../../util/signals";
 import { reserveScope, ReserveType } from "../../util/reserve";
 import { currentProgramPath, scopeIdentifier } from "../program";
 
diff --git a/packages/translator/src/visitors/tag/dynamic-tag.ts b/packages/translator/src/visitors/tag/dynamic-tag.ts
index 6f0c600a7..281f8ac53 100644
--- a/packages/translator/src/visitors/tag/dynamic-tag.ts
+++ b/packages/translator/src/visitors/tag/dynamic-tag.ts
@@ -7,7 +7,7 @@ import { callRuntime } from "../../util/runtime";
 import translateVar from "../../util/translate-var";
 import { isOutputHTML } from "../../util/marko-config";
 import { getOrCreateSectionId, getSectionId } from "../../util/sections";
-import { getComputeFn, getSignal, subscribe } from "../../util/apply-hydrate";
+import { getComputeFn, getSignal, subscribe } from "../../util/signals";
 import {
   countReserves,
   Reserve,
diff --git a/packages/translator/src/visitors/tag/native-tag.ts b/packages/translator/src/visitors/tag/native-tag.ts
index ba9d1fdc0..29d701691 100644
--- a/packages/translator/src/visitors/tag/native-tag.ts
+++ b/packages/translator/src/visitors/tag/native-tag.ts
@@ -7,7 +7,7 @@ import translateVar from "../../util/translate-var";
 import evaluate from "../../util/evaluate";
 import { getOrCreateSectionId, getSectionId } from "../../util/sections";
 import { ReserveType, reserveScope } from "../../util/reserve";
-import { addStatement, addHTMLHydrateCall } from "../../util/apply-hydrate";
+import { addStatement, addHTMLHydrateCall } from "../../util/signals";
 import * as writer from "../../util/writer";
 import * as walks from "../../util/walks";
 import { currentProgramPath, scopeIdentifier } from "../program";