diff --git a/generated.mako.cpp b/generated.mako.cpp
index 6fc1521..fee8745 100644
--- a/generated.mako.cpp
+++ b/generated.mako.cpp
@@ -25,16 +25,16 @@
         std::make_tuple(
             MakeInterface<
                 ServerObject<
-                    ${i.namespace()}>>::make,
-            MakeInterface<
+                    ${i.namespace()}>>::op,
+            AssignInterface<
                 ServerObject<
-                    ${i.namespace()}>>::assign,
-            MakeInterface<
+                    ${i.namespace()}>>::op,
+            SerializeInterface<
                 ServerObject<
-                    ${i.namespace()}>>::serialize,
-            MakeInterface<
+                    ${i.namespace()}>, SerialOps>::op,
+            DeserializeInterface<
                 ServerObject<
-                    ${i.namespace()}>>::deserialize
+                    ${i.namespace()}>, SerialOps>::op
         )
     },
 % endfor