diff --git a/config/compas.json b/config/compas.json
index e8d3b54a0f..cee7358d0f 100644
--- a/config/compas.json
+++ b/config/compas.json
@@ -2,7 +2,7 @@
   "cli": {
     "globalWatchOptions": {
       "extensions": [],
-      "ignorePatterns": ["__fixtures__", "test/tmp"]
+      "ignorePatterns": ["__fixtures__", ".cache"]
     }
   }
 }
diff --git a/gen/code-gen.js b/gen/code-gen.js
index edf6f378db..a37ce78ef1 100644
--- a/gen/code-gen.js
+++ b/gen/code-gen.js
@@ -6,7 +6,7 @@ import { TypeCreator } from "@compas/code-gen";
  * @param {import("@compas/code-gen").Generator} generator
  */
 export function extendWithCodeGen(generator) {
-  const T = new TypeCreator("experimental");
+  const T = new TypeCreator("structure");
 
   const namePart = T.string("namePart")
     .min(1)
@@ -45,7 +45,7 @@ export function extendWithCodeGen(generator) {
       .values(
         T.generic()
           .keys(namePart)
-          .values(T.reference("experimental", "namedTypeDefinition")),
+          .values(T.reference("structure", "namedTypeDefinition")),
       ),
 
     T.object("generateOptions")
@@ -137,7 +137,7 @@ export function extendWithCodeGen(generator) {
               includeBaseTypes: T.bool()
                 .default(false)
                 .docs(
-                  "Always generate validators for all named types even if no other generator needs it. This implies {@link ExperimentalGenerateOptions.generators.types.includeBaseTypes}.",
+                  "Always generate validators for all named types even if no other generator needs it. This implies {@link StructureGenerateOptions.generators.types.includeBaseTypes}.",
                 ),
             })
             .optional()
@@ -243,32 +243,32 @@ export function extendWithCodeGen(generator) {
         "This contains all types that can be added top level to the structure.",
       )
       .values(
-        T.reference("experimental", "anyDefinition"),
-        T.reference("experimental", "anyOfDefinition"),
-        T.reference("experimental", "arrayDefinition"),
-        T.reference("experimental", "booleanDefinition"),
-        T.reference("experimental", "crudDefinition"),
-        T.reference("experimental", "dateDefinition"),
-        T.reference("experimental", "extendDefinition"),
-        T.reference("experimental", "fileDefinition"),
-        T.reference("experimental", "genericDefinition"),
-        T.reference("experimental", "numberDefinition"),
-        T.reference("experimental", "objectDefinition"),
-        T.reference("experimental", "omitDefinition"),
-        T.reference("experimental", "pickDefinition"),
-        T.reference("experimental", "routeDefinition"),
-        T.reference("experimental", "stringDefinition"),
-        T.reference("experimental", "uuidDefinition"),
+        T.reference("structure", "anyDefinition"),
+        T.reference("structure", "anyOfDefinition"),
+        T.reference("structure", "arrayDefinition"),
+        T.reference("structure", "booleanDefinition"),
+        T.reference("structure", "crudDefinition"),
+        T.reference("structure", "dateDefinition"),
+        T.reference("structure", "extendDefinition"),
+        T.reference("structure", "fileDefinition"),
+        T.reference("structure", "genericDefinition"),
+        T.reference("structure", "numberDefinition"),
+        T.reference("structure", "objectDefinition"),
+        T.reference("structure", "omitDefinition"),
+        T.reference("structure", "pickDefinition"),
+        T.reference("structure", "routeDefinition"),
+        T.reference("structure", "stringDefinition"),
+        T.reference("structure", "uuidDefinition"),
       )
       .discriminant("type"),
 
     T.anyOf("typeDefinition")
       .docs("This contains all known type definitions.")
       .values(
-        T.reference("experimental", "namedTypeDefinition"),
-        T.reference("experimental", "referenceDefinition"),
-        T.reference("experimental", "relationDefinition"),
-        T.reference("experimental", "routeInvalidationDefinition"),
+        T.reference("structure", "namedTypeDefinition"),
+        T.reference("structure", "referenceDefinition"),
+        T.reference("structure", "relationDefinition"),
+        T.reference("structure", "routeInvalidationDefinition"),
       ),
 
     T.anyOf("typeSystemDefinition")
@@ -276,22 +276,22 @@ export function extendWithCodeGen(generator) {
         "All type definitions that can be used inside other types, like object keys.",
       )
       .values(
-        T.reference("experimental", "anyDefinition"),
-        T.reference("experimental", "anyOfDefinition"),
-        T.reference("experimental", "arrayDefinition"),
-        T.reference("experimental", "booleanDefinition"),
-        T.reference("experimental", "crudDefinition"),
-        T.reference("experimental", "dateDefinition"),
-        T.reference("experimental", "extendDefinition"),
-        T.reference("experimental", "fileDefinition"),
-        T.reference("experimental", "genericDefinition"),
-        T.reference("experimental", "numberDefinition"),
-        T.reference("experimental", "objectDefinition"),
-        T.reference("experimental", "omitDefinition"),
-        T.reference("experimental", "pickDefinition"),
-        T.reference("experimental", "referenceDefinition"),
-        T.reference("experimental", "stringDefinition"),
-        T.reference("experimental", "uuidDefinition"),
+        T.reference("structure", "anyDefinition"),
+        T.reference("structure", "anyOfDefinition"),
+        T.reference("structure", "arrayDefinition"),
+        T.reference("structure", "booleanDefinition"),
+        T.reference("structure", "crudDefinition"),
+        T.reference("structure", "dateDefinition"),
+        T.reference("structure", "extendDefinition"),
+        T.reference("structure", "fileDefinition"),
+        T.reference("structure", "genericDefinition"),
+        T.reference("structure", "numberDefinition"),
+        T.reference("structure", "objectDefinition"),
+        T.reference("structure", "omitDefinition"),
+        T.reference("structure", "pickDefinition"),
+        T.reference("structure", "referenceDefinition"),
+        T.reference("structure", "stringDefinition"),
+        T.reference("structure", "uuidDefinition"),
       )
       .discriminant("type"),
 
@@ -372,7 +372,7 @@ export function extendWithCodeGen(generator) {
           .loose(),
         values: T.array()
           .min(1)
-          .values(T.reference("experimental", "typeSystemDefinition")),
+          .values(T.reference("structure", "typeSystemDefinition")),
       })
       .loose(),
 
