diff --git a/remix/class0.rkt b/remix/class0.rkt
index 1f6ed35..a9747f5 100644
--- a/remix/class0.rkt
+++ b/remix/class0.rkt
@@ -116,7 +116,7 @@
            (define cls-int-impl-id (format-id #f "~a-~a" #'cls int))
            (match-define (list int-vtable-id cls-int-impl-def)
              (int-internal cls-int-impl-id #'cls-this))
-           (list int int-vtable-id cls-int-impl cls-int-impl-def))]
+           (list int int-vtable-id cls-int-impl-id cls-int-impl-def))]
         [cls-new-def (new-found? #'cls-new)])
        (syntax/loc stx
          (begin
diff --git a/remix/layout0.rkt b/remix/layout0.rkt
index 2cb9ffc..76aa16d 100644
--- a/remix/layout0.rkt
+++ b/remix/layout0.rkt
@@ -223,20 +223,20 @@
                (begin-encourage-inline
                  (define (all-name-f v) (rep-accessor v all-f-idx))
                  ...)
-               (define-syntax name
-                 (static-interface
-                  (remix:#%brackets #:alloc name-alloc)
-                  (remix:#%brackets #:set name-set)
-                  (remix:#%brackets #:= name-set)
-                  mutation-interface ...
-                  (remix:#%brackets all-f . all-f-si-rhs)
-                  ...
-                  #:extensions
-                  #:methods gen:layout
-                  [(define (layout-planner-id _)
-                     #'stx-the-planner-id)
-                   (define (layout-field->acc _)
-                     f->acc)])))))]))]))
+               (remix:def
+                (remix:#%brackets static-interface name)
+                (remix:#%brackets #:alloc name-alloc)
+                (remix:#%brackets #:set name-set)
+                (remix:#%brackets #:= name-set)
+                mutation-interface ...
+                (remix:#%brackets all-f . all-f-si-rhs)
+                ...
+                #:extensions
+                #:methods gen:layout
+                [(define (layout-planner-id _)
+                   #'stx-the-planner-id)
+                 (define (layout-field->acc _)
+                   f->acc)]))))]))]))
 
 (provide (rename-out [phase0:layout layout])
          (for-syntax gen:layout