diff --git a/src/ZodSchemaClass.ts b/src/ZodSchemaClass.ts
index 1a11590..72d10c9 100644
--- a/src/ZodSchemaClass.ts
+++ b/src/ZodSchemaClass.ts
@@ -87,8 +87,6 @@ extends TraitExpressionBuilder<Superclass, Traits> {
         Values                     extends object,
         DefaultValues              extends Partial<Values>,
 
-        JsonifiedValues            extends JsonifiableObject,
-
         JsonifySchemaT             extends z.ZodRawShape,
         JsonifySchemaUnknownKeys   extends z.UnknownKeysParam,
         JsonifySchemaCatchall      extends z.ZodTypeAny,
@@ -96,6 +94,8 @@ extends TraitExpressionBuilder<Superclass, Traits> {
         DejsonifySchemaT           extends z.ZodRawShape,
         DejsonifySchemaUnknownKeys extends z.UnknownKeysParam,
         DejsonifySchemaCatchall    extends z.ZodTypeAny,
+
+        JsonifiedValues            extends JsonifiableObject,
     >(
         this: ZodSchemaClassBuilder<
             Superclass | ZodSchemaAbstractClass<Instance, SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
diff --git a/src/shapes/JsonifiableZodSchemaClass.ts b/src/shapes/JsonifiableZodSchemaClass.ts
index 107fc5c..2f35971 100644
--- a/src/shapes/JsonifiableZodSchemaClass.ts
+++ b/src/shapes/JsonifiableZodSchemaClass.ts
@@ -14,8 +14,8 @@ export type JsonifiableZodSchemaClass<
     DejsonifySchemaUnknownKeys extends z.UnknownKeysParam,
     DejsonifySchemaCatchall    extends z.ZodTypeAny,
 
-    Values                     extends object,
     JsonifiedValues            extends JsonifiableObject,
+    Values                     extends object,
 > = (
     Class<Instance, [values: Values]> &
     JsonifiableZodSchemas<
@@ -27,8 +27,8 @@ export type JsonifiableZodSchemaClass<
         DejsonifySchemaUnknownKeys,
         DejsonifySchemaCatchall,
 
-        Values,
-        JsonifiedValues
+        JsonifiedValues,
+        Values
     >
 )
 
@@ -43,8 +43,8 @@ export type JsonifiableZodSchemaAbstractClass<
     DejsonifySchemaUnknownKeys extends z.UnknownKeysParam,
     DejsonifySchemaCatchall    extends z.ZodTypeAny,
 
-    Values                     extends object,
     JsonifiedValues            extends JsonifiableObject,
+    Values                     extends object,
 > = (
     AbstractClass<Instance, [values: Values]> &
     JsonifiableZodSchemas<
@@ -56,8 +56,8 @@ export type JsonifiableZodSchemaAbstractClass<
         DejsonifySchemaUnknownKeys,
         DejsonifySchemaCatchall,
 
-        Values,
-        JsonifiedValues
+        JsonifiedValues,
+        Values
     >
 )
 
@@ -70,8 +70,8 @@ export type JsonifiableZodSchemas<
     DejsonifySchemaUnknownKeys extends z.UnknownKeysParam,
     DejsonifySchemaCatchall    extends z.ZodTypeAny,
 
-    Values                     extends object,
     JsonifiedValues            extends JsonifiableObject,
+    Values                     extends object,
 > = {
     readonly jsonifySchema:    z.ZodObject<JsonifySchemaT, JsonifySchemaUnknownKeys, JsonifySchemaCatchall, JsonifiedValues, Values>
     readonly dejsonifySchema:  z.ZodObject<DejsonifySchemaT, DejsonifySchemaUnknownKeys, DejsonifySchemaCatchall, Values, JsonifiedValues>
diff --git a/src/shapes/ZodSchemaClass.ts b/src/shapes/ZodSchemaClass.ts
index 682e3b2..0b33a2d 100644
--- a/src/shapes/ZodSchemaClass.ts
+++ b/src/shapes/ZodSchemaClass.ts
@@ -13,7 +13,7 @@ export type ZodSchemaClass<
     DefaultValues     extends Partial<Values>,
 > = (
     Class<Instance, [values: Values]> &
-    ZodSchemaClassStatic<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>
+    ZodSchemas<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>
 )
 
 export type ZodSchemaAbstractClass<
@@ -27,10 +27,10 @@ export type ZodSchemaAbstractClass<
     DefaultValues     extends Partial<Values>,
 > = (
     AbstractClass<Instance, [values: Values]> &
-    ZodSchemaClassStatic<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>
+    ZodSchemas<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>
 )
 
-export type ZodSchemaClassStatic<
+export type ZodSchemas<
     SchemaT           extends z.ZodRawShape,
     SchemaUnknownKeys extends z.UnknownKeysParam,
     SchemaCatchall    extends z.ZodTypeAny,
diff --git a/src/traits/DejsonifiableZodSchemaObject.ts b/src/traits/DejsonifiableZodSchemaObject.ts
index 9f38dc3..cda0026 100644
--- a/src/traits/DejsonifiableZodSchemaObject.ts
+++ b/src/traits/DejsonifiableZodSchemaObject.ts
@@ -19,8 +19,8 @@ export const DejsonifiableZodSchemaObject = trait
             DejsonifySchemaUnknownKeys extends z.UnknownKeysParam,
             DejsonifySchemaCatchall    extends z.ZodTypeAny,
 
-            Values                     extends object,
             JsonifiedValues            extends JsonifiableObject,
+            Values                     extends object,
         >(
             this: JsonifiableZodSchemaClass<
                 Instance,
@@ -33,8 +33,8 @@ export const DejsonifiableZodSchemaObject = trait
                 DejsonifySchemaUnknownKeys,
                 DejsonifySchemaCatchall,
 
-                Values,
-                JsonifiedValues
+                JsonifiedValues,
+                Values
             >,
 
             values:   JsonifiedValues,
@@ -56,8 +56,8 @@ export const DejsonifiableZodSchemaObject = trait
             DejsonifySchemaUnknownKeys extends z.UnknownKeysParam,
             DejsonifySchemaCatchall    extends z.ZodTypeAny,
 
-            Values                     extends object,
             JsonifiedValues            extends JsonifiableObject,
+            Values                     extends object,
         >(
             this: JsonifiableZodSchemaClass<
                 Instance,
@@ -70,8 +70,8 @@ export const DejsonifiableZodSchemaObject = trait
                 DejsonifySchemaUnknownKeys,
                 DejsonifySchemaCatchall,
 
-                Values,
-                JsonifiedValues
+                JsonifiedValues,
+                Values
             >,
 
             values:   JsonifiedValues,
@@ -93,8 +93,8 @@ export const DejsonifiableZodSchemaObject = trait
             DejsonifySchemaUnknownKeys extends z.UnknownKeysParam,
             DejsonifySchemaCatchall    extends z.ZodTypeAny,
 
-            Values                     extends object,
             JsonifiedValues            extends JsonifiableObject,
+            Values                     extends object,
         >(
             this: JsonifiableZodSchemaClass<
                 Instance,
@@ -107,8 +107,8 @@ export const DejsonifiableZodSchemaObject = trait
                 DejsonifySchemaUnknownKeys,
                 DejsonifySchemaCatchall,
 
-                Values,
-                JsonifiedValues
+                JsonifiedValues,
+                Values
             >,
 
             values:   JsonifiedValues,