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 5a022c7fb6..f20418c2ca 100644
--- a/output/schema/schema-serverless.json
+++ b/output/schema/schema-serverless.json
@@ -18914,6 +18914,7 @@
     },
     {
       "body": {
+        "codegenName": "data",
         "kind": "value",
         "value": {
           "kind": "instance_of",
@@ -20370,6 +20371,7 @@
     },
     {
       "body": {
+        "codegenName": "source",
         "kind": "value",
         "value": {
           "kind": "instance_of",
@@ -22359,6 +22361,7 @@
     },
     {
       "body": {
+        "codegenName": "indices",
         "kind": "value",
         "value": {
           "key": {
@@ -22489,6 +22492,7 @@
     },
     {
       "body": {
+        "codegenName": "aliases",
         "kind": "value",
         "value": {
           "key": {
@@ -23002,6 +23006,7 @@
     },
     {
       "body": {
+        "codegenName": "mappings",
         "kind": "value",
         "value": {
           "key": {
@@ -23171,6 +23176,7 @@
     },
     {
       "body": {
+        "codegenName": "settings",
         "kind": "value",
         "value": {
           "key": {
@@ -26706,6 +26712,7 @@
     },
     {
       "body": {
+        "codegenName": "pipelines",
         "kind": "value",
         "value": {
           "key": {
@@ -27233,6 +27240,7 @@
     },
     {
       "body": {
+        "codegenName": "pipelines",
         "kind": "value",
         "value": {
           "key": {
@@ -30777,6 +30785,7 @@
     },
     {
       "body": {
+        "codegenName": "documents",
         "kind": "value",
         "value": {
           "kind": "array_of",
@@ -39274,6 +39283,7 @@
     },
     {
       "body": {
+        "codegenName": "analytics",
         "kind": "value",
         "value": {
           "key": {
@@ -40014,6 +40024,7 @@
     },
     {
       "body": {
+        "codegenName": "vector_tiles",
         "kind": "value",
         "value": {
           "kind": "instance_of",
@@ -41256,6 +41267,7 @@
     },
     {
       "body": {
+        "codegenName": "roles",
         "kind": "value",
         "value": {
           "key": {
diff --git a/output/schema/schema.json b/output/schema/schema.json
index eaa4943292..61cd8c747e 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -27466,6 +27466,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "source",
         "value": {
           "kind": "instance_of",
           "type": {
@@ -41995,6 +41996,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "vector_tiles",
         "value": {
           "kind": "instance_of",
           "type": {
@@ -112585,6 +112587,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "infos",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -123501,6 +123504,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "data",
         "value": {
           "kind": "instance_of",
           "type": {
@@ -127408,6 +127412,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "lifecycles",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -135422,6 +135427,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "disk_usage",
         "value": {
           "kind": "user_defined_value"
         }
@@ -135492,6 +135498,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "result",
         "value": {
           "kind": "user_defined_value"
         }
@@ -137082,6 +137089,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "indices",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -137244,6 +137252,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "aliases",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -137814,6 +137823,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "field_mappings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -138166,6 +138176,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "mappings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -138584,6 +138595,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "settings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -138689,6 +138701,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "templates",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -139247,6 +139260,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "result",
         "value": {
           "kind": "user_defined_value"
         }
@@ -141162,6 +141176,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "statuses",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -142006,6 +142021,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "infos",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -154815,6 +154831,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "pipelines",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -156772,6 +156789,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "pipelines",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -177020,6 +177038,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "documents",
         "value": {
           "kind": "array_of",
           "value": {
@@ -193606,6 +193625,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "capabilities",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -193835,6 +193855,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "capabilities",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -194909,6 +194930,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "analytics",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -195806,6 +195828,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "result",
         "value": {
           "kind": "user_defined_value"
         }
@@ -201226,6 +201249,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "result",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -202351,6 +202375,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "privileges",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -202427,6 +202452,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "roles",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -202703,6 +202729,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "role_mappings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -202780,6 +202807,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "service_accoutns",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -203509,6 +203537,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "users",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -205484,6 +205513,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "result",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -210808,6 +210838,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "lifecycles",
         "value": {
           "kind": "dictionary_of",
           "key": {