diff --git a/docs/new-generator.md b/docs/new-generator.md
index ad1f77039d4..a2b71152ebe 100644
--- a/docs/new-generator.md
+++ b/docs/new-generator.md
@@ -309,10 +309,10 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 {{#parent}}
 {{#parentVars}}
-**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{refClass}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
 {{/parentVars}}
 {{/parent}}
-{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{refClass}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
 {{/vars}}
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/templating.md b/docs/templating.md
index d1bdd81a738..6c624ef5206 100644
--- a/docs/templating.md
+++ b/docs/templating.md
@@ -807,7 +807,7 @@ Supporting files can either be processed through the templating engine or copied
 
 > This is a very limited list of variable name explanations. Feel free to [open a pull request](https://github.com/OpenAPITools/openapi-generator/pull/new/master) to add to this documentation!
 
-- **complexType**: stores the name of the model (e.g. Pet)
+- **refClass**: stores the name of the model (e.g. Pet)
 - **isContainer**: true if the parameter or property is an array or a map.
 - **isPrimitiveType**: true if the parameter or property type is a primitive type (e.g. string, integer, etc) as defined in the spec.
 
diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java
index e5fe46954bf..2110c932029 100644
--- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java
+++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java
@@ -26,7 +26,7 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
      */
     public String openApiType;
     public String baseName;
-    public String complexType;
+    public String refClass;
     public String getter;
     public String setter;
     /**
@@ -258,12 +258,12 @@ public void setBaseName(String baseName) {
         this.baseName = baseName;
     }
 
-    public String getComplexType() {
-        return complexType;
+    public String getRefClass() {
+        return refClass;
     }
 
-    public void setComplexType(String complexType) {
-        this.complexType = complexType;
+    public void setRefClass(String refClass) {
+        this.refClass = refClass;
     }
 
     public String getGetter() {
@@ -978,7 +978,7 @@ public String toString() {
         final StringBuilder sb = new StringBuilder("CodegenProperty{");
         sb.append("openApiType='").append(openApiType).append('\'');
         sb.append(", baseName='").append(baseName).append('\'');
-        sb.append(", complexType='").append(complexType).append('\'');
+        sb.append(", refClass='").append(refClass).append('\'');
         sb.append(", getter='").append(getter).append('\'');
         sb.append(", setter='").append(setter).append('\'');
         sb.append(", description='").append(description).append('\'');
@@ -1151,7 +1151,7 @@ public boolean equals(Object o) {
                 Objects.equals(composedSchemas, that.composedSchemas) &&
                 Objects.equals(openApiType, that.openApiType) &&
                 Objects.equals(baseName, that.baseName) &&
-                Objects.equals(complexType, that.complexType) &&
+                Objects.equals(refClass, that.refClass) &&
                 Objects.equals(getter, that.getter) &&
                 Objects.equals(setter, that.setter) &&
                 Objects.equals(description, that.description) &&
@@ -1197,7 +1197,7 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
 
-        return Objects.hash(openApiType, baseName, complexType, getter, setter, description,
+        return Objects.hash(openApiType, baseName, refClass, getter, setter, description,
                 dataType, datatypeWithEnum, dataFormat, name, min, max, defaultValue,
                 defaultValueWithParam, baseType, containerType, title, unescapedDescription,
                 maxLength, minLength, pattern, example, jsonSchema, minimum, maximum,
diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index 8685ccf6a65..de4109daae9 100644
--- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -2579,7 +2579,7 @@ protected void updateModelForComposedSchema(CodegenModel m, Schema schema, Map<S
                     CodegenProperty interfaceProperty = fromProperty(languageType, interfaceSchema, false);
                     if (ModelUtils.isArraySchema(interfaceSchema) || ModelUtils.isMapSchema(interfaceSchema)) {
                         while (interfaceProperty != null) {
-                            addImport(m, interfaceProperty.complexType);
+                            addImport(m, interfaceProperty.refClass);
                             interfaceProperty = interfaceProperty.items;
                         }
                     }
@@ -2921,7 +2921,7 @@ public CodegenModel fromModel(String name, Schema schema) {
         if (ModelUtils.isArraySchema(schema)) {
             CodegenProperty arrayProperty = fromProperty("items", schema, false);
             m.setItems(arrayProperty.items);
-            m.arrayModelType = arrayProperty.complexType;
+            m.arrayModelType = arrayProperty.refClass;
             addParentContainer(m, name, schema);
         } else if (ModelUtils.isIntegerSchema(schema)) { // integer type
             updateModelForInteger(m, schema);
@@ -3884,7 +3884,7 @@ protected void updatePropertyForArray(CodegenProperty property, CodegenProperty
         }
         property.dataFormat = innerProperty.dataFormat;
         if (!languageSpecificPrimitives.contains(innerProperty.baseType)) {
-            property.complexType = innerProperty.baseType;
+            property.refClass = innerProperty.baseType;
         } else {
             property.isPrimitiveType = true;
         }
@@ -3919,7 +3919,7 @@ protected void updatePropertyForMap(CodegenProperty property, CodegenProperty in
             return;
         }
         if (!languageSpecificPrimitives.contains(innerProperty.baseType)) {
-            property.complexType = innerProperty.baseType;
+            property.refClass = innerProperty.baseType;
         } else {
             property.isPrimitiveType = true;
         }
@@ -4031,7 +4031,7 @@ protected void setNonArrayMapProperty(CodegenProperty property, String type) {
         if (languageSpecificPrimitives().contains(type)) {
             property.isPrimitiveType = true;
         } else {
-            property.complexType = property.baseType;
+            property.refClass = property.baseType;
             property.isModel = true;
         }
     }
@@ -4099,8 +4099,8 @@ protected void handleMethodResponse(Operation operation,
                 CodegenProperty innerProperty = fromProperty("response", getAdditionalProperties(responseSchema), false);
                 op.returnBaseType = innerProperty.baseType;
             } else {
-                if (cm.complexType != null) {
-                    op.returnBaseType = cm.complexType;
+                if (cm.refClass != null) {
+                    op.returnBaseType = cm.refClass;
                 } else {
                     op.returnBaseType = cm.baseType;
                 }
@@ -4536,11 +4536,11 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
         r.dataType = getTypeDeclaration(responseSchema);
 
         if (!ModelUtils.isArraySchema(responseSchema)) {
-            if (cp.complexType != null) {
+            if (cp.refClass != null) {
                 if (cp.items != null) {
-                    r.baseType = cp.items.complexType;
+                    r.baseType = cp.items.refClass;
                 } else {
-                    r.baseType = cp.complexType;
+                    r.baseType = cp.refClass;
                 }
                 r.isModel = true;
             } else {
@@ -4953,7 +4953,7 @@ public CodegenParameter fromParameter(Parameter parameter, Set<String> imports,
         if (parameterModelName != null) {
             codegenParameter.dataType = parameterModelName;
             if (ModelUtils.isObjectSchema(parameterSchema)) {
-                codegenProperty.complexType = codegenParameter.dataType;
+                codegenProperty.refClass = codegenParameter.dataType;
             }
         } else {
             codegenParameter.dataType = codegenProperty.dataType;
@@ -4996,8 +4996,8 @@ public CodegenParameter fromParameter(Parameter parameter, Set<String> imports,
         codegenParameter.paramName = toParamName(priorJsonPathFragment);
         if (!addSchemaImportsFromV3SpecLocations) {
             // import
-            if (codegenProperty.complexType != null) {
-                imports.add(codegenProperty.complexType);
+            if (codegenProperty.refClass != null) {
+                imports.add(codegenProperty.refClass);
             }
         }
         codegenParameter.pattern = toRegularExpression(parameterSchema.getPattern());
@@ -5367,7 +5367,7 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
      */
     protected void addParentContainer(CodegenModel model, String name, Schema schema) {
         final CodegenProperty property = fromProperty(name, schema, false);
-        addImport(model, property.complexType);
+        addImport(model, property.refClass);
         model.parent = toInstantiationType(schema);
         if (!addSchemaImportsFromV3SpecLocations) {
             final String containerType = property.containerType;
@@ -6757,8 +6757,8 @@ public CodegenParameter fromFormProperty(String name, Schema propertySchema, Set
 
         if (!addSchemaImportsFromV3SpecLocations) {
             // import
-            if (codegenProperty.complexType != null) {
-                imports.add(codegenProperty.complexType);
+            if (codegenProperty.refClass != null) {
+                imports.add(codegenProperty.refClass);
             }
         }
         setParameterExampleValue(codegenParameter);
@@ -6795,13 +6795,13 @@ protected void addBodyModelSchema(CodegenParameter codegenParameter, String name
         } else {
             CodegenProperty codegenProperty = fromProperty("property", schema, false);
 
-            if (codegenProperty != null && codegenProperty.getComplexType() != null && codegenProperty.getComplexType().contains(" | ")) {
+            if (codegenProperty != null && codegenProperty.getRefClass() != null && codegenProperty.getRefClass().contains(" | ")) {
                 if (!addSchemaImportsFromV3SpecLocations) {
                     // TODO move this splitting logic to the generator that needs it only
-                    List<String> parts = Arrays.asList(codegenProperty.getComplexType().split(" \\| "));
+                    List<String> parts = Arrays.asList(codegenProperty.getRefClass().split(" \\| "));
                     imports.addAll(parts);
                 }
-                String codegenModelName = codegenProperty.getComplexType();
+                String codegenModelName = codegenProperty.getRefClass();
                 codegenParameter.baseName = codegenModelName;
                 codegenParameter.paramName = toParamName(codegenParameter.baseName);
                 codegenParameter.baseType = codegenParameter.baseName;
@@ -6841,8 +6841,8 @@ protected void addBodyModelSchema(CodegenParameter codegenParameter, String name
                     if (!addSchemaImportsFromV3SpecLocations) {
                         imports.add(codegenParameter.baseType);
 
-                        if (codegenProperty.complexType != null) {
-                            imports.add(codegenProperty.complexType);
+                        if (codegenProperty.refClass != null) {
+                            imports.add(codegenProperty.refClass);
                         }
                     }
                 }
@@ -6869,8 +6869,8 @@ protected void updateRequestBodyForMap(CodegenParameter codegenParameter, Schema
                 imports.add(codegenProperty.baseType);
                 CodegenProperty innerCp = codegenProperty;
                 while (innerCp != null) {
-                    if (innerCp.complexType != null) {
-                        imports.add(innerCp.complexType);
+                    if (innerCp.refClass != null) {
+                        imports.add(innerCp.refClass);
                     }
                     innerCp = innerCp.items;
                 }
@@ -6912,8 +6912,8 @@ protected void updateRequestBodyForPrimitiveType(CodegenParameter codegenParamet
             codegenParameter.isNullable = codegenProperty.isNullable;
 
             if (!addSchemaImportsFromV3SpecLocations) {
-                if (codegenProperty.complexType != null) {
-                    imports.add(codegenProperty.complexType);
+                if (codegenProperty.refClass != null) {
+                    imports.add(codegenProperty.refClass);
                 }
             }
         }
@@ -6974,8 +6974,8 @@ protected void updateRequestBodyForArray(CodegenParameter codegenParameter, Sche
             // also find the most inner item
             while (innerCp != null) {
                 if (!addSchemaImportsFromV3SpecLocations) {
-                    if (innerCp.complexType != null) {
-                        imports.add(innerCp.complexType);
+                    if (innerCp.refClass != null) {
+                        imports.add(innerCp.refClass);
                     }
                 }
                 mostInnerItem = innerCp;
@@ -6987,10 +6987,10 @@ protected void updateRequestBodyForArray(CodegenParameter codegenParameter, Sche
             }
 
             if (StringUtils.isEmpty(bodyParameterName)) {
-                if (StringUtils.isEmpty(mostInnerItem.complexType)) {
+                if (StringUtils.isEmpty(mostInnerItem.refClass)) {
                     codegenParameter.baseName = "request_body";
                 } else {
-                    codegenParameter.baseName = mostInnerItem.complexType;
+                    codegenParameter.baseName = mostInnerItem.refClass;
                 }
             } else {
                 codegenParameter.baseName = bodyParameterName;
@@ -7235,7 +7235,7 @@ protected void addRequiredVarsMap(Schema schema, IJsonSchemaValidationProperties
         /*
         this should be called after vars and additionalProperties are set
         Features added by storing codegenProperty values:
-        - complexType stores reference to additionalProperties definition
+        - refClass stores reference to additionalProperties definition
         - baseName stores original name (can be invalid in a programming language)
         - nameInSnakeCase can store valid name for a programming language
          */
diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java
index d5e8f7faa1f..e064adb2c59 100644
--- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java
+++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java
@@ -292,7 +292,7 @@ default String getBaseType() {
     /**
      * @return complex type that can contain type parameters - like {@code List<Items>} for Java
      */
-    default String getComplexType() {
+    default String getRefClass() {
         return getBaseType();
     };
 
@@ -344,13 +344,13 @@ default Set<String> getImports(boolean importContainerType, boolean importBaseTy
         if (this.getIsArray() || this.getIsMap()) {
             if (importContainerType) {
                 /*
-                use-case for this complexType block:
+                use-case for this refClass block:
                 DefaultCodegenTest.objectQueryParamIdentifyAsObject
                 DefaultCodegenTest.mapParamImportInnerObject
                 */
-                String complexType = this.getComplexType();
-                if (complexType != null) {
-                    imports.add(complexType);
+                String refClass = this.getRefClass();
+                if (refClass != null) {
+                    imports.add(refClass);
                 }
                 /*
                 use-case:
@@ -363,9 +363,9 @@ default Set<String> getImports(boolean importContainerType, boolean importBaseTy
             }
         } else {
             // referenced or inline schemas
-            String complexType = this.getComplexType();
-            if (complexType != null) {
-                imports.add(complexType);
+            String refClass = this.getRefClass();
+            if (refClass != null) {
+                imports.add(refClass);
             }
             String baseType = this.getBaseType();
             if (importBaseType && baseType != null) {
diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
index 1f87e4e2ff9..680e445c112 100644
--- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
+++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
@@ -1030,7 +1030,7 @@ public CodegenProperty fromProperty(String name, Schema p, boolean required, boo
         if (cp.isAnyType && cp.isNullable) {
             cp.isNullable = false;
         }
-        if (cp.isNullable && cp.complexType == null) {
+        if (cp.isNullable && cp.refClass == null) {
             cp.setIsNull(true);
             cp.isNullable = false;
             cp.setHasMultipleTypes(true);
@@ -1054,7 +1054,7 @@ public CodegenProperty fromProperty(String name, Schema p, boolean required, boo
         }
         Schema unaliasedSchema = unaliasSchema(p);
         if (cp.isPrimitiveType && unaliasedSchema.get$ref() != null) {
-            cp.complexType = cp.dataType;
+            cp.refClass = cp.dataType;
         }
         return cp;
     }
@@ -1133,10 +1133,10 @@ public CodegenParameter fromRequestBody(RequestBody body, Set<String> imports, S
         Schema unaliasedSchema = unaliasSchema(schema);
         CodegenProperty unaliasedProp = fromProperty("body", unaliasedSchema, false);
         Boolean dataTypeMismatch = !cp.dataType.equals(unaliasedProp.dataType);
-        Boolean baseTypeMismatch = !cp.baseType.equals(unaliasedProp.complexType) && unaliasedProp.complexType != null;
+        Boolean baseTypeMismatch = !cp.baseType.equals(unaliasedProp.refClass) && unaliasedProp.refClass != null;
         if (dataTypeMismatch || baseTypeMismatch) {
             cp.dataType = unaliasedProp.dataType;
-            cp.baseType = unaliasedProp.complexType;
+            cp.baseType = unaliasedProp.refClass;
         }
         return cp;
     }
@@ -2440,22 +2440,22 @@ protected void updateModelForComposedSchema(CodegenModel m, Schema schema, Map<S
         if (cs != null) {
             if (cs.getAllOf() != null && !cs.getAllOf().isEmpty()) {
                 for (CodegenProperty cp: cs.getAllOf()) {
-                    if (cp.complexType != null) {
-                        addImport(m, cp.complexType);
+                    if (cp.refClass != null) {
+                        addImport(m, cp.refClass);
                     }
                 }
             }
             if (cs.getOneOf() != null && !cs.getOneOf().isEmpty()) {
                 for (CodegenProperty cp: cs.getOneOf()) {
-                    if (cp.complexType != null) {
-                        addImport(m, cp.complexType);
+                    if (cp.refClass != null) {
+                        addImport(m, cp.refClass);
                     }
                 }
             }
             if (cs.getAnyOf() != null && !cs.getAnyOf().isEmpty()) {
                 for (CodegenProperty cp: cs.getAnyOf()) {
-                    if (cp.complexType != null) {
-                        addImport(m, cp.complexType);
+                    if (cp.refClass != null) {
+                        addImport(m, cp.refClass);
                     }
                 }
             }
diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache b/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache
index 9faeed2eaf3..747ad0af7d4 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache
+++ b/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache
@@ -371,7 +371,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{name}} = ({{{datatypeWithEnum}}})in.readValue(null);
 {{/isPrimitiveType}}
 {{^isPrimitiveType}}
-    {{name}} = ({{{datatypeWithEnum}}})in.readValue({{complexType}}.class.getClassLoader());
+    {{name}} = ({{{datatypeWithEnum}}})in.readValue({{refClass}}.class.getClassLoader());
 {{/isPrimitiveType}}
 {{/vars}}
 {{/isArray}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache b/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache
index 156cc4cd5cc..29476fedbdb 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache
+++ b/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache
@@ -371,7 +371,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{name}} = ({{{datatypeWithEnum}}})in.readValue(null);
 {{/isPrimitiveType}}
 {{^isPrimitiveType}}
-    {{name}} = ({{{datatypeWithEnum}}})in.readValue({{complexType}}.class.getClassLoader());
+    {{name}} = ({{{datatypeWithEnum}}})in.readValue({{refClass}}.class.getClassLoader());
 {{/isPrimitiveType}}
 {{/vars}}
 {{/isArray}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/pojo.mustache b/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/pojo.mustache
index 804a2154e0e..6147777f578 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/pojo.mustache
+++ b/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/pojo.mustache
@@ -371,7 +371,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{name}} = ({{{datatypeWithEnum}}})in.readValue(null);
 {{/isPrimitiveType}}
 {{^isPrimitiveType}}
-    {{name}} = ({{{datatypeWithEnum}}})in.readValue({{complexType}}.class.getClassLoader());
+    {{name}} = ({{{datatypeWithEnum}}})in.readValue({{refClass}}.class.getClassLoader());
 {{/isPrimitiveType}}
 {{/vars}}
 {{/isArray}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache b/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
index 48962a371e2..c76e0dfaace 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
+++ b/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
@@ -382,7 +382,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{name}} = ({{{datatypeWithEnum}}})in.readValue(null);
 {{/isPrimitiveType}}
 {{^isPrimitiveType}}
-    {{name}} = ({{{datatypeWithEnum}}})in.readValue({{complexType}}.class.getClassLoader());
+    {{name}} = ({{{datatypeWithEnum}}})in.readValue({{refClass}}.class.getClassLoader());
 {{/isPrimitiveType}}
 {{/vars}}
 {{/isArray}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-json-schema-generator/src/main/resources/Java/pojo.mustache
index 5972ac9f29e..e59d7995d6b 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/Java/pojo.mustache
+++ b/modules/openapi-json-schema-generator/src/main/resources/Java/pojo.mustache
@@ -359,7 +359,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{name}} = ({{{datatypeWithEnum}}})in.readValue(null);
 {{/isPrimitiveType}}
 {{^isPrimitiveType}}
-    {{name}} = ({{{datatypeWithEnum}}})in.readValue({{complexType}}.class.getClassLoader());
+    {{name}} = ({{{datatypeWithEnum}}})in.readValue({{refClass}}.class.getClassLoader());
 {{/isPrimitiveType}}
 {{/vars}}
 {{/isArray}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/class_doc.mustache b/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/class_doc.mustache
index a3405b25c84..623e317aa5f 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/class_doc.mustache
+++ b/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/class_doc.mustache
@@ -3,7 +3,7 @@
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isEnum}}[**inline**](#{{datatypeWithEnum}}){{/isEnum}}{{^isEnum}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}}{{/isEnum}} | {{description}} | {{^required}} [optional]{{/required}}{{#isReadOnly}} [readonly]{{/isReadOnly}}
+{{#vars}}**{{name}}** | {{#isEnum}}[**inline**](#{{datatypeWithEnum}}){{/isEnum}}{{^isEnum}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{refClass}}.md){{/isPrimitiveType}}{{/isEnum}} | {{description}} | {{^required}} [optional]{{/required}}{{#isReadOnly}} [readonly]{{/isReadOnly}}
 {{/vars}}
 {{#vars}}{{#isEnum}}
 
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/api_doc_schema_type_hint.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/api_doc_schema_type_hint.handlebars
index 5828b601de7..ffb43aaa6f5 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/api_doc_schema_type_hint.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/api_doc_schema_type_hint.handlebars
@@ -1,9 +1,9 @@
 
 # {{#if schemaNamePrefix1}}{{#if anchorPrefix}}<a id="{{anchorPrefix}}.{{> api_doc_schema_fancy_schema_name }}" >{{/if}}{{> api_doc_schema_fancy_schema_name }}{{#if anchorPrefix}}</a>{{/if}}{{else}}{{baseName}}{{/if}}
-{{#if complexType}}
+{{#if refClass}}
 Type | Description  | Notes
 ------------- | ------------- | -------------
-[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md) | {{#if description}}{{description}}{{/if}} | {{#if isReadOnly}}[readonly] {{/if}}
+[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md) | {{#if description}}{{description}}{{/if}} | {{#if isReadOnly}}[readonly] {{/if}}
 
 {{else}}
 {{> schema_doc complexTypePrefix="{{complexTypePrefix}}" }}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/composed_schemas.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/composed_schemas.handlebars
index 9deb056577d..e2e7d81be3e 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/composed_schemas.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/composed_schemas.handlebars
@@ -1,16 +1,16 @@
 {{#with composedSchemas}}
 {{#each allOf}}
-{{#unless complexType}}
+{{#unless refClass}}
 {{> model_templates/schema }}
 {{/unless}}
 {{/each}}
 {{#each oneOf}}
-{{#unless complexType}}
+{{#unless refClass}}
 {{> model_templates/schema }}
 {{/unless}}
 {{/each}}
 {{#each anyOf}}
-{{#unless complexType}}
+{{#unless refClass}}
 {{> model_templates/schema }}
 {{/unless}}
 {{/each}}
@@ -30,8 +30,8 @@ def all_of(cls):
     # loading
     return [
 {{#each allOf}}
-{{#if complexType}}
-        {{complexType}},
+{{#if refClass}}
+        {{refClass}},
 {{else}}
     {{#if nameInSnakeCase}}
         cls.{{name}},
@@ -56,8 +56,8 @@ def one_of(cls):
     # loading
     return [
 {{#each oneOf}}
-{{#if complexType}}
-        {{complexType}},
+{{#if refClass}}
+        {{refClass}},
 {{else}}
     {{#if nameInSnakeCase}}
         cls.{{name}},
@@ -82,8 +82,8 @@ def any_of(cls):
     # loading
     return [
 {{#each anyOf}}
-{{#if complexType}}
-        {{complexType}},
+{{#if refClass}}
+        {{refClass}},
 {{else}}
     {{#if nameInSnakeCase}}
         cls.{{name}},
@@ -96,11 +96,11 @@ def any_of(cls):
 {{/if}}
 {{#if not}}
 {{#with not}}
-{{#if complexType}}
+{{#if refClass}}
 
 @staticmethod
-def {{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}() -> typing.Type['{{complexType}}']:
-    return {{complexType}}
+def {{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}() -> typing.Type['{{refClass}}']:
+    return {{refClass}}
 {{else}}
 {{> model_templates/schema }}
 {{/if}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/dict_partial.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/dict_partial.handlebars
index 9ff3e7c37ea..93815b00f49 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/dict_partial.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/dict_partial.handlebars
@@ -27,11 +27,11 @@ def discriminator():
 
 class properties:
 {{#each vars}}
-{{#if complexType}}
+{{#if refClass}}
 
     @staticmethod
-    def {{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}() -> typing.Type['{{complexType}}']:
-        return {{complexType}}
+    def {{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}() -> typing.Type['{{refClass}}']:
+        return {{refClass}}
 {{else}}
     {{> model_templates/schema }}
 {{/if}}
@@ -47,11 +47,11 @@ class properties:
     }
 {{/if}}
 {{#with additionalProperties}}
-{{#if complexType}}
+{{#if refClass}}
 
 @staticmethod
-def {{baseName}}() -> typing.Type['{{complexType}}']:
-    return {{complexType}}
+def {{baseName}}() -> typing.Type['{{refClass}}']:
+    return {{refClass}}
 {{else}}
 {{> model_templates/schema }}
 {{/if}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/list_partial.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/list_partial.handlebars
index 97c4003fe9b..ffe154af3da 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/list_partial.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/list_partial.handlebars
@@ -1,9 +1,9 @@
 {{#with items}}
-{{#if complexType}}
+{{#if refClass}}
 
 @staticmethod
-def {{baseName}}() -> typing.Type['{{complexType}}']:
-    return {{complexType}}
+def {{baseName}}() -> typing.Type['{{refClass}}']:
+    return {{refClass}}
 {{else}}
 {{> model_templates/schema }}
 {{/if}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/new.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/new.handlebars
index fbf25512bad..306a6462309 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/new.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/new.handlebars
@@ -4,7 +4,7 @@ def __new__(
     *args: typing.Union[{{> model_templates/schema_python_types }}],
 {{else}}
 {{#if isArray }}
-    arg: typing.Union[typing.Tuple[{{#with items}}{{#if complexType}}'{{complexType}}'{{else}}typing.Union[MetaOapg.{{baseName}}, {{> model_templates/schema_python_types }}]{{/if}}{{/with}}], typing.List[{{#with items}}{{#if complexType}}'{{complexType}}'{{else}}typing.Union[MetaOapg.{{baseName}}, {{> model_templates/schema_python_types }}]{{/if}}{{/with}}]],
+    arg: typing.Union[typing.Tuple[{{#with items}}{{#if refClass}}'{{refClass}}'{{else}}typing.Union[MetaOapg.{{baseName}}, {{> model_templates/schema_python_types }}]{{/if}}{{/with}}], typing.List[{{#with items}}{{#if refClass}}'{{refClass}}'{{else}}typing.Union[MetaOapg.{{baseName}}, {{> model_templates/schema_python_types }}]{{/if}}{{/with}}]],
 {{else}}
     *args: typing.Union[{{> model_templates/schema_python_types }}],
 {{/if}}
@@ -14,8 +14,8 @@ def __new__(
 {{#each getRequiredVarsMap}}
 {{#with this}}
 {{#unless nameInSnakeCase}}
-{{#if complexType}}
-    {{baseName}}: '{{complexType}}',
+{{#if refClass}}
+    {{baseName}}: '{{refClass}}',
 {{else}}
     {{#if getSchemaIsFromAdditionalProperties}}
         {{#if addPropsUnset}}
@@ -35,8 +35,8 @@ def __new__(
 {{#each vars}}
 {{#unless nameInSnakeCase}}
 {{#unless getRequired}}
-{{#if complexType}}
-    {{baseName}}: typing.Union['{{complexType}}', schemas.Unset] = schemas.unset,
+{{#if refClass}}
+    {{baseName}}: typing.Union['{{refClass}}', schemas.Unset] = schemas.unset,
 {{else}}
     {{baseName}}: typing.Union[MetaOapg.properties.{{baseName}}, {{> model_templates/schema_python_types }}schemas.Unset] = schemas.unset,
 {{/if}}
@@ -46,8 +46,8 @@ def __new__(
     _configuration: typing.Optional[schemas.Configuration] = None,
 {{#with additionalProperties}}
 {{#unless getIsBooleanSchemaFalse}}
-{{#if complexType}}
-    **kwargs: '{{complexType}}',
+{{#if refClass}}
+    **kwargs: '{{refClass}}',
 {{else}}
     **kwargs: typing.Union[MetaOapg.additional_properties, {{> model_templates/schema_python_types }}],
 {{/if}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/notes_msg.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/notes_msg.handlebars
index 43d1163b5c0..4385b1a430f 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/notes_msg.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/notes_msg.handlebars
@@ -1 +1 @@
-{{#unless isArray}}{{#unless complexType}}{{#with allowableValues}}must be one of [{{#each enumVars}}{{#eq value "schemas.NoneClass.NONE"}}None{{else}}{{#eq value "schemas.BoolClass.TRUE"}}True{{else}}{{#eq value "schemas.BoolClass.FALSE"}}False{{else}}{{{value}}}{{/eq}}{{/eq}}{{/eq}}, {{/each}}] {{/with}}{{#if defaultValue}}{{#unless hasRequired}}if omitted the server will use the default value of {{{defaultValue}}}{{/unless}}{{/if}}{{#eq getFormat "uuid"}}value must be a uuid{{/eq}}{{#eq getFormat "date"}}value must conform to RFC-3339 full-date YYYY-MM-DD{{/eq}}{{#eq getFormat "date-time"}}value must conform to RFC-3339 date-time{{/eq}}{{#eq getFormat "number"}}value must be numeric and storable in decimal.Decimal{{/eq}}{{#eq getFormat "int32"}}value must be a 32 bit integer{{/eq}}{{#eq getFormat "int64"}}value must be a 64 bit integer{{/eq}}{{#eq getFormat "double"}}value must be a 64 bit float{{/eq}}{{#eq getFormat "float"}}value must be a 32 bit float{{/eq}}{{/unless}}{{/unless}}
\ No newline at end of file
+{{#unless isArray}}{{#unless refClass}}{{#with allowableValues}}must be one of [{{#each enumVars}}{{#eq value "schemas.NoneClass.NONE"}}None{{else}}{{#eq value "schemas.BoolClass.TRUE"}}True{{else}}{{#eq value "schemas.BoolClass.FALSE"}}False{{else}}{{{value}}}{{/eq}}{{/eq}}{{/eq}}, {{/each}}] {{/with}}{{#if defaultValue}}{{#unless hasRequired}}if omitted the server will use the default value of {{{defaultValue}}}{{/unless}}{{/if}}{{#eq getFormat "uuid"}}value must be a uuid{{/eq}}{{#eq getFormat "date"}}value must conform to RFC-3339 full-date YYYY-MM-DD{{/eq}}{{#eq getFormat "date-time"}}value must conform to RFC-3339 date-time{{/eq}}{{#eq getFormat "number"}}value must be numeric and storable in decimal.Decimal{{/eq}}{{#eq getFormat "int32"}}value must be a 32 bit integer{{/eq}}{{#eq getFormat "int64"}}value must be a 64 bit integer{{/eq}}{{#eq getFormat "double"}}value must be a 64 bit float{{/eq}}{{#eq getFormat "float"}}value must be a 32 bit float{{/eq}}{{/unless}}{{/unless}}
\ No newline at end of file
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems_with_addprops.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems_with_addprops.handlebars
index 6fd1d8a3a37..9a0572db24f 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems_with_addprops.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems_with_addprops.handlebars
@@ -3,8 +3,8 @@
 {{#with this}}
 
 @typing.overload
-{{#if complexType}}
-def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> '{{complexType}}': ...
+{{#if refClass}}
+def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> '{{refClass}}': ...
 {{else}}
 {{#if schemaIsFromAdditionalProperties}}
 def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> MetaOapg.additional_properties: ...
@@ -24,8 +24,8 @@ def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> Meta
 {{#unless required}}
 
 @typing.overload
-{{#if complexType}}
-def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> '{{complexType}}': ...
+{{#if refClass}}
+def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> '{{refClass}}': ...
 {{else}}
 {{#if nameInSnakeCase}}
 def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{name}}: ...
@@ -41,7 +41,7 @@ def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> Meta
 {{#unless getIsBooleanSchemaFalse}}
 
 @typing.overload
-def __getitem__(self, name: str) -> {{#if complexType}}'{{complexType}}'{{else}}MetaOapg.{{baseName}}{{/if}}: ...
+def __getitem__(self, name: str) -> {{#if refClass}}'{{refClass}}'{{else}}MetaOapg.{{baseName}}{{/if}}: ...
 {{/unless}}
 {{/with}}
 
@@ -57,8 +57,8 @@ def __getitem__(self, name: str) -> {{#if complexType}}'{{complexType}}'{{else}}
 {{#with this}}
 
 @typing.overload
-{{#if complexType}}
-def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> '{{complexType}}': ...
+{{#if refClass}}
+def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> '{{refClass}}': ...
 {{else}}
 {{#if schemaIsFromAdditionalProperties}}
 def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> MetaOapg.additional_properties: ...
@@ -78,8 +78,8 @@ def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> Me
 {{#unless required}}
 
 @typing.overload
-{{#if complexType}}
-def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> typing.Union['{{complexType}}', schemas.Unset]: ...
+{{#if refClass}}
+def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> typing.Union['{{refClass}}', schemas.Unset]: ...
 {{else}}
 {{#if nameInSnakeCase}}
 def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> typing.Union[MetaOapg.properties.{{name}}, schemas.Unset]: ...
@@ -95,7 +95,7 @@ def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> ty
 {{#unless getIsBooleanSchemaFalse}}
 
 @typing.overload
-def get_item_oapg(self, name: str) -> typing.Union[{{#if complexType}}'{{complexType}}'{{else}}MetaOapg.{{baseName}}{{/if}}, schemas.Unset]: ...
+def get_item_oapg(self, name: str) -> typing.Union[{{#if refClass}}'{{refClass}}'{{else}}MetaOapg.{{baseName}}{{/if}}, schemas.Unset]: ...
 {{/unless}}
 {{/with}}
 
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems_with_addprops_getitem.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems_with_addprops_getitem.handlebars
index f35667373fc..326b3d9bd20 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems_with_addprops_getitem.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems_with_addprops_getitem.handlebars
@@ -1,4 +1,4 @@
-def {{methodName}}(self, name: typing.Union[{{#each getRequiredVarsMap}}{{#with this}}typing_extensions.Literal["{{{baseName}}}"], {{/with}}{{/each}}{{#each vars}}{{#unless required}}typing_extensions.Literal["{{{baseName}}}"], {{/unless}}{{/each}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}}str, {{/unless}}{{/with}}]){{#not vars}}{{#not getRequiredVarsMap}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}} -> {{#if complexType}}'{{complexType}}'{{else}}MetaOapg.{{baseName}}{{/if}}{{/unless}}{{/with}}{{/not}}{{/not}}:
+def {{methodName}}(self, name: typing.Union[{{#each getRequiredVarsMap}}{{#with this}}typing_extensions.Literal["{{{baseName}}}"], {{/with}}{{/each}}{{#each vars}}{{#unless required}}typing_extensions.Literal["{{{baseName}}}"], {{/unless}}{{/each}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}}str, {{/unless}}{{/with}}]){{#not vars}}{{#not getRequiredVarsMap}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}} -> {{#if refClass}}'{{refClass}}'{{else}}MetaOapg.{{baseName}}{{/if}}{{/unless}}{{/with}}{{/not}}{{/not}}:
 {{#eq methodName "__getitem__"}}
     # dict_instance[name] accessor
 {{/eq}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems_without_addprops.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems_without_addprops.handlebars
index efb37d4ca18..be7bee936ca 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems_without_addprops.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems_without_addprops.handlebars
@@ -2,8 +2,8 @@
 {{#each vars}}
 
 @typing.overload
-{{#if complexType}}
-def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> '{{complexType}}': ...
+{{#if refClass}}
+def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> '{{refClass}}': ...
 {{else}}
 {{#if nameInSnakeCase}}
 def __getitem__(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> MetaOapg.properties.{{name}}: ...
@@ -25,8 +25,8 @@ def __getitem__(self, name: typing.Union[typing_extensions.Literal[{{#each vars}
 {{#each vars}}
 
 @typing.overload
-{{#if complexType}}
-def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> {{#unless required}}typing.Union[{{/unless}}'{{complexType}}'{{#unless required}}, schemas.Unset]{{/unless}}: ...
+{{#if refClass}}
+def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> {{#unless required}}typing.Union[{{/unless}}'{{refClass}}'{{#unless required}}, schemas.Unset]{{/unless}}: ...
 {{else}}
 {{#if nameInSnakeCase}}
 def get_item_oapg(self, name: typing_extensions.Literal["{{{baseName}}}"]) -> {{#unless required}}typing.Union[{{/unless}}MetaOapg.properties.{{name}}{{#unless required}}, schemas.Unset]{{/unless}}: ...
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_type_hints_required.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_type_hints_required.handlebars
index 2a265d61d77..9e3d9b8224d 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_type_hints_required.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_type_hints_required.handlebars
@@ -1,8 +1,8 @@
 {{#each getRequiredVarsMap}}
 {{#with this}}
 {{#unless nameInSnakeCase}}
-{{#if complexType}}
-{{baseName}}: '{{complexType}}'
+{{#if refClass}}
+{{baseName}}: '{{refClass}}'
 {{else}}
 {{#if schemaIsFromAdditionalProperties}}
 {{#if addPropsUnset}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_list.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_list.handlebars
index ae52b3e923f..ef501877ee8 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_list.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_list.handlebars
@@ -35,5 +35,5 @@ class {{> model_templates/classname }}(
 
     {{> model_templates/new }}
 
-    def __getitem__(self, i: int) -> {{#with items}}{{#if complexType}}'{{complexType}}'{{else}}MetaOapg.items{{/if}}{{/with}}:
+    def __getitem__(self, i: int) -> {{#with items}}{{#if refClass}}'{{refClass}}'{{else}}MetaOapg.items{{/if}}{{/with}}:
         return super().__getitem__(i)
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/var_equals_cls.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/var_equals_cls.handlebars
index 4e1177d37ba..e4c9f79d9b9 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/var_equals_cls.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/var_equals_cls.handlebars
@@ -1 +1 @@
-{{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}} = {{#or getIsBooleanSchemaTrue getIsBooleanSchemaFalse}}{{#if getIsBooleanSchemaTrue}}schemas.AnyTypeSchema{{else}}schemas.NotAnyTypeSchema{{/if}}{{else}}{{#if complexType}}{{complexType}}{{else}}schemas.{{#if isNullable}}Nullable{{/if}}{{#if getIsNull}}None{{/if}}{{#if isAnyType}}AnyType{{/if}}{{#if isMap}}Dict{{/if}}{{#if isArray}}List{{/if}}{{#if isString}}{{#eq format "date"}}Date{{/eq}}{{#eq format "date-time"}}DateTime{{/eq}}{{#eq format "uuid"}}UUID{{/eq}}{{#eq format "number"}}Decimal{{/eq}}{{#eq format "binary"}}Binary{{/eq}}{{#neq format "date"}}{{#neq format "date-time"}}{{#neq format "uuid"}}{{#neq format "number"}}{{#neq format "binary"}}Str{{/neq}}{{/neq}}{{/neq}}{{/neq}}{{/neq}}{{/if}}{{#if isInteger}}{{#eq format "int32"}}Int32{{/eq}}{{#eq format "int64"}}Int64{{/eq}}{{#neq format "int32"}}{{#neq format "int64"}}Int{{/neq}}{{/neq}}{{/if}}{{#if isNumber}}{{#eq format "float"}}Float32{{/eq}}{{#eq format "double"}}Float64{{/eq}}{{#neq format "float"}}{{#neq format "double"}}Number{{/neq}}{{/neq}}{{/if}}{{#if isBoolean}}Bool{{/if}}Schema{{/if}}{{/or}}
+{{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}{{/if}} = {{#or getIsBooleanSchemaTrue getIsBooleanSchemaFalse}}{{#if getIsBooleanSchemaTrue}}schemas.AnyTypeSchema{{else}}schemas.NotAnyTypeSchema{{/if}}{{else}}{{#if refClass}}{{refClass}}{{else}}schemas.{{#if isNullable}}Nullable{{/if}}{{#if getIsNull}}None{{/if}}{{#if isAnyType}}AnyType{{/if}}{{#if isMap}}Dict{{/if}}{{#if isArray}}List{{/if}}{{#if isString}}{{#eq format "date"}}Date{{/eq}}{{#eq format "date-time"}}DateTime{{/eq}}{{#eq format "uuid"}}UUID{{/eq}}{{#eq format "number"}}Decimal{{/eq}}{{#eq format "binary"}}Binary{{/eq}}{{#neq format "date"}}{{#neq format "date-time"}}{{#neq format "uuid"}}{{#neq format "number"}}{{#neq format "binary"}}Str{{/neq}}{{/neq}}{{/neq}}{{/neq}}{{/neq}}{{/if}}{{#if isInteger}}{{#eq format "int32"}}Int32{{/eq}}{{#eq format "int64"}}Int64{{/eq}}{{#neq format "int32"}}{{#neq format "int64"}}Int{{/neq}}{{/neq}}{{/if}}{{#if isNumber}}{{#eq format "float"}}Float32{{/eq}}{{#eq format "double"}}Float64{{/eq}}{{#neq format "float"}}{{#neq format "double"}}Number{{/neq}}{{/neq}}{{/if}}{{#if isBoolean}}Bool{{/if}}Schema{{/if}}{{/or}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/schema_doc.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/schema_doc.handlebars
index 8e67813ed6e..cbdae6bd359 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/schema_doc.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/schema_doc.handlebars
@@ -13,11 +13,11 @@ Input Type | Accessed Type | Description | Notes
 Key | Input Type | Accessed Type | Description | Notes
 ------------ | ------------- | ------------- | ------------- | -------------
     {{#each getRequiredVarsMap}}
-**{{#with this}}{{#unless complexType}}{{#or isArray isMap composedSchemas}}[{{/or}}{{/unless}}{{/with}}{{{@key}}}{{#with this}}{{#unless complexType}}{{#or isArray isMap composedSchemas}}](#{{baseName}}){{/or}}{{/unless}}{{/with}}** | {{#with this}}{{#unless complexType}}{{> model_templates/schema_python_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#unless complexType}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#if description}}{{description}}{{/if}} | {{> model_templates/notes_msg }}{{/with}}
+**{{#with this}}{{#unless refClass}}{{#or isArray isMap composedSchemas}}[{{/or}}{{/unless}}{{/with}}{{{@key}}}{{#with this}}{{#unless refClass}}{{#or isArray isMap composedSchemas}}](#{{baseName}}){{/or}}{{/unless}}{{/with}}** | {{#with this}}{{#unless refClass}}{{> model_templates/schema_python_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#unless refClass}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#if description}}{{description}}{{/if}} | {{> model_templates/notes_msg }}{{/with}}
     {{/each}}
     {{#each vars}}
     {{#unless required}}
-**{{#unless complexType}}{{#or isArray isMap composedSchemas}}[{{/or}}{{/unless}}{{baseName}}{{#unless complexType}}{{#or isArray isMap composedSchemas}}](#{{baseName}}){{/or}}{{/unless}}** | {{#unless complexType}}{{> model_templates/schema_python_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#unless complexType}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#if description}}{{description}}{{/if}} | [optional] {{> model_templates/notes_msg }}
+**{{#unless refClass}}{{#or isArray isMap composedSchemas}}[{{/or}}{{/unless}}{{baseName}}{{#unless refClass}}{{#or isArray isMap composedSchemas}}](#{{baseName}}){{/or}}{{/unless}}** | {{#unless refClass}}{{> model_templates/schema_python_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#unless refClass}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#if description}}{{description}}{{/if}} | [optional] {{> model_templates/notes_msg }}
     {{/unless}}
     {{/each}}
     {{#with additionalProperties}}
@@ -25,7 +25,7 @@ Key | Input Type | Accessed Type | Description | Notes
     {{#if getIsBooleanSchemaTrue}}
 **any_string_name** | {{> model_templates/schema_python_types }} | {{> model_templates/schema_accessed_types }} | any string name can be used but the value must be the correct type{{#if description}} {{description}}{{/if}} | [optional]
     {{else}}
-**{{#unless complexType}}{{#or isArray isMap composedSchemas}}[{{/or}}{{/unless}}any_string_name{{#unless complexType}}{{#or isArray isMap composedSchemas}}](#any_string_name){{/or}}{{/unless}}** | {{#unless complexType}}{{> model_templates/schema_python_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#unless complexType}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | any string name can be used but the value must be the correct type{{#if description}} {{description}}{{/if}} | [optional] {{> model_templates/notes_msg }}
+**{{#unless refClass}}{{#or isArray isMap composedSchemas}}[{{/or}}{{/unless}}any_string_name{{#unless refClass}}{{#or isArray isMap composedSchemas}}](#any_string_name){{/or}}{{/unless}}** | {{#unless refClass}}{{> model_templates/schema_python_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#unless refClass}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | any string name can be used but the value must be the correct type{{#if description}} {{description}}{{/if}} | [optional] {{> model_templates/notes_msg }}
     {{/if}}
     {{/unless}}
     {{else}}
@@ -33,7 +33,7 @@ Key | Input Type | Accessed Type | Description | Notes
     {{/with}}
 {{/or}}
 {{#each vars}}
-{{#unless complexType}}
+{{#unless refClass}}
 {{#or isArray isMap composedSchemas}}
 
 # {{baseName}}
@@ -44,7 +44,7 @@ Key | Input Type | Accessed Type | Description | Notes
 {{#with additionalProperties}}
 {{#unless getIsBooleanSchemaFalse}}
 {{#unless getIsBooleanSchemaTrue}}
-{{#unless complexType}}
+{{#unless refClass}}
 {{#or isArray isMap composedSchemas}}
 
 # any_string_name
@@ -60,8 +60,8 @@ Key | Input Type | Accessed Type | Description | Notes
 Class Name | Input Type | Accessed Type | Description | Notes
 ------------- | ------------- | ------------- | ------------- | -------------
 {{#with items}}
-{{#unless complexType}}{{#or isArray isMap composedSchemas}}[{{/or}}{{baseName}}{{#or isArray isMap composedSchemas}}](#{{baseName}}){{/or}}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#unless complexType}}{{> model_templates/schema_python_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#unless complexType}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#if description}}{{description}}{{/if}} | {{> model_templates/notes_msg }}
-{{#unless complexType}}
+{{#unless refClass}}{{#or isArray isMap composedSchemas}}[{{/or}}{{baseName}}{{#or isArray isMap composedSchemas}}](#{{baseName}}){{/or}}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#unless refClass}}{{> model_templates/schema_python_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#unless refClass}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#if description}}{{description}}{{/if}} | {{> model_templates/notes_msg }}
+{{#unless refClass}}
 {{#or isArray isMap composedSchemas}}
 
 # {{baseName}}
@@ -79,10 +79,10 @@ Class Name | Input Type | Accessed Type | Description | Notes
 Class Name | Input Type | Accessed Type | Description | Notes
 ------------- | ------------- | ------------- | ------------- | -------------
 {{#each allOf}}
-{{#if complexType}}[{{dataType}}]({{complexTypePrefix}}{{complexType}}.md){{else}}[{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}](#{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}){{/if}} | {{#unless complexType}}{{> model_templates/schema_python_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#unless complexType}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#if description}}{{description}}{{/if}} | {{> model_templates/notes_msg }}
+{{#if refClass}}[{{dataType}}]({{complexTypePrefix}}{{refClass}}.md){{else}}[{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}](#{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}){{/if}} | {{#unless refClass}}{{> model_templates/schema_python_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#unless refClass}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#if description}}{{description}}{{/if}} | {{> model_templates/notes_msg }}
 {{/each}}
 {{#each allOf}}
-{{#unless complexType}}
+{{#unless refClass}}
 
 # {{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}
 {{> schema_doc }}
@@ -94,10 +94,10 @@ Class Name | Input Type | Accessed Type | Description | Notes
 Class Name | Input Type | Accessed Type | Description | Notes
 ------------- | ------------- | ------------- | ------------- | -------------
 {{#each anyOf}}
-{{#if complexType}}[{{dataType}}]({{complexTypePrefix}}{{complexType}}.md){{else}}[{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}](#{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}){{/if}} | {{#unless complexType}}{{> model_templates/schema_python_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#unless complexType}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#if description}}{{description}}{{/if}} | {{> model_templates/notes_msg }}
+{{#if refClass}}[{{dataType}}]({{complexTypePrefix}}{{refClass}}.md){{else}}[{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}](#{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}){{/if}} | {{#unless refClass}}{{> model_templates/schema_python_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#unless refClass}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#if description}}{{description}}{{/if}} | {{> model_templates/notes_msg }}
 {{/each}}
 {{#each anyOf}}
-{{#unless complexType}}
+{{#unless refClass}}
 
 # {{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}
 {{> schema_doc }}
@@ -109,10 +109,10 @@ Class Name | Input Type | Accessed Type | Description | Notes
 Class Name | Input Type | Accessed Type | Description | Notes
 ------------- | ------------- | ------------- | ------------- | -------------
 {{#each oneOf}}
-{{#if complexType}}[{{dataType}}]({{complexTypePrefix}}{{complexType}}.md){{else}}[{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}](#{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}){{/if}} | {{#unless complexType}}{{> model_templates/schema_python_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#unless complexType}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#if description}}{{description}}{{/if}} | {{> model_templates/notes_msg }}
+{{#if refClass}}[{{dataType}}]({{complexTypePrefix}}{{refClass}}.md){{else}}[{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}](#{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}){{/if}} | {{#unless refClass}}{{> model_templates/schema_python_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#unless refClass}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#if description}}{{description}}{{/if}} | {{> model_templates/notes_msg }}
 {{/each}}
 {{#each oneOf}}
-{{#unless complexType}}
+{{#unless refClass}}
 
 # {{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}
 {{> schema_doc }}
@@ -124,8 +124,8 @@ Class Name | Input Type | Accessed Type | Description | Notes
 Class Name | Input Type | Accessed Type | Description | Notes
 ------------- | ------------- | ------------- | ------------- | -------------
 {{#with not}}
-{{#if complexType}}[{{dataType}}]({{complexTypePrefix}}{{complexType}}.md){{else}}[{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}](#{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}){{/if}} | {{#unless complexType}}{{> model_templates/schema_python_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#unless complexType}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if complexType}}[**{{dataType}}**]({{complexTypePrefix}}{{complexType}}.md){{/if}} | {{#if description}}{{description}}{{/if}} | {{> model_templates/notes_msg }}
-{{#unless complexType}}
+{{#if refClass}}[{{dataType}}]({{complexTypePrefix}}{{refClass}}.md){{else}}[{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}](#{{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}){{/if}} | {{#unless refClass}}{{> model_templates/schema_python_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#unless refClass}}{{> model_templates/schema_accessed_types }}{{/unless}}{{#if refClass}}[**{{dataType}}**]({{complexTypePrefix}}{{refClass}}.md){{/if}} | {{#if description}}{{description}}{{/if}} | {{> model_templates/notes_msg }}
+{{#unless refClass}}
 
 # {{#if nameInSnakeCase}}{{name}}{{else}}{{baseName}}{{/if}}
 {{> schema_doc }}
diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
index 15b801cff44..8dd38905697 100644
--- a/modules/openapi-json-schema-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
+++ b/modules/openapi-json-schema-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
@@ -3172,7 +3172,7 @@ public void testVarsAndRequiredVarsPresent() {
         cm = codegen.fromModel(modelName, sc);
         CodegenProperty cp = cm.getVars().get(0);
         assertTrue(cp.isModel);
-        assertEquals(cp.complexType, "objectWithOptionalAndRequiredProps_request");
+        assertEquals(cp.refClass, "objectWithOptionalAndRequiredProps_request");
     }
 
     @Test
@@ -3999,7 +3999,7 @@ public void testRequestParameterContent() {
         CodegenProperty cp = mt.getSchema();
         assertTrue(cp.isMap);
         assertTrue(cp.isModel);
-        assertEquals(cp.complexType, "object");
+        assertEquals(cp.refClass, "object");
         assertEquals(cp.baseName, "schema");
 
         CodegenParameter coordinatesReferencedSchema = co.queryParams.get(1);
@@ -4008,7 +4008,7 @@ public void testRequestParameterContent() {
         assertNull(mt.getEncoding());
         cp = mt.getSchema();
         assertFalse(cp.isMap); // because it is a referenced schema
-        assertEquals(cp.complexType, "coordinates");
+        assertEquals(cp.refClass, "coordinates");
         assertEquals(cp.baseName, "schema");
     }
 
@@ -4050,7 +4050,7 @@ public void testRequestBodyContent() {
         assertNull(mt.getEncoding());
         cp = mt.getSchema();
         assertEquals(cp.baseName, "application/json");
-        assertEquals(cp.complexType, "coordinates");
+        assertEquals(cp.refClass, "coordinates");
 
         mt = content.get("text/plain");
         assertNull(mt.getEncoding());
@@ -4135,7 +4135,7 @@ public void testResponseContentAndHeader() {
         assertNull(mt.getEncoding());
         CodegenProperty cp = mt.getSchema();
         assertFalse(cp.isMap); // because it is a referenced schema
-        assertEquals(cp.complexType, "coordinates");
+        assertEquals(cp.refClass, "coordinates");
         assertEquals(cp.baseName, "application/json");
 
         mt = content.get("text/plain");
@@ -4151,7 +4151,7 @@ public void testResponseContentAndHeader() {
         assertNull(mt.getEncoding());
         cp = mt.getSchema();
         assertFalse(cp.isMap); // because it is a referenced schema
-        assertEquals(cp.complexType, "coordinates");
+        assertEquals(cp.refClass, "coordinates");
         assertEquals(cp.baseName, "application/json");
 
         mt = content.get("text/plain");
diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java
index 6a5b6cff49b..802687c8bc3 100644
--- a/modules/openapi-json-schema-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java
+++ b/modules/openapi-json-schema-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java
@@ -327,7 +327,7 @@ public void complexListPropertyTest() {
 
         final CodegenProperty property = cm.vars.get(0);
         Assert.assertEquals(property.baseName, "children");
-        Assert.assertEquals(property.complexType, "Children");
+        Assert.assertEquals(property.refClass, "Children");
         Assert.assertEquals(property.getter, "getChildren");
         Assert.assertEquals(property.setter, "setChildren");
         Assert.assertEquals(property.dataType, "List<Children>");
@@ -358,7 +358,7 @@ public void complexMapPropertyTest() {
 
         final CodegenProperty property = cm.vars.get(0);
         Assert.assertEquals(property.baseName, "children");
-        Assert.assertEquals(property.complexType, "Children");
+        Assert.assertEquals(property.refClass, "Children");
         Assert.assertEquals(property.getter, "getChildren");
         Assert.assertEquals(property.setter, "setChildren");
         Assert.assertEquals(property.dataType, "Map<String, Children>");
@@ -390,7 +390,7 @@ public void complexArrayPropertyTest() {
 
         final CodegenProperty property = cm.vars.get(0);
         Assert.assertEquals(property.baseName, "children");
-        Assert.assertEquals(property.complexType, "Children");
+        Assert.assertEquals(property.refClass, "Children");
         Assert.assertEquals(property.getter, "getChildren");
         Assert.assertEquals(property.setter, "setChildren");
         Assert.assertEquals(property.dataType, "List<Children>");
@@ -423,7 +423,7 @@ public void complexSetPropertyTest() {
 
         final CodegenProperty property = cm.vars.get(0);
         Assert.assertEquals(property.baseName, "children");
-        Assert.assertEquals(property.complexType, "Children");
+        Assert.assertEquals(property.refClass, "Children");
         Assert.assertEquals(property.getter, "getChildren");
         Assert.assertEquals(property.setter, "setChildren");
         Assert.assertEquals(property.dataType, "Set<Children>");
@@ -460,7 +460,7 @@ public void arrayModelWithItemNameTest() {
 
         final CodegenProperty property = cm.vars.get(0);
         Assert.assertEquals(property.baseName, "children");
-        Assert.assertEquals(property.complexType, "Child");
+        Assert.assertEquals(property.refClass, "Child");
         Assert.assertEquals(property.getter, "getChildren");
         Assert.assertEquals(property.setter, "setChildren");
         Assert.assertEquals(property.dataType, "List<Child>");
@@ -1232,7 +1232,7 @@ public void arraySchemaTestInRequestBody() {
         Assert.assertTrue(cp1.isArray);
         Assert.assertFalse(cp1.isMap);
         Assert.assertEquals(cp1.items.baseType, "Pet");
-        Assert.assertEquals(cp1.items.complexType, "Pet");
+        Assert.assertEquals(cp1.items.refClass, "Pet");
         Assert.assertEquals(cp1.items.dataType, "Pet");
 
         Assert.assertEquals(co.responses.size(), 1);
@@ -1312,10 +1312,10 @@ public void arrayOfArraySchemaTestInRequestBody() {
         Assert.assertTrue(cp1.isArray);
         Assert.assertFalse(cp1.isMap);
         Assert.assertEquals(cp1.items.baseType, "List");
-        Assert.assertEquals(cp1.items.complexType, "Pet");
+        Assert.assertEquals(cp1.items.refClass, "Pet");
         Assert.assertEquals(cp1.items.dataType, "List<Pet>");
         Assert.assertEquals(cp1.items.items.baseType, "Pet");
-        Assert.assertEquals(cp1.items.items.complexType, "Pet");
+        Assert.assertEquals(cp1.items.items.refClass, "Pet");
         Assert.assertEquals(cp1.items.items.dataType, "Pet");
 
         Assert.assertEquals(co.responses.size(), 1);