diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
index 41a34cc7a2779b0f508b5380e789869933e8e4ce..81e51cae126a85d498231c033233f494cad7ef01 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
@@ -49,28 +49,27 @@ AnchorChangesNodeInstance::Pointer AnchorChangesNodeInstance::create(QObject *ob
     return instance;
 }
 
-void AnchorChangesNodeInstance::setPropertyVariant(const QString &/*name*/, const QVariant &/*value*/)
+void AnchorChangesNodeInstance::setPropertyVariant(const PropertyName &/*name*/, const QVariant &/*value*/)
 {
 }
 
-void AnchorChangesNodeInstance::setPropertyBinding(const QString &/*name*/, const QString &/*expression*/)
+void AnchorChangesNodeInstance::setPropertyBinding(const PropertyName &/*name*/, const QString &/*expression*/)
 {
 }
 
-QVariant AnchorChangesNodeInstance::property(const QString &/*name*/) const
+QVariant AnchorChangesNodeInstance::property(const PropertyName &/*name*/) const
 {
     return QVariant();
 }
 
-void AnchorChangesNodeInstance::resetProperty(const QString &/*name*/)
+void AnchorChangesNodeInstance::resetProperty(const PropertyName &/*name*/)
 {
 }
 
-
 void AnchorChangesNodeInstance::reparent(const ServerNodeInstance &/*oldParentInstance*/,
-                                         const QString &/*oldParentProperty*/,
+                                         const PropertyName &/*oldParentProperty*/,
                                          const ServerNodeInstance &/*newParentInstance*/,
-                                         const QString &/*newParentProperty*/)
+                                         const PropertyName &/*newParentProperty*/)
 {
 }
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
index a2e3f600b8bc0c854c6eba4bb4811b597196ccfb..612324f23065721498a878d7701555c6a14ba68b 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
@@ -52,16 +52,16 @@ public:
 
     static Pointer create(QObject *objectToBeWrapped);
 
-    virtual void setPropertyVariant(const QString &name, const QVariant &value);
-    virtual void setPropertyBinding(const QString &name, const QString &expression);
-    virtual QVariant property(const QString &name) const;
-    virtual void resetProperty(const QString &name);
+    virtual void setPropertyVariant(const PropertyName &name, const QVariant &value);
+    virtual void setPropertyBinding(const PropertyName &name, const QString &expression);
+    virtual QVariant property(const PropertyName &name) const;
+    virtual void resetProperty(const PropertyName &name);
 
     using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around
     void reparent(const ServerNodeInstance &oldParentInstance,
-                  const QString &oldParentProperty,
+                  const PropertyName &oldParentProperty,
                   const ServerNodeInstance &newParentInstance,
-                  const QString &newParentProperty);
+                  const PropertyName &newParentProperty);
 
 protected:
     AnchorChangesNodeInstance(QObject *object);
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp
index 3ee9ae4eff94faced99de345a2494ae1ae8373ab..3ba0afc025bdfd2340c6333eb6cc39a3237bd95b 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp
@@ -71,11 +71,11 @@ double DummyNodeInstance::opacity() const
     return 0.0;
 }
 
-void DummyNodeInstance::setPropertyVariant(const QString &/*name*/, const QVariant &/*value*/)
+void DummyNodeInstance::setPropertyVariant(const PropertyName &/*name*/, const QVariant &/*value*/)
 {
 }
 
-void DummyNodeInstance::setPropertyBinding(const QString &/*name*/, const QString &/*expression*/)
+void DummyNodeInstance::setPropertyBinding(const PropertyName &/*name*/, const QString &/*expression*/)
 {
 
 }
@@ -85,7 +85,7 @@ void DummyNodeInstance::setId(const QString &/*id*/)
 
 }
 
-QVariant DummyNodeInstance::property(const QString &/*name*/) const
+QVariant DummyNodeInstance::property(const PropertyName &/*name*/) const
 {
     return QVariant();
 }
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
index 357dcb4263181454bc8622afe967b3dc170c8347..3746e62a242fc8155f3bb1684c532aaf2d2afe85 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
@@ -53,10 +53,10 @@ public:
     QTransform transform() const;
     double opacity() const;
 
-    void setPropertyVariant(const QString &name, const QVariant &value);
-    void setPropertyBinding(const QString &name, const QString &expression);
+    void setPropertyVariant(const PropertyName &name, const QVariant &value);
+    void setPropertyBinding(const PropertyName &name, const QString &expression);
     void setId(const QString &id);
