diff --git a/src/core/components/model.jsx b/src/core/components/model.jsx
index 4293c480..e00c317e 100644
--- a/src/core/components/model.jsx
+++ b/src/core/components/model.jsx
@@ -55,14 +55,14 @@ export default class Model extends Component {
         return <ObjectModel
           className="object" { ...this.props }
           schema={ modelSchema }
-          name={ name || modelName }
+          name={ modelName || name }
           deprecated={deprecated}
           isRef={ isRef!== undefined ? isRef : !!$$ref } />
       case "array":
         return <ArrayModel
           className="array" { ...this.props }
           schema={ modelSchema }
-          name={ name || modelName }
+          name={ modelName || name }
           deprecated={deprecated}
           required={ required } />
       case "string":
@@ -74,7 +74,7 @@ export default class Model extends Component {
           { ...this.props }
           getComponent={ getComponent }
           schema={ modelSchema }
-          name={ modelName }
+          name={ modelName || name }
           deprecated={deprecated}
           required={ required }/> }
   }