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 fe7dff5e4d0..1a4aaa9fc5e 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
@@ -2934,8 +2934,7 @@ public CodegenModel fromModel(String name, Schema schema) {
         m.setFormat(schema.getFormat());
         m.setComposedSchemas(getComposedSchemas(schema));
         if (ModelUtils.isArraySchema(schema)) {
-            String itemName = getItemsName(null, name);
-            CodegenProperty arrayProperty = fromProperty(itemName, schema, false);
+            CodegenProperty arrayProperty = fromProperty(name, schema, false);
             m.setItems(arrayProperty.items);
             m.arrayModelType = arrayProperty.complexType;
             addParentContainer(m, name, schema);
@@ -7910,16 +7909,10 @@ public List<VendorExtension> getSupportedVendorExtensions() {
     protected String handleSpecialCharacters(String name) { return name; }
 
     public String getItemsName(Schema containingSchema, String containingSchemaName) {
-        String itemName = null;
-        if (containingSchema != null) {
-            // fromProperty use case
-            if (containingSchema.getExtensions() != null && containingSchema.getExtensions().get("x-item-name") != null) {
-                return containingSchema.getExtensions().get("x-item-name").toString();
-            }
-            return toVarName(containingSchemaName);
+        if (containingSchema.getExtensions() != null && containingSchema.getExtensions().get("x-item-name") != null) {
+            return containingSchema.getExtensions().get("x-item-name").toString();
         }
-        // fromModel use case
-        return containingSchemaName;
+        return toVarName(containingSchemaName);
     }
 
     public String getAdditionalPropertiesName() {