diff --git a/typescript/types/layout.d.ts b/typescript/types/layout.d.ts
index 8c5706d0b..3867efe46 100644
--- a/typescript/types/layout.d.ts
+++ b/typescript/types/layout.d.ts
@@ -1,6 +1,6 @@
 type Prev = [never, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
 
-type ExtractIds<T extends Layout_.Hierarchy, Depth extends Prev[number] = 9> =
+type ExtractIds<T extends Layout.Hierarchy, Depth extends Prev[number] = 9> =
   [Depth] extends [never]
   ? never
   : (T extends { id: infer Id extends string }
@@ -8,12 +8,12 @@ type ExtractIds<T extends Layout_.Hierarchy, Depth extends Prev[number] = 9> =
     : never)
   |
   (
-    T extends { c: Array<infer Sub extends Layout_.Hierarchy> }
+    T extends { c: Array<infer Sub extends Layout.Hierarchy> }
     ? ExtractIds<Sub, Prev[Depth]>
     : never
   );
 
-declare module Layout_ {
+declare module Layout {
   type Layouter<T extends Hierarchy> =
     ExtractIds<T>
     &
diff --git a/typescript/types/modules.d.ts b/typescript/types/modules.d.ts
index 5c65548fc..ad3612117 100644
--- a/typescript/types/modules.d.ts
+++ b/typescript/types/modules.d.ts
@@ -4,4 +4,4 @@ declare function require(moduleName: "sched"): typeof Sched;
 
 declare function require(moduleName: "ClockFace"): typeof ClockFace_.ClockFace;
 declare function require(moduleName: "clock_info"): typeof ClockInfo;
-declare function require(moduleName: "Layout"): typeof Layout_.Layout;
+declare function require(moduleName: "Layout"): typeof Layout.Layout;