-    QVariant property(const QString &name) const;
+    QVariant property(const PropertyName &name) const;
     QStringList properties();
     QStringList localProperties();
 
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp
index 41a34cc7a2779b0f508b5380e789869933e8e4ce..2a7f17c7151129917b2fbd701e15b5cf23b7e008 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp
@@ -49,28 +49,28 @@ AnchorChangesNodeInstance::Pointer AnchorChangesNodeInstance::create(QObject *ob
     return instance;
 }
 
-void AnchorChangesNodeInstance::setPropertyVariant(const QString &/*name*/, const QVariant &/*value*/)
+void AnchorChangesNodeInstance::setPropertyVariant(const PropertyName &/*name*/, const QVariant &/*value*/)
 {
 }
 
-void AnchorChangesNodeInstance::setPropertyBinding(const QString &/*name*/, const QString &/*expression*/)
+void AnchorChangesNodeInstance::setPropertyBinding(const PropertyName &/*name*/, const QString &/*expression*/)
 {
 }
 
-QVariant AnchorChangesNodeInstance::property(const QString &/*name*/) const
+QVariant AnchorChangesNodeInstance::property(const PropertyName &/*name*/) const
 {
     return QVariant();
 }
 
-void AnchorChangesNodeInstance::resetProperty(const QString &/*name*/)
+void AnchorChangesNodeInstance::resetProperty(const PropertyName &/*name*/)
 {
 }
 
 
 void AnchorChangesNodeInstance::reparent(const ServerNodeInstance &/*oldParentInstance*/,
-                                         const QString &/*oldParentProperty*/,
+                                         const PropertyName &/*oldParentProperty*/,
                                          const ServerNodeInstance &/*newParentInstance*/,
-                                         const QString &/*newParentProperty*/)
+                                         const PropertyName &/*newParentProperty*/)
 {
 }
 
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h
index 595f813cc4fdae8db025c16cc21b8a8ac7f3c6e2..d1418a976d613491117cfcc37b6b8ddec169efbf 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h
@@ -53,16 +53,16 @@ public:
 
     static Pointer create(QObject *objectToBeWrapped);
 
-    virtual void setPropertyVariant(const QString &name, const QVariant &value);
-    virtual void setPropertyBinding(const QString &name, const QString &expression);
-    virtual QVariant property(const QString &name) const;
-    virtual void resetProperty(const QString &name);
+    virtual void setPropertyVariant(const PropertyName &name, const QVariant &value);
+    virtual void setPropertyBinding(const PropertyName &name, const QString &expression);
+    virtual QVariant property(const PropertyName &name) const;
+    virtual void resetProperty(const PropertyName &name);
 
     using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around
     void reparent(const ServerNodeInstance &oldParentInstance,
-                  const QString &oldParentProperty,
+                  const PropertyName &oldParentProperty,
                   const ServerNodeInstance &newParentInstance,
-                  const QString &newParentProperty);
+                  const PropertyName &newParentProperty);
 
 protected:
     AnchorChangesNodeInstance(QObject *object);
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp
index 5c8173c2dd8a71012294f2849fac8f9c90adc23b..69547501fb3ca7844a13dd12b634be9e8d4d105c 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp
@@ -70,11 +70,11 @@ double DummyNodeInstance::opacity() const
     return 0.0;
 }
 
-void DummyNodeInstance::setPropertyVariant(const QString &/*name*/, const QVariant &/*value*/)
+void DummyNodeInstance::setPropertyVariant(const PropertyName &/*name*/, const QVariant &/*value*/)
 {
 }
 
-void DummyNodeInstance::setPropertyBinding(const QString &/*name*/, const QString &/*expression*/)
+void DummyNodeInstance::setPropertyBinding(const PropertyName &/*name*/, const QString &/*expression*/)
 {
 
 }
@@ -84,7 +84,7 @@ void DummyNodeInstance::setId(const QString &/*id*/)
 
 }
 
-QVariant DummyNodeInstance::property(const QString &/*name*/) const
+QVariant DummyNodeInstance::property(const PropertyName &/*name*/) const
 {
     return QVariant();
 }
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h
index 357dcb4263181454bc8622afe967b3dc170c8347..50335eb8530d43f38d3de3ddf2323152ac01a6fb 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h
@@ -53,12 +53,13 @@ public:
     QTransform transform() const;
     double opacity() const;
 
-    void setPropertyVariant(const QString &name, const QVariant &value);
-    void setPropertyBinding(const QString &name, const QString &expression);
+    void setPropertyVariant(const PropertyName &name, const QVariant &value);
+    void setPropertyBinding(const PropertyName &name, const QString &expression);
     void setId(const QString &id);
-    QVariant property(const QString &name) const;
     QStringList properties();
     QStringList localProperties();
+    QVariant property(const PropertyName &name) const;
+
 
     void initializePropertyWatcher(const ObjectNodeInstance::Pointer &objectNodeInstance);