@@ -380,7 +380,7 @@ export function extendWithCodeGen(generator) {
       .keys({
         type: "array",
         ...namedTypeDefinitionBase,
-        values: T.reference("experimental", "typeSystemDefinition"),
+        values: T.reference("structure", "typeSystemDefinition"),
         validator: T.object()
           .keys({
             convert: T.bool(),
@@ -410,7 +410,7 @@ export function extendWithCodeGen(generator) {
         type: "crud",
         ...namedTypeDefinitionBase,
         basePath: T.string().optional(),
-        entity: T.reference("experimental", "referenceDefinition").optional(),
+        entity: T.reference("structure", "referenceDefinition").optional(),
         fromParent: T.object()
           .keys({
             field: T.string(),
@@ -442,7 +442,7 @@ export function extendWithCodeGen(generator) {
               .loose()
               .optional(),
             readableType: T.reference(
-              "experimental",
+              "structure",
               "referenceDefinition",
             ).optional(),
             writable: T.object()
@@ -454,8 +454,8 @@ export function extendWithCodeGen(generator) {
               .optional(),
           })
           .loose(),
-        inlineRelations: [T.reference("experimental", "crudDefinition")],
-        nestedRelations: [T.reference("experimental", "crudDefinition")],
+        inlineRelations: [T.reference("structure", "crudDefinition")],
+        nestedRelations: [T.reference("structure", "crudDefinition")],
       })
       .loose(),
 
@@ -482,10 +482,10 @@ export function extendWithCodeGen(generator) {
         ...namedTypeDefinitionBase,
         keys: T.generic()
           .keys(T.string())
-          .values(T.reference("experimental", "typeSystemDefinition")),
-        reference: T.reference("experimental", "referenceDefinition"),
+          .values(T.reference("structure", "typeSystemDefinition")),
+        reference: T.reference("structure", "referenceDefinition"),
         relations: T.array().values(
-          T.reference("experimental", "relationDefinition"),
+          T.reference("structure", "relationDefinition"),
         ),
       })
       .loose(),
@@ -506,8 +506,8 @@ export function extendWithCodeGen(generator) {
       .keys({
         type: "generic",
         ...namedTypeDefinitionBase,
-        keys: T.reference("experimental", "typeSystemDefinition"),
-        values: T.reference("experimental", "typeSystemDefinition"),
+        keys: T.reference("structure", "typeSystemDefinition"),
+        values: T.reference("structure", "typeSystemDefinition"),
       })
       .loose(),
 
@@ -553,7 +553,7 @@ export function extendWithCodeGen(generator) {
           .loose(),
         keys: T.generic()
           .keys(T.string())
-          .values(T.reference("experimental", "typeSystemDefinition")),
+          .values(T.reference("structure", "typeSystemDefinition")),
         enableQueries: T.bool().optional(),
         queryOptions: T.object()
           .keys({
@@ -566,7 +566,7 @@ export function extendWithCodeGen(generator) {
           .optional()
           .loose(),
         relations: T.array().values(
-          T.reference("experimental", "relationDefinition"),
+          T.reference("structure", "relationDefinition"),
         ),
       })
       .loose(),
@@ -582,7 +582,7 @@ export function extendWithCodeGen(generator) {
           })
           .loose(),
         keys: [T.string()],
-        reference: T.reference("experimental", "typeSystemDefinition"),
+        reference: T.reference("structure", "typeSystemDefinition"),
       })
       .loose(),
 
@@ -597,7 +597,7 @@ export function extendWithCodeGen(generator) {
           })
           .loose(),
         keys: [T.string()],
-        reference: T.reference("experimental", "typeSystemDefinition"),
+        reference: T.reference("structure", "typeSystemDefinition"),
       })
       .loose(),
 
@@ -623,7 +623,7 @@ export function extendWithCodeGen(generator) {
           "oneToOne",
           "oneToOneReverse",
         ),
-        reference: T.reference("experimental", "referenceDefinition"),
+        reference: T.reference("structure", "referenceDefinition"),
         ownKey: T.string(),
         referencedKey: T.string().optional(),
         isOptional: T.bool(),
@@ -645,13 +645,13 @@ export function extendWithCodeGen(generator) {
         idempotent: T.bool(),
         path: T.string(),
         tags: [T.string()],
-        query: T.reference("experimental", "referenceDefinition").optional(),
-        params: T.reference("experimental", "referenceDefinition").optional(),
-        body: T.reference("experimental", "referenceDefinition").optional(),
-        files: T.reference("experimental", "referenceDefinition").optional(),
-        response: T.reference("experimental", "referenceDefinition").optional(),
+        query: T.reference("structure", "referenceDefinition").optional(),
+        params: T.reference("structure", "referenceDefinition").optional(),
+        body: T.reference("structure", "referenceDefinition").optional(),
+        files: T.reference("structure", "referenceDefinition").optional(),
+        response: T.reference("structure", "referenceDefinition").optional(),
         invalidations: [
-          T.reference("experimental", "routeInvalidationDefinition"),
+          T.reference("structure", "routeInvalidationDefinition"),
         ],
         metadata: T.object()
           .keys({
diff --git a/packages/code-gen/src/api-client/generator.js b/packages/code-gen/src/api-client/generator.js
index 06c639b15f..23cbf6b203 100644
--- a/packages/code-gen/src/api-client/generator.js
+++ b/packages/code-gen/src/api-client/generator.js
@@ -54,7 +54,7 @@ export function apiClientGenerator(generateContext) {
   const target = apiClientFormatTarget(generateContext);
   const wrapperTarget = apiClientFormatWrapperTarget(generateContext);
 
-  /** @type {import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[]} */
+  /** @type {import("../generated/common/types.js").StructureAnyDefinitionTarget[]} */
   const typeTargets = [generateContext.options.targetLanguage, target];
 
   if (distilledTargetInfo.isAxios) {
diff --git a/packages/code-gen/src/api-client/js-axios.d.ts b/packages/code-gen/src/api-client/js-axios.d.ts
index 642684841d..3f6266b029 100644
--- a/packages/code-gen/src/api-client/js-axios.d.ts
+++ b/packages/code-gen/src/api-client/js-axios.d.ts
@@ -10,26 +10,26 @@ export function jsAxiosGenerateCommonFile(
  * Write the global clients to the common directory
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition} route
+ * @param {import("../generated/common/types.js").StructureRouteDefinition} route
  * @returns {import("../file/context.js").GenerateFile}
  */
 export function jsAxiosGetApiClientFile(
   generateContext: import("../generate.js").GenerateContext,
-  route: import("../generated/common/types.js").ExperimentalRouteDefinition,
+  route: import("../generated/common/types.js").StructureRouteDefinition,
 ): import("../file/context.js").GenerateFile;
 /**
  * Generate the api client function
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function jsAxiosGenerateFunction(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   route: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalRouteDefinition
+    import("../generated/common/types").StructureRouteDefinition
   >,
   contextNames: Record<string, string>,
 ): void;
diff --git a/packages/code-gen/src/api-client/js-axios.js b/packages/code-gen/src/api-client/js-axios.js
index b304d787d5..ba90f50d18 100644
--- a/packages/code-gen/src/api-client/js-axios.js
+++ b/packages/code-gen/src/api-client/js-axios.js
@@ -101,7 +101,7 @@ export function axiosInterceptErrorAndWrapWithAppError(axiosInstance) {
  * Write the global clients to the common directory
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition} route
+ * @param {import("../generated/common/types.js").StructureRouteDefinition} route
  * @returns {import("../file/context.js").GenerateFile}
  */
 export function jsAxiosGetApiClientFile(generateContext, route) {
@@ -139,7 +139,7 @@ export function jsAxiosGetApiClientFile(generateContext, route) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function jsAxiosGenerateFunction(
@@ -218,7 +218,7 @@ export function jsAxiosGenerateFunction(
 
     fileBlockStart(file, `if (!(${parameter} instanceof FormData))`);
 
-    /** @type {import("../generated/common/types.d.ts").ExperimentalObjectDefinition} */
+    /** @type {import("../generated/common/types.d.ts").StructureObjectDefinition} */
     // @ts-expect-error
     const type = structureResolveReference(
       generateContext.structure,
diff --git a/packages/code-gen/src/api-client/js-fetch.d.ts b/packages/code-gen/src/api-client/js-fetch.d.ts
index 53406593b9..4ab977ac45 100644
--- a/packages/code-gen/src/api-client/js-fetch.d.ts
+++ b/packages/code-gen/src/api-client/js-fetch.d.ts
@@ -10,26 +10,26 @@ export function jsFetchGenerateCommonFile(
  * Write the global clients to the common directory
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition} route
+ * @param {import("../generated/common/types.js").StructureRouteDefinition} route
  * @returns {import("../file/context.js").GenerateFile}
  */
 export function jsFetchGetApiClientFile(
   generateContext: import("../generate.js").GenerateContext,
-  route: import("../generated/common/types.js").ExperimentalRouteDefinition,
+  route: import("../generated/common/types.js").StructureRouteDefinition,
 ): import("../file/context.js").GenerateFile;
 /**
  * Generate the api client function
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function jsFetchGenerateFunction(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   route: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalRouteDefinition
+    import("../generated/common/types").StructureRouteDefinition
   >,
   contextNames: Record<string, string>,
 ): void;
diff --git a/packages/code-gen/src/api-client/js-fetch.js b/packages/code-gen/src/api-client/js-fetch.js
index 342ff04e7d..d476b65245 100644
--- a/packages/code-gen/src/api-client/js-fetch.js
+++ b/packages/code-gen/src/api-client/js-fetch.js
@@ -127,7 +127,7 @@ export function fetchCatchErrorAndWrapWithAppError(originalFetch) {
  * Write the global clients to the common directory
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition} route
+ * @param {import("../generated/common/types.js").StructureRouteDefinition} route
  * @returns {import("../file/context.js").GenerateFile}
  */
 export function jsFetchGetApiClientFile(generateContext, route) {
@@ -164,7 +164,7 @@ export function jsFetchGetApiClientFile(generateContext, route) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function jsFetchGenerateFunction(
@@ -244,7 +244,7 @@ export function jsFetchGenerateFunction(
 
     fileBlockStart(file, `if (!(${parameter} instanceof FormData))`);
 
-    /** @type {import("../generated/common/types.d.ts").ExperimentalObjectDefinition} */
+    /** @type {import("../generated/common/types.d.ts").StructureObjectDefinition} */
     // @ts-expect-error
     const type = structureResolveReference(
       generateContext.structure,
@@ -273,7 +273,7 @@ export function jsFetchGenerateFunction(
   }
 
   if (route.query) {
-    /** @type {import("../generated/common/types.d.ts").ExperimentalObjectDefinition} */
+    /** @type {import("../generated/common/types.d.ts").StructureObjectDefinition} */
     // @ts-expect-error
     const type = structureResolveReference(
       generateContext.structure,
diff --git a/packages/code-gen/src/api-client/react-query.d.ts b/packages/code-gen/src/api-client/react-query.d.ts
index 217f096085..9752bf4e75 100644
--- a/packages/code-gen/src/api-client/react-query.d.ts
+++ b/packages/code-gen/src/api-client/react-query.d.ts
@@ -10,26 +10,26 @@ export function reactQueryGenerateCommonFile(
  * Get the api client file
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition} route
+ * @param {import("../generated/common/types.js").StructureRouteDefinition} route
  * @returns {import("../file/context.js").GenerateFile}
  */
 export function reactQueryGetApiClientFile(
   generateContext: import("../generate.js").GenerateContext,
-  route: import("../generated/common/types.js").ExperimentalRouteDefinition,
+  route: import("../generated/common/types.js").StructureRouteDefinition,
 ): import("../file/context.js").GenerateFile;
 /**
  * Generate the api client hooks
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function reactQueryGenerateFunction(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   route: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalRouteDefinition
+    import("../generated/common/types").StructureRouteDefinition
   >,
   contextNames: Record<string, string>,
 ): void;
diff --git a/packages/code-gen/src/api-client/react-query.js b/packages/code-gen/src/api-client/react-query.js
index e9d173907a..0cee347aa4 100644
--- a/packages/code-gen/src/api-client/react-query.js
+++ b/packages/code-gen/src/api-client/react-query.js
@@ -102,7 +102,7 @@ export const useApi = () => {
  * Get the api client file
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition} route
+ * @param {import("../generated/common/types.js").StructureRouteDefinition} route
  * @returns {import("../file/context.js").GenerateFile}
  */
 export function reactQueryGetApiClientFile(generateContext, route) {
@@ -173,7 +173,7 @@ export function reactQueryGetApiClientFile(generateContext, route) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function reactQueryGenerateFunction(
@@ -310,7 +310,7 @@ export function reactQueryGenerateFunction(
     let result = "";
 
     if (route.params) {
-      /** @type {import("../generated/common/types.d.ts").ExperimentalObjectDefinition} */
+      /** @type {import("../generated/common/types.d.ts").StructureObjectDefinition} */
       // @ts-expect-error
       const params = structureResolveReference(
         generateContext.structure,
@@ -337,7 +337,7 @@ export function reactQueryGenerateFunction(
     }
 
     if (route.query) {
-      /** @type {import("../generated/common/types.d.ts").ExperimentalObjectDefinition} */
+      /** @type {import("../generated/common/types.d.ts").StructureObjectDefinition} */
       // @ts-expect-error
       const query = structureResolveReference(
         generateContext.structure,
@@ -364,7 +364,7 @@ export function reactQueryGenerateFunction(
     }
 
     if (route.body) {
-      /** @type {import("../generated/common/types.d.ts").ExperimentalObjectDefinition} */
+      /** @type {import("../generated/common/types.d.ts").StructureObjectDefinition} */
       // @ts-expect-error
       const body = structureResolveReference(
         generateContext.structure,
@@ -391,7 +391,7 @@ export function reactQueryGenerateFunction(
     }
 
     if (route.files) {
-      /** @type {import("../generated/common/types.d.ts").ExperimentalObjectDefinition} */
+      /** @type {import("../generated/common/types.d.ts").StructureObjectDefinition} */
       // @ts-expect-error
       const files = structureResolveReference(
         generateContext.structure,
@@ -694,7 +694,7 @@ ${hookName}.setQueryData = (
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  */
 function reactQueryWriteIsEnabled(generateContext, file, route) {
   const keysAffectingEnabled = [];
@@ -704,7 +704,7 @@ function reactQueryWriteIsEnabled(generateContext, file, route) {
       continue;
     }
 
-    /** @type {import("../generated/common/types.d.ts").ExperimentalObjectDefinition} */
+    /** @type {import("../generated/common/types.d.ts").StructureObjectDefinition} */
     // @ts-expect-error
     const type = structureResolveReference(
       generateContext.structure,
@@ -746,7 +746,7 @@ function reactQueryWriteIsEnabled(generateContext, file, route) {
  * Write the invalidations in the mutation hook
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  */
 function reactQueryWriteInvalidations(file, route) {
   fileWrite(file, `const originalOnSuccess = options.onSuccess;`);
diff --git a/packages/code-gen/src/api-client/ts-axios.d.ts b/packages/code-gen/src/api-client/ts-axios.d.ts
index 43e022e075..9d45020183 100644
--- a/packages/code-gen/src/api-client/ts-axios.d.ts
+++ b/packages/code-gen/src/api-client/ts-axios.d.ts
@@ -10,26 +10,26 @@ export function tsAxiosGenerateCommonFile(
  * Write the global clients to the common directory
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition} route
+ * @param {import("../generated/common/types.js").StructureRouteDefinition} route
  * @returns {import("../file/context.js").GenerateFile}
  */
 export function tsAxiosGetApiClientFile(
   generateContext: import("../generate.js").GenerateContext,
-  route: import("../generated/common/types.js").ExperimentalRouteDefinition,
+  route: import("../generated/common/types.js").StructureRouteDefinition,
 ): import("../file/context.js").GenerateFile;
 /**
  * Generate the api client function
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function tsAxiosGenerateFunction(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   route: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalRouteDefinition
+    import("../generated/common/types").StructureRouteDefinition
   >,
   contextNames: Record<string, string>,
 ): void;
diff --git a/packages/code-gen/src/api-client/ts-axios.js b/packages/code-gen/src/api-client/ts-axios.js
index f0611e5bf5..0e524c0c94 100644
--- a/packages/code-gen/src/api-client/ts-axios.js
+++ b/packages/code-gen/src/api-client/ts-axios.js
@@ -73,7 +73,7 @@ export function tsAxiosGenerateCommonFile(generateContext) {
  * Write the global clients to the common directory
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition} route
+ * @param {import("../generated/common/types.js").StructureRouteDefinition} route
  * @returns {import("../file/context.js").GenerateFile}
  */
 export function tsAxiosGetApiClientFile(generateContext, route) {
@@ -113,7 +113,7 @@ export function tsAxiosGetApiClientFile(generateContext, route) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function tsAxiosGenerateFunction(
@@ -176,7 +176,7 @@ export function tsAxiosGenerateFunction(
 
     fileBlockStart(file, `if (!(${parameter} instanceof FormData))`);
 
-    /** @type {import("../generated/common/types.d.ts").ExperimentalObjectDefinition} */
+    /** @type {import("../generated/common/types.d.ts").StructureObjectDefinition} */
     // @ts-expect-error
     const type = structureResolveReference(
       generateContext.structure,
diff --git a/packages/code-gen/src/api-client/ts-fetch.d.ts b/packages/code-gen/src/api-client/ts-fetch.d.ts
index 5e8ed72e3b..d077c1122c 100644
--- a/packages/code-gen/src/api-client/ts-fetch.d.ts
+++ b/packages/code-gen/src/api-client/ts-fetch.d.ts
@@ -10,26 +10,26 @@ export function tsFetchGenerateCommonFile(
  * Get a specific api client file.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition} route
+ * @param {import("../generated/common/types.js").StructureRouteDefinition} route
  * @returns {import("../file/context.js").GenerateFile}
  */
 export function tsFetchGetApiClientFile(
   generateContext: import("../generate.js").GenerateContext,
-  route: import("../generated/common/types.js").ExperimentalRouteDefinition,
+  route: import("../generated/common/types.js").StructureRouteDefinition,
 ): import("../file/context.js").GenerateFile;
 /**
  * Generate the api client function
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function tsFetchGenerateFunction(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   route: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalRouteDefinition
+    import("../generated/common/types").StructureRouteDefinition
   >,
   contextNames: Record<string, string>,
 ): void;
diff --git a/packages/code-gen/src/api-client/ts-fetch.js b/packages/code-gen/src/api-client/ts-fetch.js
index e65d959669..f280c104a5 100644
--- a/packages/code-gen/src/api-client/ts-fetch.js
+++ b/packages/code-gen/src/api-client/ts-fetch.js
@@ -133,7 +133,7 @@ export function fetchCatchErrorAndWrapWithAppError(originalFetch: FetchFn): Fetc
  * Get a specific api client file.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition} route
+ * @param {import("../generated/common/types.js").StructureRouteDefinition} route
  * @returns {import("../file/context.js").GenerateFile}
  */
 export function tsFetchGetApiClientFile(generateContext, route) {
@@ -172,7 +172,7 @@ export function tsFetchGetApiClientFile(generateContext, route) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  * @param {Record<string, string>} contextNames
  */
 export function tsFetchGenerateFunction(
@@ -237,7 +237,7 @@ export function tsFetchGenerateFunction(
 
     fileBlockStart(file, `if (!(${parameter} instanceof FormData))`);
 
-    /** @type {import("../generated/common/types.d.ts").ExperimentalObjectDefinition} */
+    /** @type {import("../generated/common/types.d.ts").StructureObjectDefinition} */
     // @ts-expect-error
     const type = structureResolveReference(
       generateContext.structure,
@@ -270,7 +270,7 @@ export function tsFetchGenerateFunction(
   }
 
   if (route.query) {
-    /** @type {import("../generated/common/types.d.ts").ExperimentalObjectDefinition} */
+    /** @type {import("../generated/common/types.d.ts").StructureObjectDefinition} */
     // @ts-expect-error
     const type = structureResolveReference(
       generateContext.structure,
diff --git a/packages/code-gen/src/builders/AnyType.d.ts b/packages/code-gen/src/builders/AnyType.d.ts
index 0e5f00ca77..576ab410c5 100644
--- a/packages/code-gen/src/builders/AnyType.d.ts
+++ b/packages/code-gen/src/builders/AnyType.d.ts
@@ -61,11 +61,11 @@ export class AnyType extends TypeBuilder {
    *
    * TODO: update above comment
    *
-   * @param {import("../generated/common/types.js").ExperimentalAnyDefinition["targets"]} targets
+   * @param {import("../generated/common/types.js").StructureAnyDefinition["targets"]} targets
    * @returns {AnyType}
    */
   implementations(
-    targets: import("../generated/common/types.js").ExperimentalAnyDefinition["targets"],
+    targets: import("../generated/common/types.js").StructureAnyDefinition["targets"],
   ): AnyType;
 }
 import { TypeBuilder } from "./TypeBuilder.js";
diff --git a/packages/code-gen/src/builders/AnyType.js b/packages/code-gen/src/builders/AnyType.js
index ff4f7b08aa..e155e77287 100644
--- a/packages/code-gen/src/builders/AnyType.js
+++ b/packages/code-gen/src/builders/AnyType.js
@@ -69,7 +69,7 @@ export class AnyType extends TypeBuilder {
    *
    * TODO: update above comment
    *
-   * @param {import("../generated/common/types.js").ExperimentalAnyDefinition["targets"]} targets
+   * @param {import("../generated/common/types.js").StructureAnyDefinition["targets"]} targets
    * @returns {AnyType}
    */
   implementations(targets) {
diff --git a/packages/code-gen/src/builders/RouteBuilder.d.ts b/packages/code-gen/src/builders/RouteBuilder.d.ts
index df7977d765..06d096c01d 100644
--- a/packages/code-gen/src/builders/RouteBuilder.d.ts
+++ b/packages/code-gen/src/builders/RouteBuilder.d.ts
@@ -135,7 +135,7 @@ export class RouteCreator {
    *
    * @param {string} group
    * @param {string} [name]
-   * @param {import("../generated/common/types").ExperimentalRouteInvalidationDefinition["properties"]} [properties]
+   * @param {import("../generated/common/types").StructureRouteInvalidationDefinition["properties"]} [properties]
    * @returns {RouteInvalidationType}
    */
   invalidates(
diff --git a/packages/code-gen/src/builders/RouteBuilder.js b/packages/code-gen/src/builders/RouteBuilder.js
index 24177f2110..f30298fe0f 100644
--- a/packages/code-gen/src/builders/RouteBuilder.js
+++ b/packages/code-gen/src/builders/RouteBuilder.js
@@ -374,7 +374,7 @@ export class RouteCreator {
    *
    * @param {string} group
    * @param {string} [name]
-   * @param {import("../generated/common/types").ExperimentalRouteInvalidationDefinition["properties"]} [properties]
+   * @param {import("../generated/common/types").StructureRouteInvalidationDefinition["properties"]} [properties]
    * @returns {RouteInvalidationType}
    */
   invalidates(group, name, properties) {
diff --git a/packages/code-gen/src/builders/RouteInvalidationType.d.ts b/packages/code-gen/src/builders/RouteInvalidationType.d.ts
index 88041fb767..a33ecbf416 100644
--- a/packages/code-gen/src/builders/RouteInvalidationType.d.ts
+++ b/packages/code-gen/src/builders/RouteInvalidationType.d.ts
@@ -1,7 +1,7 @@
 export class RouteInvalidationType {
   constructor(group: any, name: any, properties: any);
-  /** @type {import("../generated/common/types.js").ExperimentalRouteInvalidationDefinition} */
-  data: import("../generated/common/types.js").ExperimentalRouteInvalidationDefinition;
+  /** @type {import("../generated/common/types.js").StructureRouteInvalidationDefinition} */
+  data: import("../generated/common/types.js").StructureRouteInvalidationDefinition;
   /**
    * @returns {Record<string, any>}
    */
diff --git a/packages/code-gen/src/builders/RouteInvalidationType.js b/packages/code-gen/src/builders/RouteInvalidationType.js
index 65c0ae73b9..8f7963a006 100644
--- a/packages/code-gen/src/builders/RouteInvalidationType.js
+++ b/packages/code-gen/src/builders/RouteInvalidationType.js
@@ -18,7 +18,7 @@ export class RouteInvalidationType {
       });
     }
 
-    /** @type {import("../generated/common/types.js").ExperimentalRouteInvalidationDefinition} */
+    /** @type {import("../generated/common/types.js").StructureRouteInvalidationDefinition} */
     this.data = {
       type: "routeInvalidation",
       target: {
diff --git a/packages/code-gen/src/builders/utils.d.ts b/packages/code-gen/src/builders/utils.d.ts
index 4362855776..e688861632 100644
--- a/packages/code-gen/src/builders/utils.d.ts
+++ b/packages/code-gen/src/builders/utils.d.ts
@@ -1,12 +1,12 @@
 /**
  * @param value
  * @returns {value is
- *   Omit<import("../generated/common/types").ExperimentalNamedTypeDefinition,
+ *   Omit<import("../generated/common/types").StructureNamedTypeDefinition,
  *   "name"|"group"> & { name: string, group: string,
  *   }}
  */
 export function isNamedTypeBuilderLike(value: any): value is Omit<
-  import("../generated/common/types").ExperimentalNamedTypeDefinition,
+  import("../generated/common/types").StructureNamedTypeDefinition,
   "name" | "group"
 > & {
   name: string;
diff --git a/packages/code-gen/src/builders/utils.js b/packages/code-gen/src/builders/utils.js
index 0bf5de764c..0a799ecc5b 100644
--- a/packages/code-gen/src/builders/utils.js
+++ b/packages/code-gen/src/builders/utils.js
@@ -8,7 +8,7 @@ import { StringType } from "./StringType.js";
 /**
  * @param value
  * @returns {value is
- *   Omit<import("../generated/common/types").ExperimentalNamedTypeDefinition,
+ *   Omit<import("../generated/common/types").StructureNamedTypeDefinition,
  *   "name"|"group"> & { name: string, group: string,
  *   }}
  */
diff --git a/packages/code-gen/src/crud/events.js b/packages/code-gen/src/crud/events.js
index 97b105ace5..f9b0f14746 100644
--- a/packages/code-gen/src/crud/events.js
+++ b/packages/code-gen/src/crud/events.js
@@ -51,7 +51,7 @@ export function crudEventsGenerate(generateContext) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudEventsGenerateForType(generateContext, file, crud) {
   crudRouteSwitch(
@@ -92,7 +92,7 @@ function crudEventsGenerateForType(generateContext, file, crud) {
 
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudEventsFile(generateContext, crud) {
   return fileContextCreateGeneric(generateContext, `${crud.group}/events.js`, {
@@ -103,7 +103,7 @@ function crudEventsFile(generateContext, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudEventsList(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -141,7 +141,7 @@ function crudEventsList(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudEventsSingle(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -168,7 +168,7 @@ function crudEventsSingle(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudEventsCreate(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -197,7 +197,7 @@ function crudEventsCreate(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudEventsUpdate(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -225,7 +225,7 @@ function crudEventsUpdate(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudEventsDelete(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -250,7 +250,7 @@ function crudEventsDelete(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudEventsTransform(generateContext, file, crud) {
   const model = crudInformationGetModel(crud);
@@ -271,7 +271,7 @@ function crudEventsTransform(generateContext, file, crud) {
 /**
  * Get metadata about inline relations for create and update events
  *
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudEventsGetInlineRelations(crud) {
   const result = [];
@@ -306,7 +306,7 @@ function crudEventsGetInlineRelations(crud) {
 /**
  * Get the transformer mapping for the provided crud
  *
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudEventsGetEntityTransformer(crud) {
   const model = crudInformationGetModel(crud);
diff --git a/packages/code-gen/src/crud/handlers.js b/packages/code-gen/src/crud/handlers.js
index 1b05f5e320..3f00c1f860 100644
--- a/packages/code-gen/src/crud/handlers.js
+++ b/packages/code-gen/src/crud/handlers.js
@@ -57,7 +57,7 @@ export function crudHandlersGenerate(generateContext) {
 
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudHandlersFile(generateContext, crud) {
   return fileContextCreateGeneric(generateContext, `${crud.group}/crud.js`, {
@@ -68,7 +68,7 @@ function crudHandlersFile(generateContext, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudHandlersStart(generateContext, file, crud) {
   const { modifierDocs, modifierDestructure } = crudHandlersGetModifiers(crud);
@@ -101,7 +101,7 @@ function crudHandlersStart(generateContext, file, crud) {
 }
 
 /**
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  * @returns {{
  *   modifierDocs: string[],
  *   modifierDestructure: string[],
@@ -196,7 +196,7 @@ function crudHandlersGetModifiers(crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudHandlersEnd(generateContext, file, crud) {
   fileWrite(file, `\n${fileFormatInlineComment(file, crud.group)}`);
@@ -206,7 +206,7 @@ function crudHandlersEnd(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudHandlersGenerateForType(generateContext, file, crud) {
   crudRouteSwitch(
@@ -230,7 +230,7 @@ function crudHandlersGenerateForType(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudHandlersList(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -282,7 +282,7 @@ function crudHandlersList(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudHandlersSingle(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -319,7 +319,7 @@ function crudHandlersSingle(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudHandlersCreate(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -376,7 +376,7 @@ function crudHandlersCreate(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudHandlersUpdate(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
@@ -405,7 +405,7 @@ function crudHandlersUpdate(generateContext, file, crud) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudHandlersDelete(generateContext, file, crud) {
   const importCollector = JavascriptImportCollector.getImportCollector(file);
diff --git a/packages/code-gen/src/crud/query-builder.d.ts b/packages/code-gen/src/crud/query-builder.d.ts
index 467dcab73a..766e889806 100644
--- a/packages/code-gen/src/crud/query-builder.d.ts
+++ b/packages/code-gen/src/crud/query-builder.d.ts
@@ -1,7 +1,7 @@
 /**
  * Get the query builder to use for the provided crud and options
  *
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  * @param {{
  *   includeOwnParam: boolean,
  *   includeJoins: boolean,
@@ -12,7 +12,7 @@
  */
 export function crudQueryBuilderGet(
   crud: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalCrudDefinition
+    import("../generated/common/types").StructureCrudDefinition
   >,
   options: {
     includeOwnParam: boolean;
diff --git a/packages/code-gen/src/crud/query-builder.js b/packages/code-gen/src/crud/query-builder.js
index 7120f9ae1c..bb687664f9 100644
--- a/packages/code-gen/src/crud/query-builder.js
+++ b/packages/code-gen/src/crud/query-builder.js
@@ -11,7 +11,7 @@ import { upperCaseFirst } from "../utils.js";
 /**
  * Get the query builder to use for the provided crud and options
  *
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  * @param {{
  *   includeOwnParam: boolean,
  *   includeJoins: boolean,
@@ -28,7 +28,7 @@ export function crudQueryBuilderGet(crud, options) {
 }
 
 /**
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  * @param {{
  *   includeOwnParam: boolean,
  *   includeJoins: boolean,
diff --git a/packages/code-gen/src/database/erd.js b/packages/code-gen/src/database/erd.js
index 3ea398dc8d..553a43ddc7 100644
--- a/packages/code-gen/src/database/erd.js
+++ b/packages/code-gen/src/database/erd.js
@@ -46,7 +46,7 @@ export function databaseERDCreate(generateContext) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  */
 function databaseERDWriteModel(generateContext, file, model) {
   fileBlockStart(file, `${model.name}`);
diff --git a/packages/code-gen/src/database/generator.js b/packages/code-gen/src/database/generator.js
index cf7ce6b164..f5988d4026 100644
--- a/packages/code-gen/src/database/generator.js
+++ b/packages/code-gen/src/database/generator.js
@@ -95,7 +95,7 @@ export function databaseGenerator(generateContext) {
   }
 
   const target = databaseFormatTarget(generateContext);
-  /** @type {import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[]} */
+  /** @type {import("../generated/common/types.js").StructureAnyDefinitionTarget[]} */
   const typeTargets = ["js", "jsPostgres"];
 
   targetCustomSwitch(
diff --git a/packages/code-gen/src/database/js-postgres.d.ts b/packages/code-gen/src/database/js-postgres.d.ts
index a5cb938fce..15a5a07459 100644
--- a/packages/code-gen/src/database/js-postgres.d.ts
+++ b/packages/code-gen/src/database/js-postgres.d.ts
@@ -10,13 +10,13 @@ export function jsPostgresGenerateUtils(
  * Create a file for the provided model
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @returns {import("../file/context.js").GenerateFile}
  */
 export function jsPostgresCreateFile(
   generateContext: import("../generate.js").GenerateContext,
   model: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalObjectDefinition
+    import("../generated/common/types").StructureObjectDefinition
   >,
 ): import("../file/context.js").GenerateFile;
 /**
@@ -24,14 +24,14 @@ export function jsPostgresCreateFile(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateWhere(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   model: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalObjectDefinition
+    import("../generated/common/types").StructureObjectDefinition
   >,
   contextNames: import("./generator.js").DatabaseContextNames,
 ): void;
@@ -40,14 +40,14 @@ export function jsPostgresGenerateWhere(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateOrderBy(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   model: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalObjectDefinition
+    import("../generated/common/types").StructureObjectDefinition
   >,
   contextNames: import("./generator.js").DatabaseContextNames,
 ): void;
@@ -57,14 +57,14 @@ export function jsPostgresGenerateOrderBy(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateCount(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   model: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalObjectDefinition
+    import("../generated/common/types").StructureObjectDefinition
   >,
   contextNames: import("./generator.js").DatabaseContextNames,
 ): void;
@@ -73,14 +73,14 @@ export function jsPostgresGenerateCount(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateInsert(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   model: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalObjectDefinition
+    import("../generated/common/types").StructureObjectDefinition
   >,
   contextNames: import("./generator.js").DatabaseContextNames,
 ): void;
@@ -89,14 +89,14 @@ export function jsPostgresGenerateInsert(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateUpsertOnPrimaryKey(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   model: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalObjectDefinition
+    import("../generated/common/types").StructureObjectDefinition
   >,
   contextNames: import("./generator.js").DatabaseContextNames,
 ): void;
@@ -105,14 +105,14 @@ export function jsPostgresGenerateUpsertOnPrimaryKey(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateUpdate(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   model: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalObjectDefinition
+    import("../generated/common/types").StructureObjectDefinition
   >,
   contextNames: import("./generator.js").DatabaseContextNames,
 ): void;
@@ -121,14 +121,14 @@ export function jsPostgresGenerateUpdate(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateDelete(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   model: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalObjectDefinition
+    import("../generated/common/types").StructureObjectDefinition
   >,
   contextNames: import("./generator.js").DatabaseContextNames,
 ): void;
@@ -137,14 +137,14 @@ export function jsPostgresGenerateDelete(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateQueryBuilder(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   model: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalObjectDefinition
+    import("../generated/common/types").StructureObjectDefinition
   >,
   contextNames: import("./generator.js").DatabaseContextNames,
 ): void;
diff --git a/packages/code-gen/src/database/js-postgres.js b/packages/code-gen/src/database/js-postgres.js
index 4c747873cd..e20ed5ed55 100644
--- a/packages/code-gen/src/database/js-postgres.js
+++ b/packages/code-gen/src/database/js-postgres.js
@@ -128,7 +128,7 @@ ${structureModels(generateContext)
  * Create a file for the provided model
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @returns {import("../file/context.js").GenerateFile}
  */
 export function jsPostgresCreateFile(generateContext, model) {
@@ -178,7 +178,7 @@ export function jsPostgresCreateFile(generateContext, model) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateWhere(
@@ -401,7 +401,7 @@ export function jsPostgresGenerateWhere(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateOrderBy(
@@ -519,7 +519,7 @@ export function jsPostgresGenerateOrderBy(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateCount(
@@ -564,7 +564,7 @@ export function jsPostgresGenerateCount(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateInsert(
@@ -773,7 +773,7 @@ export function jsPostgresGenerateInsert(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateUpsertOnPrimaryKey(
@@ -944,7 +944,7 @@ export function jsPostgresGenerateUpsertOnPrimaryKey(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateUpdate(
@@ -1084,7 +1084,7 @@ export function jsPostgresGenerateUpdate(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateDelete(
@@ -1148,7 +1148,7 @@ export function jsPostgresGenerateDelete(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  * @param {import("./generator.js").DatabaseContextNames} contextNames
  */
 export function jsPostgresGenerateQueryBuilder(
diff --git a/packages/code-gen/src/database/postgres.js b/packages/code-gen/src/database/postgres.js
index 0eaa696f9c..7887e84100 100644
--- a/packages/code-gen/src/database/postgres.js
+++ b/packages/code-gen/src/database/postgres.js
@@ -60,7 +60,7 @@ The order of this output is alphabetically sorted, dependencies between tables a
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} model
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} model
  */
 function databasePostgresWriteModelDDL(generateContext, file, model) {
   if (model.queryOptions?.isView) {
@@ -125,7 +125,7 @@ function databasePostgresWriteModelDDL(generateContext, file, model) {
 
     if (isPrimary) {
       switch (
-        /** @type {import("../generated/common/types.js").ExperimentalTypeSystemDefinition["type"]} */ type
+        /** @type {import("../generated/common/types.js").StructureTypeSystemDefinition["type"]} */ type
       ) {
         case "number":
           fileWriteInline(file, ` BIGSERIAL PRIMARY KEY`);
@@ -147,7 +147,7 @@ function databasePostgresWriteModelDDL(generateContext, file, model) {
       }
     } else {
       switch (
-        /** @type {import("../generated/common/types.js").ExperimentalTypeSystemDefinition["type"]} */ type
+        /** @type {import("../generated/common/types.js").StructureTypeSystemDefinition["type"]} */ type
       ) {
         case "any":
           fileWriteInline(file, ` jsonb`);
diff --git a/packages/code-gen/src/generate.d.ts b/packages/code-gen/src/generate.d.ts
index 2bd2b50a1c..52573f51a8 100644
--- a/packages/code-gen/src/generate.d.ts
+++ b/packages/code-gen/src/generate.d.ts
@@ -6,8 +6,8 @@
 /**
  * @typedef {object} GenerateContext
  * @property {import("@compas/stdlib").Logger} log
- * @property {import("./generated/common/types.d.ts").ExperimentalGenerateOptions} options
- * @property {import("./generated/common/types.d.ts").ExperimentalStructure} structure
+ * @property {import("./generated/common/types.d.ts").StructureGenerateOptions} options
+ * @property {import("./generated/common/types.d.ts").StructureStructure} structure
  * @property {import("./file/context.js").GenerateFileMap} files
  */
 /**
@@ -21,12 +21,12 @@
  * - targetLanguageSwitch & targetCustomSwitch
  *
  * @param {import("./generator.js").Generator} generator
- * @param {import("./generated/common/types.js").ExperimentalGenerateOptions} options
+ * @param {import("./generated/common/types.js").StructureGenerateOptions} options
  * @returns {OutputFile[]}
  */
 export function generateExecute(
   generator: import("./generator.js").Generator,
-  options: import("./generated/common/types.js").ExperimentalGenerateOptions,
+  options: import("./generated/common/types.js").StructureGenerateOptions,
 ): OutputFile[];
 /**
  * Write output files if an output directory is provided
@@ -44,8 +44,8 @@ export type OutputFile = {
 };
 export type GenerateContext = {
   log: import("@compas/stdlib").Logger;
-  options: import("./generated/common/types.d.ts").ExperimentalGenerateOptions;
-  structure: import("./generated/common/types.d.ts").ExperimentalStructure;
+  options: import("./generated/common/types.d.ts").StructureGenerateOptions;
+  structure: import("./generated/common/types.d.ts").StructureStructure;
   files: import("./file/context.js").GenerateFileMap;
 };
 //# sourceMappingURL=generate.d.ts.map
diff --git a/packages/code-gen/src/generate.js b/packages/code-gen/src/generate.js
index 5f43696d49..0d4239a9ac 100644
--- a/packages/code-gen/src/generate.js
+++ b/packages/code-gen/src/generate.js
@@ -5,7 +5,7 @@ import { crudEventsGenerate } from "./crud/events.js";
 import { crudHandlersGenerate } from "./crud/handlers.js";
 import { databaseGenerator } from "./database/generator.js";
 import { fileContextConvertToOutputFiles } from "./file/context.js";
-import { validateExperimentalStructure } from "./generated/experimental/validators.js";
+import { validateStructureStructure } from "./generated/structure/validators.js";
 import { openApiGenerate } from "./open-api/generator.js";
 import { anyOfPreProcess } from "./processors/any-of.js";
 import { crudTypesCreate } from "./processors/crud-types.js";
@@ -66,8 +66,8 @@ import { validatorGeneratorGenerateBaseTypes } from "./validators/generator.js";
 /**
  * @typedef {object} GenerateContext
  * @property {import("@compas/stdlib").Logger} log
- * @property {import("./generated/common/types.d.ts").ExperimentalGenerateOptions} options
- * @property {import("./generated/common/types.d.ts").ExperimentalStructure} structure
+ * @property {import("./generated/common/types.d.ts").StructureGenerateOptions} options
+ * @property {import("./generated/common/types.d.ts").StructureStructure} structure
  * @property {import("./file/context.js").GenerateFileMap} files
  */
 
@@ -82,11 +82,11 @@ import { validatorGeneratorGenerateBaseTypes } from "./validators/generator.js";
  * - targetLanguageSwitch & targetCustomSwitch
  *
  * @param {import("./generator.js").Generator} generator
- * @param {import("./generated/common/types.js").ExperimentalGenerateOptions} options
+ * @param {import("./generated/common/types.js").StructureGenerateOptions} options
  * @returns {OutputFile[]}
  */
 export function generateExecute(generator, options) {
-  const validationResultStructure = validateExperimentalStructure(
+  const validationResultStructure = validateStructureStructure(
     generator.internalStructure,
   );
 
diff --git a/packages/code-gen/src/generated/common/structure.json b/packages/code-gen/src/generated/common/structure.json
index 24170bc1c6..b5e353a645 100644
--- a/packages/code-gen/src/generated/common/structure.json
+++ b/packages/code-gen/src/generated/common/structure.json
@@ -1,5 +1,5 @@
 {
-  "experimental": {
+  "structure": {
     "anyDefinition": {
       "docString": "",
       "isOptional": false,
@@ -9,7 +9,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "anyDefinition",
       "relations": [],
       "keys": {
@@ -208,7 +208,7 @@
             "sql": {},
             "validator": {},
             "reference": {
-              "group": "experimental",
+              "group": "structure",
               "name": "anyDefinitionTarget"
             }
           },
@@ -407,7 +407,7 @@
       },
       "sql": {},
       "type": "string",
-      "group": "experimental",
+      "group": "structure",
       "name": "anyDefinitionTarget",
       "oneOf": [
         "js",
@@ -436,7 +436,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "anyOfDefinition",
       "relations": [],
       "keys": {
@@ -643,9 +643,9 @@
             "sql": {},
             "type": "reference",
             "reference": {
-              "group": "experimental",
+              "group": "structure",
               "name": "typeSystemDefinition",
-              "uniqueName": "ExperimentalTypeSystemDefinition"
+              "uniqueName": "StructureTypeSystemDefinition"
             }
           }
         }
@@ -660,7 +660,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "arrayDefinition",
       "relations": [],
       "keys": {
@@ -879,9 +879,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "typeSystemDefinition",
-            "uniqueName": "ExperimentalTypeSystemDefinition"
+            "uniqueName": "StructureTypeSystemDefinition"
           }
         }
       }
@@ -895,7 +895,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "booleanDefinition",
       "relations": [],
       "keys": {
@@ -1113,7 +1113,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "crudDefinition",
       "relations": [],
       "keys": {
@@ -1310,9 +1310,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "referenceDefinition",
-            "uniqueName": "ExperimentalReferenceDefinition"
+            "uniqueName": "StructureReferenceDefinition"
           }
         },
         "fromParent": {
@@ -1509,9 +1509,9 @@
               "sql": {},
               "type": "reference",
               "reference": {
-                "group": "experimental",
+                "group": "structure",
                 "name": "referenceDefinition",
-                "uniqueName": "ExperimentalReferenceDefinition"
+                "uniqueName": "StructureReferenceDefinition"
               }
             },
             "writable": {
@@ -1590,9 +1590,9 @@
             "sql": {},
             "type": "reference",
             "reference": {
-              "group": "experimental",
+              "group": "structure",
               "name": "crudDefinition",
-              "uniqueName": "ExperimentalCrudDefinition"
+              "uniqueName": "StructureCrudDefinition"
             }
           }
         },
@@ -1611,9 +1611,9 @@
             "sql": {},
             "type": "reference",
             "reference": {
-              "group": "experimental",
+              "group": "structure",
               "name": "crudDefinition",
-              "uniqueName": "ExperimentalCrudDefinition"
+              "uniqueName": "StructureCrudDefinition"
             }
           }
         }
@@ -1628,7 +1628,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "dateDefinition",
       "relations": [],
       "keys": {
@@ -1879,7 +1879,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "extendDefinition",
       "relations": [],
       "keys": {
@@ -2082,9 +2082,9 @@
             "sql": {},
             "type": "reference",
             "reference": {
-              "group": "experimental",
+              "group": "structure",
               "name": "typeSystemDefinition",
-              "uniqueName": "ExperimentalTypeSystemDefinition"
+              "uniqueName": "StructureTypeSystemDefinition"
             }
           }
         },
@@ -2095,9 +2095,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "referenceDefinition",
-            "uniqueName": "ExperimentalReferenceDefinition"
+            "uniqueName": "StructureReferenceDefinition"
           }
         },
         "relations": {
@@ -2115,9 +2115,9 @@
             "sql": {},
             "type": "reference",
             "reference": {
-              "group": "experimental",
+              "group": "structure",
               "name": "relationDefinition",
-              "uniqueName": "ExperimentalRelationDefinition"
+              "uniqueName": "StructureRelationDefinition"
             }
           }
         }
@@ -2132,7 +2132,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "fileDefinition",
       "relations": [],
       "keys": {
@@ -2342,7 +2342,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "generateOptions",
       "relations": [],
       "keys": {
@@ -2645,7 +2645,7 @@
               "relations": [],
               "keys": {
                 "includeBaseTypes": {
-                  "docString": "Always generate validators for all named types even if no other generator needs it. This implies {@link ExperimentalGenerateOptions.generators.types.includeBaseTypes}.",
+                  "docString": "Always generate validators for all named types even if no other generator needs it. This implies {@link StructureGenerateOptions.generators.types.includeBaseTypes}.",
                   "isOptional": true,
                   "validator": {
                     "convert": false,
@@ -2889,7 +2889,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "genericDefinition",
       "relations": [],
       "keys": {
@@ -3072,9 +3072,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "typeSystemDefinition",
-            "uniqueName": "ExperimentalTypeSystemDefinition"
+            "uniqueName": "StructureTypeSystemDefinition"
           }
         },
         "values": {
@@ -3084,9 +3084,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "typeSystemDefinition",
-            "uniqueName": "ExperimentalTypeSystemDefinition"
+            "uniqueName": "StructureTypeSystemDefinition"
           }
         }
       }
@@ -3105,7 +3105,7 @@
       },
       "sql": {},
       "type": "string",
-      "group": "experimental",
+      "group": "structure",
       "name": "namePart"
     },
     "namePartOptional": {
@@ -3122,7 +3122,7 @@
       },
       "sql": {},
       "type": "string",
-      "group": "experimental",
+      "group": "structure",
       "name": "namePartOptional"
     },
     "namedTypeDefinition": {
@@ -3133,7 +3133,7 @@
       },
       "sql": {},
       "type": "anyOf",
-      "group": "experimental",
+      "group": "structure",
       "name": "namedTypeDefinition",
       "values": [
         {
@@ -3143,9 +3143,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "anyDefinition",
-            "uniqueName": "ExperimentalAnyDefinition"
+            "uniqueName": "StructureAnyDefinition"
           }
         },
         {
@@ -3155,9 +3155,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "anyOfDefinition",
-            "uniqueName": "ExperimentalAnyOfDefinition"
+            "uniqueName": "StructureAnyOfDefinition"
           }
         },
         {
@@ -3167,9 +3167,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "arrayDefinition",
-            "uniqueName": "ExperimentalArrayDefinition"
+            "uniqueName": "StructureArrayDefinition"
           }
         },
         {
@@ -3179,9 +3179,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "booleanDefinition",
-            "uniqueName": "ExperimentalBooleanDefinition"
+            "uniqueName": "StructureBooleanDefinition"
           }
         },
         {
@@ -3191,9 +3191,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "crudDefinition",
-            "uniqueName": "ExperimentalCrudDefinition"
+            "uniqueName": "StructureCrudDefinition"
           }
         },
         {
@@ -3203,9 +3203,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "dateDefinition",
-            "uniqueName": "ExperimentalDateDefinition"
+            "uniqueName": "StructureDateDefinition"
           }
         },
         {
@@ -3215,9 +3215,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "extendDefinition",
-            "uniqueName": "ExperimentalExtendDefinition"
+            "uniqueName": "StructureExtendDefinition"
           }
         },
         {
@@ -3227,9 +3227,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "fileDefinition",
-            "uniqueName": "ExperimentalFileDefinition"
+            "uniqueName": "StructureFileDefinition"
           }
         },
         {
@@ -3239,9 +3239,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "genericDefinition",
-            "uniqueName": "ExperimentalGenericDefinition"
+            "uniqueName": "StructureGenericDefinition"
           }
         },
         {
@@ -3251,9 +3251,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "numberDefinition",
-            "uniqueName": "ExperimentalNumberDefinition"
+            "uniqueName": "StructureNumberDefinition"
           }
         },
         {
@@ -3263,9 +3263,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "objectDefinition",
-            "uniqueName": "ExperimentalObjectDefinition"
+            "uniqueName": "StructureObjectDefinition"
           }
         },
         {
@@ -3275,9 +3275,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "omitDefinition",
-            "uniqueName": "ExperimentalOmitDefinition"
+            "uniqueName": "StructureOmitDefinition"
           }
         },
         {
@@ -3287,9 +3287,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "pickDefinition",
-            "uniqueName": "ExperimentalPickDefinition"
+            "uniqueName": "StructurePickDefinition"
           }
         },
         {
@@ -3299,9 +3299,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "routeDefinition",
-            "uniqueName": "ExperimentalRouteDefinition"
+            "uniqueName": "StructureRouteDefinition"
           }
         },
         {
@@ -3311,9 +3311,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "stringDefinition",
-            "uniqueName": "ExperimentalStringDefinition"
+            "uniqueName": "StructureStringDefinition"
           }
         },
         {
@@ -3323,9 +3323,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "uuidDefinition",
-            "uniqueName": "ExperimentalUuidDefinition"
+            "uniqueName": "StructureUuidDefinition"
           }
         }
       ]
@@ -3339,7 +3339,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "numberDefinition",
       "relations": [],
       "keys": {
@@ -3605,7 +3605,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "objectDefinition",
       "relations": [],
       "keys": {
@@ -3843,9 +3843,9 @@
             "sql": {},
             "type": "reference",
             "reference": {
-              "group": "experimental",
+              "group": "structure",
               "name": "typeSystemDefinition",
-              "uniqueName": "ExperimentalTypeSystemDefinition"
+              "uniqueName": "StructureTypeSystemDefinition"
             }
           }
         },
@@ -3941,9 +3941,9 @@
             "sql": {},
             "type": "reference",
             "reference": {
-              "group": "experimental",
+              "group": "structure",
               "name": "relationDefinition",
-              "uniqueName": "ExperimentalRelationDefinition"
+              "uniqueName": "StructureRelationDefinition"
             }
           }
         }
@@ -3958,7 +3958,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "omitDefinition",
       "relations": [],
       "keys": {
@@ -4185,9 +4185,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "typeSystemDefinition",
-            "uniqueName": "ExperimentalTypeSystemDefinition"
+            "uniqueName": "StructureTypeSystemDefinition"
           }
         }
       }
@@ -4201,7 +4201,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "pickDefinition",
       "relations": [],
       "keys": {
@@ -4428,9 +4428,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "typeSystemDefinition",
-            "uniqueName": "ExperimentalTypeSystemDefinition"
+            "uniqueName": "StructureTypeSystemDefinition"
           }
         }
       }
@@ -4444,7 +4444,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "referenceDefinition",
       "relations": [],
       "keys": {
@@ -4610,7 +4610,7 @@
               "sql": {},
               "validator": {},
               "reference": {
-                "group": "experimental",
+                "group": "structure",
                 "name": "namePart"
               }
             },
@@ -4621,7 +4621,7 @@
               "sql": {},
               "validator": {},
               "reference": {
-                "group": "experimental",
+                "group": "structure",
                 "name": "namePart"
               }
             }
@@ -4638,7 +4638,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "relationDefinition",
       "relations": [],
       "keys": {
@@ -4679,9 +4679,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "referenceDefinition",
-            "uniqueName": "ExperimentalReferenceDefinition"
+            "uniqueName": "StructureReferenceDefinition"
           }
         },
         "ownKey": {
@@ -4733,7 +4733,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "routeDefinition",
       "relations": [],
       "keys": {
@@ -4978,9 +4978,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "referenceDefinition",
-            "uniqueName": "ExperimentalReferenceDefinition"
+            "uniqueName": "StructureReferenceDefinition"
           }
         },
         "params": {
@@ -4990,9 +4990,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "referenceDefinition",
-            "uniqueName": "ExperimentalReferenceDefinition"
+            "uniqueName": "StructureReferenceDefinition"
           }
         },
         "body": {
@@ -5002,9 +5002,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "referenceDefinition",
-            "uniqueName": "ExperimentalReferenceDefinition"
+            "uniqueName": "StructureReferenceDefinition"
           }
         },
         "files": {
@@ -5014,9 +5014,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "referenceDefinition",
-            "uniqueName": "ExperimentalReferenceDefinition"
+            "uniqueName": "StructureReferenceDefinition"
           }
         },
         "response": {
@@ -5026,9 +5026,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "referenceDefinition",
-            "uniqueName": "ExperimentalReferenceDefinition"
+            "uniqueName": "StructureReferenceDefinition"
           }
         },
         "invalidations": {
@@ -5046,9 +5046,9 @@
             "sql": {},
             "type": "reference",
             "reference": {
-              "group": "experimental",
+              "group": "structure",
               "name": "routeInvalidationDefinition",
-              "uniqueName": "ExperimentalRouteInvalidationDefinition"
+              "uniqueName": "StructureRouteInvalidationDefinition"
             }
           }
         },
@@ -5091,7 +5091,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "routeInvalidationDefinition",
       "relations": [],
       "keys": {
@@ -5128,7 +5128,7 @@
               "sql": {},
               "validator": {},
               "reference": {
-                "group": "experimental",
+                "group": "structure",
                 "name": "namePart"
               }
             },
@@ -5139,7 +5139,7 @@
               "sql": {},
               "validator": {},
               "reference": {
-                "group": "experimental",
+                "group": "structure",
                 "name": "namePartOptional"
               }
             }
@@ -5290,7 +5290,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "stringDefinition",
       "relations": [],
       "keys": {
@@ -5613,7 +5613,7 @@
       "validator": {},
       "sql": {},
       "type": "generic",
-      "group": "experimental",
+      "group": "structure",
       "name": "structure",
       "keys": {
         "type": "reference",
@@ -5622,7 +5622,7 @@
         "sql": {},
         "validator": {},
         "reference": {
-          "group": "experimental",
+          "group": "structure",
           "name": "namePart"
         }
       },
@@ -5639,7 +5639,7 @@
           "sql": {},
           "validator": {},
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "namePart"
           }
         },
@@ -5650,9 +5650,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "namedTypeDefinition",
-            "uniqueName": "ExperimentalNamedTypeDefinition"
+            "uniqueName": "StructureNamedTypeDefinition"
           }
         }
       }
@@ -5663,7 +5663,7 @@
       "validator": {},
       "sql": {},
       "type": "anyOf",
-      "group": "experimental",
+      "group": "structure",
       "name": "typeDefinition",
       "values": [
         {
@@ -5673,9 +5673,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "namedTypeDefinition",
-            "uniqueName": "ExperimentalNamedTypeDefinition"
+            "uniqueName": "StructureNamedTypeDefinition"
           }
         },
         {
@@ -5685,9 +5685,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "referenceDefinition",
-            "uniqueName": "ExperimentalReferenceDefinition"
+            "uniqueName": "StructureReferenceDefinition"
           }
         },
         {
@@ -5697,9 +5697,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "relationDefinition",
-            "uniqueName": "ExperimentalRelationDefinition"
+            "uniqueName": "StructureRelationDefinition"
           }
         },
         {
@@ -5709,9 +5709,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "routeInvalidationDefinition",
-            "uniqueName": "ExperimentalRouteInvalidationDefinition"
+            "uniqueName": "StructureRouteInvalidationDefinition"
           }
         }
       ]
@@ -5724,7 +5724,7 @@
       },
       "sql": {},
       "type": "anyOf",
-      "group": "experimental",
+      "group": "structure",
       "name": "typeSystemDefinition",
       "values": [
         {
@@ -5734,9 +5734,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "anyDefinition",
-            "uniqueName": "ExperimentalAnyDefinition"
+            "uniqueName": "StructureAnyDefinition"
           }
         },
         {
@@ -5746,9 +5746,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "anyOfDefinition",
-            "uniqueName": "ExperimentalAnyOfDefinition"
+            "uniqueName": "StructureAnyOfDefinition"
           }
         },
         {
@@ -5758,9 +5758,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "arrayDefinition",
-            "uniqueName": "ExperimentalArrayDefinition"
+            "uniqueName": "StructureArrayDefinition"
           }
         },
         {
@@ -5770,9 +5770,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "booleanDefinition",
-            "uniqueName": "ExperimentalBooleanDefinition"
+            "uniqueName": "StructureBooleanDefinition"
           }
         },
         {
@@ -5782,9 +5782,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "crudDefinition",
-            "uniqueName": "ExperimentalCrudDefinition"
+            "uniqueName": "StructureCrudDefinition"
           }
         },
         {
@@ -5794,9 +5794,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "dateDefinition",
-            "uniqueName": "ExperimentalDateDefinition"
+            "uniqueName": "StructureDateDefinition"
           }
         },
         {
@@ -5806,9 +5806,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "extendDefinition",
-            "uniqueName": "ExperimentalExtendDefinition"
+            "uniqueName": "StructureExtendDefinition"
           }
         },
         {
@@ -5818,9 +5818,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "fileDefinition",
-            "uniqueName": "ExperimentalFileDefinition"
+            "uniqueName": "StructureFileDefinition"
           }
         },
         {
@@ -5830,9 +5830,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "genericDefinition",
-            "uniqueName": "ExperimentalGenericDefinition"
+            "uniqueName": "StructureGenericDefinition"
           }
         },
         {
@@ -5842,9 +5842,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "numberDefinition",
-            "uniqueName": "ExperimentalNumberDefinition"
+            "uniqueName": "StructureNumberDefinition"
           }
         },
         {
@@ -5854,9 +5854,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "objectDefinition",
-            "uniqueName": "ExperimentalObjectDefinition"
+            "uniqueName": "StructureObjectDefinition"
           }
         },
         {
@@ -5866,9 +5866,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "omitDefinition",
-            "uniqueName": "ExperimentalOmitDefinition"
+            "uniqueName": "StructureOmitDefinition"
           }
         },
         {
@@ -5878,9 +5878,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "pickDefinition",
-            "uniqueName": "ExperimentalPickDefinition"
+            "uniqueName": "StructurePickDefinition"
           }
         },
         {
@@ -5890,9 +5890,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "referenceDefinition",
-            "uniqueName": "ExperimentalReferenceDefinition"
+            "uniqueName": "StructureReferenceDefinition"
           }
         },
         {
@@ -5902,9 +5902,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "stringDefinition",
-            "uniqueName": "ExperimentalStringDefinition"
+            "uniqueName": "StructureStringDefinition"
           }
         },
         {
@@ -5914,9 +5914,9 @@
           "sql": {},
           "type": "reference",
           "reference": {
-            "group": "experimental",
+            "group": "structure",
             "name": "uuidDefinition",
-            "uniqueName": "ExperimentalUuidDefinition"
+            "uniqueName": "StructureUuidDefinition"
           }
         }
       ]
@@ -5930,7 +5930,7 @@
       },
       "sql": {},
       "type": "object",
-      "group": "experimental",
+      "group": "structure",
       "name": "uuidDefinition",
       "relations": [],
       "keys": {
diff --git a/packages/code-gen/src/generated/common/types.d.ts b/packages/code-gen/src/generated/common/types.d.ts
index c1b8d029da..83ba89623c 100644
--- a/packages/code-gen/src/generated/common/types.d.ts
+++ b/packages/code-gen/src/generated/common/types.d.ts
@@ -1,6 +1,6 @@
 // Generated by @compas/code-gen
 
-export type ExperimentalAnyDefinitionTarget =
+export type StructureAnyDefinitionTarget =
   | "js"
   | "ts"
   | "jsKoaReceive"
@@ -17,7 +17,7 @@ export type ExperimentalAnyDefinitionTarget =
   | "tsFetchBrowser"
   | "tsFetchReactNative";
 
-export type ExperimentalAnyDefinition = {
+export type StructureAnyDefinition = {
   type: "any";
   group?: string | undefined;
   name?: string | undefined;
@@ -39,7 +39,7 @@ export type ExperimentalAnyDefinition = {
   targets?:
     | Partial<
         Record<
-          ExperimentalAnyDefinitionTarget,
+          StructureAnyDefinitionTarget,
           {
             validatorInputType: string;
             validatorOutputType: string;
@@ -69,7 +69,7 @@ export type ExperimentalAnyDefinition = {
   };
 };
 
-export type ExperimentalAnyDefinitionInput = {
+export type StructureAnyDefinitionInput = {
   type: "any";
   group?: string | undefined;
   name?: string | undefined;
@@ -93,7 +93,7 @@ export type ExperimentalAnyDefinitionInput = {
   targets?:
     | Partial<
         Record<
-          ExperimentalAnyDefinitionTarget,
+          StructureAnyDefinitionTarget,
           {
             validatorInputType: string;
             validatorOutputType: string;
@@ -123,7 +123,7 @@ export type ExperimentalAnyDefinitionInput = {
   };
 };
 
-export type ExperimentalArrayDefinition = {
+export type StructureArrayDefinition = {
   type: "array";
   group?: string | undefined;
   name?: string | undefined;
@@ -140,10 +140,10 @@ export type ExperimentalArrayDefinition = {
     min?: number | undefined;
     max?: number | undefined;
   };
-  values: ExperimentalTypeSystemDefinition;
+  values: StructureTypeSystemDefinition;
 };
 
-export type ExperimentalBooleanDefinition = {
+export type StructureBooleanDefinition = {
   type: "boolean";
   group?: string | undefined;
   name?: string | undefined;
@@ -162,9 +162,9 @@ export type ExperimentalBooleanDefinition = {
   oneOf?: boolean | undefined;
 };
 
-export type ExperimentalNamePart = string;
+export type StructureNamePart = string;
 
-export type ExperimentalReferenceDefinition = {
+export type StructureReferenceDefinition = {
   type: "reference";
   docString: string;
   isOptional: boolean;
@@ -176,12 +176,12 @@ export type ExperimentalReferenceDefinition = {
   };
   validator: {};
   reference: {
-    group: ExperimentalNamePart;
-    name: ExperimentalNamePart;
+    group: StructureNamePart;
+    name: StructureNamePart;
   };
 };
 
-export type ExperimentalCrudDefinition = {
+export type StructureCrudDefinition = {
   type: "crud";
   group?: string | undefined;
   name?: string | undefined;
@@ -195,7 +195,7 @@ export type ExperimentalCrudDefinition = {
   };
   validator: {};
   basePath?: string | undefined;
-  entity?: ExperimentalReferenceDefinition | undefined;
+  entity?: StructureReferenceDefinition | undefined;
   fromParent?:
     | {
         field: string;
@@ -220,7 +220,7 @@ export type ExperimentalCrudDefinition = {
           $pick?: string[] | undefined;
         }
       | undefined;
-    readableType?: ExperimentalReferenceDefinition | undefined;
+    readableType?: StructureReferenceDefinition | undefined;
     writable?:
       | {
           $omit?: string[] | undefined;
@@ -228,11 +228,11 @@ export type ExperimentalCrudDefinition = {
         }
       | undefined;
   };
-  inlineRelations: ExperimentalCrudDefinition[];
-  nestedRelations: ExperimentalCrudDefinition[];
+  inlineRelations: StructureCrudDefinition[];
+  nestedRelations: StructureCrudDefinition[];
 };
 
-export type ExperimentalDateDefinition = {
+export type StructureDateDefinition = {
   type: "date";
   group?: string | undefined;
   name?: string | undefined;
@@ -254,16 +254,16 @@ export type ExperimentalDateDefinition = {
   specifier?: "dateOnly" | "timeOnly" | undefined;
 };
 
-export type ExperimentalRelationDefinition = {
+export type StructureRelationDefinition = {
   type: "relation";
   subType: "manyToOne" | "oneToMany" | "oneToOne" | "oneToOneReverse";
-  reference: ExperimentalReferenceDefinition;
+  reference: StructureReferenceDefinition;
   ownKey: string;
   referencedKey?: string | undefined;
   isOptional: boolean;
 };
 
-export type ExperimentalExtendDefinition = {
+export type StructureExtendDefinition = {
   type: "extend";
   group?: string | undefined;
   name?: string | undefined;
@@ -276,12 +276,12 @@ export type ExperimentalExtendDefinition = {
     hasDefaultValue?: boolean | undefined;
   };
   validator: {};
-  keys: { [key: string]: ExperimentalTypeSystemDefinition };
-  reference: ExperimentalReferenceDefinition;
-  relations: ExperimentalRelationDefinition[];
+  keys: { [key: string]: StructureTypeSystemDefinition };
+  reference: StructureReferenceDefinition;
+  relations: StructureRelationDefinition[];
 };
 
-export type ExperimentalFileDefinition = {
+export type StructureFileDefinition = {
   type: "file";
   group?: string | undefined;
   name?: string | undefined;
@@ -298,7 +298,7 @@ export type ExperimentalFileDefinition = {
   };
 };
 
-export type ExperimentalGenericDefinition = {
+export type StructureGenericDefinition = {
   type: "generic";
   group?: string | undefined;
   name?: string | undefined;
@@ -311,11 +311,11 @@ export type ExperimentalGenericDefinition = {
     hasDefaultValue?: boolean | undefined;
   };
   validator: {};
-  keys: ExperimentalTypeSystemDefinition;
-  values: ExperimentalTypeSystemDefinition;
+  keys: StructureTypeSystemDefinition;
+  values: StructureTypeSystemDefinition;
 };
 
-export type ExperimentalNumberDefinition = {
+export type StructureNumberDefinition = {
   type: "number";
   group?: string | undefined;
   name?: string | undefined;
@@ -337,7 +337,7 @@ export type ExperimentalNumberDefinition = {
   oneOf?: number[] | undefined;
 };
 
-export type ExperimentalObjectDefinition = {
+export type StructureObjectDefinition = {
   type: "object";
   group?: string | undefined;
   name?: string | undefined;
@@ -354,7 +354,7 @@ export type ExperimentalObjectDefinition = {
     strict: boolean;
   };
   shortName?: string | undefined;
-  keys: { [key: string]: ExperimentalTypeSystemDefinition };
+  keys: { [key: string]: StructureTypeSystemDefinition };
   enableQueries?: boolean | undefined;
   queryOptions?:
     | {
@@ -365,10 +365,10 @@ export type ExperimentalObjectDefinition = {
         schema?: string | undefined;
       }
     | undefined;
-  relations: ExperimentalRelationDefinition[];
+  relations: StructureRelationDefinition[];
 };
 
-export type ExperimentalOmitDefinition = {
+export type StructureOmitDefinition = {
   type: "omit";
   group?: string | undefined;
   name?: string | undefined;
@@ -385,10 +385,10 @@ export type ExperimentalOmitDefinition = {
     strict: boolean;
   };
   keys: string[];
-  reference: ExperimentalTypeSystemDefinition;
+  reference: StructureTypeSystemDefinition;
 };
 
-export type ExperimentalPickDefinition = {
+export type StructurePickDefinition = {
   type: "pick";
   group?: string | undefined;
   name?: string | undefined;
@@ -405,10 +405,10 @@ export type ExperimentalPickDefinition = {
     strict: boolean;
   };
   keys: string[];
-  reference: ExperimentalTypeSystemDefinition;
+  reference: StructureTypeSystemDefinition;
 };
 
-export type ExperimentalStringDefinition = {
+export type StructureStringDefinition = {
   type: "string";
   group?: string | undefined;
   name?: string | undefined;
@@ -434,7 +434,7 @@ export type ExperimentalStringDefinition = {
   oneOf?: string[] | undefined;
 };
 
-export type ExperimentalUuidDefinition = {
+export type StructureUuidDefinition = {
   type: "uuid";
   group?: string | undefined;
   name?: string | undefined;
@@ -454,25 +454,25 @@ export type ExperimentalUuidDefinition = {
 /**
  * All type definitions that can be used inside other types, like object keys.
  */
-export type ExperimentalTypeSystemDefinition =
-  | ExperimentalAnyDefinition
-  | ExperimentalAnyOfDefinition
-  | ExperimentalArrayDefinition
-  | ExperimentalBooleanDefinition
-  | ExperimentalCrudDefinition
-  | ExperimentalDateDefinition
-  | ExperimentalExtendDefinition
-  | ExperimentalFileDefinition
-  | ExperimentalGenericDefinition
-  | ExperimentalNumberDefinition
-  | ExperimentalObjectDefinition
-  | ExperimentalOmitDefinition
-  | ExperimentalPickDefinition
-  | ExperimentalReferenceDefinition
-  | ExperimentalStringDefinition
-  | ExperimentalUuidDefinition;
-
-export type ExperimentalAnyOfDefinition = {
+export type StructureTypeSystemDefinition =
+  | StructureAnyDefinition
+  | StructureAnyOfDefinition
+  | StructureArrayDefinition
+  | StructureBooleanDefinition
+  | StructureCrudDefinition
+  | StructureDateDefinition
+  | StructureExtendDefinition
+  | StructureFileDefinition
+  | StructureGenericDefinition
+  | StructureNumberDefinition
+  | StructureObjectDefinition
+  | StructureOmitDefinition
+  | StructurePickDefinition
+  | StructureReferenceDefinition
+  | StructureStringDefinition
+  | StructureUuidDefinition;
+
+export type StructureAnyOfDefinition = {
   type: "anyOf";
   group?: string | undefined;
   name?: string | undefined;
@@ -487,10 +487,10 @@ export type ExperimentalAnyOfDefinition = {
   validator: {
     discriminant?: string | undefined;
   };
-  values: ExperimentalTypeSystemDefinition[];
+  values: StructureTypeSystemDefinition[];
 };
 
-export type ExperimentalArrayDefinitionInput = {
+export type StructureArrayDefinitionInput = {
   type: "array";
   group?: string | undefined;
   name?: string | undefined;
@@ -509,10 +509,10 @@ export type ExperimentalArrayDefinitionInput = {
     min?: number | undefined;
     max?: number | undefined;
   };
-  values: ExperimentalTypeSystemDefinitionInput;
+  values: StructureTypeSystemDefinitionInput;
 };
 
-export type ExperimentalBooleanDefinitionInput = {
+export type StructureBooleanDefinitionInput = {
   type: "boolean";
   group?: string | undefined;
   name?: string | undefined;
@@ -533,7 +533,7 @@ export type ExperimentalBooleanDefinitionInput = {
   oneOf?: boolean | "true" | "false" | undefined;
 };
 
-export type ExperimentalReferenceDefinitionInput = {
+export type StructureReferenceDefinitionInput = {
   type: "reference";
   docString?: string | undefined;
   isOptional?: boolean | "true" | "false" | undefined;
@@ -547,12 +547,12 @@ export type ExperimentalReferenceDefinitionInput = {
     | undefined;
   validator?: {} | undefined;
   reference: {
-    group: ExperimentalNamePart;
-    name: ExperimentalNamePart;
+    group: StructureNamePart;
+    name: StructureNamePart;
   };
 };
 
-export type ExperimentalCrudDefinitionInput = {
+export type StructureCrudDefinitionInput = {
   type: "crud";
   group?: string | undefined;
   name?: string | undefined;
@@ -568,7 +568,7 @@ export type ExperimentalCrudDefinitionInput = {
     | undefined;
   validator?: {} | undefined;
   basePath?: string | undefined;
-  entity?: ExperimentalReferenceDefinitionInput | undefined;
+  entity?: StructureReferenceDefinitionInput | undefined;
   fromParent?:
     | {
         field: string;
@@ -593,7 +593,7 @@ export type ExperimentalCrudDefinitionInput = {
           $pick?: string[] | string | undefined;
         }
       | undefined;
-    readableType?: ExperimentalReferenceDefinitionInput | undefined;
+    readableType?: StructureReferenceDefinitionInput | undefined;
     writable?:
       | {
           $omit?: string[] | string | undefined;
@@ -602,14 +602,14 @@ export type ExperimentalCrudDefinitionInput = {
       | undefined;
   };
   inlineRelations:
-    | ExperimentalCrudDefinitionInput[]
-    | ExperimentalCrudDefinitionInput;
+    | StructureCrudDefinitionInput[]
+    | StructureCrudDefinitionInput;
   nestedRelations:
-    | ExperimentalCrudDefinitionInput[]
-    | ExperimentalCrudDefinitionInput;
+    | StructureCrudDefinitionInput[]
+    | StructureCrudDefinitionInput;
 };
 
-export type ExperimentalDateDefinitionInput = {
+export type StructureDateDefinitionInput = {
   type: "date";
   group?: string | undefined;
   name?: string | undefined;
@@ -633,16 +633,16 @@ export type ExperimentalDateDefinitionInput = {
   specifier?: "dateOnly" | "timeOnly" | undefined;
 };
 
-export type ExperimentalRelationDefinitionInput = {
+export type StructureRelationDefinitionInput = {
   type: "relation";
   subType: "manyToOne" | "oneToMany" | "oneToOne" | "oneToOneReverse";
-  reference: ExperimentalReferenceDefinitionInput;
+  reference: StructureReferenceDefinitionInput;
   ownKey: string;
   referencedKey?: string | undefined;
   isOptional: boolean | "true" | "false";
 };
 
-export type ExperimentalExtendDefinitionInput = {
+export type StructureExtendDefinitionInput = {
   type: "extend";
   group?: string | undefined;
   name?: string | undefined;
@@ -657,14 +657,14 @@ export type ExperimentalExtendDefinitionInput = {
       }
     | undefined;
   validator?: {} | undefined;
-  keys: { [key: string]: ExperimentalTypeSystemDefinitionInput };
-  reference: ExperimentalReferenceDefinitionInput;
+  keys: { [key: string]: StructureTypeSystemDefinitionInput };
+  reference: StructureReferenceDefinitionInput;
   relations:
-    | ExperimentalRelationDefinitionInput[]
-    | ExperimentalRelationDefinitionInput;
+    | StructureRelationDefinitionInput[]
+    | StructureRelationDefinitionInput;
 };
 
-export type ExperimentalFileDefinitionInput = {
+export type StructureFileDefinitionInput = {
   type: "file";
   group?: string | undefined;
   name?: string | undefined;
@@ -683,7 +683,7 @@ export type ExperimentalFileDefinitionInput = {
   };
 };
 
-export type ExperimentalGenericDefinitionInput = {
+export type StructureGenericDefinitionInput = {
   type: "generic";
   group?: string | undefined;
   name?: string | undefined;
@@ -698,11 +698,11 @@ export type ExperimentalGenericDefinitionInput = {
       }
     | undefined;
   validator?: {} | undefined;
-  keys: ExperimentalTypeSystemDefinitionInput;
-  values: ExperimentalTypeSystemDefinitionInput;
+  keys: StructureTypeSystemDefinitionInput;
+  values: StructureTypeSystemDefinitionInput;
 };
 
-export type ExperimentalNumberDefinitionInput = {
+export type StructureNumberDefinitionInput = {
   type: "number";
   group?: string | undefined;
   name?: string | undefined;
@@ -726,7 +726,7 @@ export type ExperimentalNumberDefinitionInput = {
   oneOf?: number[] | number | undefined;
 };
 
-export type ExperimentalObjectDefinitionInput = {
+export type StructureObjectDefinitionInput = {
   type: "object";
   group?: string | undefined;
   name?: string | undefined;
@@ -745,7 +745,7 @@ export type ExperimentalObjectDefinitionInput = {
     strict: boolean | "true" | "false";
   };
   shortName?: string | undefined;
-  keys: { [key: string]: ExperimentalTypeSystemDefinitionInput };
+  keys: { [key: string]: StructureTypeSystemDefinitionInput };
   enableQueries?: boolean | "true" | "false" | undefined;
   queryOptions?:
     | {
@@ -757,11 +757,11 @@ export type ExperimentalObjectDefinitionInput = {
       }
     | undefined;
   relations:
-    | ExperimentalRelationDefinitionInput[]
-    | ExperimentalRelationDefinitionInput;
+    | StructureRelationDefinitionInput[]
+    | StructureRelationDefinitionInput;
 };
 
-export type ExperimentalOmitDefinitionInput = {
+export type StructureOmitDefinitionInput = {
   type: "omit";
   group?: string | undefined;
   name?: string | undefined;
@@ -780,10 +780,10 @@ export type ExperimentalOmitDefinitionInput = {
     strict: boolean | "true" | "false";
   };
   keys: string[] | string;
-  reference: ExperimentalTypeSystemDefinitionInput;
+  reference: StructureTypeSystemDefinitionInput;
 };
 
-export type ExperimentalPickDefinitionInput = {
+export type StructurePickDefinitionInput = {
   type: "pick";
   group?: string | undefined;
   name?: string | undefined;
@@ -802,10 +802,10 @@ export type ExperimentalPickDefinitionInput = {
     strict: boolean | "true" | "false";
   };
   keys: string[] | string;
-  reference: ExperimentalTypeSystemDefinitionInput;
+  reference: StructureTypeSystemDefinitionInput;
 };
 
-export type ExperimentalStringDefinitionInput = {
+export type StructureStringDefinitionInput = {
   type: "string";
   group?: string | undefined;
   name?: string | undefined;
@@ -833,7 +833,7 @@ export type ExperimentalStringDefinitionInput = {
   oneOf?: string[] | string | undefined;
 };
 
-export type ExperimentalUuidDefinitionInput = {
+export type StructureUuidDefinitionInput = {
   type: "uuid";
   group?: string | undefined;
   name?: string | undefined;
@@ -855,25 +855,25 @@ export type ExperimentalUuidDefinitionInput = {
 /**
  * All type definitions that can be used inside other types, like object keys.
  */
-export type ExperimentalTypeSystemDefinitionInput =
-  | ExperimentalAnyDefinitionInput
-  | ExperimentalAnyOfDefinitionInput
-  | ExperimentalArrayDefinitionInput
-  | ExperimentalBooleanDefinitionInput
-  | ExperimentalCrudDefinitionInput
-  | ExperimentalDateDefinitionInput
-  | ExperimentalExtendDefinitionInput
-  | ExperimentalFileDefinitionInput
-  | ExperimentalGenericDefinitionInput
-  | ExperimentalNumberDefinitionInput
-  | ExperimentalObjectDefinitionInput
-  | ExperimentalOmitDefinitionInput
-  | ExperimentalPickDefinitionInput
-  | ExperimentalReferenceDefinitionInput
-  | ExperimentalStringDefinitionInput
-  | ExperimentalUuidDefinitionInput;
-
-export type ExperimentalAnyOfDefinitionInput = {
+export type StructureTypeSystemDefinitionInput =
+  | StructureAnyDefinitionInput
+  | StructureAnyOfDefinitionInput
+  | StructureArrayDefinitionInput
+  | StructureBooleanDefinitionInput
+  | StructureCrudDefinitionInput
+  | StructureDateDefinitionInput
+  | StructureExtendDefinitionInput
+  | StructureFileDefinitionInput
+  | StructureGenericDefinitionInput
+  | StructureNumberDefinitionInput
+  | StructureObjectDefinitionInput
+  | StructureOmitDefinitionInput
+  | StructurePickDefinitionInput
+  | StructureReferenceDefinitionInput
+  | StructureStringDefinitionInput
+  | StructureUuidDefinitionInput;
+
+export type StructureAnyOfDefinitionInput = {
   type: "anyOf";
   group?: string | undefined;
   name?: string | undefined;
@@ -893,14 +893,14 @@ export type ExperimentalAnyOfDefinitionInput = {
       }
     | undefined;
   values:
-    | ExperimentalTypeSystemDefinitionInput[]
-    | ExperimentalTypeSystemDefinitionInput;
+    | StructureTypeSystemDefinitionInput[]
+    | StructureTypeSystemDefinitionInput;
 };
 
 /**
  * Select the targets and generators to be used when generating. See {@link https://compasjs.com/generators/targets.html} for more information.
  */
-export type ExperimentalGenerateOptions = {
+export type StructureGenerateOptions = {
   targetLanguage: "js" | "ts";
 
   /**
@@ -983,7 +983,7 @@ export type ExperimentalGenerateOptions = {
     validators?:
       | {
           /**
-           * Always generate validators for all named types even if no other generator needs it. This implies {@link ExperimentalGenerateOptions.generators.types.includeBaseTypes}.
+           * Always generate validators for all named types even if no other generator needs it. This implies {@link StructureGenerateOptions.generators.types.includeBaseTypes}.
            */
           includeBaseTypes: boolean;
         }
@@ -1058,7 +1058,7 @@ export type ExperimentalGenerateOptions = {
 /**
  * Select the targets and generators to be used when generating. See {@link https://compasjs.com/generators/targets.html} for more information.
  */
-export type ExperimentalGenerateOptionsInput = {
+export type StructureGenerateOptionsInput = {
   targetLanguage: "js" | "ts";
 
   /**
@@ -1143,7 +1143,7 @@ export type ExperimentalGenerateOptionsInput = {
     validators?:
       | {
           /**
-           * Always generate validators for all named types even if no other generator needs it. This implies {@link ExperimentalGenerateOptions.generators.types.includeBaseTypes}.
+           * Always generate validators for all named types even if no other generator needs it. This implies {@link StructureGenerateOptions.generators.types.includeBaseTypes}.
            */
           includeBaseTypes?: boolean | "true" | "false" | undefined;
         }
@@ -1217,13 +1217,13 @@ export type ExperimentalGenerateOptionsInput = {
   };
 };
 
-export type ExperimentalNamePartOptional = string | undefined;
+export type StructureNamePartOptional = string | undefined;
 
-export type ExperimentalRouteInvalidationDefinition = {
+export type StructureRouteInvalidationDefinition = {
   type: "routeInvalidation";
   target: {
-    group: ExperimentalNamePart;
-    name?: ExperimentalNamePartOptional | undefined;
+    group: StructureNamePart;
+    name?: StructureNamePartOptional | undefined;
   };
   properties: {
     useSharedParams?: boolean | undefined;
@@ -1237,7 +1237,7 @@ export type ExperimentalRouteInvalidationDefinition = {
   };
 };
 
-export type ExperimentalRouteDefinition = {
+export type StructureRouteDefinition = {
   type: "route";
   group?: string | undefined;
   name?: string | undefined;
@@ -1254,12 +1254,12 @@ export type ExperimentalRouteDefinition = {
   idempotent: boolean;
   path: string;
   tags: string[];
-  query?: ExperimentalReferenceDefinition | undefined;
-  params?: ExperimentalReferenceDefinition | undefined;
-  body?: ExperimentalReferenceDefinition | undefined;
-  files?: ExperimentalReferenceDefinition | undefined;
-  response?: ExperimentalReferenceDefinition | undefined;
-  invalidations: ExperimentalRouteInvalidationDefinition[];
+  query?: StructureReferenceDefinition | undefined;
+  params?: StructureReferenceDefinition | undefined;
+  body?: StructureReferenceDefinition | undefined;
+  files?: StructureReferenceDefinition | undefined;
+  response?: StructureReferenceDefinition | undefined;
+  invalidations: StructureRouteInvalidationDefinition[];
   metadata?:
     | {
         requestBodyType?: "json" | "form-data" | undefined;
@@ -1270,29 +1270,29 @@ export type ExperimentalRouteDefinition = {
 /**
  * This contains all types that can be added top level to the structure.
  */
-export type ExperimentalNamedTypeDefinition =
-  | ExperimentalAnyDefinition
-  | ExperimentalAnyOfDefinition
-  | ExperimentalArrayDefinition
-  | ExperimentalBooleanDefinition
-  | ExperimentalCrudDefinition
-  | ExperimentalDateDefinition
-  | ExperimentalExtendDefinition
-  | ExperimentalFileDefinition
-  | ExperimentalGenericDefinition
-  | ExperimentalNumberDefinition
-  | ExperimentalObjectDefinition
-  | ExperimentalOmitDefinition
-  | ExperimentalPickDefinition
-  | ExperimentalRouteDefinition
-  | ExperimentalStringDefinition
-  | ExperimentalUuidDefinition;
-
-export type ExperimentalRouteInvalidationDefinitionInput = {
+export type StructureNamedTypeDefinition =
+  | StructureAnyDefinition
+  | StructureAnyOfDefinition
+  | StructureArrayDefinition
+  | StructureBooleanDefinition
+  | StructureCrudDefinition
+  | StructureDateDefinition
+  | StructureExtendDefinition
+  | StructureFileDefinition
+  | StructureGenericDefinition
+  | StructureNumberDefinition
+  | StructureObjectDefinition
+  | StructureOmitDefinition
+  | StructurePickDefinition
+  | StructureRouteDefinition
+  | StructureStringDefinition
+  | StructureUuidDefinition;
+
+export type StructureRouteInvalidationDefinitionInput = {
   type: "routeInvalidation";
   target: {
-    group: ExperimentalNamePart;
-    name?: ExperimentalNamePartOptional | undefined;
+    group: StructureNamePart;
+    name?: StructureNamePartOptional | undefined;
   };
   properties: {
     useSharedParams?: boolean | "true" | "false" | undefined;
@@ -1306,7 +1306,7 @@ export type ExperimentalRouteInvalidationDefinitionInput = {
   };
 };
 
-export type ExperimentalRouteDefinitionInput = {
+export type StructureRouteDefinitionInput = {
   type: "route";
   group?: string | undefined;
   name?: string | undefined;
@@ -1325,14 +1325,14 @@ export type ExperimentalRouteDefinitionInput = {
   idempotent: boolean | "true" | "false";
   path: string;
   tags: string[] | string;
-  query?: ExperimentalReferenceDefinitionInput | undefined;
-  params?: ExperimentalReferenceDefinitionInput | undefined;
-  body?: ExperimentalReferenceDefinitionInput | undefined;
-  files?: ExperimentalReferenceDefinitionInput | undefined;
-  response?: ExperimentalReferenceDefinitionInput | undefined;
+  query?: StructureReferenceDefinitionInput | undefined;
+  params?: StructureReferenceDefinitionInput | undefined;
+  body?: StructureReferenceDefinitionInput | undefined;
+  files?: StructureReferenceDefinitionInput | undefined;
+  response?: StructureReferenceDefinitionInput | undefined;
   invalidations:
-    | ExperimentalRouteInvalidationDefinitionInput[]
-    | ExperimentalRouteInvalidationDefinitionInput;
+    | StructureRouteInvalidationDefinitionInput[]
+    | StructureRouteInvalidationDefinitionInput;
   metadata?:
     | {
         requestBodyType?: "json" | "form-data" | undefined;
@@ -1343,50 +1343,50 @@ export type ExperimentalRouteDefinitionInput = {
 /**
  * This contains all types that can be added top level to the structure.
  */
-export type ExperimentalNamedTypeDefinitionInput =
-  | ExperimentalAnyDefinitionInput
-  | ExperimentalAnyOfDefinitionInput
-  | ExperimentalArrayDefinitionInput
-  | ExperimentalBooleanDefinitionInput
-  | ExperimentalCrudDefinitionInput
-  | ExperimentalDateDefinitionInput
-  | ExperimentalExtendDefinitionInput
-  | ExperimentalFileDefinitionInput
-  | ExperimentalGenericDefinitionInput
-  | ExperimentalNumberDefinitionInput
-  | ExperimentalObjectDefinitionInput
-  | ExperimentalOmitDefinitionInput
-  | ExperimentalPickDefinitionInput
-  | ExperimentalRouteDefinitionInput
-  | ExperimentalStringDefinitionInput
-  | ExperimentalUuidDefinitionInput;
-
-export type ExperimentalStructure = {
-  [key: ExperimentalNamePart]: {
-    [key: ExperimentalNamePart]: ExperimentalNamedTypeDefinition;
+export type StructureNamedTypeDefinitionInput =
+  | StructureAnyDefinitionInput
+  | StructureAnyOfDefinitionInput
+  | StructureArrayDefinitionInput
+  | StructureBooleanDefinitionInput
+  | StructureCrudDefinitionInput
+  | StructureDateDefinitionInput
+  | StructureExtendDefinitionInput
+  | StructureFileDefinitionInput
+  | StructureGenericDefinitionInput
+  | StructureNumberDefinitionInput
+  | StructureObjectDefinitionInput
+  | StructureOmitDefinitionInput
+  | StructurePickDefinitionInput
+  | StructureRouteDefinitionInput
+  | StructureStringDefinitionInput
+  | StructureUuidDefinitionInput;
+
+export type StructureStructure = {
+  [key: StructureNamePart]: {
+    [key: StructureNamePart]: StructureNamedTypeDefinition;
   };
 };
 
-export type ExperimentalStructureInput = {
-  [key: ExperimentalNamePart]: {
-    [key: ExperimentalNamePart]: ExperimentalNamedTypeDefinitionInput;
+export type StructureStructureInput = {
+  [key: StructureNamePart]: {
+    [key: StructureNamePart]: StructureNamedTypeDefinitionInput;
   };
 };
 
 /**
  * This contains all known type definitions.
  */
-export type ExperimentalTypeDefinition =
-  | ExperimentalNamedTypeDefinition
-  | ExperimentalReferenceDefinition
-  | ExperimentalRelationDefinition
-  | ExperimentalRouteInvalidationDefinition;
+export type StructureTypeDefinition =
+  | StructureNamedTypeDefinition
+  | StructureReferenceDefinition
+  | StructureRelationDefinition
+  | StructureRouteInvalidationDefinition;
 
 /**
  * This contains all known type definitions.
  */
-export type ExperimentalTypeDefinitionInput =
-  | ExperimentalNamedTypeDefinitionInput
-  | ExperimentalReferenceDefinitionInput
-  | ExperimentalRelationDefinitionInput
-  | ExperimentalRouteInvalidationDefinitionInput;
+export type StructureTypeDefinitionInput =
+  | StructureNamedTypeDefinitionInput
+  | StructureReferenceDefinitionInput
+  | StructureRelationDefinitionInput
+  | StructureRouteInvalidationDefinitionInput;
diff --git a/packages/code-gen/src/generated/experimental/validators.d.ts b/packages/code-gen/src/generated/experimental/validators.d.ts
deleted file mode 100644
index f5f5b3c0e6..0000000000
--- a/packages/code-gen/src/generated/experimental/validators.d.ts
+++ /dev/null
@@ -1,292 +0,0 @@
-/**
- * @template T, E
- * @typedef {{ value: T, error?: never}|{ value?: never, error: E }} Either
- */
-/**
- * @typedef {Record<string, any|undefined>} ValidatorErrorMap
- */
-/**
- * @param {import("../common/types").ExperimentalAnyDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalAnyDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalAnyDefinition(
-  value: import("../common/types").ExperimentalAnyDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalAnyDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalAnyDefinitionTarget|any} value
- * @returns {Either<import("../common/types").ExperimentalAnyDefinitionTarget, ValidatorErrorMap>}
- */
-export function validateExperimentalAnyDefinitionTarget(
-  value: import("../common/types").ExperimentalAnyDefinitionTarget | any,
-): Either<
-  import("../common/types").ExperimentalAnyDefinitionTarget,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalAnyOfDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalAnyOfDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalAnyOfDefinition(
-  value: import("../common/types").ExperimentalAnyOfDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalAnyOfDefinition,
-  ValidatorErrorMap
->;
-/**
- * All type definitions that can be used inside other types, like object keys.
- *
- * @param {import("../common/types").ExperimentalTypeSystemDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalTypeSystemDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalTypeSystemDefinition(
-  value: import("../common/types").ExperimentalTypeSystemDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalTypeSystemDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalArrayDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalArrayDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalArrayDefinition(
-  value: import("../common/types").ExperimentalArrayDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalArrayDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalBooleanDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalBooleanDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalBooleanDefinition(
-  value: import("../common/types").ExperimentalBooleanDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalBooleanDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalCrudDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalCrudDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalCrudDefinition(
-  value: import("../common/types").ExperimentalCrudDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalCrudDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalReferenceDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalReferenceDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalReferenceDefinition(
-  value: import("../common/types").ExperimentalReferenceDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalReferenceDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalNamePart|any} value
- * @returns {Either<import("../common/types").ExperimentalNamePart, ValidatorErrorMap>}
- */
-export function validateExperimentalNamePart(
-  value: import("../common/types").ExperimentalNamePart | any,
-): Either<import("../common/types").ExperimentalNamePart, ValidatorErrorMap>;
-/**
- * @param {import("../common/types").ExperimentalDateDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalDateDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalDateDefinition(
-  value: import("../common/types").ExperimentalDateDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalDateDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalExtendDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalExtendDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalExtendDefinition(
-  value: import("../common/types").ExperimentalExtendDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalExtendDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalRelationDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalRelationDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalRelationDefinition(
-  value: import("../common/types").ExperimentalRelationDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalRelationDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalFileDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalFileDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalFileDefinition(
-  value: import("../common/types").ExperimentalFileDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalFileDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalGenericDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalGenericDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalGenericDefinition(
-  value: import("../common/types").ExperimentalGenericDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalGenericDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalNumberDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalNumberDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalNumberDefinition(
-  value: import("../common/types").ExperimentalNumberDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalNumberDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalObjectDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalObjectDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalObjectDefinition(
-  value: import("../common/types").ExperimentalObjectDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalObjectDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalOmitDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalOmitDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalOmitDefinition(
-  value: import("../common/types").ExperimentalOmitDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalOmitDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalPickDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalPickDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalPickDefinition(
-  value: import("../common/types").ExperimentalPickDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalPickDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalStringDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalStringDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalStringDefinition(
-  value: import("../common/types").ExperimentalStringDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalStringDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalUuidDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalUuidDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalUuidDefinition(
-  value: import("../common/types").ExperimentalUuidDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalUuidDefinition,
-  ValidatorErrorMap
->;
-/**
- * Select the targets and generators to be used when generating. See {@link https://compasjs.com/generators/targets.html} for more information.
- *
- * @param {import("../common/types").ExperimentalGenerateOptionsInput|any} value
- * @returns {Either<import("../common/types").ExperimentalGenerateOptions, ValidatorErrorMap>}
- */
-export function validateExperimentalGenerateOptions(
-  value: import("../common/types").ExperimentalGenerateOptionsInput | any,
-): Either<
-  import("../common/types").ExperimentalGenerateOptions,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalNamePartOptional|any} value
- * @returns {Either<import("../common/types").ExperimentalNamePartOptional, ValidatorErrorMap>}
- */
-export function validateExperimentalNamePartOptional(
-  value: import("../common/types").ExperimentalNamePartOptional | any,
-): Either<
-  import("../common/types").ExperimentalNamePartOptional,
-  ValidatorErrorMap
->;
-/**
- * This contains all types that can be added top level to the structure.
- *
- * @param {import("../common/types").ExperimentalNamedTypeDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalNamedTypeDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalNamedTypeDefinition(
-  value: import("../common/types").ExperimentalNamedTypeDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalNamedTypeDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalRouteDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalRouteDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalRouteDefinition(
-  value: import("../common/types").ExperimentalRouteDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalRouteDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalRouteInvalidationDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalRouteInvalidationDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalRouteInvalidationDefinition(
-  value:
-    | import("../common/types").ExperimentalRouteInvalidationDefinitionInput
-    | any,
-): Either<
-  import("../common/types").ExperimentalRouteInvalidationDefinition,
-  ValidatorErrorMap
->;
-/**
- * @param {import("../common/types").ExperimentalStructureInput|any} value
- * @returns {Either<import("../common/types").ExperimentalStructure, ValidatorErrorMap>}
- */
-export function validateExperimentalStructure(
-  value: import("../common/types").ExperimentalStructureInput | any,
-): Either<import("../common/types").ExperimentalStructure, ValidatorErrorMap>;
-/**
- * This contains all known type definitions.
- *
- * @param {import("../common/types").ExperimentalTypeDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalTypeDefinition, ValidatorErrorMap>}
- */
-export function validateExperimentalTypeDefinition(
-  value: import("../common/types").ExperimentalTypeDefinitionInput | any,
-): Either<
-  import("../common/types").ExperimentalTypeDefinition,
-  ValidatorErrorMap
->;
-export type Either<T, E> =
-  | {
-      value: T;
-      error?: never;
-    }
-  | {
-      value?: never;
-      error: E;
-    };
-export type ValidatorErrorMap = Record<string, any | undefined>;
-//# sourceMappingURL=validators.d.ts.map
diff --git a/packages/code-gen/src/generated/structure/validators.d.ts b/packages/code-gen/src/generated/structure/validators.d.ts
new file mode 100644
index 0000000000..054ae9d764
--- /dev/null
+++ b/packages/code-gen/src/generated/structure/validators.d.ts
@@ -0,0 +1,268 @@
+/**
+ * @template T, E
+ * @typedef {{ value: T, error?: never}|{ value?: never, error: E }} Either
+ */
+/**
+ * @typedef {Record<string, any|undefined>} ValidatorErrorMap
+ */
+/**
+ * @param {import("../common/types").StructureAnyDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureAnyDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureAnyDefinition(
+  value: import("../common/types").StructureAnyDefinitionInput | any,
+): Either<import("../common/types").StructureAnyDefinition, ValidatorErrorMap>;
+/**
+ * @param {import("../common/types").StructureAnyDefinitionTarget|any} value
+ * @returns {Either<import("../common/types").StructureAnyDefinitionTarget, ValidatorErrorMap>}
+ */
+export function validateStructureAnyDefinitionTarget(
+  value: import("../common/types").StructureAnyDefinitionTarget | any,
+): Either<
+  import("../common/types").StructureAnyDefinitionTarget,
+  ValidatorErrorMap
+>;
+/**
+ * @param {import("../common/types").StructureAnyOfDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureAnyOfDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureAnyOfDefinition(
+  value: import("../common/types").StructureAnyOfDefinitionInput | any,
+): Either<
+  import("../common/types").StructureAnyOfDefinition,
+  ValidatorErrorMap
+>;
+/**
+ * All type definitions that can be used inside other types, like object keys.
+ *
+ * @param {import("../common/types").StructureTypeSystemDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureTypeSystemDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureTypeSystemDefinition(
+  value: import("../common/types").StructureTypeSystemDefinitionInput | any,
+): Either<
+  import("../common/types").StructureTypeSystemDefinition,
+  ValidatorErrorMap
+>;
+/**
+ * @param {import("../common/types").StructureArrayDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureArrayDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureArrayDefinition(
+  value: import("../common/types").StructureArrayDefinitionInput | any,
+): Either<
+  import("../common/types").StructureArrayDefinition,
+  ValidatorErrorMap
+>;
+/**
+ * @param {import("../common/types").StructureBooleanDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureBooleanDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureBooleanDefinition(
+  value: import("../common/types").StructureBooleanDefinitionInput | any,
+): Either<
+  import("../common/types").StructureBooleanDefinition,
+  ValidatorErrorMap
+>;
+/**
+ * @param {import("../common/types").StructureCrudDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureCrudDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureCrudDefinition(
+  value: import("../common/types").StructureCrudDefinitionInput | any,
+): Either<import("../common/types").StructureCrudDefinition, ValidatorErrorMap>;
+/**
+ * @param {import("../common/types").StructureReferenceDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureReferenceDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureReferenceDefinition(
+  value: import("../common/types").StructureReferenceDefinitionInput | any,
+): Either<
+  import("../common/types").StructureReferenceDefinition,
+  ValidatorErrorMap
+>;
+/**
+ * @param {import("../common/types").StructureNamePart|any} value
+ * @returns {Either<import("../common/types").StructureNamePart, ValidatorErrorMap>}
+ */
+export function validateStructureNamePart(
+  value: import("../common/types").StructureNamePart | any,
+): Either<import("../common/types").StructureNamePart, ValidatorErrorMap>;
+/**
+ * @param {import("../common/types").StructureDateDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureDateDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureDateDefinition(
+  value: import("../common/types").StructureDateDefinitionInput | any,
+): Either<import("../common/types").StructureDateDefinition, ValidatorErrorMap>;
+/**
+ * @param {import("../common/types").StructureExtendDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureExtendDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureExtendDefinition(
+  value: import("../common/types").StructureExtendDefinitionInput | any,
+): Either<
+  import("../common/types").StructureExtendDefinition,
+  ValidatorErrorMap
+>;
+/**
+ * @param {import("../common/types").StructureRelationDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureRelationDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureRelationDefinition(
+  value: import("../common/types").StructureRelationDefinitionInput | any,
+): Either<
+  import("../common/types").StructureRelationDefinition,
+  ValidatorErrorMap
+>;
+/**
+ * @param {import("../common/types").StructureFileDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureFileDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureFileDefinition(
+  value: import("../common/types").StructureFileDefinitionInput | any,
+): Either<import("../common/types").StructureFileDefinition, ValidatorErrorMap>;
+/**
+ * @param {import("../common/types").StructureGenericDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureGenericDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureGenericDefinition(
+  value: import("../common/types").StructureGenericDefinitionInput | any,
+): Either<
+  import("../common/types").StructureGenericDefinition,
+  ValidatorErrorMap
+>;
+/**
+ * @param {import("../common/types").StructureNumberDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureNumberDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureNumberDefinition(
+  value: import("../common/types").StructureNumberDefinitionInput | any,
+): Either<
+  import("../common/types").StructureNumberDefinition,
+  ValidatorErrorMap
+>;
+/**
+ * @param {import("../common/types").StructureObjectDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureObjectDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureObjectDefinition(
+  value: import("../common/types").StructureObjectDefinitionInput | any,
+): Either<
+  import("../common/types").StructureObjectDefinition,
+  ValidatorErrorMap
+>;
+/**
+ * @param {import("../common/types").StructureOmitDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureOmitDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureOmitDefinition(
+  value: import("../common/types").StructureOmitDefinitionInput | any,
+): Either<import("../common/types").StructureOmitDefinition, ValidatorErrorMap>;
+/**
+ * @param {import("../common/types").StructurePickDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructurePickDefinition, ValidatorErrorMap>}
+ */
+export function validateStructurePickDefinition(
+  value: import("../common/types").StructurePickDefinitionInput | any,
+): Either<import("../common/types").StructurePickDefinition, ValidatorErrorMap>;
+/**
+ * @param {import("../common/types").StructureStringDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureStringDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureStringDefinition(
+  value: import("../common/types").StructureStringDefinitionInput | any,
+): Either<
+  import("../common/types").StructureStringDefinition,
+  ValidatorErrorMap
+>;
+/**
+ * @param {import("../common/types").StructureUuidDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureUuidDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureUuidDefinition(
+  value: import("../common/types").StructureUuidDefinitionInput | any,
+): Either<import("../common/types").StructureUuidDefinition, ValidatorErrorMap>;
+/**
+ * Select the targets and generators to be used when generating. See {@link https://compasjs.com/generators/targets.html} for more information.
+ *
+ * @param {import("../common/types").StructureGenerateOptionsInput|any} value
+ * @returns {Either<import("../common/types").StructureGenerateOptions, ValidatorErrorMap>}
+ */
+export function validateStructureGenerateOptions(
+  value: import("../common/types").StructureGenerateOptionsInput | any,
+): Either<
+  import("../common/types").StructureGenerateOptions,
+  ValidatorErrorMap
+>;
+/**
+ * @param {import("../common/types").StructureNamePartOptional|any} value
+ * @returns {Either<import("../common/types").StructureNamePartOptional, ValidatorErrorMap>}
+ */
+export function validateStructureNamePartOptional(
+  value: import("../common/types").StructureNamePartOptional | any,
+): Either<
+  import("../common/types").StructureNamePartOptional,
+  ValidatorErrorMap
+>;
+/**
+ * This contains all types that can be added top level to the structure.
+ *
+ * @param {import("../common/types").StructureNamedTypeDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureNamedTypeDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureNamedTypeDefinition(
+  value: import("../common/types").StructureNamedTypeDefinitionInput | any,
+): Either<
+  import("../common/types").StructureNamedTypeDefinition,
+  ValidatorErrorMap
+>;
+/**
+ * @param {import("../common/types").StructureRouteDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureRouteDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureRouteDefinition(
+  value: import("../common/types").StructureRouteDefinitionInput | any,
+): Either<
+  import("../common/types").StructureRouteDefinition,
+  ValidatorErrorMap
+>;
+/**
+ * @param {import("../common/types").StructureRouteInvalidationDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureRouteInvalidationDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureRouteInvalidationDefinition(
+  value:
+    | import("../common/types").StructureRouteInvalidationDefinitionInput
+    | any,
+): Either<
+  import("../common/types").StructureRouteInvalidationDefinition,
+  ValidatorErrorMap
+>;
+/**
+ * @param {import("../common/types").StructureStructureInput|any} value
+ * @returns {Either<import("../common/types").StructureStructure, ValidatorErrorMap>}
+ */
+export function validateStructureStructure(
+  value: import("../common/types").StructureStructureInput | any,
+): Either<import("../common/types").StructureStructure, ValidatorErrorMap>;
+/**
+ * This contains all known type definitions.
+ *
+ * @param {import("../common/types").StructureTypeDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureTypeDefinition, ValidatorErrorMap>}
+ */
+export function validateStructureTypeDefinition(
+  value: import("../common/types").StructureTypeDefinitionInput | any,
+): Either<import("../common/types").StructureTypeDefinition, ValidatorErrorMap>;
+export type Either<T, E> =
+  | {
+      value: T;
+      error?: never;
+    }
+  | {
+      value?: never;
+      error: E;
+    };
+export type ValidatorErrorMap = Record<string, any | undefined>;
+//# sourceMappingURL=validators.d.ts.map
diff --git a/packages/code-gen/src/generated/experimental/validators.js b/packages/code-gen/src/generated/structure/validators.js
similarity index 97%
rename from packages/code-gen/src/generated/experimental/validators.js
rename to packages/code-gen/src/generated/structure/validators.js
index 883d062aba..b1ac3317ad 100644
--- a/packages/code-gen/src/generated/experimental/validators.js
+++ b/packages/code-gen/src/generated/structure/validators.js
@@ -10,10 +10,10 @@
  */
 
 /**
- * @param {import("../common/types").ExperimentalAnyDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalAnyDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureAnyDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureAnyDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalAnyDefinition(value) {
+export function validateStructureAnyDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -462,7 +462,7 @@ export function validateExperimentalAnyDefinition(value) {
               };
             } else {
               const refResult12 =
-                validateExperimentalAnyDefinitionTarget(genericKeyInput9);
+                validateStructureAnyDefinitionTarget(genericKeyInput9);
 
               if (refResult12.error) {
                 for (const errorKey of Object.keys(refResult12.error)) {
@@ -921,10 +921,10 @@ export function validateExperimentalAnyDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalAnyDefinitionTarget|any} value
- * @returns {Either<import("../common/types").ExperimentalAnyDefinitionTarget, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureAnyDefinitionTarget|any} value
+ * @returns {Either<import("../common/types").StructureAnyDefinitionTarget, ValidatorErrorMap>}
  */
-export function validateExperimentalAnyDefinitionTarget(value) {
+export function validateStructureAnyDefinitionTarget(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -997,10 +997,10 @@ export function validateExperimentalAnyDefinitionTarget(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalAnyOfDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalAnyOfDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureAnyOfDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureAnyOfDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalAnyOfDefinition(value) {
+export function validateStructureAnyOfDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -1454,7 +1454,7 @@ export function validateExperimentalAnyOfDefinition(value) {
               key: "validator.undefined",
             };
           } else {
-            const refResult10 = validateExperimentalTypeSystemDefinition(
+            const refResult10 = validateStructureTypeSystemDefinition(
               intermediateValue10[i10],
             );
 
@@ -1487,10 +1487,10 @@ export function validateExperimentalAnyOfDefinition(value) {
 /**
  * All type definitions that can be used inside other types, like object keys.
  *
- * @param {import("../common/types").ExperimentalTypeSystemDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalTypeSystemDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureTypeSystemDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureTypeSystemDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalTypeSystemDefinition(value) {
+export function validateStructureTypeSystemDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -1502,7 +1502,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
     };
   } else {
     if (value.type === "any") {
-      const refResult0 = validateExperimentalAnyDefinition(value);
+      const refResult0 = validateStructureAnyDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1511,7 +1511,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "anyOf") {
-      const refResult0 = validateExperimentalAnyOfDefinition(value);
+      const refResult0 = validateStructureAnyOfDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1520,7 +1520,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "array") {
-      const refResult0 = validateExperimentalArrayDefinition(value);
+      const refResult0 = validateStructureArrayDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1529,7 +1529,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "boolean") {
-      const refResult0 = validateExperimentalBooleanDefinition(value);
+      const refResult0 = validateStructureBooleanDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1538,7 +1538,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "crud") {
-      const refResult0 = validateExperimentalCrudDefinition(value);
+      const refResult0 = validateStructureCrudDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1547,7 +1547,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "date") {
-      const refResult0 = validateExperimentalDateDefinition(value);
+      const refResult0 = validateStructureDateDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1556,7 +1556,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "extend") {
-      const refResult0 = validateExperimentalExtendDefinition(value);
+      const refResult0 = validateStructureExtendDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1565,7 +1565,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "file") {
-      const refResult0 = validateExperimentalFileDefinition(value);
+      const refResult0 = validateStructureFileDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1574,7 +1574,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "generic") {
-      const refResult0 = validateExperimentalGenericDefinition(value);
+      const refResult0 = validateStructureGenericDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1583,7 +1583,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "number") {
-      const refResult0 = validateExperimentalNumberDefinition(value);
+      const refResult0 = validateStructureNumberDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1592,7 +1592,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "object") {
-      const refResult0 = validateExperimentalObjectDefinition(value);
+      const refResult0 = validateStructureObjectDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1601,7 +1601,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "omit") {
-      const refResult0 = validateExperimentalOmitDefinition(value);
+      const refResult0 = validateStructureOmitDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1610,7 +1610,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "pick") {
-      const refResult0 = validateExperimentalPickDefinition(value);
+      const refResult0 = validateStructurePickDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1619,7 +1619,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "reference") {
-      const refResult0 = validateExperimentalReferenceDefinition(value);
+      const refResult0 = validateStructureReferenceDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1628,7 +1628,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "string") {
-      const refResult0 = validateExperimentalStringDefinition(value);
+      const refResult0 = validateStructureStringDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1637,7 +1637,7 @@ export function validateExperimentalTypeSystemDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "uuid") {
-      const refResult0 = validateExperimentalUuidDefinition(value);
+      const refResult0 = validateStructureUuidDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -1678,10 +1678,10 @@ export function validateExperimentalTypeSystemDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalArrayDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalArrayDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureArrayDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureArrayDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalArrayDefinition(value) {
+export function validateStructureArrayDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -2186,7 +2186,7 @@ export function validateExperimentalArrayDefinition(value) {
           key: "validator.undefined",
         };
       } else {
-        const refResult9 = validateExperimentalTypeSystemDefinition(
+        const refResult9 = validateStructureTypeSystemDefinition(
           value["values"],
         );
 
@@ -2207,10 +2207,10 @@ export function validateExperimentalArrayDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalBooleanDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalBooleanDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureBooleanDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureBooleanDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalBooleanDefinition(value) {
+export function validateStructureBooleanDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -2696,10 +2696,10 @@ export function validateExperimentalBooleanDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalCrudDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalCrudDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureCrudDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureCrudDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalCrudDefinition(value) {
+export function validateStructureCrudDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -3120,7 +3120,7 @@ export function validateExperimentalCrudDefinition(value) {
       if (value["entity"] === null || value["entity"] === undefined) {
         result["entity"] = undefined;
       } else {
-        const refResult10 = validateExperimentalReferenceDefinition(
+        const refResult10 = validateStructureReferenceDefinition(
           value["entity"],
         );
 
@@ -3537,7 +3537,7 @@ export function validateExperimentalCrudDefinition(value) {
           ) {
             result["fieldOptions"]["readableType"] = undefined;
           } else {
-            const refResult15 = validateExperimentalReferenceDefinition(
+            const refResult15 = validateStructureReferenceDefinition(
               value["fieldOptions"]["readableType"],
             );
 
@@ -3712,7 +3712,7 @@ export function validateExperimentalCrudDefinition(value) {
               key: "validator.undefined",
             };
           } else {
-            const refResult15 = validateExperimentalCrudDefinition(
+            const refResult15 = validateStructureCrudDefinition(
               intermediateValue15[i15],
             );
 
@@ -3762,7 +3762,7 @@ export function validateExperimentalCrudDefinition(value) {
               key: "validator.undefined",
             };
           } else {
-            const refResult16 = validateExperimentalCrudDefinition(
+            const refResult16 = validateStructureCrudDefinition(
               intermediateValue16[i16],
             );
 
@@ -3793,10 +3793,10 @@ export function validateExperimentalCrudDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalReferenceDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalReferenceDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureReferenceDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureReferenceDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalReferenceDefinition(value) {
+export function validateStructureReferenceDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -4167,7 +4167,7 @@ export function validateExperimentalReferenceDefinition(value) {
               key: "validator.undefined",
             };
           } else {
-            const refResult8 = validateExperimentalNamePart(
+            const refResult8 = validateStructureNamePart(
               value["reference"]["group"],
             );
 
@@ -4187,7 +4187,7 @@ export function validateExperimentalReferenceDefinition(value) {
               key: "validator.undefined",
             };
           } else {
-            const refResult9 = validateExperimentalNamePart(
+            const refResult9 = validateStructureNamePart(
               value["reference"]["name"],
             );
 
@@ -4210,10 +4210,10 @@ export function validateExperimentalReferenceDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalNamePart|any} value
- * @returns {Either<import("../common/types").ExperimentalNamePart, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureNamePart|any} value
+ * @returns {Either<import("../common/types").StructureNamePart, ValidatorErrorMap>}
  */
-export function validateExperimentalNamePart(value) {
+export function validateStructureNamePart(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -4252,10 +4252,10 @@ export function validateExperimentalNamePart(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalDateDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalDateDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureDateDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureDateDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalDateDefinition(value) {
+export function validateStructureDateDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -4831,10 +4831,10 @@ export function validateExperimentalDateDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalExtendDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalExtendDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureExtendDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureExtendDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalExtendDefinition(value) {
+export function validateStructureExtendDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -5289,7 +5289,7 @@ export function validateExperimentalExtendDefinition(value) {
                   key: "validator.undefined",
                 };
               } else {
-                const refResult12 = validateExperimentalTypeSystemDefinition(
+                const refResult12 = validateStructureTypeSystemDefinition(
                   value["keys"][genericKeyResult10],
                 );
 
@@ -5311,7 +5311,7 @@ export function validateExperimentalExtendDefinition(value) {
           key: "validator.undefined",
         };
       } else {
-        const refResult10 = validateExperimentalReferenceDefinition(
+        const refResult10 = validateStructureReferenceDefinition(
           value["reference"],
         );
 
@@ -5348,7 +5348,7 @@ export function validateExperimentalExtendDefinition(value) {
               key: "validator.undefined",
             };
           } else {
-            const refResult12 = validateExperimentalRelationDefinition(
+            const refResult12 = validateStructureRelationDefinition(
               intermediateValue12[i12],
             );
 
@@ -5379,10 +5379,10 @@ export function validateExperimentalExtendDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalRelationDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalRelationDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureRelationDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureRelationDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalRelationDefinition(value) {
+export function validateStructureRelationDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -5473,7 +5473,7 @@ export function validateExperimentalRelationDefinition(value) {
           key: "validator.undefined",
         };
       } else {
-        const refResult3 = validateExperimentalReferenceDefinition(
+        const refResult3 = validateStructureReferenceDefinition(
           value["reference"],
         );
 
@@ -5569,10 +5569,10 @@ export function validateExperimentalRelationDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalFileDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalFileDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureFileDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureFileDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalFileDefinition(value) {
+export function validateStructureFileDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -6031,10 +6031,10 @@ export function validateExperimentalFileDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalGenericDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalGenericDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureGenericDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureGenericDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalGenericDefinition(value) {
+export function validateStructureGenericDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -6433,9 +6433,7 @@ export function validateExperimentalGenericDefinition(value) {
           key: "validator.undefined",
         };
       } else {
-        const refResult9 = validateExperimentalTypeSystemDefinition(
-          value["keys"],
-        );
+        const refResult9 = validateStructureTypeSystemDefinition(value["keys"]);
 
         if (refResult9.error) {
           for (const errorKey of Object.keys(refResult9.error)) {
@@ -6450,7 +6448,7 @@ export function validateExperimentalGenericDefinition(value) {
           key: "validator.undefined",
         };
       } else {
-        const refResult10 = validateExperimentalTypeSystemDefinition(
+        const refResult10 = validateStructureTypeSystemDefinition(
           value["values"],
         );
 
@@ -6471,10 +6469,10 @@ export function validateExperimentalGenericDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalNumberDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalNumberDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureNumberDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureNumberDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalNumberDefinition(value) {
+export function validateStructureNumberDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -7103,10 +7101,10 @@ export function validateExperimentalNumberDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalObjectDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalObjectDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureObjectDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureObjectDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalObjectDefinition(value) {
+export function validateStructureObjectDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -7644,7 +7642,7 @@ export function validateExperimentalObjectDefinition(value) {
                   key: "validator.undefined",
                 };
               } else {
-                const refResult13 = validateExperimentalTypeSystemDefinition(
+                const refResult13 = validateStructureTypeSystemDefinition(
                   value["keys"][genericKeyResult11],
                 );
 
@@ -7870,7 +7868,7 @@ export function validateExperimentalObjectDefinition(value) {
               key: "validator.undefined",
             };
           } else {
-            const refResult14 = validateExperimentalRelationDefinition(
+            const refResult14 = validateStructureRelationDefinition(
               intermediateValue14[i14],
             );
 
@@ -7901,10 +7899,10 @@ export function validateExperimentalObjectDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalOmitDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalOmitDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureOmitDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureOmitDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalOmitDefinition(value) {
+export function validateStructureOmitDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -8414,7 +8412,7 @@ export function validateExperimentalOmitDefinition(value) {
           key: "validator.undefined",
         };
       } else {
-        const refResult10 = validateExperimentalTypeSystemDefinition(
+        const refResult10 = validateStructureTypeSystemDefinition(
           value["reference"],
         );
 
@@ -8435,10 +8433,10 @@ export function validateExperimentalOmitDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalPickDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalPickDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructurePickDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructurePickDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalPickDefinition(value) {
+export function validateStructurePickDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -8948,7 +8946,7 @@ export function validateExperimentalPickDefinition(value) {
           key: "validator.undefined",
         };
       } else {
-        const refResult10 = validateExperimentalTypeSystemDefinition(
+        const refResult10 = validateStructureTypeSystemDefinition(
           value["reference"],
         );
 
@@ -8969,10 +8967,10 @@ export function validateExperimentalPickDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalStringDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalStringDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureStringDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureStringDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalStringDefinition(value) {
+export function validateStructureStringDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -9733,10 +9731,10 @@ export function validateExperimentalStringDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalUuidDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalUuidDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureUuidDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureUuidDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalUuidDefinition(value) {
+export function validateStructureUuidDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -10171,10 +10169,10 @@ export function validateExperimentalUuidDefinition(value) {
 /**
  * Select the targets and generators to be used when generating. See {@link https://compasjs.com/generators/targets.html} for more information.
  *
- * @param {import("../common/types").ExperimentalGenerateOptionsInput|any} value
- * @returns {Either<import("../common/types").ExperimentalGenerateOptions, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureGenerateOptionsInput|any} value
+ * @returns {Either<import("../common/types").StructureGenerateOptions, ValidatorErrorMap>}
  */
-export function validateExperimentalGenerateOptions(value) {
+export function validateStructureGenerateOptions(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -11832,10 +11830,10 @@ export function validateExperimentalGenerateOptions(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalNamePartOptional|any} value
- * @returns {Either<import("../common/types").ExperimentalNamePartOptional, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureNamePartOptional|any} value
+ * @returns {Either<import("../common/types").StructureNamePartOptional, ValidatorErrorMap>}
  */
-export function validateExperimentalNamePartOptional(value) {
+export function validateStructureNamePartOptional(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -11878,10 +11876,10 @@ export function validateExperimentalNamePartOptional(value) {
 /**
  * This contains all types that can be added top level to the structure.
  *
- * @param {import("../common/types").ExperimentalNamedTypeDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalNamedTypeDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureNamedTypeDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureNamedTypeDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalNamedTypeDefinition(value) {
+export function validateStructureNamedTypeDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -11893,7 +11891,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
     };
   } else {
     if (value.type === "any") {
-      const refResult0 = validateExperimentalAnyDefinition(value);
+      const refResult0 = validateStructureAnyDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -11902,7 +11900,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "anyOf") {
-      const refResult0 = validateExperimentalAnyOfDefinition(value);
+      const refResult0 = validateStructureAnyOfDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -11911,7 +11909,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "array") {
-      const refResult0 = validateExperimentalArrayDefinition(value);
+      const refResult0 = validateStructureArrayDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -11920,7 +11918,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "boolean") {
-      const refResult0 = validateExperimentalBooleanDefinition(value);
+      const refResult0 = validateStructureBooleanDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -11929,7 +11927,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "crud") {
-      const refResult0 = validateExperimentalCrudDefinition(value);
+      const refResult0 = validateStructureCrudDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -11938,7 +11936,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "date") {
-      const refResult0 = validateExperimentalDateDefinition(value);
+      const refResult0 = validateStructureDateDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -11947,7 +11945,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "extend") {
-      const refResult0 = validateExperimentalExtendDefinition(value);
+      const refResult0 = validateStructureExtendDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -11956,7 +11954,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "file") {
-      const refResult0 = validateExperimentalFileDefinition(value);
+      const refResult0 = validateStructureFileDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -11965,7 +11963,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "generic") {
-      const refResult0 = validateExperimentalGenericDefinition(value);
+      const refResult0 = validateStructureGenericDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -11974,7 +11972,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "number") {
-      const refResult0 = validateExperimentalNumberDefinition(value);
+      const refResult0 = validateStructureNumberDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -11983,7 +11981,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "object") {
-      const refResult0 = validateExperimentalObjectDefinition(value);
+      const refResult0 = validateStructureObjectDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -11992,7 +11990,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "omit") {
-      const refResult0 = validateExperimentalOmitDefinition(value);
+      const refResult0 = validateStructureOmitDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -12001,7 +11999,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "pick") {
-      const refResult0 = validateExperimentalPickDefinition(value);
+      const refResult0 = validateStructurePickDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -12010,7 +12008,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "route") {
-      const refResult0 = validateExperimentalRouteDefinition(value);
+      const refResult0 = validateStructureRouteDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -12019,7 +12017,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "string") {
-      const refResult0 = validateExperimentalStringDefinition(value);
+      const refResult0 = validateStructureStringDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -12028,7 +12026,7 @@ export function validateExperimentalNamedTypeDefinition(value) {
       }
       result = refResult0.value;
     } else if (value.type === "uuid") {
-      const refResult0 = validateExperimentalUuidDefinition(value);
+      const refResult0 = validateStructureUuidDefinition(value);
 
       if (refResult0.error) {
         for (const errorKey of Object.keys(refResult0.error)) {
@@ -12069,10 +12067,10 @@ export function validateExperimentalNamedTypeDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalRouteDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalRouteDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureRouteDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureRouteDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalRouteDefinition(value) {
+export function validateStructureRouteDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -12604,7 +12602,7 @@ export function validateExperimentalRouteDefinition(value) {
       if (value["query"] === null || value["query"] === undefined) {
         result["query"] = undefined;
       } else {
-        const refResult13 = validateExperimentalReferenceDefinition(
+        const refResult13 = validateStructureReferenceDefinition(
           value["query"],
         );
 
@@ -12619,7 +12617,7 @@ export function validateExperimentalRouteDefinition(value) {
       if (value["params"] === null || value["params"] === undefined) {
         result["params"] = undefined;
       } else {
-        const refResult14 = validateExperimentalReferenceDefinition(
+        const refResult14 = validateStructureReferenceDefinition(
           value["params"],
         );
 
@@ -12634,9 +12632,7 @@ export function validateExperimentalRouteDefinition(value) {
       if (value["body"] === null || value["body"] === undefined) {
         result["body"] = undefined;
       } else {
-        const refResult15 = validateExperimentalReferenceDefinition(
-          value["body"],
-        );
+        const refResult15 = validateStructureReferenceDefinition(value["body"]);
 
         if (refResult15.error) {
           for (const errorKey of Object.keys(refResult15.error)) {
@@ -12649,7 +12645,7 @@ export function validateExperimentalRouteDefinition(value) {
       if (value["files"] === null || value["files"] === undefined) {
         result["files"] = undefined;
       } else {
-        const refResult16 = validateExperimentalReferenceDefinition(
+        const refResult16 = validateStructureReferenceDefinition(
           value["files"],
         );
 
@@ -12664,7 +12660,7 @@ export function validateExperimentalRouteDefinition(value) {
       if (value["response"] === null || value["response"] === undefined) {
         result["response"] = undefined;
       } else {
-        const refResult17 = validateExperimentalReferenceDefinition(
+        const refResult17 = validateStructureReferenceDefinition(
           value["response"],
         );
 
@@ -12704,7 +12700,7 @@ export function validateExperimentalRouteDefinition(value) {
               key: "validator.undefined",
             };
           } else {
-            const refResult19 = validateExperimentalRouteInvalidationDefinition(
+            const refResult19 = validateStructureRouteInvalidationDefinition(
               intermediateValue19[i19],
             );
 
@@ -12788,10 +12784,10 @@ export function validateExperimentalRouteDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalRouteInvalidationDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalRouteInvalidationDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureRouteInvalidationDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureRouteInvalidationDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalRouteInvalidationDefinition(value) {
+export function validateStructureRouteInvalidationDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -12864,7 +12860,7 @@ export function validateExperimentalRouteInvalidationDefinition(value) {
               key: "validator.undefined",
             };
           } else {
-            const refResult3 = validateExperimentalNamePart(
+            const refResult3 = validateStructureNamePart(
               value["target"]["group"],
             );
 
@@ -12882,7 +12878,7 @@ export function validateExperimentalRouteInvalidationDefinition(value) {
           ) {
             result["target"]["name"] = undefined;
           } else {
-            const refResult4 = validateExperimentalNamePartOptional(
+            const refResult4 = validateStructureNamePartOptional(
               value["target"]["name"],
             );
 
@@ -13300,10 +13296,10 @@ export function validateExperimentalRouteInvalidationDefinition(value) {
 }
 
 /**
- * @param {import("../common/types").ExperimentalStructureInput|any} value
- * @returns {Either<import("../common/types").ExperimentalStructure, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureStructureInput|any} value
+ * @returns {Either<import("../common/types").StructureStructure, ValidatorErrorMap>}
  */
-export function validateExperimentalStructure(value) {
+export function validateStructureStructure(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -13330,7 +13326,7 @@ export function validateExperimentalStructure(value) {
             key: "validator.undefined",
           };
         } else {
-          const refResult3 = validateExperimentalNamePart(genericKeyInput0);
+          const refResult3 = validateStructureNamePart(genericKeyInput0);
 
           if (refResult3.error) {
             for (const errorKey of Object.keys(refResult3.error)) {
@@ -13386,7 +13382,7 @@ export function validateExperimentalStructure(value) {
                   };
                 } else {
                   const refResult6 =
-                    validateExperimentalNamePart(genericKeyInput3);
+                    validateStructureNamePart(genericKeyInput3);
 
                   if (refResult6.error) {
                     for (const errorKey of Object.keys(refResult6.error)) {
@@ -13419,7 +13415,7 @@ export function validateExperimentalStructure(value) {
                       key: "validator.undefined",
                     };
                   } else {
-                    const refResult6 = validateExperimentalNamedTypeDefinition(
+                    const refResult6 = validateStructureNamedTypeDefinition(
                       value[genericKeyResult1][genericKeyResult4],
                     );
 
@@ -13452,10 +13448,10 @@ export function validateExperimentalStructure(value) {
 /**
  * This contains all known type definitions.
  *
- * @param {import("../common/types").ExperimentalTypeDefinitionInput|any} value
- * @returns {Either<import("../common/types").ExperimentalTypeDefinition, ValidatorErrorMap>}
+ * @param {import("../common/types").StructureTypeDefinitionInput|any} value
+ * @returns {Either<import("../common/types").StructureTypeDefinition, ValidatorErrorMap>}
  */
-export function validateExperimentalTypeDefinition(value) {
+export function validateStructureTypeDefinition(value) {
   /** @type {ValidatorErrorMap} */
   const errorMap = {};
   /** @type {any} */
@@ -13485,7 +13481,7 @@ export function validateExperimentalTypeDefinition(value) {
         };
       } else {
         const refResult2 =
-          validateExperimentalNamedTypeDefinition(intermediateValue2);
+          validateStructureNamedTypeDefinition(intermediateValue2);
 
         if (refResult2.error) {
           for (const errorKey of Object.keys(refResult2.error)) {
@@ -13517,7 +13513,7 @@ export function validateExperimentalTypeDefinition(value) {
         };
       } else {
         const refResult2 =
-          validateExperimentalReferenceDefinition(intermediateValue2);
+          validateStructureReferenceDefinition(intermediateValue2);
 
         if (refResult2.error) {
           for (const errorKey of Object.keys(refResult2.error)) {
@@ -13549,7 +13545,7 @@ export function validateExperimentalTypeDefinition(value) {
         };
       } else {
         const refResult2 =
-          validateExperimentalRelationDefinition(intermediateValue2);
+          validateStructureRelationDefinition(intermediateValue2);
 
         if (refResult2.error) {
           for (const errorKey of Object.keys(refResult2.error)) {
@@ -13581,7 +13577,7 @@ export function validateExperimentalTypeDefinition(value) {
         };
       } else {
         const refResult2 =
-          validateExperimentalRouteInvalidationDefinition(intermediateValue2);
+          validateStructureRouteInvalidationDefinition(intermediateValue2);
 
         if (refResult2.error) {
           for (const errorKey of Object.keys(refResult2.error)) {
diff --git a/packages/code-gen/src/generator.d.ts b/packages/code-gen/src/generator.d.ts
index 8e3cc09d4a..5d6d485ec4 100644
--- a/packages/code-gen/src/generator.d.ts
+++ b/packages/code-gen/src/generator.d.ts
@@ -15,9 +15,9 @@ export class Generator {
    */
   logger: import("@compas/stdlib").Logger;
   /**
-   * @type {import("./generated/common/types.js").ExperimentalStructure}
+   * @type {import("./generated/common/types.js").StructureStructure}
    */
-  internalStructure: import("./generated/common/types.js").ExperimentalStructure;
+  internalStructure: import("./generated/common/types.js").StructureStructure;
   /**
    * Add new type definitions to this generator
    *
@@ -32,12 +32,12 @@ export class Generator {
    * If a string is provided, it is expected to be a path to a 'structure.json' or to an
    * 'outputDirectory' of a generate call that included 'structure: {}'.
    *
-   * @param {import("./generated/common/types.js").ExperimentalStructure|string} structureOrDirectory
+   * @param {import("./generated/common/types.js").StructureStructure|string} structureOrDirectory
    * @returns {Generator}
    */
   addStructure(
     structureOrDirectory:
-      | import("./generated/common/types.js").ExperimentalStructure
+      | import("./generated/common/types.js").StructureStructure
       | string,
   ): Generator;
   /**
@@ -64,11 +64,11 @@ export class Generator {
   /**
    * Generate based on the structure that is known to this generator
    *
-   * @param {import("./generated/common/types.js").ExperimentalGenerateOptionsInput} options
+   * @param {import("./generated/common/types.js").StructureGenerateOptionsInput} options
    * @returns {import("./generate.js").OutputFile[]}
    */
   generate(
-    options: import("./generated/common/types.js").ExperimentalGenerateOptionsInput,
+    options: import("./generated/common/types.js").StructureGenerateOptionsInput,
   ): import("./generate.js").OutputFile[];
 }
 //# sourceMappingURL=generator.d.ts.map
diff --git a/packages/code-gen/src/generator.js b/packages/code-gen/src/generator.js
index 8977901b11..ee5ee25365 100644
--- a/packages/code-gen/src/generator.js
+++ b/packages/code-gen/src/generator.js
@@ -11,7 +11,7 @@ import {
 } from "@compas/stdlib";
 import { buildOrInfer } from "./builders/index.js";
 import { generateExecute } from "./generate.js";
-import { validateExperimentalGenerateOptions } from "./generated/experimental/validators.js";
+import { validateStructureGenerateOptions } from "./generated/structure/validators.js";
 import {
   structureAddType,
   structureExtractGroups,
@@ -48,7 +48,7 @@ export class Generator {
     this.logger = logger ?? newLogger();
 
     /**
-     * @type {import("./generated/common/types.js").ExperimentalStructure}
+     * @type {import("./generated/common/types.js").StructureStructure}
      */
     this.internalStructure = {};
   }
@@ -86,7 +86,7 @@ export class Generator {
    * If a string is provided, it is expected to be a path to a 'structure.json' or to an
    * 'outputDirectory' of a generate call that included 'structure: {}'.
    *
-   * @param {import("./generated/common/types.js").ExperimentalStructure|string} structureOrDirectory
+   * @param {import("./generated/common/types.js").StructureStructure|string} structureOrDirectory
    * @returns {Generator}
    */
   addStructure(structureOrDirectory) {
@@ -176,12 +176,11 @@ export class Generator {
   /**
    * Generate based on the structure that is known to this generator
    *
-   * @param {import("./generated/common/types.js").ExperimentalGenerateOptionsInput} options
+   * @param {import("./generated/common/types.js").StructureGenerateOptionsInput} options
    * @returns {import("./generate.js").OutputFile[]}
    */
   generate(options) {
-    const validationResultOptions =
-      validateExperimentalGenerateOptions(options);
+    const validationResultOptions = validateStructureGenerateOptions(options);
     if (validationResultOptions.error) {
       throw AppError.serverError({
         message: "Static validation failed for the provided options.",
diff --git a/packages/code-gen/src/open-api/generator.js b/packages/code-gen/src/open-api/generator.js
index 136b805b93..0fb520a2d3 100644
--- a/packages/code-gen/src/open-api/generator.js
+++ b/packages/code-gen/src/open-api/generator.js
@@ -93,7 +93,7 @@ function openApiBuildFile(generateContext) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {any} openApiSpec
- * @param { import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param { import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  */
 function openApiTransformRoute(generateContext, openApiSpec, route) {
   const method = route.method.toLowerCase();
@@ -136,7 +136,7 @@ function openApiTransformPath(path) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {any} openApiSpec
- * @param { import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param { import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  */
 function openApiTransformParams(generateContext, openApiSpec, route) {
   if (isNil(route.query) && isNil(route.params)) {
@@ -230,7 +230,7 @@ function openApiTransformParams(generateContext, openApiSpec, route) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {any} openApiSpec
- * @param { import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param { import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  */
 function openApiTransformBody(generateContext, openApiSpec, route) {
   const field = route.body ?? route.files;
@@ -260,7 +260,7 @@ function openApiTransformBody(generateContext, openApiSpec, route) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {any} openApiSpec
- * @param { import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
+ * @param { import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
  */
 function openApiTransformResponse(generateContext, openApiSpec, route) {
   const contentAppError = {
@@ -325,7 +325,7 @@ function openApiTransformResponse(generateContext, openApiSpec, route) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {any} openApiSpec
- * @param { import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalTypeSystemDefinition>} type
+ * @param { import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureTypeSystemDefinition>} type
  */
 function transformType(generateContext, openApiSpec, type) {
   const property = {};
diff --git a/packages/code-gen/src/processors/any-of.js b/packages/code-gen/src/processors/any-of.js
index 30cdfb5270..bf6f13e3bf 100644
--- a/packages/code-gen/src/processors/any-of.js
+++ b/packages/code-gen/src/processors/any-of.js
@@ -64,7 +64,7 @@ export function anyOfPreProcess(generateContext) {
  * - The discriminant should be unique and a single `oneOf` string
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.d.ts").ExperimentalAnyOfDefinition} type
+ * @param {import("../generated/common/types.d.ts").StructureAnyOfDefinition} type
  */
 function anyOfPreprocessDiscriminant(generateContext, type) {
   const discriminantSet = new Set();
diff --git a/packages/code-gen/src/processors/crud-information.d.ts b/packages/code-gen/src/processors/crud-information.d.ts
index 79be1eb5e8..f485d44e7d 100644
--- a/packages/code-gen/src/processors/crud-information.d.ts
+++ b/packages/code-gen/src/processors/crud-information.d.ts
@@ -1,96 +1,96 @@
 /**
  * Get the resolved name of the provided crud route
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @param {string} suffix
  * @returns {string}
  */
 export function crudInformationGetName(
-  crud: import("../generated/common/types.js").ExperimentalCrudDefinition,
+  crud: import("../generated/common/types.js").StructureCrudDefinition,
   suffix: string,
 ): string;
 /**
  * Get the resolved path of the provided crud route
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @param {string} suffix
  * @returns {string}
  */
 export function crudInformationGetPath(
-  crud: import("../generated/common/types.js").ExperimentalCrudDefinition,
+  crud: import("../generated/common/types.js").StructureCrudDefinition,
   suffix: string,
 ): string;
 /**
  * Get the param name for the provided crud object
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  */
 export function crudInformationGetParamName(
-  crud: import("../generated/common/types.js").ExperimentalCrudDefinition,
+  crud: import("../generated/common/types.js").StructureCrudDefinition,
 ): string;
 /**
  * Save the used model, so we don't have to resolve that each and every time.
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} model
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} model
  */
 export function crudInformationSetModel(
-  crud: import("../generated/common/types.js").ExperimentalCrudDefinition,
-  model: import("../generated/common/types.js").ExperimentalObjectDefinition,
+  crud: import("../generated/common/types.js").StructureCrudDefinition,
+  model: import("../generated/common/types.js").StructureObjectDefinition,
 ): void;
 /**
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
- * @returns {import("../generated/common/types.js").ExperimentalObjectDefinition}
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
+ * @returns {import("../generated/common/types.js").StructureObjectDefinition}
  */
 export function crudInformationGetModel(
-  crud: import("../generated/common/types.js").ExperimentalCrudDefinition,
-): import("../generated/common/types.js").ExperimentalObjectDefinition;
+  crud: import("../generated/common/types.js").StructureCrudDefinition,
+): import("../generated/common/types.js").StructureObjectDefinition;
 /**
  * Save the used relation and parent
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} parent
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} parent
  * @param {import("../generated/common/types.js").
- * ExperimentalRelationDefinition} relation
+ * StructureRelationDefinition} relation
  */
 export function crudInformationSetRelationAndParent(
-  crud: import("../generated/common/types.js").ExperimentalCrudDefinition,
-  parent: import("../generated/common/types.js").ExperimentalCrudDefinition,
-  relation: import("../generated/common/types.js").ExperimentalRelationDefinition,
+  crud: import("../generated/common/types.js").StructureCrudDefinition,
+  parent: import("../generated/common/types.js").StructureCrudDefinition,
+  relation: import("../generated/common/types.js").StructureRelationDefinition,
 ): void;
 /**
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
- * @returns {import("../generated/common/types.js").ExperimentalRelationDefinition}
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
+ * @returns {import("../generated/common/types.js").StructureRelationDefinition}
  */
 export function crudInformationGetRelation(
-  crud: import("../generated/common/types.js").ExperimentalCrudDefinition,
-): import("../generated/common/types.js").ExperimentalRelationDefinition;
+  crud: import("../generated/common/types.js").StructureCrudDefinition,
+): import("../generated/common/types.js").StructureRelationDefinition;
 /**
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
- * @returns {import("../generated/common/types.js").ExperimentalCrudDefinition}
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
+ * @returns {import("../generated/common/types.js").StructureCrudDefinition}
  */
 export function crudInformationGetParent(
-  crud: import("../generated/common/types.js").ExperimentalCrudDefinition,
-): import("../generated/common/types.js").ExperimentalCrudDefinition;
+  crud: import("../generated/common/types.js").StructureCrudDefinition,
+): import("../generated/common/types.js").StructureCrudDefinition;
 /**
  * Save the created readable type, so it is easily resolvable later on.
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @param {{ group: string, name: string }} readable
  */
 export function crudInformationSetReadableType(
-  crud: import("../generated/common/types.js").ExperimentalCrudDefinition,
+  crud: import("../generated/common/types.js").StructureCrudDefinition,
   readable: {
     group: string;
     name: string;
   },
 ): void;
 /**
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @returns {{ group: string, name: string }}
  */
 export function crudInformationGetReadableType(
-  crud: import("../generated/common/types.js").ExperimentalCrudDefinition,
+  crud: import("../generated/common/types.js").StructureCrudDefinition,
 ): {
   group: string;
   name: string;
@@ -98,22 +98,22 @@ export function crudInformationGetReadableType(
 /**
  * Save the created writable type, so it is easily resolvable later on.
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @param {{ group: string, name: string }} writable
  */
 export function crudInformationSetWritableType(
-  crud: import("../generated/common/types.js").ExperimentalCrudDefinition,
+  crud: import("../generated/common/types.js").StructureCrudDefinition,
   writable: {
     group: string;
     name: string;
   },
 ): void;
 /**
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @returns {{ group: string, name: string }}
  */
 export function crudInformationGetWritableType(
-  crud: import("../generated/common/types.js").ExperimentalCrudDefinition,
+  crud: import("../generated/common/types.js").StructureCrudDefinition,
 ): {
   group: string;
   name: string;
@@ -121,29 +121,29 @@ export function crudInformationGetWritableType(
 /**
  * Cache when the provided CRUD has a custom readable type.
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @param {boolean} hasCustomReadableType
  */
 export function crudInformationSetHasCustomReadableType(
-  crud: import("../generated/common/types.js").ExperimentalCrudDefinition,
+  crud: import("../generated/common/types.js").StructureCrudDefinition,
   hasCustomReadableType: boolean,
 ): void;
 /**
  * Check if the crud or parent has a custom readable type
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @returns {boolean}
  */
 export function crudInformationGetHasCustomReadableType(
-  crud: import("../generated/common/types.js").ExperimentalCrudDefinition,
+  crud: import("../generated/common/types.js").StructureCrudDefinition,
 ): boolean;
 export type CrudInformation = {
-  model: import("../generated/common/types.js").ExperimentalObjectDefinition;
+  model: import("../generated/common/types.js").StructureObjectDefinition;
   parent?:
-    | import("../generated/common/types.js").ExperimentalCrudDefinition
+    | import("../generated/common/types.js").StructureCrudDefinition
     | undefined;
   relation?:
-    | import("../generated/common/types.js").ExperimentalRelationDefinition
+    | import("../generated/common/types.js").StructureRelationDefinition
     | undefined;
   readableType: {
     group: string;
diff --git a/packages/code-gen/src/processors/crud-information.js b/packages/code-gen/src/processors/crud-information.js
index 8c274b1ae7..778784ddda 100644
--- a/packages/code-gen/src/processors/crud-information.js
+++ b/packages/code-gen/src/processors/crud-information.js
@@ -3,10 +3,10 @@ import { modelKeyGetPrimary } from "./model-keys.js";
 
 /**
  * @typedef {object} CrudInformation
- * @property {import("../generated/common/types.js").ExperimentalObjectDefinition} model
- * @property {import("../generated/common/types.js").ExperimentalCrudDefinition} [parent]
+ * @property {import("../generated/common/types.js").StructureObjectDefinition} model
+ * @property {import("../generated/common/types.js").StructureCrudDefinition} [parent]
  * @property {import("../generated/common/types.js").
- *   ExperimentalRelationDefinition} [relation]
+ *   StructureRelationDefinition} [relation]
  * @property {{ group: string, name: string }} readableType
  * @property {{ group: string, name: string }} writableType
  * @property {boolean} hasCustomReadableType
@@ -22,7 +22,7 @@ const crudCache = new WeakMap();
 /**
  * Get the resolved name of the provided crud route
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @param {string} suffix
  * @returns {string}
  */
@@ -43,7 +43,7 @@ export function crudInformationGetName(crud, suffix) {
 /**
  * Get the resolved path of the provided crud route
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @param {string} suffix
  * @returns {string}
  */
@@ -76,7 +76,7 @@ export function crudInformationGetPath(crud, suffix) {
 /**
  * Get the param name for the provided crud object
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  */
 export function crudInformationGetParamName(crud) {
   const model = crudInformationGetModel(crud);
@@ -90,8 +90,8 @@ export function crudInformationGetParamName(crud) {
 /**
  * Save the used model, so we don't have to resolve that each and every time.
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} model
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} model
  */
 export function crudInformationSetModel(crud, model) {
   const obj = crudCache.get(crud) ?? {};
@@ -103,8 +103,8 @@ export function crudInformationSetModel(crud, model) {
 }
 
 /**
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
- * @returns {import("../generated/common/types.js").ExperimentalObjectDefinition}
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
+ * @returns {import("../generated/common/types.js").StructureObjectDefinition}
  */
 export function crudInformationGetModel(crud) {
   // @ts-expect-error
@@ -114,10 +114,10 @@ export function crudInformationGetModel(crud) {
 /**
  * Save the used relation and parent
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} parent
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} parent
  * @param {import("../generated/common/types.js").
- * ExperimentalRelationDefinition} relation
+ * StructureRelationDefinition} relation
  */
 export function crudInformationSetRelationAndParent(crud, parent, relation) {
   const obj = crudCache.get(crud) ?? {};
@@ -132,8 +132,8 @@ export function crudInformationSetRelationAndParent(crud, parent, relation) {
 }
 
 /**
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
- * @returns {import("../generated/common/types.js").ExperimentalRelationDefinition}
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
+ * @returns {import("../generated/common/types.js").StructureRelationDefinition}
  */
 export function crudInformationGetRelation(crud) {
   // @ts-expect-error
@@ -141,8 +141,8 @@ export function crudInformationGetRelation(crud) {
 }
 
 /**
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
- * @returns {import("../generated/common/types.js").ExperimentalCrudDefinition}
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
+ * @returns {import("../generated/common/types.js").StructureCrudDefinition}
  */
 export function crudInformationGetParent(crud) {
   // @ts-expect-error
@@ -152,7 +152,7 @@ export function crudInformationGetParent(crud) {
 /**
  * Save the created readable type, so it is easily resolvable later on.
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @param {{ group: string, name: string }} readable
  */
 export function crudInformationSetReadableType(crud, readable) {
@@ -165,7 +165,7 @@ export function crudInformationSetReadableType(crud, readable) {
 }
 
 /**
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @returns {{ group: string, name: string }}
  */
 export function crudInformationGetReadableType(crud) {
@@ -176,7 +176,7 @@ export function crudInformationGetReadableType(crud) {
 /**
  * Save the created writable type, so it is easily resolvable later on.
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @param {{ group: string, name: string }} writable
  */
 export function crudInformationSetWritableType(crud, writable) {
@@ -189,7 +189,7 @@ export function crudInformationSetWritableType(crud, writable) {
 }
 
 /**
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @returns {{ group: string, name: string }}
  */
 export function crudInformationGetWritableType(crud) {
@@ -200,7 +200,7 @@ export function crudInformationGetWritableType(crud) {
 /**
  * Cache when the provided CRUD has a custom readable type.
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @param {boolean} hasCustomReadableType
  */
 export function crudInformationSetHasCustomReadableType(
@@ -218,7 +218,7 @@ export function crudInformationSetHasCustomReadableType(
 /**
  * Check if the crud or parent has a custom readable type
  *
- * @param {import("../generated/common/types.js").ExperimentalCrudDefinition} crud
+ * @param {import("../generated/common/types.js").StructureCrudDefinition} crud
  * @returns {boolean}
  */
 export function crudInformationGetHasCustomReadableType(crud) {
diff --git a/packages/code-gen/src/processors/crud-types.js b/packages/code-gen/src/processors/crud-types.js
index 5698a8ee15..c33036b96e 100644
--- a/packages/code-gen/src/processors/crud-types.js
+++ b/packages/code-gen/src/processors/crud-types.js
@@ -42,7 +42,7 @@ export function crudTypesCreate(generateContext) {
  * Generate the readable and writable types recursively for the provided CRUD
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  * @param {string} [name]
  */
 function crudTypesCreateItemTypes(generateContext, crud, name) {
@@ -77,7 +77,7 @@ function crudTypesCreateItemTypes(generateContext, crud, name) {
 
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  * @param {{
  *   name: string,
  *   type: "readable"|"writable"
@@ -224,7 +224,7 @@ function crudTypesItem(generateContext, crud, options) {
 
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudTypesRoutes(generateContext, crud) {
   crudRouteSwitch(
@@ -249,7 +249,7 @@ function crudTypesRoutes(generateContext, crud) {
  * Build the params object for the provided crud object. Including params necessary for
  * 'parents'.
  *
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  * @param {{ includeSelf: boolean }} options
  */
 function crudTypesBuildParamsObject(crud, options) {
@@ -280,7 +280,7 @@ function crudTypesBuildParamsObject(crud, options) {
 
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudTypesListRoute(generateContext, crud) {
   const model = crudInformationGetModel(crud);
@@ -373,7 +373,7 @@ function crudTypesListRoute(generateContext, crud) {
  * query-able where object could lead to slowdowns.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudTypesBuildWhereObject(generateContext, crud) {
   const model = crudInformationGetModel(crud);
@@ -420,7 +420,7 @@ function crudTypesBuildWhereObject(generateContext, crud) {
 
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudTypesSingleRoute(generateContext, crud) {
   const model = crudInformationGetModel(crud);
@@ -479,7 +479,7 @@ function crudTypesSingleRoute(generateContext, crud) {
 
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudTypesCreateRoute(generateContext, crud) {
   const model = crudInformationGetModel(crud);
@@ -536,7 +536,7 @@ function crudTypesCreateRoute(generateContext, crud) {
 
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudTypesUpdateRoute(generateContext, crud) {
   const model = crudInformationGetModel(crud);
@@ -596,7 +596,7 @@ function crudTypesUpdateRoute(generateContext, crud) {
 
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudTypesDeleteRoute(generateContext, crud) {
   const model = crudInformationGetModel(crud);
@@ -653,9 +653,9 @@ function crudTypesDeleteRoute(generateContext, crud) {
 }
 
 /**
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  * @param {{ skipSingleRoute: boolean}} [options]
- * @returns {import("../generated/common/types.d.ts").ExperimentalRouteInvalidationDefinition[]}
+ * @returns {import("../generated/common/types.d.ts").StructureRouteInvalidationDefinition[]}
  */
 function crudTypesRouteInvalidations(
   crud,
@@ -663,7 +663,7 @@ function crudTypesRouteInvalidations(
     skipSingleRoute: false,
   },
 ) {
-  /** @type {import("../generated/common/types.d.ts").ExperimentalRouteInvalidationDefinition[]} */
+  /** @type {import("../generated/common/types.d.ts").StructureRouteInvalidationDefinition[]} */
   const invalidations = [];
 
   if (crud.routeOptions.listRoute) {
diff --git a/packages/code-gen/src/processors/crud-validation.js b/packages/code-gen/src/processors/crud-validation.js
index 75376fffe9..b9c0bc0fde 100644
--- a/packages/code-gen/src/processors/crud-validation.js
+++ b/packages/code-gen/src/processors/crud-validation.js
@@ -39,11 +39,11 @@ export function crudValidation(generateContext) {
 
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  */
 function crudValidateType(generateContext, crud) {
   /**
-   * @type {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>}
+   * @type {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>}
    */
   // @ts-expect-error
   const model = structureResolveReference(
@@ -174,8 +174,8 @@ function crudValidateType(generateContext, crud) {
  * Resolve and validate the relation used in the nested crud.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} relation
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} relation
  */
 function crudValidateRelation(generateContext, crud, relation) {
   const model = crudInformationGetModel(crud);
diff --git a/packages/code-gen/src/processors/crud.d.ts b/packages/code-gen/src/processors/crud.d.ts
index ea9ac8e032..af697c1070 100644
--- a/packages/code-gen/src/processors/crud.d.ts
+++ b/packages/code-gen/src/processors/crud.d.ts
@@ -2,18 +2,18 @@
  * Get a list of CRUD objects in the structure
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>)[]}
+ * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>)[]}
  */
 export function structureCrud(
   generateContext: import("../generate.js").GenerateContext,
 ): import("../../types/advanced-types").NamedType<
-  import("../generated/common/types").ExperimentalCrudDefinition
+  import("../generated/common/types").StructureCrudDefinition
 >[];
 /**
  * Call the route specific functions that are enabled on the CRUD object.
  *
  * @template {any[]} X
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  * @param {{
  *   listRoute: (...X) => void,
  *   singleRoute: (...X) => void,
@@ -25,7 +25,7 @@ export function structureCrud(
  */
 export function crudRouteSwitch<X extends any[]>(
   crud: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalCrudDefinition
+    import("../generated/common/types").StructureCrudDefinition
   >,
   functions: {
     listRoute: (...X: any[]) => void;
diff --git a/packages/code-gen/src/processors/crud.js b/packages/code-gen/src/processors/crud.js
index 9848450db6..b4ced458bd 100644
--- a/packages/code-gen/src/processors/crud.js
+++ b/packages/code-gen/src/processors/crud.js
@@ -4,11 +4,11 @@ import { structureNamedTypes } from "./structure.js";
  * Get a list of CRUD objects in the structure
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>)[]}
+ * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>)[]}
  */
 export function structureCrud(generateContext) {
   /**
-   * @type {(import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>)[]}
+   * @type {(import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>)[]}
    */
   const result = [];
 
@@ -25,7 +25,7 @@ export function structureCrud(generateContext) {
  * Call the route specific functions that are enabled on the CRUD object.
  *
  * @template {any[]} X
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalCrudDefinition>} crud
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureCrudDefinition>} crud
  * @param {{
  *   listRoute: (...X) => void,
  *   singleRoute: (...X) => void,
diff --git a/packages/code-gen/src/processors/file-implementations.d.ts b/packages/code-gen/src/processors/file-implementations.d.ts
index 1b4da00abf..c00bf9fa31 100644
--- a/packages/code-gen/src/processors/file-implementations.d.ts
+++ b/packages/code-gen/src/processors/file-implementations.d.ts
@@ -1,7 +1,7 @@
 /**
- * @type {NonNullable<import("../generated/common/types.d.ts").ExperimentalAnyDefinition["targets"]>}
+ * @type {NonNullable<import("../generated/common/types.d.ts").StructureAnyDefinition["targets"]>}
  */
 export const fileImplementations: NonNullable<
-  import("../generated/common/types.d.ts").ExperimentalAnyDefinition["targets"]
+  import("../generated/common/types.d.ts").StructureAnyDefinition["targets"]
 >;
 //# sourceMappingURL=file-implementations.d.ts.map
diff --git a/packages/code-gen/src/processors/file-implementations.js b/packages/code-gen/src/processors/file-implementations.js
index 69c5bf36b0..0d2d1031b0 100644
--- a/packages/code-gen/src/processors/file-implementations.js
+++ b/packages/code-gen/src/processors/file-implementations.js
@@ -1,5 +1,5 @@
 /**
- * @type {NonNullable<import("../generated/common/types.d.ts").ExperimentalAnyDefinition["targets"]>}
+ * @type {NonNullable<import("../generated/common/types.d.ts").StructureAnyDefinition["targets"]>}
  */
 export const fileImplementations = {
   jsKoaReceive: {
diff --git a/packages/code-gen/src/processors/model-keys.d.ts b/packages/code-gen/src/processors/model-keys.d.ts
index 3be5b8337e..42fa305364 100644
--- a/packages/code-gen/src/processors/model-keys.d.ts
+++ b/packages/code-gen/src/processors/model-keys.d.ts
@@ -25,18 +25,18 @@ export function modelKeyAddDateKeys(
  *
  * The result is cached and early returned in the next call with the same model.
  *
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} model
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} model
  * @returns {{
  *   primaryKeyName: string,
  *   primaryKeyDefinition:
- *   import("../generated/common/types.js").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types.js").StructureTypeSystemDefinition
  * }}
  */
 export function modelKeyGetPrimary(
-  model: import("../generated/common/types.js").ExperimentalObjectDefinition,
+  model: import("../generated/common/types.js").StructureObjectDefinition,
 ): {
   primaryKeyName: string;
-  primaryKeyDefinition: import("../generated/common/types.js").ExperimentalTypeSystemDefinition;
+  primaryKeyDefinition: import("../generated/common/types.js").StructureTypeSystemDefinition;
 };
 /**
  * Get the searchable model keys for the provided model.
@@ -44,11 +44,11 @@ export function modelKeyGetPrimary(
  * The result is cached and early returned in the next call with the same model.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} model
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} model
  * @returns {string[]}
  */
 export function modelKeyGetSearchable(
   generateContext: import("../generate.js").GenerateContext,
-  model: import("../generated/common/types.js").ExperimentalObjectDefinition,
+  model: import("../generated/common/types.js").StructureObjectDefinition,
 ): string[];
 //# sourceMappingURL=model-keys.d.ts.map
diff --git a/packages/code-gen/src/processors/model-keys.js b/packages/code-gen/src/processors/model-keys.js
index cd1239e64c..898564a281 100644
--- a/packages/code-gen/src/processors/model-keys.js
+++ b/packages/code-gen/src/processors/model-keys.js
@@ -13,7 +13,7 @@ import { referenceUtilsGetProperty } from "./reference-utils.js";
  * @type {WeakMap<object, {
  *   primaryKeyName: string,
  *   primaryKeyDefinition:
- *   import("../generated/common/types.js").ExperimentalTypeDefinition
+ *   import("../generated/common/types.js").StructureTypeDefinition
  * }>}
  */
 const primaryKeyCache = new WeakMap();
@@ -112,11 +112,11 @@ export function modelKeyAddDateKeys(generateContext) {
  *
  * The result is cached and early returned in the next call with the same model.
  *
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} model
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} model
  * @returns {{
  *   primaryKeyName: string,
  *   primaryKeyDefinition:
- *   import("../generated/common/types.js").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types.js").StructureTypeSystemDefinition
  * }}
  */
 export function modelKeyGetPrimary(model) {
@@ -155,7 +155,7 @@ export function modelKeyGetPrimary(model) {
  * The result is cached and early returned in the next call with the same model.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} model
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} model
  * @returns {string[]}
  */
 export function modelKeyGetSearchable(generateContext, model) {
diff --git a/packages/code-gen/src/processors/model-partials.d.ts b/packages/code-gen/src/processors/model-partials.d.ts
index 3549a99927..e08532287e 100644
--- a/packages/code-gen/src/processors/model-partials.d.ts
+++ b/packages/code-gen/src/processors/model-partials.d.ts
@@ -38,7 +38,7 @@ export function modelPartialOrderByTypes(
  * Get unnamed orderBy & orderBySpec type
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} model
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} model
  * @returns {{
  *   orderByType: any,
  *   orderBySpecType: any,
@@ -46,7 +46,7 @@ export function modelPartialOrderByTypes(
  */
 export function modelPartialGetOrderByTypes(
   generateContext: import("../generate.js").GenerateContext,
-  model: import("../generated/common/types.js").ExperimentalObjectDefinition,
+  model: import("../generated/common/types.js").StructureObjectDefinition,
 ): {
   orderByType: any;
   orderBySpecType: any;
diff --git a/packages/code-gen/src/processors/model-partials.js b/packages/code-gen/src/processors/model-partials.js
index 40a72a0eb4..595162cac8 100644
--- a/packages/code-gen/src/processors/model-partials.js
+++ b/packages/code-gen/src/processors/model-partials.js
@@ -291,7 +291,7 @@ export function modelPartialOrderByTypes(generateContext) {
  * Get unnamed orderBy & orderBySpec type
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} model
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} model
  * @returns {{
  *   orderByType: any,
  *   orderBySpecType: any,
diff --git a/packages/code-gen/src/processors/model-relation.d.ts b/packages/code-gen/src/processors/model-relation.d.ts
index 787163772f..88bce696ee 100644
--- a/packages/code-gen/src/processors/model-relation.d.ts
+++ b/packages/code-gen/src/processors/model-relation.d.ts
@@ -2,22 +2,22 @@
  * Get the owned relations of the provided model. The 'relation.ownKey' of these
  * relations is a field on the model that it belongs to.
  *
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} model
- * @returns {import("../generated/common/types.js").ExperimentalRelationDefinition[]}
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} model
+ * @returns {import("../generated/common/types.js").StructureRelationDefinition[]}
  */
 export function modelRelationGetOwn(
-  model: import("../generated/common/types.js").ExperimentalObjectDefinition,
-): import("../generated/common/types.js").ExperimentalRelationDefinition[];
+  model: import("../generated/common/types.js").StructureObjectDefinition,
+): import("../generated/common/types.js").StructureRelationDefinition[];
 /**
  * Get the inverse relations of the provided model. The 'relation.ownKey' is a virtual
  * key on this model, which is not populated by default.
  *
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} model
- * @returns {import("../generated/common/types.js").ExperimentalRelationDefinition[]}
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} model
+ * @returns {import("../generated/common/types.js").StructureRelationDefinition[]}
  */
 export function modelRelationGetInverse(
-  model: import("../generated/common/types.js").ExperimentalObjectDefinition,
-): import("../generated/common/types.js").ExperimentalRelationDefinition[];
+  model: import("../generated/common/types.js").StructureObjectDefinition,
+): import("../generated/common/types.js").StructureRelationDefinition[];
 /**
  * Get the related information for the provided relation.
  * This object is always built through the eyes of the owning model. So when an inverse
@@ -26,11 +26,11 @@ export function modelRelationGetInverse(
  * By returning both models and both relations, other code only needs to pass in a
  * relation to get the full picture.
  *
- * @param {import("../generated/common/types.js").ExperimentalRelationDefinition} relation
+ * @param {import("../generated/common/types.js").StructureRelationDefinition} relation
  * @returns {ModelRelationInformation}
  */
 export function modelRelationGetInformation(
-  relation: import("../generated/common/types.js").ExperimentalRelationDefinition,
+  relation: import("../generated/common/types.js").StructureRelationDefinition,
 ): ModelRelationInformation;
 /**
  * Follow all relations of each model;
@@ -69,14 +69,14 @@ export function modelRelationBuildRelationInformationCache(
   generateContext: import("../generate.js").GenerateContext,
 ): void;
 export type ModelRelationInformation = {
-  modelOwn: import("../generated/common/types.js").ExperimentalObjectDefinition;
-  modelInverse: import("../generated/common/types").ExperimentalObjectDefinition;
-  relationOwn: import("../generated/common/types").ExperimentalRelationDefinition;
-  relationInverse: import("../generated/common/types").ExperimentalRelationDefinition;
+  modelOwn: import("../generated/common/types.js").StructureObjectDefinition;
+  modelInverse: import("../generated/common/types").StructureObjectDefinition;
+  relationOwn: import("../generated/common/types").StructureRelationDefinition;
+  relationInverse: import("../generated/common/types").StructureRelationDefinition;
   keyNameOwn: string;
-  keyDefinitionOwn: import("../generated/common/types").ExperimentalTypeSystemDefinition;
+  keyDefinitionOwn: import("../generated/common/types").StructureTypeSystemDefinition;
   virtualKeyNameInverse: string;
   primaryKeyNameInverse: string;
-  primaryKeyDefinitionInverse: import("../generated/common/types").ExperimentalTypeSystemDefinition;
+  primaryKeyDefinitionInverse: import("../generated/common/types").StructureTypeSystemDefinition;
 };
 //# sourceMappingURL=model-relation.d.ts.map
diff --git a/packages/code-gen/src/processors/model-relation.js b/packages/code-gen/src/processors/model-relation.js
index 05152a17ec..d8bbc08df2 100644
--- a/packages/code-gen/src/processors/model-relation.js
+++ b/packages/code-gen/src/processors/model-relation.js
@@ -13,20 +13,20 @@ import { structureNamedTypes, structureResolveReference } from "./structure.js";
 /**
  * @typedef {{
  *   modelOwn:
- *   import("../generated/common/types.js").ExperimentalObjectDefinition,
+ *   import("../generated/common/types.js").StructureObjectDefinition,
  *   modelInverse:
- *   import("../generated/common/types").ExperimentalObjectDefinition,
+ *   import("../generated/common/types").StructureObjectDefinition,
  *   relationOwn:
- *   import("../generated/common/types").ExperimentalRelationDefinition,
+ *   import("../generated/common/types").StructureRelationDefinition,
  *   relationInverse:
- *   import("../generated/common/types").ExperimentalRelationDefinition,
+ *   import("../generated/common/types").StructureRelationDefinition,
  *   keyNameOwn: string,
  *   keyDefinitionOwn:
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition,
+ *   import("../generated/common/types").StructureTypeSystemDefinition,
  *   virtualKeyNameInverse: string,
  *   primaryKeyNameInverse: string,
  *   primaryKeyDefinitionInverse:
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition,
+ *   import("../generated/common/types").StructureTypeSystemDefinition,
  * }} ModelRelationInformation
  */
 
@@ -34,7 +34,7 @@ import { structureNamedTypes, structureResolveReference } from "./structure.js";
  * Cache to resolve various relations related types.
  *
  * @type {WeakMap<
- *   import("../generated/common/types.js").ExperimentalRelationDefinition,
+ *   import("../generated/common/types.js").StructureRelationDefinition,
  *   ModelRelationInformation
  * >}
  */
@@ -44,11 +44,11 @@ const relationCache = new WeakMap();
  * Get the owned relations of the provided model. The 'relation.ownKey' of these
  * relations is a field on the model that it belongs to.
  *
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} model
- * @returns {import("../generated/common/types.js").ExperimentalRelationDefinition[]}
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} model
+ * @returns {import("../generated/common/types.js").StructureRelationDefinition[]}
  */
 export function modelRelationGetOwn(model) {
-  /** @type {import("../generated/common/types.js").ExperimentalRelationDefinition[]} */
+  /** @type {import("../generated/common/types.js").StructureRelationDefinition[]} */
   const result = [];
 
   for (const relation of model.relations) {
@@ -64,11 +64,11 @@ export function modelRelationGetOwn(model) {
  * Get the inverse relations of the provided model. The 'relation.ownKey' is a virtual
  * key on this model, which is not populated by default.
  *
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} model
- * @returns {import("../generated/common/types.js").ExperimentalRelationDefinition[]}
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} model
+ * @returns {import("../generated/common/types.js").StructureRelationDefinition[]}
  */
 export function modelRelationGetInverse(model) {
-  /** @type {import("../generated/common/types.js").ExperimentalRelationDefinition[]} */
+  /** @type {import("../generated/common/types.js").StructureRelationDefinition[]} */
   const result = [];
 
   for (const relation of model.relations) {
@@ -91,7 +91,7 @@ export function modelRelationGetInverse(model) {
  * By returning both models and both relations, other code only needs to pass in a
  * relation to get the full picture.
  *
- * @param {import("../generated/common/types.js").ExperimentalRelationDefinition} relation
+ * @param {import("../generated/common/types.js").StructureRelationDefinition} relation
  * @returns {ModelRelationInformation}
  */
 export function modelRelationGetInformation(relation) {
@@ -163,7 +163,7 @@ export function modelRelationCheckAllRelations(generateContext) {
   // relation
   for (const model of structureModels(generateContext)) {
     for (const relation of modelRelationGetOwn(model)) {
-      /** @type {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} */
+      /** @type {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} */
       // @ts-expect-error
       const inverseModel = structureResolveReference(
         generateContext.structure,
@@ -331,7 +331,7 @@ export function modelRelationAddKeys(generateContext) {
       // We allow the user to define their own key for this relation, however it should
       // have the same type as the referenced primary key.
       if (model.keys[relation.ownKey]) {
-        /** @type {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>} */
+        /** @type {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>} */
         // @ts-expect-error
         const modelInverse = structureResolveReference(
           generateContext.structure,
@@ -440,7 +440,7 @@ export function modelRelationAddKeys(generateContext) {
 export function modelRelationBuildRelationInformationCache(generateContext) {
   for (const model of structureModels(generateContext)) {
     for (const relation of modelRelationGetOwn(model)) {
-      /** @type { import("../generated/common/types.js").ExperimentalObjectDefinition} */
+      /** @type { import("../generated/common/types.js").StructureObjectDefinition} */
       // @ts-expect-error
       const modelInverse = structureResolveReference(
         generateContext.structure,
@@ -474,7 +474,7 @@ export function modelRelationBuildRelationInformationCache(generateContext) {
 
   for (const model of structureModels(generateContext)) {
     for (const relation of modelRelationGetInverse(model)) {
-      /** @type { import("../generated/common/types.js").ExperimentalObjectDefinition} */
+      /** @type { import("../generated/common/types.js").StructureObjectDefinition} */
       // @ts-expect-error
       const modelOwn = structureResolveReference(
         generateContext.structure,
diff --git a/packages/code-gen/src/processors/model-where.d.ts b/packages/code-gen/src/processors/model-where.d.ts
index 74e0949cfe..1ab2899786 100644
--- a/packages/code-gen/src/processors/model-where.d.ts
+++ b/packages/code-gen/src/processors/model-where.d.ts
@@ -1,10 +1,10 @@
 /**
  *
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} model
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} model
  * @returns {ModelWhereInformation}
  */
 export function modelWhereGetInformation(
-  model: import("../generated/common/types.js").ExperimentalObjectDefinition,
+  model: import("../generated/common/types.js").StructureObjectDefinition,
 ): ModelWhereInformation;
 /**
  * Build the {@link ModelWhereInformation} object for each model. This way further
diff --git a/packages/code-gen/src/processors/model-where.js b/packages/code-gen/src/processors/model-where.js
index ecb39b3db4..f3922a93d6 100644
--- a/packages/code-gen/src/processors/model-where.js
+++ b/packages/code-gen/src/processors/model-where.js
@@ -46,7 +46,7 @@ const modelWhereTypeTable = {
  * Cache where information per model.
  *
  * @type {WeakMap<
- *   import("../generated/common/types.js").ExperimentalObjectDefinition,
+ *   import("../generated/common/types.js").StructureObjectDefinition,
  *   ModelWhereInformation
  * >}
  */
@@ -54,7 +54,7 @@ const whereCache = new WeakMap();
 
 /**
  *
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} model
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} model
  * @returns {ModelWhereInformation}
  */
 export function modelWhereGetInformation(model) {
diff --git a/packages/code-gen/src/processors/models.d.ts b/packages/code-gen/src/processors/models.d.ts
index 807eaea595..574923cb3e 100644
--- a/packages/code-gen/src/processors/models.d.ts
+++ b/packages/code-gen/src/processors/models.d.ts
@@ -2,12 +2,12 @@
  * Get a list of query enabled objects in the structure.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>)[]}
+ * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>)[]}
  */
 export function structureModels(
   generateContext: import("../generate.js").GenerateContext,
 ): import("../../types/advanced-types").NamedType<
-  import("../generated/common/types").ExperimentalObjectDefinition
+  import("../generated/common/types").StructureObjectDefinition
 >[];
 /**
  * Return a new generic any type for custom query parts
diff --git a/packages/code-gen/src/processors/models.js b/packages/code-gen/src/processors/models.js
index ddae00f021..2b93e1aa48 100644
--- a/packages/code-gen/src/processors/models.js
+++ b/packages/code-gen/src/processors/models.js
@@ -5,11 +5,11 @@ import { structureNamedTypes } from "./structure.js";
  * Get a list of query enabled objects in the structure.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>)[]}
+ * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>)[]}
  */
 export function structureModels(generateContext) {
   /**
-   * @type {(import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalObjectDefinition>)[]}
+   * @type {(import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureObjectDefinition>)[]}
    */
   const result = [];
 
diff --git a/packages/code-gen/src/processors/object-expansion.d.ts b/packages/code-gen/src/processors/object-expansion.d.ts
index 558404a5fe..a9140e041e 100644
--- a/packages/code-gen/src/processors/object-expansion.d.ts
+++ b/packages/code-gen/src/processors/object-expansion.d.ts
@@ -15,12 +15,12 @@ export function objectExpansionExecute(
  * The 'extend' type is then removed from the structure, as it doesn't serve a purpose
  * anymore.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition} namedType
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @param {import("../generated/common/types.js").StructureTypeDefinition} namedType
  */
 export function objectExpansionExtend(
-  structure: import("../generated/common/types.js").ExperimentalStructure,
-  namedType: import("../generated/common/types.js").ExperimentalTypeDefinition,
+  structure: import("../generated/common/types.js").StructureStructure,
+  namedType: import("../generated/common/types.js").StructureTypeDefinition,
 ): void;
 /**
  * Replace 'omit' types with an object definition without the omitted keys.
@@ -28,12 +28,12 @@ export function objectExpansionExtend(
  * This function alters the type in place, creating a shallow copy of the source objects
  * keys.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition} namedType
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @param {import("../generated/common/types.js").StructureTypeDefinition} namedType
  */
 export function objectExpansionOmit(
-  structure: import("../generated/common/types.js").ExperimentalStructure,
-  namedType: import("../generated/common/types.js").ExperimentalTypeDefinition,
+  structure: import("../generated/common/types.js").StructureStructure,
+  namedType: import("../generated/common/types.js").StructureTypeDefinition,
 ): void;
 /**
  * Replace 'pick' types with an object definition only including the picked keys
@@ -41,11 +41,11 @@ export function objectExpansionOmit(
  * This function alters the type in place, creating a shallow copy of the source objects
  * keys.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition} namedType
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @param {import("../generated/common/types.js").StructureTypeDefinition} namedType
  */
 export function objectExpansionPick(
-  structure: import("../generated/common/types.js").ExperimentalStructure,
-  namedType: import("../generated/common/types.js").ExperimentalTypeDefinition,
+  structure: import("../generated/common/types.js").StructureStructure,
+  namedType: import("../generated/common/types.js").StructureTypeDefinition,
 ): void;
 //# sourceMappingURL=object-expansion.d.ts.map
diff --git a/packages/code-gen/src/processors/object-expansion.js b/packages/code-gen/src/processors/object-expansion.js
index c27d5674a3..8bafa07682 100644
--- a/packages/code-gen/src/processors/object-expansion.js
+++ b/packages/code-gen/src/processors/object-expansion.js
@@ -51,8 +51,8 @@ export function objectExpansionExecute(generateContext) {
  * The 'extend' type is then removed from the structure, as it doesn't serve a purpose
  * anymore.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition} namedType
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @param {import("../generated/common/types.js").StructureTypeDefinition} namedType
  */
 export function objectExpansionExtend(structure, namedType) {
   if (namedType.type === "extend") {
@@ -85,8 +85,8 @@ export function objectExpansionExtend(structure, namedType) {
  * This function alters the type in place, creating a shallow copy of the source objects
  * keys.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition} namedType
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @param {import("../generated/common/types.js").StructureTypeDefinition} namedType
  */
 export function objectExpansionOmit(structure, namedType) {
   // We keep a callstack with `beforeTraversal` and `afterTraversal` to improve the
@@ -113,7 +113,7 @@ export function objectExpansionOmit(structure, namedType) {
         const removedKeys = type.keys;
 
         /**
-         * @type {import("../generated/common/types.js").ExperimentalObjectDefinition}
+         * @type {import("../generated/common/types.js").StructureObjectDefinition}
          */
         // @ts-expect-error
         //
@@ -163,8 +163,8 @@ export function objectExpansionOmit(structure, namedType) {
  * This function alters the type in place, creating a shallow copy of the source objects
  * keys.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition} namedType
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @param {import("../generated/common/types.js").StructureTypeDefinition} namedType
  */
 export function objectExpansionPick(structure, namedType) {
   // We keep a callstack with `beforeTraversal` and `afterTraversal` to improve the
@@ -191,7 +191,7 @@ export function objectExpansionPick(structure, namedType) {
         const pickedKeys = type.keys;
 
         /**
-         * @type {import("../generated/common/types.js").ExperimentalObjectDefinition}
+         * @type {import("../generated/common/types.js").StructureObjectDefinition}
          */
         // @ts-expect-error
         //
diff --git a/packages/code-gen/src/processors/reference-utils.d.ts b/packages/code-gen/src/processors/reference-utils.d.ts
index f1a814f7e4..748445dd4c 100644
--- a/packages/code-gen/src/processors/reference-utils.d.ts
+++ b/packages/code-gen/src/processors/reference-utils.d.ts
@@ -4,14 +4,14 @@
  * is not a reference.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
  * @param {(string|number)[]} accessPath
  * @param {any} [defaultValue]
  * @returns {any}
  */
 export function referenceUtilsGetProperty(
   generateContext: import("../generate.js").GenerateContext,
-  type: import("../generated/common/types.js").ExperimentalTypeSystemDefinition,
+  type: import("../generated/common/types.js").StructureTypeSystemDefinition,
   accessPath: (string | number)[],
   defaultValue?: any,
 ): any;
diff --git a/packages/code-gen/src/processors/reference-utils.js b/packages/code-gen/src/processors/reference-utils.js
index a43c79df39..f22bf77fff 100644
--- a/packages/code-gen/src/processors/reference-utils.js
+++ b/packages/code-gen/src/processors/reference-utils.js
@@ -6,7 +6,7 @@ import { structureResolveReference } from "./structure.js";
  * is not a reference.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
  * @param {(string|number)[]} accessPath
  * @param {any} [defaultValue]
  * @returns {any}
diff --git a/packages/code-gen/src/processors/route-invalidation.js b/packages/code-gen/src/processors/route-invalidation.js
index f819cee15f..74d7a9020b 100644
--- a/packages/code-gen/src/processors/route-invalidation.js
+++ b/packages/code-gen/src/processors/route-invalidation.js
@@ -35,8 +35,8 @@ export function routeInvalidationsCheck(generateContext) {
 /**
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>} route
- * @param {import("../generated/common/types.js").ExperimentalRouteInvalidationDefinition} invalidation
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>} route
+ * @param {import("../generated/common/types.js").StructureRouteInvalidationDefinition} invalidation
  */
 function routeInvalidationProcess(generateContext, route, invalidation) {
   const targetGroup = generateContext.structure[invalidation.target.group];
@@ -57,7 +57,7 @@ function routeInvalidationProcess(generateContext, route, invalidation) {
     return;
   }
 
-  /** @type {import("../generated/common/types.js").ExperimentalRouteDefinition} */
+  /** @type {import("../generated/common/types.js").StructureRouteDefinition} */
   // @ts-expect-error
   const targetRoute = targetGroup?.[invalidation.target.name];
 
@@ -223,7 +223,7 @@ function routeInvalidationProcess(generateContext, route, invalidation) {
 
 /**
  *
- * @param {import("../generated/common/types.js").ExperimentalRouteInvalidationDefinition["target"]} target
+ * @param {import("../generated/common/types.js").StructureRouteInvalidationDefinition["target"]} target
  */
 function formatTarget(target) {
   return `(targetGroup: '${target.group}'${
diff --git a/packages/code-gen/src/processors/route-trie.d.ts b/packages/code-gen/src/processors/route-trie.d.ts
index b1e0cf78fe..071d22ec51 100644
--- a/packages/code-gen/src/processors/route-trie.d.ts
+++ b/packages/code-gen/src/processors/route-trie.d.ts
@@ -29,7 +29,7 @@ export function trieCleanAndCollapse(trie: RouteTrie): void;
 export function trieSort(trie: RouteTrie): void;
 export type RouteTrie = {
   route?:
-    | import("../generated/common/types.js").ExperimentalRouteDefinition
+    | import("../generated/common/types.js").StructureRouteDefinition
     | undefined;
   prio: keyof typeof RoutePrio;
   children: RouteTrie[];
diff --git a/packages/code-gen/src/processors/route-trie.js b/packages/code-gen/src/processors/route-trie.js
index 00f150caf5..ceb02550db 100644
--- a/packages/code-gen/src/processors/route-trie.js
+++ b/packages/code-gen/src/processors/route-trie.js
@@ -7,7 +7,7 @@ import { structureRoutes } from "./routes.js";
 
 /**
  * @typedef {object} RouteTrie
- * @property {import("../generated/common/types.js").ExperimentalRouteDefinition} [route]
+ * @property {import("../generated/common/types.js").StructureRouteDefinition} [route]
  * @property {keyof typeof RoutePrio} prio
  * @property {RouteTrie[]} children
  * @property {RouteTrie} [parent]
diff --git a/packages/code-gen/src/processors/routes.d.ts b/packages/code-gen/src/processors/routes.d.ts
index 8dda14dcb2..688f3c1fb5 100644
--- a/packages/code-gen/src/processors/routes.d.ts
+++ b/packages/code-gen/src/processors/routes.d.ts
@@ -2,11 +2,11 @@
  * Get a list of routes in the structure.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>)[]}
+ * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>)[]}
  */
 export function structureRoutes(
   generateContext: import("../generate.js").GenerateContext,
 ): import("../../types/advanced-types").NamedType<
-  import("../generated/common/types").ExperimentalRouteDefinition
+  import("../generated/common/types").StructureRouteDefinition
 >[];
 //# sourceMappingURL=routes.d.ts.map
diff --git a/packages/code-gen/src/processors/routes.js b/packages/code-gen/src/processors/routes.js
index ed160327c0..b36090b0f9 100644
--- a/packages/code-gen/src/processors/routes.js
+++ b/packages/code-gen/src/processors/routes.js
@@ -4,11 +4,11 @@ import { structureNamedTypes } from "./structure.js";
  * Get a list of routes in the structure.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>)[]}
+ * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>)[]}
  */
 export function structureRoutes(generateContext) {
   /**
-   * @type {(import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>)[]}
+   * @type {(import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>)[]}
    */
   const result = [];
 
diff --git a/packages/code-gen/src/processors/structure-name-checks.d.ts b/packages/code-gen/src/processors/structure-name-checks.d.ts
index 5cbdd3720b..ab537a59b1 100644
--- a/packages/code-gen/src/processors/structure-name-checks.d.ts
+++ b/packages/code-gen/src/processors/structure-name-checks.d.ts
@@ -22,11 +22,11 @@ export function structureNameCheckForGroup(group: string): void;
  * Objects shouldn't use reserved keys, since that breaks the atomic database updates
  * that we support.
  *
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} type
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} type
  * @param {string[]} typeStack
  */
 export function structureNameChecksForObject(
-  type: import("../generated/common/types.js").ExperimentalObjectDefinition,
+  type: import("../generated/common/types.js").StructureObjectDefinition,
   typeStack: string[],
 ): void;
 //# sourceMappingURL=structure-name-checks.d.ts.map
diff --git a/packages/code-gen/src/processors/structure-name-checks.js b/packages/code-gen/src/processors/structure-name-checks.js
index db868209cb..264ca93168 100644
--- a/packages/code-gen/src/processors/structure-name-checks.js
+++ b/packages/code-gen/src/processors/structure-name-checks.js
@@ -158,7 +158,7 @@ export function structureNameCheckForGroup(group) {
  * Objects shouldn't use reserved keys, since that breaks the atomic database updates
  * that we support.
  *
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} type
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} type
  * @param {string[]} typeStack
  */
 export function structureNameChecksForObject(type, typeStack) {
diff --git a/packages/code-gen/src/processors/structure.d.ts b/packages/code-gen/src/processors/structure.d.ts
index 66f98f108e..201e97c5e5 100644
--- a/packages/code-gen/src/processors/structure.d.ts
+++ b/packages/code-gen/src/processors/structure.d.ts
@@ -5,13 +5,13 @@
  * This function can be used all over the generation process, to optimize cases where
  * references are already normalized, it supports to skip reference extraction.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @param {import("../generated/common/types.js").ExperimentalNamedTypeDefinition} type
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @param {import("../generated/common/types.js").StructureNamedTypeDefinition} type
  * @param {{ skipReferenceExtraction: boolean }} options
  */
 export function structureAddType(
-  structure: import("../generated/common/types.js").ExperimentalStructure,
-  type: import("../generated/common/types.js").ExperimentalNamedTypeDefinition,
+  structure: import("../generated/common/types.js").StructureStructure,
+  type: import("../generated/common/types.js").StructureNamedTypeDefinition,
   options: {
     skipReferenceExtraction: boolean;
   },
@@ -34,35 +34,35 @@ export function structureAddType(
  * }
  * ```
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalNamedTypeDefinition>)[]}
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureNamedTypeDefinition>)[]}
  */
 export function structureNamedTypes(
-  structure: import("../generated/common/types.js").ExperimentalStructure,
+  structure: import("../generated/common/types.js").StructureStructure,
 ): import("../../types/advanced-types").NamedType<
-  import("../generated/common/types").ExperimentalNamedTypeDefinition
+  import("../generated/common/types").StructureNamedTypeDefinition
 >[];
 /**
  * Extract a selection of groups from the provided structure. This function resolves
  * references that point to not included groups and will try to include them.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
+ * @param {import("../generated/common/types.js").StructureStructure} structure
  * @param {string[]} groups
- * @returns {import("../generated/common/types.js").ExperimentalStructure}
+ * @returns {import("../generated/common/types.js").StructureStructure}
  */
 export function structureExtractGroups(
-  structure: import("../generated/common/types.js").ExperimentalStructure,
+  structure: import("../generated/common/types.js").StructureStructure,
   groups: string[],
-): import("../generated/common/types.js").ExperimentalStructure;
+): import("../generated/common/types.js").StructureStructure;
 /**
  * Check if all references in the current structure resolve. Will try to collect as much
  * errors as possible before throwing a combined error via {@link
  * errorsThrowCombinedError}.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
+ * @param {import("../generated/common/types.js").StructureStructure} structure
  */
 export function structureValidateReferences(
-  structure: import("../generated/common/types.js").ExperimentalStructure,
+  structure: import("../generated/common/types.js").StructureStructure,
 ): void;
 /**
  * Resolve the provided reference.
@@ -70,27 +70,27 @@ export function structureValidateReferences(
  * Throws if the provided value is not a reference or if the reference can not be
  * resolved.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition} reference
- * @returns {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalNamedTypeDefinition>}
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @param {import("../generated/common/types.js").StructureTypeDefinition} reference
+ * @returns {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureNamedTypeDefinition>}
  */
 export function structureResolveReference(
-  structure: import("../generated/common/types.js").ExperimentalStructure,
-  reference: import("../generated/common/types.js").ExperimentalTypeDefinition,
+  structure: import("../generated/common/types.js").StructureStructure,
+  reference: import("../generated/common/types.js").StructureTypeDefinition,
 ): import("../../types/advanced-types").NamedType<
-  import("../generated/common/types").ExperimentalNamedTypeDefinition
+  import("../generated/common/types").StructureNamedTypeDefinition
 >;
 /**
  * Create a new reference to the provided group and name.
  *
  * @param {string} group
  * @param {string} name
- * @returns {import("../generated/common/types.js").ExperimentalReferenceDefinition}
+ * @returns {import("../generated/common/types.js").StructureReferenceDefinition}
  */
 export function structureCreateReference(
   group: string,
   name: string,
-): import("../generated/common/types.js").ExperimentalReferenceDefinition;
+): import("../generated/common/types.js").StructureReferenceDefinition;
 /**
  * Copy and sort the structure. We do this for 2 reasons;
  * - It allows multiple generate calls within the same 'Generator', since we don't mutate
@@ -98,12 +98,12 @@ export function structureCreateReference(
  * - The JS iterators in Node.js are based on object insertion order, so this ensures
  * that our output is stable.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @returns {import("../generated/common/types.js").ExperimentalStructure}
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @returns {import("../generated/common/types.js").StructureStructure}
  */
 export function structureCopyAndSort(
-  structure: import("../generated/common/types.js").ExperimentalStructure,
-): import("../generated/common/types.js").ExperimentalStructure;
+  structure: import("../generated/common/types.js").StructureStructure,
+): import("../generated/common/types.js").StructureStructure;
 /**
  * Recursively extract references from the provided type.
  *
@@ -111,13 +111,13 @@ export function structureCopyAndSort(
  * possible and resolve them on the fly. This prevents weird recursion errors and should
  * simplify conditional logic down in the generators.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition} type
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @param {import("../generated/common/types.js").StructureTypeDefinition} type
  * @returns {void}
  */
 export function structureExtractReferences(
-  structure: import("../generated/common/types.js").ExperimentalStructure,
-  type: import("../generated/common/types.js").ExperimentalTypeDefinition,
+  structure: import("../generated/common/types.js").StructureStructure,
+  type: import("../generated/common/types.js").StructureTypeDefinition,
 ): void;
 /**
  * Recursively add references that are necessary in the newStructure from the
@@ -126,14 +126,14 @@ export function structureExtractReferences(
  * This is used when extracting groups or specific types from the structure in to a new
  * structure. By resolving out of group references a valid structure is created.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} fullStructure
- * @param {import("../generated/common/types.js").ExperimentalStructure} newStructure
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition} type
+ * @param {import("../generated/common/types.js").StructureStructure} fullStructure
+ * @param {import("../generated/common/types.js").StructureStructure} newStructure
+ * @param {import("../generated/common/types.js").StructureTypeDefinition} type
  */
 export function structureIncludeReferences(
-  fullStructure: import("../generated/common/types.js").ExperimentalStructure,
-  newStructure: import("../generated/common/types.js").ExperimentalStructure,
-  type: import("../generated/common/types.js").ExperimentalTypeDefinition,
+  fullStructure: import("../generated/common/types.js").StructureStructure,
+  newStructure: import("../generated/common/types.js").StructureStructure,
+  type: import("../generated/common/types.js").StructureTypeDefinition,
 ): void;
 /**
  * Recursively validate references for the provided type.
@@ -141,11 +141,11 @@ export function structureIncludeReferences(
  * We do this early in the generation process to check the user input, and expect that
  * processors don't create invalid references.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition} type
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @param {import("../generated/common/types.js").StructureTypeDefinition} type
  */
 export function structureValidateReferenceForType(
-  structure: import("../generated/common/types.js").ExperimentalStructure,
-  type: import("../generated/common/types.js").ExperimentalTypeDefinition,
+  structure: import("../generated/common/types.js").StructureStructure,
+  type: import("../generated/common/types.js").StructureTypeDefinition,
 ): void;
 //# sourceMappingURL=structure.d.ts.map
diff --git a/packages/code-gen/src/processors/structure.js b/packages/code-gen/src/processors/structure.js
index 2463abf048..a2f47f4af3 100644
--- a/packages/code-gen/src/processors/structure.js
+++ b/packages/code-gen/src/processors/structure.js
@@ -13,8 +13,8 @@ import { typeDefinitionTraverse } from "./type-definition-traverse.js";
  * This function can be used all over the generation process, to optimize cases where
  * references are already normalized, it supports to skip reference extraction.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @param {import("../generated/common/types.js").ExperimentalNamedTypeDefinition} type
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @param {import("../generated/common/types.js").StructureNamedTypeDefinition} type
  * @param {{ skipReferenceExtraction: boolean }} options
  */
 export function structureAddType(structure, type, options) {
@@ -54,8 +54,8 @@ export function structureAddType(structure, type, options) {
  * }
  * ```
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalNamedTypeDefinition>)[]}
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @returns {(import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureNamedTypeDefinition>)[]}
  */
 export function structureNamedTypes(structure) {
   // @ts-expect-error
@@ -70,12 +70,12 @@ export function structureNamedTypes(structure) {
  * Extract a selection of groups from the provided structure. This function resolves
  * references that point to not included groups and will try to include them.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
+ * @param {import("../generated/common/types.js").StructureStructure} structure
  * @param {string[]} groups
- * @returns {import("../generated/common/types.js").ExperimentalStructure}
+ * @returns {import("../generated/common/types.js").StructureStructure}
  */
 export function structureExtractGroups(structure, groups) {
-  /** @type {import("../generated/common/types.js").ExperimentalStructure} */
+  /** @type {import("../generated/common/types.js").StructureStructure} */
   const newStructure = {};
 
   for (const group of groups) {
@@ -96,7 +96,7 @@ export function structureExtractGroups(structure, groups) {
  * errors as possible before throwing a combined error via {@link
  * errorsThrowCombinedError}.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
+ * @param {import("../generated/common/types.js").StructureStructure} structure
  */
 export function structureValidateReferences(structure) {
   /** @type {import("@compas/stdlib").AppError[]} */
@@ -119,9 +119,9 @@ export function structureValidateReferences(structure) {
  * Throws if the provided value is not a reference or if the reference can not be
  * resolved.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition} reference
- * @returns {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalNamedTypeDefinition>}
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @param {import("../generated/common/types.js").StructureTypeDefinition} reference
+ * @returns {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureNamedTypeDefinition>}
  */
 export function structureResolveReference(structure, reference) {
   if (reference.type !== "reference") {
@@ -153,7 +153,7 @@ export function structureResolveReference(structure, reference) {
  *
  * @param {string} group
  * @param {string} name
- * @returns {import("../generated/common/types.js").ExperimentalReferenceDefinition}
+ * @returns {import("../generated/common/types.js").StructureReferenceDefinition}
  */
 export function structureCreateReference(group, name) {
   return {
@@ -176,11 +176,11 @@ export function structureCreateReference(group, name) {
  * - The JS iterators in Node.js are based on object insertion order, so this ensures
  * that our output is stable.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @returns {import("../generated/common/types.js").ExperimentalStructure}
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @returns {import("../generated/common/types.js").StructureStructure}
  */
 export function structureCopyAndSort(structure) {
-  /** @type {import("../generated/common/types.js").ExperimentalStructure} */
+  /** @type {import("../generated/common/types.js").StructureStructure} */
   const newStructure = {};
 
   const groups = Object.keys(structure).sort();
@@ -212,8 +212,8 @@ export function structureCopyAndSort(structure) {
  * possible and resolve them on the fly. This prevents weird recursion errors and should
  * simplify conditional logic down in the generators.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition} type
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @param {import("../generated/common/types.js").StructureTypeDefinition} type
  * @returns {void}
  */
 export function structureExtractReferences(structure, type) {
@@ -282,9 +282,9 @@ export function structureExtractReferences(structure, type) {
  * This is used when extracting groups or specific types from the structure in to a new
  * structure. By resolving out of group references a valid structure is created.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} fullStructure
- * @param {import("../generated/common/types.js").ExperimentalStructure} newStructure
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition} type
+ * @param {import("../generated/common/types.js").StructureStructure} fullStructure
+ * @param {import("../generated/common/types.js").StructureStructure} newStructure
+ * @param {import("../generated/common/types.js").StructureTypeDefinition} type
  */
 export function structureIncludeReferences(fullStructure, newStructure, type) {
   typeDefinitionTraverse(
@@ -331,8 +331,8 @@ export function structureIncludeReferences(fullStructure, newStructure, type) {
  * We do this early in the generation process to check the user input, and expect that
  * processors don't create invalid references.
  *
- * @param {import("../generated/common/types.js").ExperimentalStructure} structure
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition} type
+ * @param {import("../generated/common/types.js").StructureStructure} structure
+ * @param {import("../generated/common/types.js").StructureTypeDefinition} type
  */
 export function structureValidateReferenceForType(structure, type) {
   // Keep a type stack so we can give the user pointers where this happened.
diff --git a/packages/code-gen/src/processors/type-definition-traverse.d.ts b/packages/code-gen/src/processors/type-definition-traverse.d.ts
index dbc65bd271..c7e216ced4 100644
--- a/packages/code-gen/src/processors/type-definition-traverse.d.ts
+++ b/packages/code-gen/src/processors/type-definition-traverse.d.ts
@@ -13,45 +13,45 @@
  *
  * This function is tested indirectly by all its users.
  *
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition|undefined} typeToTraverse
+ * @param {import("../generated/common/types.js").StructureTypeDefinition|undefined} typeToTraverse
  * @param {(
- *   type: import("../generated/common/types").ExperimentalTypeDefinition,
+ *   type: import("../generated/common/types").StructureTypeDefinition,
  *   callback: (
- *   type: import("../generated/common/types").ExperimentalTypeDefinition,
- * ) => import("../generated/common/types").ExperimentalTypeDefinition|void,
- * ) => import("../generated/common/types.js").ExperimentalTypeDefinition|void} callback
+ *   type: import("../generated/common/types").StructureTypeDefinition,
+ * ) => import("../generated/common/types").StructureTypeDefinition|void,
+ * ) => import("../generated/common/types.js").StructureTypeDefinition|void} callback
  * @param {{
  *   isInitialType: boolean,
  *   assignResult?: boolean,
  *   beforeTraversal?: (
- *   type: import("../generated/common/types.js").ExperimentalTypeDefinition,
+ *   type: import("../generated/common/types.js").StructureTypeDefinition,
  *   ) => void,
  *   afterTraversal?: (
- *   type: import("../generated/common/types").ExperimentalTypeDefinition,
+ *   type: import("../generated/common/types").StructureTypeDefinition,
  *   ) => void,
  * }} options
  */
 export function typeDefinitionTraverse(
   typeToTraverse:
-    | import("../generated/common/types.js").ExperimentalTypeDefinition
+    | import("../generated/common/types.js").StructureTypeDefinition
     | undefined,
   callback: (
-    type: import("../generated/common/types").ExperimentalTypeDefinition,
+    type: import("../generated/common/types").StructureTypeDefinition,
     callback: (
-      type: import("../generated/common/types").ExperimentalTypeDefinition,
-    ) => import("../generated/common/types").ExperimentalTypeDefinition | void,
-  ) => import("../generated/common/types.js").ExperimentalTypeDefinition | void,
+      type: import("../generated/common/types").StructureTypeDefinition,
+    ) => import("../generated/common/types").StructureTypeDefinition | void,
+  ) => import("../generated/common/types.js").StructureTypeDefinition | void,
   options: {
     isInitialType: boolean;
     assignResult?: boolean | undefined;
     beforeTraversal?:
       | ((
-          type: import("../generated/common/types.js").ExperimentalTypeDefinition,
+          type: import("../generated/common/types.js").StructureTypeDefinition,
         ) => void)
       | undefined;
     afterTraversal?:
       | ((
-          type: import("../generated/common/types").ExperimentalTypeDefinition,
+          type: import("../generated/common/types").StructureTypeDefinition,
         ) => void)
       | undefined;
   },
@@ -65,14 +65,14 @@ export function typeDefinitionTraverse(
  * object are all typeDefiniton.
  *
  * @type {Record<
- *   import("../generated/common/types.js").ExperimentalTypeDefinition["type"],
+ *   import("../generated/common/types.js").StructureTypeDefinition["type"],
  *   {
  *     key: string,
  *     amount: "single" | "many"
  *   }[]>}
  */
 export const typeDefinitionTraversePaths: Record<
-  import("../generated/common/types.js").ExperimentalTypeDefinition["type"],
+  import("../generated/common/types.js").StructureTypeDefinition["type"],
   {
     key: string;
     amount: "single" | "many";
diff --git a/packages/code-gen/src/processors/type-definition-traverse.js b/packages/code-gen/src/processors/type-definition-traverse.js
index 0db4daeef1..10ae1152b2 100644
--- a/packages/code-gen/src/processors/type-definition-traverse.js
+++ b/packages/code-gen/src/processors/type-definition-traverse.js
@@ -9,7 +9,7 @@ import { AppError, isNil } from "@compas/stdlib";
  * object are all typeDefiniton.
  *
  * @type {Record<
- *   import("../generated/common/types.js").ExperimentalTypeDefinition["type"],
+ *   import("../generated/common/types.js").StructureTypeDefinition["type"],
  *   {
  *     key: string,
  *     amount: "single" | "many"
@@ -150,21 +150,21 @@ export const typeDefinitionTraversePaths = {
  *
  * This function is tested indirectly by all its users.
  *
- * @param {import("../generated/common/types.js").ExperimentalTypeDefinition|undefined} typeToTraverse
+ * @param {import("../generated/common/types.js").StructureTypeDefinition|undefined} typeToTraverse
  * @param {(
- *   type: import("../generated/common/types").ExperimentalTypeDefinition,
+ *   type: import("../generated/common/types").StructureTypeDefinition,
  *   callback: (
- *   type: import("../generated/common/types").ExperimentalTypeDefinition,
- * ) => import("../generated/common/types").ExperimentalTypeDefinition|void,
- * ) => import("../generated/common/types.js").ExperimentalTypeDefinition|void} callback
+ *   type: import("../generated/common/types").StructureTypeDefinition,
+ * ) => import("../generated/common/types").StructureTypeDefinition|void,
+ * ) => import("../generated/common/types.js").StructureTypeDefinition|void} callback
  * @param {{
  *   isInitialType: boolean,
  *   assignResult?: boolean,
  *   beforeTraversal?: (
- *   type: import("../generated/common/types.js").ExperimentalTypeDefinition,
+ *   type: import("../generated/common/types.js").StructureTypeDefinition,
  *   ) => void,
  *   afterTraversal?: (
- *   type: import("../generated/common/types").ExperimentalTypeDefinition,
+ *   type: import("../generated/common/types").StructureTypeDefinition,
  *   ) => void,
  * }} options
  */
diff --git a/packages/code-gen/src/router/generator.js b/packages/code-gen/src/router/generator.js
index e98b62dcd3..3056923c57 100644
--- a/packages/code-gen/src/router/generator.js
+++ b/packages/code-gen/src/router/generator.js
@@ -52,10 +52,10 @@ export function routerGenerator(generateContext) {
   );
 
   const target = routerFormatTarget(generateContext);
-  /** @type {import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[]} */
+  /** @type {import("../generated/common/types.js").StructureAnyDefinitionTarget[]} */
   const typeTargets = ["js", "jsKoaReceive"];
 
-  /** @type Record<string, (import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalRouteDefinition>)[]>} */
+  /** @type Record<string, (import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureRouteDefinition>)[]>} */
   const routesPerGroup = {};
 
   for (const route of structureRoutes(generateContext)) {
diff --git a/packages/code-gen/src/router/js-koa.d.ts b/packages/code-gen/src/router/js-koa.d.ts
index 4ae46d8b60..f11ebf7b9b 100644
--- a/packages/code-gen/src/router/js-koa.d.ts
+++ b/packages/code-gen/src/router/js-koa.d.ts
@@ -21,47 +21,47 @@ export function jsKoaGetControllerFile(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition} route
+ * @param {import("../generated/common/types.js").StructureRouteDefinition} route
  * @param {Record<string, string>} contextNames
  */
 export function jsKoaPrepareContext(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
-  route: import("../generated/common/types.js").ExperimentalRouteDefinition,
+  route: import("../generated/common/types.js").StructureRouteDefinition,
   contextNames: Record<string, string>,
 ): void;
 /**
  * @param {import("../file/context.js").GenerateFile} file
  * @param {string} group
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition[]} routes
+ * @param {import("../generated/common/types.js").StructureRouteDefinition[]} routes
  * @param {Map<any, Record<string, string>>} contextNamesMap
  */
 export function jsKoaWriteHandlers(
   file: import("../file/context.js").GenerateFile,
   group: string,
-  routes: import("../generated/common/types.js").ExperimentalRouteDefinition[],
+  routes: import("../generated/common/types.js").StructureRouteDefinition[],
   contextNamesMap: Map<any, Record<string, string>>,
 ): void;
 /**
  * @param {import("../file/context.js").GenerateFile} file
  * @param {string} group
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition[]} routes
+ * @param {import("../generated/common/types.js").StructureRouteDefinition[]} routes
  */
 export function jsKoaWriteTags(
   file: import("../file/context.js").GenerateFile,
   group: string,
-  routes: import("../generated/common/types.js").ExperimentalRouteDefinition[],
+  routes: import("../generated/common/types.js").StructureRouteDefinition[],
 ): void;
 /**
  * @param {import("../file/context.js").GenerateFile} file
- * @param {Record<string, import("../generated/common/types.js").ExperimentalRouteDefinition[]>} routesPerGroup
+ * @param {Record<string, import("../generated/common/types.js").StructureRouteDefinition[]>} routesPerGroup
  * @param {Map<any, Record<string, string>>} contextNamesMap
  */
 export function jsKoaBuildRouterFile(
   file: import("../file/context.js").GenerateFile,
   routesPerGroup: Record<
     string,
-    import("../generated/common/types.js").ExperimentalRouteDefinition[]
+    import("../generated/common/types.js").StructureRouteDefinition[]
   >,
   contextNamesMap: Map<any, Record<string, string>>,
 ): void;
diff --git a/packages/code-gen/src/router/js-koa.js b/packages/code-gen/src/router/js-koa.js
index 8d9ae6dac1..e5e6c4b7df 100644
--- a/packages/code-gen/src/router/js-koa.js
+++ b/packages/code-gen/src/router/js-koa.js
@@ -67,7 +67,7 @@ export function jsKoaGetControllerFile(generateContext, group) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition} route
+ * @param {import("../generated/common/types.js").StructureRouteDefinition} route
  * @param {Record<string, string>} contextNames
  */
 export function jsKoaPrepareContext(
@@ -171,7 +171,7 @@ export function jsKoaPrepareContext(
 /**
  * @param {import("../file/context.js").GenerateFile} file
  * @param {string} group
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition[]} routes
+ * @param {import("../generated/common/types.js").StructureRouteDefinition[]} routes
  * @param {Map<any, Record<string, string>>} contextNamesMap
  */
 export function jsKoaWriteHandlers(file, group, routes, contextNamesMap) {
@@ -213,7 +213,7 @@ export function jsKoaWriteHandlers(file, group, routes, contextNamesMap) {
 /**
  * @param {import("../file/context.js").GenerateFile} file
  * @param {string} group
- * @param {import("../generated/common/types.js").ExperimentalRouteDefinition[]} routes
+ * @param {import("../generated/common/types.js").StructureRouteDefinition[]} routes
  */
 export function jsKoaWriteTags(file, group, routes) {
   fileWrite(file, `export const ${group}Tags = {`);
@@ -229,7 +229,7 @@ export function jsKoaWriteTags(file, group, routes) {
 
 /**
  * @param {import("../file/context.js").GenerateFile} file
- * @param {Record<string, import("../generated/common/types.js").ExperimentalRouteDefinition[]>} routesPerGroup
+ * @param {Record<string, import("../generated/common/types.js").StructureRouteDefinition[]>} routesPerGroup
  * @param {Map<any, Record<string, string>>} contextNamesMap
  */
 export function jsKoaBuildRouterFile(file, routesPerGroup, contextNamesMap) {
diff --git a/packages/code-gen/src/target/switcher.d.ts b/packages/code-gen/src/target/switcher.d.ts
index fde31acc76..dc5bd5ebee 100644
--- a/packages/code-gen/src/target/switcher.d.ts
+++ b/packages/code-gen/src/target/switcher.d.ts
@@ -4,7 +4,7 @@
  * @template {(...args: any) => any} F
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {Record<import("../generated/common/types.js").ExperimentalGenerateOptions["targetLanguage"], F|(() =>
+ * @param {Record<import("../generated/common/types.js").StructureGenerateOptions["targetLanguage"], F|(() =>
  *   void)>} functions
  * @param {[...Parameters<F>]} args
  * @returns {ReturnType<F>|undefined}
diff --git a/packages/code-gen/src/target/switcher.js b/packages/code-gen/src/target/switcher.js
index 53af02edde..560788fac4 100644
--- a/packages/code-gen/src/target/switcher.js
+++ b/packages/code-gen/src/target/switcher.js
@@ -4,7 +4,7 @@
  * @template {(...args: any) => any} F
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {Record<import("../generated/common/types.js").ExperimentalGenerateOptions["targetLanguage"], F|(() =>
+ * @param {Record<import("../generated/common/types.js").StructureGenerateOptions["targetLanguage"], F|(() =>
  *   void)>} functions
  * @param {[...Parameters<F>]} args
  * @returns {ReturnType<F>|undefined}
diff --git a/packages/code-gen/src/types/cache.d.ts b/packages/code-gen/src/types/cache.d.ts
index 4e87cf69c5..7aba1c6f7a 100644
--- a/packages/code-gen/src/types/cache.d.ts
+++ b/packages/code-gen/src/types/cache.d.ts
@@ -2,13 +2,13 @@
  * Add a cache entry for the type and its options to resolve to the generated type name.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
  * @param {import("./generator.js").GenerateTypeOptions} options
  * @param {string} name
  */
 export function typesCacheAdd(
   generateContext: import("../generate.js").GenerateContext,
-  type: import("../generated/common/types.js").ExperimentalTypeSystemDefinition,
+  type: import("../generated/common/types.js").StructureTypeSystemDefinition,
   options: import("./generator.js").GenerateTypeOptions,
   name: string,
 ): void;
@@ -17,22 +17,22 @@ export function typesCacheAdd(
  * already exists.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
  * @param {import("./generator.js").GenerateTypeOptions} options
  * @returns {string|undefined} name
  */
 export function typesCacheGet(
   generateContext: import("../generate.js").GenerateContext,
-  type: import("../generated/common/types.js").ExperimentalTypeSystemDefinition,
+  type: import("../generated/common/types.js").StructureTypeSystemDefinition,
   options: import("./generator.js").GenerateTypeOptions,
 ): string | undefined;
 /**
  * Get the already used type names for the provided type.
  *
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
  * @returns {string[]}
  */
 export function typesCacheGetUsedNames(
-  type: import("../generated/common/types.js").ExperimentalTypeSystemDefinition,
+  type: import("../generated/common/types.js").StructureTypeSystemDefinition,
 ): string[];
 //# sourceMappingURL=cache.d.ts.map
diff --git a/packages/code-gen/src/types/cache.js b/packages/code-gen/src/types/cache.js
index f294cbe307..e9b23efaa4 100644
--- a/packages/code-gen/src/types/cache.js
+++ b/packages/code-gen/src/types/cache.js
@@ -7,7 +7,7 @@ import { typeTargetsDetermine, typeTargetsGetUsed } from "./targets.js";
  * For each type, we can save multiple generated type names based on the different input
  * options.
  *
- * @type {WeakMap<import("../generated/common/types.js").ExperimentalTypeSystemDefinition,
+ * @type {WeakMap<import("../generated/common/types.js").StructureTypeSystemDefinition,
  *   Record<string, string>>}
  */
 const typeCache = new WeakMap();
@@ -16,7 +16,7 @@ const typeCache = new WeakMap();
  * Add a cache entry for the type and its options to resolve to the generated type name.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
  * @param {import("./generator.js").GenerateTypeOptions} options
  * @param {string} name
  */
@@ -47,7 +47,7 @@ export function typesCacheAdd(generateContext, type, options, name) {
  * already exists.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
  * @param {import("./generator.js").GenerateTypeOptions} options
  * @returns {string|undefined} name
  */
@@ -77,7 +77,7 @@ export function typesCacheGet(generateContext, type, options) {
 /**
  * Get the already used type names for the provided type.
  *
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
  * @returns {string[]}
  */
 export function typesCacheGetUsedNames(type) {
diff --git a/packages/code-gen/src/types/generator.d.ts b/packages/code-gen/src/types/generator.d.ts
index 711f194689..1f98cbb306 100644
--- a/packages/code-gen/src/types/generator.d.ts
+++ b/packages/code-gen/src/types/generator.d.ts
@@ -5,7 +5,7 @@
  *   input: string,
  *   output: string,
  * }} nameSuffixes
- * @property {(import("../generated/common/types.d.ts").ExperimentalAnyDefinitionTarget
+ * @property {(import("../generated/common/types.d.ts").StructureAnyDefinitionTarget
  *  )[]} targets
  */
 /**
@@ -40,14 +40,14 @@ export function typesGeneratorFinalize(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {GenerateTypeOptions} options
  */
 export function typesGeneratorGenerateNamedType(
   generateContext: import("../generate.js").GenerateContext,
   type: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalTypeSystemDefinition
+    import("../generated/common/types").StructureTypeSystemDefinition
   >,
   options: GenerateTypeOptions,
 ): void;
@@ -70,6 +70,6 @@ export type GenerateTypeOptions = {
     input: string;
     output: string;
   };
-  targets: import("../generated/common/types.d.ts").ExperimentalAnyDefinitionTarget[];
+  targets: import("../generated/common/types.d.ts").StructureAnyDefinitionTarget[];
 };
 //# sourceMappingURL=generator.d.ts.map
diff --git a/packages/code-gen/src/types/generator.js b/packages/code-gen/src/types/generator.js
index 7de4c270a4..39c6ebada0 100644
--- a/packages/code-gen/src/types/generator.js
+++ b/packages/code-gen/src/types/generator.js
@@ -20,7 +20,7 @@ import {
  *   input: string,
  *   output: string,
  * }} nameSuffixes
- * @property {(import("../generated/common/types.d.ts").ExperimentalAnyDefinitionTarget
+ * @property {(import("../generated/common/types.d.ts").StructureAnyDefinitionTarget
  *  )[]} targets
  */
 
@@ -155,7 +155,7 @@ function typesGeneratorGenerateBaseTypes(generateContext) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {GenerateTypeOptions} options
  */
diff --git a/packages/code-gen/src/types/optionality.d.ts b/packages/code-gen/src/types/optionality.d.ts
index 99f0a9829c..a055160fe9 100644
--- a/packages/code-gen/src/types/optionality.d.ts
+++ b/packages/code-gen/src/types/optionality.d.ts
@@ -4,24 +4,24 @@
  * applied.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
  * @param {Pick<import("./generator.js").GenerateTypeOptions, "validatorState">} options
  * @returns {boolean}
  */
 export function typesOptionalityIsOptional(
   generateContext: import("../generate.js").GenerateContext,
-  type: import("../generated/common/types.js").ExperimentalTypeSystemDefinition,
+  type: import("../generated/common/types.js").StructureTypeSystemDefinition,
   options: Pick<import("./generator.js").GenerateTypeOptions, "validatorState">,
 ): boolean;
 /**
  * Check if the type recursively has optionality differences
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
  * @returns {boolean}
  */
 export function typesHasDifferentTypeAfterValidators(
   generateContext: import("../generate.js").GenerateContext,
-  type: import("../generated/common/types.js").ExperimentalTypeSystemDefinition,
+  type: import("../generated/common/types.js").StructureTypeSystemDefinition,
 ): boolean;
 //# sourceMappingURL=optionality.d.ts.map
diff --git a/packages/code-gen/src/types/optionality.js b/packages/code-gen/src/types/optionality.js
index 7bb0592e6e..aed7cdfcf7 100644
--- a/packages/code-gen/src/types/optionality.js
+++ b/packages/code-gen/src/types/optionality.js
@@ -5,7 +5,7 @@ import { typeDefinitionTraverse } from "../processors/type-definition-traverse.j
 /**
  * Cache to check if for the provided type we already have resolved the used optionality
  *
- * @type {WeakMap<import("../generated/common/types.js").ExperimentalTypeSystemDefinition,
+ * @type {WeakMap<import("../generated/common/types.js").StructureTypeSystemDefinition,
  *   boolean>}
  */
 const typeOptionalityCache = new WeakMap();
@@ -16,7 +16,7 @@ const typeOptionalityCache = new WeakMap();
  * applied.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
  * @param {Pick<import("./generator.js").GenerateTypeOptions, "validatorState">} options
  * @returns {boolean}
  */
@@ -51,7 +51,7 @@ export function typesOptionalityIsOptional(generateContext, type, options) {
  * Check if the type recursively has optionality differences
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
  * @returns {boolean}
  */
 export function typesHasDifferentTypeAfterValidators(generateContext, type) {
diff --git a/packages/code-gen/src/types/targets.d.ts b/packages/code-gen/src/types/targets.d.ts
index 8bdc81df99..1aa25d1cbc 100644
--- a/packages/code-gen/src/types/targets.d.ts
+++ b/packages/code-gen/src/types/targets.d.ts
@@ -3,25 +3,25 @@
  * references.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
- * @returns {import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[]}
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
+ * @returns {import("../generated/common/types.js").StructureAnyDefinitionTarget[]}
  */
 export function typeTargetsDetermine(
   generateContext: import("../generate.js").GenerateContext,
-  type: import("../generated/common/types.js").ExperimentalTypeSystemDefinition,
-): import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[];
+  type: import("../generated/common/types.js").StructureTypeSystemDefinition,
+): import("../generated/common/types.js").StructureAnyDefinitionTarget[];
 /**
  * Filter out the targets that will be used based on the targets that the type provides
  * special handling for and which targets can be used by the provider.
  *
  * Does not alter the order of the provided {@link usedTargetsByGenerator} array.
  *
- * @param {import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[]} availableTargetsInType
- * @param {import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[]} usedTargetsByGenerator
- * @returns {import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[]}
+ * @param {import("../generated/common/types.js").StructureAnyDefinitionTarget[]} availableTargetsInType
+ * @param {import("../generated/common/types.js").StructureAnyDefinitionTarget[]} usedTargetsByGenerator
+ * @returns {import("../generated/common/types.js").StructureAnyDefinitionTarget[]}
  */
 export function typeTargetsGetUsed(
-  availableTargetsInType: import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[],
-  usedTargetsByGenerator: import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[],
-): import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[];
+  availableTargetsInType: import("../generated/common/types.js").StructureAnyDefinitionTarget[],
+  usedTargetsByGenerator: import("../generated/common/types.js").StructureAnyDefinitionTarget[],
+): import("../generated/common/types.js").StructureAnyDefinitionTarget[];
 //# sourceMappingURL=targets.d.ts.map
diff --git a/packages/code-gen/src/types/targets.js b/packages/code-gen/src/types/targets.js
index 49fa46e104..6268803b4e 100644
--- a/packages/code-gen/src/types/targets.js
+++ b/packages/code-gen/src/types/targets.js
@@ -4,12 +4,12 @@ import { typeDefinitionTraverse } from "../processors/type-definition-traverse.j
 /**
  * Cache to check if for the provided type we already have resolved the used targets.
  *
- * @type {WeakMap<import("../generated/common/types.js").ExperimentalTypeSystemDefinition,
- *   import("../generated/common/types").ExperimentalAnyDefinitionTarget[]>}
+ * @type {WeakMap<import("../generated/common/types.js").StructureTypeSystemDefinition,
+ *   import("../generated/common/types").StructureAnyDefinitionTarget[]>}
  */
 const typeTargetCache = new WeakMap();
 
-/** @type {import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[]} */
+/** @type {import("../generated/common/types.js").StructureAnyDefinitionTarget[]} */
 const fileTargets = [
   "jsAxiosNode",
   "jsKoaReceive",
@@ -23,8 +23,8 @@ const fileTargets = [
  * references.
  *
  * @param {import("../generate.js").GenerateContext} generateContext
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
- * @returns {import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[]}
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
+ * @returns {import("../generated/common/types.js").StructureAnyDefinitionTarget[]}
  */
 export function typeTargetsDetermine(generateContext, type) {
   if (typeTargetCache.has(type)) {
@@ -78,9 +78,9 @@ export function typeTargetsDetermine(generateContext, type) {
  *
  * Does not alter the order of the provided {@link usedTargetsByGenerator} array.
  *
- * @param {import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[]} availableTargetsInType
- * @param {import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[]} usedTargetsByGenerator
- * @returns {import("../generated/common/types.js").ExperimentalAnyDefinitionTarget[]}
+ * @param {import("../generated/common/types.js").StructureAnyDefinitionTarget[]} availableTargetsInType
+ * @param {import("../generated/common/types.js").StructureAnyDefinitionTarget[]} usedTargetsByGenerator
+ * @returns {import("../generated/common/types.js").StructureAnyDefinitionTarget[]}
  */
 export function typeTargetsGetUsed(
   availableTargetsInType,
diff --git a/packages/code-gen/src/types/typescript.d.ts b/packages/code-gen/src/types/typescript.d.ts
index 7c063f2c50..b90b911168 100644
--- a/packages/code-gen/src/types/typescript.d.ts
+++ b/packages/code-gen/src/types/typescript.d.ts
@@ -56,14 +56,14 @@ export function typesTypescriptHasDeclaredTypes(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {import("./generator.js").GenerateTypeOptions} options
  */
 export function typesTypescriptGenerateNamedType(
   generateContext: import("../generate.js").GenerateContext,
   type: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalTypeSystemDefinition
+    import("../generated/common/types").StructureTypeSystemDefinition
   >,
   options: import("./generator.js").GenerateTypeOptions,
 ): void;
@@ -72,14 +72,14 @@ export function typesTypescriptGenerateNamedType(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
  * @param {import("./generator.js").GenerateTypeOptions} options
  * @returns {void}
  */
 export function typesTypescriptFormatType(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
-  type: import("../generated/common/types.js").ExperimentalTypeSystemDefinition,
+  type: import("../generated/common/types.js").StructureTypeSystemDefinition,
   options: import("./generator.js").GenerateTypeOptions,
 ): void;
 /**
diff --git a/packages/code-gen/src/types/typescript.js b/packages/code-gen/src/types/typescript.js
index 7dc3d7927e..07b347379e 100644
--- a/packages/code-gen/src/types/typescript.js
+++ b/packages/code-gen/src/types/typescript.js
@@ -99,7 +99,7 @@ export function typesTypescriptHasDeclaredTypes(file) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {import("./generator.js").GenerateTypeOptions} options
  */
@@ -178,7 +178,7 @@ export function typesTypescriptGenerateNamedType(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalTypeSystemDefinition} type
+ * @param {import("../generated/common/types.js").StructureTypeSystemDefinition} type
  * @param {import("./generator.js").GenerateTypeOptions} options
  * @returns {void}
  */
@@ -479,7 +479,7 @@ export function typesTypescriptFormatType(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {import("./generator.js").GenerateTypeOptions} options
  * @returns {string}
diff --git a/packages/code-gen/src/validators/generator.d.ts b/packages/code-gen/src/validators/generator.d.ts
index 78d955ee94..0dc216dbec 100644
--- a/packages/code-gen/src/validators/generator.d.ts
+++ b/packages/code-gen/src/validators/generator.d.ts
@@ -15,9 +15,7 @@
  * @property {import("../types/generator.js").GenerateTypeOptions} outputTypeOptions
  * @property {number} reusedVariableIndex
  * @property {ValidatorPath[]} validatedValuePath
- * @property {import("../generated/common/types.js")
- * .ExperimentalReferenceDefinition[]
- * } dependingValidators
+ * @property {import("../generated/common/types.js").StructureReferenceDefinition[]} dependingValidators
  * @property {boolean} [jsHasInlineTypes]
  * @property {boolean} [skipFirstNilCheck]
  */
@@ -40,7 +38,7 @@ export function validatorGeneratorGenerateBaseTypes(
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {string} outputTypeName
  * @returns {string}
@@ -49,7 +47,7 @@ export function validatorGetNameAndImport(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   type: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalTypeSystemDefinition
+    import("../generated/common/types").StructureTypeSystemDefinition
   >,
   outputTypeName: string,
 ): string;
@@ -65,7 +63,7 @@ export function validatorGetNameAndImport(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {import("../types/generator.js").GenerateTypeOptions & {
  *   preferInputBaseName?: boolean;
@@ -74,7 +72,7 @@ export function validatorGetNameAndImport(
 export function validatorGeneratorGenerateValidator(
   generateContext: import("../generate.js").GenerateContext,
   type: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalTypeSystemDefinition
+    import("../generated/common/types").StructureTypeSystemDefinition
   >,
   outputTypeOptions: import("../types/generator.js").GenerateTypeOptions & {
     preferInputBaseName?: boolean;
@@ -86,14 +84,14 @@ export function validatorGeneratorGenerateValidator(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalTypeSystemDefinition>} type
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureTypeSystemDefinition>} type
  * @param {ValidatorState} validatorState
  */
 export function validatorGeneratorGenerateBody(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   type: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalTypeSystemDefinition
+    import("../generated/common/types").StructureTypeSystemDefinition
   >,
   validatorState: ValidatorState,
 ): void;
@@ -119,7 +117,7 @@ export type ValidatorState = {
   outputTypeOptions: import("../types/generator.js").GenerateTypeOptions;
   reusedVariableIndex: number;
   validatedValuePath: ValidatorPath[];
-  dependingValidators: import("../generated/common/types.js").ExperimentalReferenceDefinition[];
+  dependingValidators: import("../generated/common/types.js").StructureReferenceDefinition[];
   jsHasInlineTypes?: boolean | undefined;
   skipFirstNilCheck?: boolean | undefined;
 };
diff --git a/packages/code-gen/src/validators/generator.js b/packages/code-gen/src/validators/generator.js
index ce799acc3c..4a912f5db4 100644
--- a/packages/code-gen/src/validators/generator.js
+++ b/packages/code-gen/src/validators/generator.js
@@ -62,9 +62,7 @@ const validatorCache = new WeakMap();
  * @property {import("../types/generator.js").GenerateTypeOptions} outputTypeOptions
  * @property {number} reusedVariableIndex
  * @property {ValidatorPath[]} validatedValuePath
- * @property {import("../generated/common/types.js")
- * .ExperimentalReferenceDefinition[]
- * } dependingValidators
+ * @property {import("../generated/common/types.js").StructureReferenceDefinition[]} dependingValidators
  * @property {boolean} [jsHasInlineTypes]
  * @property {boolean} [skipFirstNilCheck]
  */
@@ -106,7 +104,7 @@ export function validatorGeneratorGenerateBaseTypes(generateContext) {
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {string} outputTypeName
  * @returns {string}
@@ -140,7 +138,7 @@ export function validatorGetNameAndImport(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {import("../types/generator.js").GenerateTypeOptions & {
  *   preferInputBaseName?: boolean;
@@ -273,7 +271,7 @@ export function validatorGeneratorGenerateValidator(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalTypeSystemDefinition>} type
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureTypeSystemDefinition>} type
  * @param {ValidatorState} validatorState
  */
 export function validatorGeneratorGenerateBody(
@@ -406,7 +404,7 @@ export function validatorGeneratorGenerateBody(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalTypeSystemDefinition>} type
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureTypeSystemDefinition>} type
  * @param {ValidatorState} validatorState
  */
 function validatorGeneratorAny(generateContext, file, type, validatorState) {
@@ -428,7 +426,7 @@ function validatorGeneratorAny(generateContext, file, type, validatorState) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalTypeSystemDefinition>} type
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureTypeSystemDefinition>} type
  * @param {ValidatorState} validatorState
  */
 function validatorGeneratorAnyOf(generateContext, file, type, validatorState) {
@@ -450,7 +448,7 @@ function validatorGeneratorAnyOf(generateContext, file, type, validatorState) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalTypeSystemDefinition>} type
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureTypeSystemDefinition>} type
  * @param {ValidatorState} validatorState
  */
 function validatorGeneratorArray(generateContext, file, type, validatorState) {
@@ -472,7 +470,7 @@ function validatorGeneratorArray(generateContext, file, type, validatorState) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalTypeSystemDefinition>} type
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureTypeSystemDefinition>} type
  * @param {ValidatorState} validatorState
  */
 function validatorGeneratorBoolean(
@@ -499,7 +497,7 @@ function validatorGeneratorBoolean(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalTypeSystemDefinition>} type
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureTypeSystemDefinition>} type
  * @param {ValidatorState} validatorState
  */
 function validatorGeneratorDate(generateContext, file, type, validatorState) {
@@ -521,7 +519,7 @@ function validatorGeneratorDate(generateContext, file, type, validatorState) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalTypeSystemDefinition>} type
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureTypeSystemDefinition>} type
  * @param {ValidatorState} validatorState
  */
 function validatorGeneratorFile(generateContext, file, type, validatorState) {
@@ -543,7 +541,7 @@ function validatorGeneratorFile(generateContext, file, type, validatorState) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalTypeSystemDefinition>} type
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureTypeSystemDefinition>} type
  * @param {ValidatorState} validatorState
  */
 function validatorGeneratorGeneric(
@@ -570,7 +568,7 @@ function validatorGeneratorGeneric(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalTypeSystemDefinition>} type
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureTypeSystemDefinition>} type
  * @param {ValidatorState} validatorState
  */
 function validatorGeneratorNumber(generateContext, file, type, validatorState) {
@@ -592,7 +590,7 @@ function validatorGeneratorNumber(generateContext, file, type, validatorState) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalTypeSystemDefinition>} type
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureTypeSystemDefinition>} type
  * @param {ValidatorState} validatorState
  */
 function validatorGeneratorObject(generateContext, file, type, validatorState) {
@@ -614,7 +612,7 @@ function validatorGeneratorObject(generateContext, file, type, validatorState) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalTypeSystemDefinition>} type
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureTypeSystemDefinition>} type
  * @param {ValidatorState} validatorState
  */
 function validatorGeneratorReference(
@@ -641,7 +639,7 @@ function validatorGeneratorReference(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalTypeSystemDefinition>} type
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureTypeSystemDefinition>} type
  * @param {ValidatorState} validatorState
  */
 function validatorGeneratorString(generateContext, file, type, validatorState) {
@@ -663,7 +661,7 @@ function validatorGeneratorString(generateContext, file, type, validatorState) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").ExperimentalTypeSystemDefinition>} type
+ * @param {import("../../types/advanced-types").NamedType<import("../generated/common/types").StructureTypeSystemDefinition>} type
  * @param {ValidatorState} validatorState
  */
 function validatorGeneratorUuid(generateContext, file, type, validatorState) {
diff --git a/packages/code-gen/src/validators/javascript.d.ts b/packages/code-gen/src/validators/javascript.d.ts
index 9240b859d1..8b88053c44 100644
--- a/packages/code-gen/src/validators/javascript.d.ts
+++ b/packages/code-gen/src/validators/javascript.d.ts
@@ -3,21 +3,21 @@
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @returns {import("../file/context.js").GenerateFile}
  */
 export function validatorJavascriptGetFile(
   generateContext: import("../generate.js").GenerateContext,
   type: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalTypeSystemDefinition
+    import("../generated/common/types").StructureTypeSystemDefinition
   >,
 ): import("../file/context.js").GenerateFile;
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {string} outputTypeName
  * @returns {string}
@@ -25,7 +25,7 @@ export function validatorJavascriptGetFile(
 export function validatorJavascriptGetNameAndImport(
   file: import("../file/context.js").GenerateFile,
   type: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalTypeSystemDefinition
+    import("../generated/common/types").StructureTypeSystemDefinition
   >,
   outputTypeName: string,
 ): string;
@@ -35,7 +35,7 @@ export function validatorJavascriptGetNameAndImport(
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
@@ -43,7 +43,7 @@ export function validatorJavascriptStartValidator(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   type: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalTypeSystemDefinition
+    import("../generated/common/types").StructureTypeSystemDefinition
   >,
   validatorState: import("./generator.js").ValidatorState,
 ): void;
@@ -78,134 +78,134 @@ export function validatorJavascriptNilCheck(
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalAnyDefinition} type
+ * @param {import("../generated/common/types.js").StructureAnyDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptAny(
   file: import("../file/context.js").GenerateFile,
-  type: import("../generated/common/types.js").ExperimentalAnyDefinition,
+  type: import("../generated/common/types.js").StructureAnyDefinition,
   validatorState: import("./generator.js").ValidatorState,
 ): void;
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalAnyOfDefinition} type
+ * @param {import("../generated/common/types.js").StructureAnyOfDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptAnyOf(
   file: import("../file/context.js").GenerateFile,
-  type: import("../generated/common/types.js").ExperimentalAnyOfDefinition,
+  type: import("../generated/common/types.js").StructureAnyOfDefinition,
   validatorState: import("./generator.js").ValidatorState,
 ): void;
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalArrayDefinition} type
+ * @param {import("../generated/common/types.js").StructureArrayDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptArray(
   file: import("../file/context.js").GenerateFile,
-  type: import("../generated/common/types.js").ExperimentalArrayDefinition,
+  type: import("../generated/common/types.js").StructureArrayDefinition,
   validatorState: import("./generator.js").ValidatorState,
 ): void;
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalBooleanDefinition} type
+ * @param {import("../generated/common/types.js").StructureBooleanDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptBoolean(
   file: import("../file/context.js").GenerateFile,
-  type: import("../generated/common/types.js").ExperimentalBooleanDefinition,
+  type: import("../generated/common/types.js").StructureBooleanDefinition,
   validatorState: import("./generator.js").ValidatorState,
 ): void;
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalDateDefinition} type
+ * @param {import("../generated/common/types.js").StructureDateDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptDate(
   file: import("../file/context.js").GenerateFile,
-  type: import("../generated/common/types.js").ExperimentalDateDefinition,
+  type: import("../generated/common/types.js").StructureDateDefinition,
   validatorState: import("./generator.js").ValidatorState,
 ): void;
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalFileDefinition} type
+ * @param {import("../generated/common/types.js").StructureFileDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptFile(
   file: import("../file/context.js").GenerateFile,
-  type: import("../generated/common/types.js").ExperimentalFileDefinition,
+  type: import("../generated/common/types.js").StructureFileDefinition,
   validatorState: import("./generator.js").ValidatorState,
 ): void;
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalGenericDefinition} type
+ * @param {import("../generated/common/types.js").StructureGenericDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptGeneric(
   file: import("../file/context.js").GenerateFile,
-  type: import("../generated/common/types.js").ExperimentalGenericDefinition,
+  type: import("../generated/common/types.js").StructureGenericDefinition,
   validatorState: import("./generator.js").ValidatorState,
 ): void;
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalNumberDefinition} type
+ * @param {import("../generated/common/types.js").StructureNumberDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptNumber(
   file: import("../file/context.js").GenerateFile,
-  type: import("../generated/common/types.js").ExperimentalNumberDefinition,
+  type: import("../generated/common/types.js").StructureNumberDefinition,
   validatorState: import("./generator.js").ValidatorState,
 ): void;
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} type
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptObject(
   file: import("../file/context.js").GenerateFile,
-  type: import("../generated/common/types.js").ExperimentalObjectDefinition,
+  type: import("../generated/common/types.js").StructureObjectDefinition,
   validatorState: import("./generator.js").ValidatorState,
 ): void;
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalReferenceDefinition} type
+ * @param {import("../generated/common/types.js").StructureReferenceDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptReference(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
-  type: import("../generated/common/types.js").ExperimentalReferenceDefinition,
+  type: import("../generated/common/types.js").StructureReferenceDefinition,
   validatorState: import("./generator.js").ValidatorState,
 ): void;
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalStringDefinition} type
+ * @param {import("../generated/common/types.js").StructureStringDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptString(
   file: import("../file/context.js").GenerateFile,
-  type: import("../generated/common/types.js").ExperimentalStringDefinition,
+  type: import("../generated/common/types.js").StructureStringDefinition,
   validatorState: import("./generator.js").ValidatorState,
 ): void;
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalUuidDefinition} type
+ * @param {import("../generated/common/types.js").StructureUuidDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptUuid(
   file: import("../file/context.js").GenerateFile,
-  type: import("../generated/common/types.js").ExperimentalUuidDefinition,
+  type: import("../generated/common/types.js").StructureUuidDefinition,
   validatorState: import("./generator.js").ValidatorState,
 ): void;
 /**
diff --git a/packages/code-gen/src/validators/javascript.js b/packages/code-gen/src/validators/javascript.js
index 545dd02076..a60f7d197d 100644
--- a/packages/code-gen/src/validators/javascript.js
+++ b/packages/code-gen/src/validators/javascript.js
@@ -94,7 +94,7 @@ function formatErrorKey(validatorState) {
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @returns {import("../file/context.js").GenerateFile}
  */
@@ -131,7 +131,7 @@ export function validatorJavascriptGetFile(generateContext, type) {
  *
  * @param {import("../file/context.js").GenerateFile} file
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {string} outputTypeName
  * @returns {string}
@@ -157,7 +157,7 @@ export function validatorJavascriptGetNameAndImport(
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
@@ -287,7 +287,7 @@ export function validatorJavascriptNilCheck(file, validatorState, options) {
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalAnyDefinition} type
+ * @param {import("../generated/common/types.js").StructureAnyDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptAny(file, type, validatorState) {
@@ -343,7 +343,7 @@ export function validatorJavascriptAny(file, type, validatorState) {
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalAnyOfDefinition} type
+ * @param {import("../generated/common/types.js").StructureAnyOfDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptAnyOf(file, type, validatorState) {
@@ -356,7 +356,7 @@ export function validatorJavascriptAnyOf(file, type, validatorState) {
     const matchableValues = [];
 
     for (const subType of type.values) {
-      /** @type {import("../generated/common/types.d.ts").ExperimentalObjectDefinition} */
+      /** @type {import("../generated/common/types.d.ts").StructureObjectDefinition} */
       // @ts-expect-error
       const resolvedSubType =
         subType.type === "reference"
@@ -509,7 +509,7 @@ export function validatorJavascriptAnyOf(file, type, validatorState) {
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalArrayDefinition} type
+ * @param {import("../generated/common/types.js").StructureArrayDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptArray(file, type, validatorState) {
@@ -666,7 +666,7 @@ export function validatorJavascriptArray(file, type, validatorState) {
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalBooleanDefinition} type
+ * @param {import("../generated/common/types.js").StructureBooleanDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptBoolean(file, type, validatorState) {
@@ -731,7 +731,7 @@ export function validatorJavascriptBoolean(file, type, validatorState) {
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalDateDefinition} type
+ * @param {import("../generated/common/types.js").StructureDateDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptDate(file, type, validatorState) {
@@ -907,7 +907,7 @@ export function validatorJavascriptDate(file, type, validatorState) {
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalFileDefinition} type
+ * @param {import("../generated/common/types.js").StructureFileDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptFile(file, type, validatorState) {
@@ -987,7 +987,7 @@ export function validatorJavascriptFile(file, type, validatorState) {
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalGenericDefinition} type
+ * @param {import("../generated/common/types.js").StructureGenericDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptGeneric(file, type, validatorState) {
@@ -1100,7 +1100,7 @@ export function validatorJavascriptGeneric(file, type, validatorState) {
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalNumberDefinition} type
+ * @param {import("../generated/common/types.js").StructureNumberDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptNumber(file, type, validatorState) {
@@ -1206,7 +1206,7 @@ export function validatorJavascriptNumber(file, type, validatorState) {
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalObjectDefinition} type
+ * @param {import("../generated/common/types.js").StructureObjectDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptObject(file, type, validatorState) {
@@ -1319,7 +1319,7 @@ export function validatorJavascriptObject(file, type, validatorState) {
 /**
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalReferenceDefinition} type
+ * @param {import("../generated/common/types.js").StructureReferenceDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptReference(
@@ -1400,7 +1400,7 @@ export function validatorJavascriptReference(
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalStringDefinition} type
+ * @param {import("../generated/common/types.js").StructureStringDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptString(file, type, validatorState) {
@@ -1584,7 +1584,7 @@ export function validatorJavascriptString(file, type, validatorState) {
 /**
  *
  * @param {import("../file/context.js").GenerateFile} file
- * @param {import("../generated/common/types.js").ExperimentalUuidDefinition} type
+ * @param {import("../generated/common/types.js").StructureUuidDefinition} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
 export function validatorJavascriptUuid(file, type, validatorState) {
diff --git a/packages/code-gen/src/validators/typescript.d.ts b/packages/code-gen/src/validators/typescript.d.ts
index b3c1257620..9a03d34a00 100644
--- a/packages/code-gen/src/validators/typescript.d.ts
+++ b/packages/code-gen/src/validators/typescript.d.ts
@@ -2,7 +2,7 @@
  *
  * @param {import("../file/context.js").GenerateFile} file
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {string} outputTypeName
  * @returns {string}
@@ -10,7 +10,7 @@
 export function validatorTypescriptGetNameAndImport(
   file: import("../file/context.js").GenerateFile,
   type: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalTypeSystemDefinition
+    import("../generated/common/types").StructureTypeSystemDefinition
   >,
   outputTypeName: string,
 ): string;
@@ -19,14 +19,14 @@ export function validatorTypescriptGetNameAndImport(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @returns {import("../file/context.js").GenerateFile}
  */
 export function validatorTypescriptGetFile(
   generateContext: import("../generate.js").GenerateContext,
   type: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalTypeSystemDefinition
+    import("../generated/common/types").StructureTypeSystemDefinition
   >,
 ): import("../file/context.js").GenerateFile;
 /**
@@ -35,7 +35,7 @@ export function validatorTypescriptGetFile(
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
@@ -43,7 +43,7 @@ export function validatorTypescriptStartValidator(
   generateContext: import("../generate.js").GenerateContext,
   file: import("../file/context.js").GenerateFile,
   type: import("../../types/advanced-types").NamedType<
-    import("../generated/common/types").ExperimentalTypeSystemDefinition
+    import("../generated/common/types").StructureTypeSystemDefinition
   >,
   validatorState: import("./generator.js").ValidatorState,
 ): void;
diff --git a/packages/code-gen/src/validators/typescript.js b/packages/code-gen/src/validators/typescript.js
index 0ee94eb9a0..40e9d4c844 100644
--- a/packages/code-gen/src/validators/typescript.js
+++ b/packages/code-gen/src/validators/typescript.js
@@ -13,7 +13,7 @@ import { typesGeneratorUseTypeName } from "../types/generator.js";
  *
  * @param {import("../file/context.js").GenerateFile} file
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {string} outputTypeName
  * @returns {string}
@@ -38,7 +38,7 @@ export function validatorTypescriptGetNameAndImport(
  *
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @returns {import("../file/context.js").GenerateFile}
  */
@@ -72,7 +72,7 @@ type ValidatorErrorMap = Record<string, any|undefined>;`,
  * @param {import("../generate.js").GenerateContext} generateContext
  * @param {import("../file/context.js").GenerateFile} file
  * @param {import("../../types/advanced-types").NamedType<
- *   import("../generated/common/types").ExperimentalTypeSystemDefinition
+ *   import("../generated/common/types").StructureTypeSystemDefinition
  * >} type
  * @param {import("./generator.js").ValidatorState} validatorState
  */
diff --git a/packages/code-gen/test/testing.d.ts b/packages/code-gen/test/testing.d.ts
index 6989f81253..cc568ab4d1 100644
--- a/packages/code-gen/test/testing.d.ts
+++ b/packages/code-gen/test/testing.d.ts
@@ -5,11 +5,11 @@
  * @param {{
  *   partialError: string,
  *   generateOptions:
- *   import("../src/generated/common/types.js").ExperimentalGenerateOptions|undefined,
+ *   import("../src/generated/common/types.js").StructureGenerateOptions|undefined,
  * }|{
  *   pass: true,
  *   generateOptions?:
- *   import("../src/generated/common/types.js").ExperimentalGenerateOptions|undefined,
+ *   import("../src/generated/common/types.js").StructureGenerateOptions|undefined,
  * }} options
  * @param {(T: import("@compas/code-gen").TypeCreator) => ((import("../src/builders/TypeBuilder.js").TypeBuilder|import("@compas/code-gen").TypeBuilderLike)[])} builders
  * @returns {void}
@@ -20,13 +20,13 @@ export function testGeneratorError(
     | {
         partialError: string;
         generateOptions:
-          | import("../src/generated/common/types.js").ExperimentalGenerateOptions
+          | import("../src/generated/common/types.js").StructureGenerateOptions
           | undefined;
       }
     | {
         pass: true;
         generateOptions?:
-          | import("../src/generated/common/types.js").ExperimentalGenerateOptions
+          | import("../src/generated/common/types.js").StructureGenerateOptions
           | undefined;
       },
   builders: (
@@ -45,7 +45,7 @@ export function testGeneratorError(
  *   validatorName: string,
  *   validatorInput: any,
  *   generateOptions?:
- *   import("../src/generated/common/types.js").ExperimentalGenerateOptions|undefined,
+ *   import("../src/generated/common/types.js").StructureGenerateOptions|undefined,
  * }} options
  * @param {(T: import("@compas/code-gen").TypeCreator) => ((import("../src/builders/TypeBuilder.js").TypeBuilder|import("@compas/code-gen").TypeBuilderLike)[])} builders
  * @returns {Promise<{ value: any, error: Record<string, ValidatorErrorMap> }>}
@@ -57,7 +57,7 @@ export function testGeneratorType(
     validatorName: string;
     validatorInput: any;
     generateOptions?:
-      | import("../src/generated/common/types.js").ExperimentalGenerateOptions
+      | import("../src/generated/common/types.js").StructureGenerateOptions
       | undefined;
   },
   builders: (
@@ -78,7 +78,7 @@ export function testGeneratorType(
  *   relativePath: string,
  *   partialValue: string,
  *   generateOptions?:
- *   import("../src/generated/common/types.js").ExperimentalGenerateOptions|undefined,
+ *   import("../src/generated/common/types.js").StructureGenerateOptions|undefined,
  * }} options
  * @param {(T: import("@compas/code-gen").TypeCreator) => ((import("../src/builders/TypeBuilder.js").TypeBuilder|import("@compas/code-gen").TypeBuilderLike)[])} builders
  * @returns {void}
@@ -89,7 +89,7 @@ export function testGeneratorStaticOutput(
     relativePath: string;
     partialValue: string;
     generateOptions?:
-      | import("../src/generated/common/types.js").ExperimentalGenerateOptions
+      | import("../src/generated/common/types.js").StructureGenerateOptions
       | undefined;
   },
   builders: (
@@ -105,7 +105,7 @@ export function testGeneratorStaticOutput(
  * @param {import("@compas/cli").TestRunner} t
  * @param {{
  *   generateOptions?:
- *   import("../src/generated/common/types.js").ExperimentalGenerateOptions|undefined,
+ *   import("../src/generated/common/types.js").StructureGenerateOptions|undefined,
  * }} options
  * @param {(T: import("@compas/code-gen").TypeCreator) => ((import("../src/builders/TypeBuilder.js").TypeBuilder|import("@compas/code-gen").TypeBuilderLike)[])} builders
  * @returns {import("../src/generate.js").OutputFile[]}
@@ -114,7 +114,7 @@ export function testGeneratorStaticFiles(
   t: import("@compas/cli").TestRunner,
   options: {
     generateOptions?:
-      | import("../src/generated/common/types.js").ExperimentalGenerateOptions
+      | import("../src/generated/common/types.js").StructureGenerateOptions
       | undefined;
   },
   builders: (
diff --git a/packages/code-gen/test/testing.js b/packages/code-gen/test/testing.js
index 105c30600c..466374328e 100644
--- a/packages/code-gen/test/testing.js
+++ b/packages/code-gen/test/testing.js
@@ -8,7 +8,7 @@ import { Generator } from "../src/index.js";
  * @param {{
  *   withOutputDirectory?: string,
  * }} options
- * @returns {import("../src/generated/common/types.js").ExperimentalGenerateOptions}
+ * @returns {import("../src/generated/common/types.js").StructureGenerateOptions}
  */
 function testGeneratorDefaultGenerateOptions(options) {
   return {
@@ -57,11 +57,11 @@ function testGeneratorDefaultGenerateOptions(options) {
  * @param {{
  *   partialError: string,
  *   generateOptions:
- *   import("../src/generated/common/types.js").ExperimentalGenerateOptions|undefined,
+ *   import("../src/generated/common/types.js").StructureGenerateOptions|undefined,
  * }|{
  *   pass: true,
  *   generateOptions?:
- *   import("../src/generated/common/types.js").ExperimentalGenerateOptions|undefined,
+ *   import("../src/generated/common/types.js").StructureGenerateOptions|undefined,
  * }} options
  * @param {(T: import("@compas/code-gen").TypeCreator) => ((import("../src/builders/TypeBuilder.js").TypeBuilder|import("@compas/code-gen").TypeBuilderLike)[])} builders
  * @returns {void}
@@ -144,7 +144,7 @@ export function testGeneratorError(t, options, builders) {
  *   validatorName: string,
  *   validatorInput: any,
  *   generateOptions?:
- *   import("../src/generated/common/types.js").ExperimentalGenerateOptions|undefined,
+ *   import("../src/generated/common/types.js").StructureGenerateOptions|undefined,
  * }} options
  * @param {(T: import("@compas/code-gen").TypeCreator) => ((import("../src/builders/TypeBuilder.js").TypeBuilder|import("@compas/code-gen").TypeBuilderLike)[])} builders
  * @returns {Promise<{ value: any, error: Record<string, ValidatorErrorMap> }>}
@@ -194,7 +194,7 @@ export async function testGeneratorType(t, options, builders) {
  *   relativePath: string,
  *   partialValue: string,
  *   generateOptions?:
- *   import("../src/generated/common/types.js").ExperimentalGenerateOptions|undefined,
+ *   import("../src/generated/common/types.js").StructureGenerateOptions|undefined,
  * }} options
  * @param {(T: import("@compas/code-gen").TypeCreator) => ((import("../src/builders/TypeBuilder.js").TypeBuilder|import("@compas/code-gen").TypeBuilderLike)[])} builders
  * @returns {void}
@@ -235,7 +235,7 @@ export function testGeneratorStaticOutput(t, options, builders) {
  * @param {import("@compas/cli").TestRunner} t
  * @param {{
  *   generateOptions?:
- *   import("../src/generated/common/types.js").ExperimentalGenerateOptions|undefined,
+ *   import("../src/generated/common/types.js").StructureGenerateOptions|undefined,
  * }} options
  * @param {(T: import("@compas/code-gen").TypeCreator) => ((import("../src/builders/TypeBuilder.js").TypeBuilder|import("@compas/code-gen").TypeBuilderLike)[])} builders
  * @returns {import("../src/generate.js").OutputFile[]}