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 02ef64adfb..26a51f2716 100644
--- a/output/schema/schema-serverless.json
+++ b/output/schema/schema-serverless.json
@@ -19438,6 +19438,7 @@
     },
     {
       "body": {
+        "codegenName": "data",
         "kind": "value",
         "value": {
           "kind": "instance_of",
@@ -20941,6 +20942,7 @@
     },
     {
       "body": {
+        "codegenName": "source",
         "kind": "value",
         "value": {
           "kind": "instance_of",
@@ -23283,6 +23285,7 @@
     },
     {
       "body": {
+        "codegenName": "indices",
         "kind": "value",
         "value": {
           "key": {
@@ -23417,6 +23420,7 @@
     },
     {
       "body": {
+        "codegenName": "aliases",
         "kind": "value",
         "value": {
           "key": {
@@ -23946,6 +23950,7 @@
     },
     {
       "body": {
+        "codegenName": "mappings",
         "kind": "value",
         "value": {
           "key": {
@@ -24115,6 +24120,7 @@
     },
     {
       "body": {
+        "codegenName": "settings",
         "kind": "value",
         "value": {
           "key": {
@@ -28099,6 +28105,7 @@
     },
     {
       "body": {
+        "codegenName": "pipelines",
         "kind": "value",
         "value": {
           "key": {
@@ -28662,6 +28669,7 @@
     },
     {
       "body": {
+        "codegenName": "pipelines",
         "kind": "value",
         "value": {
           "key": {
@@ -32387,6 +32395,7 @@
     },
     {
       "body": {
+        "codegenName": "documents",
         "kind": "value",
         "value": {
           "kind": "array_of",
@@ -41125,6 +41134,7 @@
     },
     {
       "body": {
+        "codegenName": "analytics",
         "kind": "value",
         "value": {
           "key": {
@@ -41891,6 +41901,7 @@
     },
     {
       "body": {
+        "codegenName": "vector_tiles",
         "kind": "value",
         "value": {
           "kind": "instance_of",
diff --git a/output/schema/schema.json b/output/schema/schema.json
index b4634e6985..b8e46a792f 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -27769,6 +27769,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "source",
         "value": {
           "kind": "instance_of",
           "type": {
@@ -42478,6 +42479,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "vector_tiles",
         "value": {
           "kind": "instance_of",
           "type": {
@@ -113646,6 +113648,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "infos",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -124729,6 +124732,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "data",
         "value": {
           "kind": "instance_of",
           "type": {
@@ -128676,6 +128680,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "lifecycles",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -136840,6 +136845,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "disk_usage",
         "value": {
           "kind": "user_defined_value"
         }
@@ -136915,6 +136921,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "result",
         "value": {
           "kind": "user_defined_value"
         }
@@ -138527,6 +138534,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "indices",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -138693,6 +138701,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "aliases",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -139294,6 +139303,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "field_mappings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -139667,6 +139677,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "mappings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -140085,6 +140096,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "settings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -140190,6 +140202,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "templates",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -140754,6 +140767,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "result",
         "value": {
           "kind": "user_defined_value"
         }
@@ -142736,6 +142750,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "statuses",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -143597,6 +143612,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "infos",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -156915,6 +156931,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "pipelines",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -158944,6 +158961,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "pipelines",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -179367,6 +179385,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "documents",
         "value": {
           "kind": "array_of",
           "value": {
@@ -196006,6 +196025,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "capabilities",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -196241,6 +196261,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "capabilities",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -197348,6 +197369,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "analytics",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -198285,6 +198307,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "result",
         "value": {
           "kind": "user_defined_value"
         }
@@ -203811,6 +203834,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "result",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -204996,6 +205020,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "privileges",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -205078,6 +205103,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "roles",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -205360,6 +205386,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "role_mappings",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -205443,6 +205470,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "service_accoutns",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -206208,6 +206236,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "users",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -208378,6 +208407,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "result",
         "value": {
           "kind": "dictionary_of",
           "key": {
@@ -214083,6 +214113,7 @@
       "kind": "response",
       "body": {
         "kind": "value",
+        "codegenName": "lifecycles",
         "value": {
           "kind": "dictionary_of",
           "key": {