diff --git a/OMEdit/OMEditLIB/Element/ElementProperties.cpp b/OMEdit/OMEditLIB/Element/ElementProperties.cpp
index 4e185d2fd67..281081f45b5 100644
--- a/OMEdit/OMEditLIB/Element/ElementProperties.cpp
+++ b/OMEdit/OMEditLIB/Element/ElementProperties.cpp
@@ -597,7 +597,7 @@ void Parameter::createValueWidget()
           }
         }
         choices = mpModelInstanceElement->getAnnotation()->getChoices().getChoices();
-        parentClassName = mpModelInstanceElement->getParentModel()->getName();
+        parentClassName = mpElementParameters->getElementParentClassName();
         if (mpModelInstanceElement->getModel()) {
           restriction = mpModelInstanceElement->getModel()->getRestriction();
         } else {
@@ -1102,6 +1102,16 @@ ElementParameters::~ElementParameters()
   mParametersList.clear();
 }
 
+/*!
+ * \brief ElementParameters::getElementParentClassName
+ * Returns the class name where the component is defined.
+ * \return
+ */
+QString ElementParameters::getElementParentClassName() const
+{
+  return mpElement->getParentModel()->getName();
+}
+
 /*!
  * \brief ElementParameters::applyStartFixedAndDisplayUnitModifiers
  * \param pParameter
diff --git a/OMEdit/OMEditLIB/Element/ElementProperties.h b/OMEdit/OMEditLIB/Element/ElementProperties.h
index 6ba9718f97e..de7aa156de8 100644
--- a/OMEdit/OMEditLIB/Element/ElementProperties.h
+++ b/OMEdit/OMEditLIB/Element/ElementProperties.h
@@ -188,6 +188,7 @@ class ElementParameters : public QDialog
 public:
   ElementParameters(ModelInstance::Element *pElement, GraphicsView *pGraphicsView, bool inherited, bool nested, QWidget *pParent = 0);
   ~ElementParameters();
+  QString getElementParentClassName() const;
   GraphicsView *getGraphicsView() const {return mpGraphicsView;}
   bool isInherited() const {return mInherited;}
   QString getModification() const {return mModification;}
diff --git a/OMEdit/OMEditLIB/Modeling/Model.h b/OMEdit/OMEditLIB/Modeling/Model.h
index 153d2c947d3..8c4df52de82 100644
--- a/OMEdit/OMEditLIB/Modeling/Model.h
+++ b/OMEdit/OMEditLIB/Modeling/Model.h
@@ -702,7 +702,7 @@ namespace ModelInstance
     virtual QString getName() const override {return mName;}
     virtual QString getQualifiedName() const override;
     virtual QString getRootType() const override {return mName;}
-    virtual QString getType() const override {return mName;}
+    virtual QString getType() const override {return mBaseClass;}
     virtual bool isShortClassDefinition() const override {return mIsShortClassDefinition;}
     virtual bool isComponent() const override {return false;}
     virtual bool isExtend() const override {return false;}