diff --git a/compiler/src/model/build-model.ts b/compiler/src/model/build-model.ts
index 400a0f008b..96bb7f511b 100644
--- a/compiler/src/model/build-model.ts
+++ b/compiler/src/model/build-model.ts
@@ -383,18 +383,7 @@ function compileClassOrInterfaceDeclaration (declaration: ClassDeclaration | Int
             if (property.valueOf.kind === 'instance_of' && property.valueOf.type.name === 'Void') {
               type.body = { kind: 'no_body' }
             } else {
-              const tags = parseJsDocTags((member as PropertySignature).getJsDocs())
-              // TODO: Enable this after adding the missing codegen names.
-              // assert(
-              //     member as Node,
-              //     tags.codegen_name != null,
-              //     'You should configure a body @codegen_name'
-              // )
-              type.body = {
-                kind: 'value',
-                value: property.valueOf,
-                codegenName: tags.codegen_name
-              }
+              type.body = { kind: 'value', value: property.valueOf }
             }
           } else {
             type.body = { kind: 'properties', properties: property.properties }
diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json
index f27b60e1db..2d32980883 100644
--- a/output/schema/schema-serverless.json
+++ b/output/schema/schema-serverless.json
@@ -19528,7 +19528,6 @@
     },
     {
       "body": {
-        "codegenName": "data",
         "kind": "value",
         "value": {
           "kind": "instance_of",
@@ -21032,7 +21031,6 @@
     },
     {
       "body": {
-        "codegenName": "source",
         "kind": "value",
         "value": {
           "kind": "instance_of",
@@ -23416,7 +23414,6 @@
     },
     {
       "body": {
-        "codegenName": "indices",
         "kind": "value",
         "value": {
           "key": {
@@ -23551,7 +23548,6 @@
     },
     {
       "body": {
-        "codegenName": "aliases",
         "kind": "value",
         "value": {
           "key": {
@@ -24081,7 +24077,6 @@
     },
     {
       "body": {
-        "codegenName": "mappings",
         "kind": "value",
         "value": {
           "key": {
@@ -24251,7 +24246,6 @@
     },
     {
       "body": {
-        "codegenName": "settings",
         "kind": "value",
         "value": {
           "key": {
@@ -28522,7 +28516,6 @@
     },
     {
       "body": {
-        "codegenName": "pipelines",
         "kind": "value",
         "value": {
           "key": {
@@ -29086,7 +29079,6 @@
     },
     {
       "body": {
-        "codegenName": "pipelines",
         "kind": "value",
         "value": {
           "key": {
@@ -32812,7 +32804,6 @@
     },
     {
       "body": {
-        "codegenName": "documents",
         "kind": "value",
         "value": {
           "kind": "array_of",
@@ -41551,7 +41542,6 @@
     },
     {
       "body": {
-        "codegenName": "analytics",
         "kind": "value",
         "value": {
           "key": {
@@ -42318,7 +42308,6 @@
     },
     {
       "body": {
-        "codegenName": "vector_tiles",
         "kind": "value",
         "value": {
           "kind": "instance_of",
diff --git a/output/schema/schema.json b/output/schema/schema.json
index 0ce2602b48..c632509836 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -27859,7 +27859,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "source",
         "value": {
           "kind": "instance_of",
           "type": {
@@ -42569,7 +42568,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "vector_tiles",
         "value": {
           "kind": "instance_of",
           "type": {
@@ -113863,7 +113861,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "infos",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -124960,7 +124957,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "data",
         "value": {
           "kind": "instance_of",
           "type": {
@@ -128908,7 +128904,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "lifecycles",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -137100,7 +137095,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "disk_usage",
         "value": {
           "kind": "user_defined_value"
         }
@@ -137176,7 +137170,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "result",
         "value": {
           "kind": "user_defined_value"
         }
@@ -138802,7 +138795,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "indices",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -138969,7 +138961,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "aliases",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -139571,7 +139562,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "field_mappings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -139945,7 +139935,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "mappings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -140364,7 +140353,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "settings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -140470,7 +140458,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "templates",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -141035,7 +141022,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "result",
         "value": {
           "kind": "user_defined_value"
         }
@@ -143031,7 +143017,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "statuses",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -143905,7 +143890,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "infos",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -157707,7 +157691,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "pipelines",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -159737,7 +159720,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "pipelines",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -180161,7 +180143,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "documents",
         "value": {
           "kind": "array_of",
           "value": {
@@ -196801,7 +196782,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "capabilities",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -197037,7 +197017,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "capabilities",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -198145,7 +198124,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "analytics",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -199083,7 +199061,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "result",
         "value": {
           "kind": "user_defined_value"
         }
@@ -204610,7 +204587,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "result",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -205796,7 +205772,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "privileges",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -205879,7 +205854,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "roles",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -206162,7 +206136,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "role_mappings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -206246,7 +206219,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "service_accoutns",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -207012,7 +206984,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "users",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -209183,7 +209154,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "result",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -214889,7 +214859,6 @@
       "kind": "response",
       "body": {
         "kind": "value",
-        "codegenName": "lifecycles",
         "value": {
           "kind": "dictionary_of",
           "key": {