diff --git a/compiler/src/model/build-model.ts b/compiler/src/model/build-model.ts
index 96bb7f511b..400a0f008b 100644
--- a/compiler/src/model/build-model.ts
+++ b/compiler/src/model/build-model.ts
@@ -383,7 +383,18 @@ function compileClassOrInterfaceDeclaration (declaration: ClassDeclaration | Int
             if (property.valueOf.kind === 'instance_of' && property.valueOf.type.name === 'Void') {
               type.body = { kind: 'no_body' }
             } else {
-              type.body = { kind: 'value', value: property.valueOf }
+              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
+              }
             }
           } else {
             type.body = { kind: 'properties', properties: property.properties }
diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json
index 4504a5d6bf..b9e6fe4fa8 100644
--- a/output/schema/schema-serverless.json
+++ b/output/schema/schema-serverless.json
@@ -19408,6 +19408,7 @@
     },
     {
       "body": {
+        "codegenName": "data",
         "kind": "value",
         "value": {
           "kind": "instance_of",
@@ -20911,6 +20912,7 @@
     },
     {
       "body": {
+        "codegenName": "source",
         "kind": "value",
         "value": {
           "kind": "instance_of",
@@ -23008,6 +23010,7 @@
     },
     {
       "body": {
+        "codegenName": "indices",
         "kind": "value",
         "value": {
           "key": {
@@ -23138,6 +23141,7 @@
     },
     {
       "body": {
+        "codegenName": "aliases",
         "kind": "value",
         "value": {
           "key": {
@@ -23667,6 +23671,7 @@
     },
     {
       "body": {
+        "codegenName": "mappings",
         "kind": "value",
         "value": {
           "key": {
@@ -23836,6 +23841,7 @@
     },
     {
       "body": {
+        "codegenName": "settings",
         "kind": "value",
         "value": {
           "key": {
@@ -27605,6 +27611,7 @@
     },
     {
       "body": {
+        "codegenName": "pipelines",
         "kind": "value",
         "value": {
           "key": {
@@ -28168,6 +28175,7 @@
     },
     {
       "body": {
+        "codegenName": "pipelines",
         "kind": "value",
         "value": {
           "key": {
@@ -31877,6 +31885,7 @@
     },
     {
       "body": {
+        "codegenName": "documents",
         "kind": "value",
         "value": {
           "kind": "array_of",
@@ -40611,6 +40620,7 @@
     },
     {
       "body": {
+        "codegenName": "analytics",
         "kind": "value",
         "value": {
           "key": {
@@ -41381,6 +41391,7 @@
     },
     {
       "body": {
+        "codegenName": "vector_tiles",
         "kind": "value",
         "value": {
           "kind": "instance_of",
@@ -42677,6 +42688,7 @@
     },
     {
       "body": {
+        "codegenName": "roles",
         "kind": "value",
         "value": {
           "key": {
diff --git a/output/schema/schema.json b/output/schema/schema.json
index 2a2b3bf6ad..0c8ac9edf6 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -27728,6 +27728,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "source",
         "value": {
           "kind": "instance_of",
           "type": {
@@ -42492,6 +42493,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "vector_tiles",
         "value": {
           "kind": "instance_of",
           "type": {
@@ -113698,6 +113700,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "infos",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -124832,6 +124835,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "data",
         "value": {
           "kind": "instance_of",
           "type": {
@@ -128769,6 +128773,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "lifecycles",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -136946,6 +136951,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "disk_usage",
         "value": {
           "kind": "user_defined_value"
         }
@@ -137021,6 +137027,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "result",
         "value": {
           "kind": "user_defined_value"
         }
@@ -138629,6 +138636,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "indices",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -138791,6 +138799,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "aliases",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -139392,6 +139401,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "field_mappings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -139765,6 +139775,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "mappings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -140183,6 +140194,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "settings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -140288,6 +140300,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "templates",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -140852,6 +140865,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "result",
         "value": {
           "kind": "user_defined_value"
         }
@@ -142834,6 +142848,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "statuses",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -143695,6 +143710,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "infos",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -156860,6 +156876,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "pipelines",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -158889,6 +158906,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "pipelines",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -179334,6 +179352,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "documents",
         "value": {
           "kind": "array_of",
           "value": {
@@ -195973,6 +195992,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "capabilities",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -196208,6 +196228,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "capabilities",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -197323,6 +197344,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "analytics",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -198268,6 +198290,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "result",
         "value": {
           "kind": "user_defined_value"
         }
@@ -203809,6 +203832,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "result",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -204994,6 +205018,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "privileges",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -205076,6 +205101,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "roles",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -205358,6 +205384,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "role_mappings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -205441,6 +205468,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "service_accoutns",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -206206,6 +206234,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "users",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -208376,6 +208405,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "result",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -214081,6 +214111,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "lifecycles",
         "value": {
           "kind": "dictionary_of",
           "key": {