diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
index a9072b6058f..d7cc1c582bb 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
@@ -41,8 +41,8 @@ namespace Internal {
 class AnchorChangesNodeInstance : public ObjectNodeInstance
 {
 public:
-    typedef QSharedPointer<AnchorChangesNodeInstance> Pointer;
-    typedef QWeakPointer<AnchorChangesNodeInstance> WeakPointer;
+    using Pointer = QSharedPointer<AnchorChangesNodeInstance>;
+    using WeakPointer = QWeakPointer<AnchorChangesNodeInstance>;
 
     static Pointer create(QObject *objectToBeWrapped);
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h
index b18f4882cb7..9ab68aeb2da 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h
@@ -33,8 +33,8 @@ namespace Internal {
 class BehaviorNodeInstance : public ObjectNodeInstance
 {
 public:
-    typedef QSharedPointer<BehaviorNodeInstance> Pointer;
-    typedef QWeakPointer<BehaviorNodeInstance> WeakPointer;
+    using Pointer = QSharedPointer<BehaviorNodeInstance>;
+    using WeakPointer = QWeakPointer<BehaviorNodeInstance>;
 
     BehaviorNodeInstance(QObject *object);
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
index 24ae2dd5d2d..27b115ad770 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
@@ -37,8 +37,9 @@ namespace Internal {
 class ComponentNodeInstance : public ObjectNodeInstance
 {
 public:
-    typedef QSharedPointer<ComponentNodeInstance> Pointer;
-    typedef QWeakPointer<ComponentNodeInstance> WeakPointer;
+    using Pointer = QSharedPointer<ComponentNodeInstance>;
+    using WeakPointer = QWeakPointer<ComponentNodeInstance>;
+
     ComponentNodeInstance(QQmlComponent *component);
     static Pointer create(QObject *objectToBeWrapped);
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
index 6a1711399e4..3505b0cc297 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
@@ -35,8 +35,8 @@ namespace Internal {
 class DummyNodeInstance : public ObjectNodeInstance
 {
 public:
-    typedef QSharedPointer<DummyNodeInstance> Pointer;
-    typedef QWeakPointer<DummyNodeInstance> WeakPointer;
+    using Pointer = QSharedPointer<DummyNodeInstance>;
+    using WeakPointer = QWeakPointer<DummyNodeInstance>;
 
     static Pointer create();
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h
index f7d0d3e3a6a..4f6225af2c4 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h
@@ -34,8 +34,8 @@ class LayoutNodeInstance : public QuickItemNodeInstance
 {
 
 public:
-    typedef QSharedPointer<LayoutNodeInstance> Pointer;
-    typedef QWeakPointer<LayoutNodeInstance> WeakPointer;
+    using Pointer = QSharedPointer<LayoutNodeInstance>;
+    using WeakPointer = QWeakPointer<LayoutNodeInstance>;
 
     static Pointer create(QObject *objectToBeWrapped);
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h
index e43c804ca65..2aebef1174c 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h
@@ -65,10 +65,11 @@ class NodeInstanceServer : public NodeInstanceServerInterface
 {
     Q_OBJECT
 public:
-    typedef QPair<QPointer<QObject>, PropertyName> ObjectPropertyPair;
-    typedef QPair<qint32, QString>  IdPropertyPair;
-    typedef QPair<ServerNodeInstance, PropertyName> InstancePropertyPair;
-    typedef QPair<QString, QPointer<QObject> > DummyPair;
+    using ObjectPropertyPair = QPair<QPointer<QObject>, PropertyName>;
+    using IdPropertyPair = QPair<qint32, QString>;
+    using InstancePropertyPair= QPair<ServerNodeInstance, PropertyName>;
+    using DummyPair = QPair<QString, QPointer<QObject> >;
+
 
     explicit NodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h
index 3dc00ed7cce..2965e06106f 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h
@@ -36,8 +36,9 @@ namespace QmlDesigner {
 namespace Internal {
 
 class ObjectNodeInstance;
-typedef QSharedPointer<ObjectNodeInstance> ObjectNodeInstancePointer;
-typedef QWeakPointer<ObjectNodeInstance> ObjectNodeInstanceWeakPointer;
+
+using ObjectNodeInstancePointer = QSharedPointer<ObjectNodeInstance>;
+using ObjectNodeInstanceWeakPointer = QWeakPointer<ObjectNodeInstance>;
 
 class NodeInstanceSignalSpy : public QObject
 {
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
index 5977d3d31ce..dafcbaa268c 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
@@ -60,8 +60,8 @@ class WidgetNodeInstance;
 class ObjectNodeInstance
 {
 public:
-    typedef QSharedPointer<ObjectNodeInstance> Pointer;
-    typedef QWeakPointer<ObjectNodeInstance> WeakPointer;
+    using Pointer = QSharedPointer<ObjectNodeInstance>;
+    using WeakPointer = QWeakPointer<ObjectNodeInstance>;
 
     virtual ~ObjectNodeInstance();
     void destroy();
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
index 7575014ea84..63e31297e7e 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
@@ -37,8 +37,8 @@ namespace Internal {
 class PositionerNodeInstance : public QuickItemNodeInstance
 {
 public:
-    typedef QSharedPointer<PositionerNodeInstance> Pointer;
-    typedef QWeakPointer<PositionerNodeInstance> WeakPointer;
+    using Pointer = QSharedPointer<PositionerNodeInstance>;
+    using WeakPointer = QWeakPointer<PositionerNodeInstance>;
 
     static Pointer create(QObject *objectToBeWrapped);
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
index 017a0eb7100..be16da972de 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
@@ -39,8 +39,8 @@ class QmlPropertyChangesNodeInstance;
 class QmlPropertyChangesNodeInstance : public ObjectNodeInstance
 {
 public:
-    typedef QSharedPointer<QmlPropertyChangesNodeInstance> Pointer;
-    typedef QWeakPointer<QmlPropertyChangesNodeInstance> WeakPointer;
+    using Pointer = QSharedPointer<QmlPropertyChangesNodeInstance>;
+    using WeakPointer = QWeakPointer<QmlPropertyChangesNodeInstance>;
 
     static Pointer create(QObject *objectToBeWrapped);
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h
index 5c09bb7ab7b..9870223fa75 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h
@@ -34,8 +34,8 @@ namespace Internal {
 class QmlStateNodeInstance : public ObjectNodeInstance
 {
 public:
-    typedef QSharedPointer<QmlStateNodeInstance> Pointer;
-    typedef QWeakPointer<QmlStateNodeInstance> WeakPointer;
+    using Pointer = QSharedPointer<QmlStateNodeInstance>;
+    using WeakPointer = QWeakPointer<QmlStateNodeInstance>;
 
     static Pointer create(QObject *objectToBeWrapped);
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h
index dc1f01dec42..f24fd3bac21 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h
@@ -33,8 +33,8 @@ namespace Internal {
 class QmlTransitionNodeInstance : public ObjectNodeInstance
 {
 public:
-    typedef QSharedPointer<QmlTransitionNodeInstance> Pointer;
-    typedef QWeakPointer<QmlTransitionNodeInstance> WeakPointer;
+    using Pointer = QSharedPointer<QmlTransitionNodeInstance>;
+    using WeakPointer = QWeakPointer<QmlTransitionNodeInstance>;
 
     static Pointer create(QObject *objectToBeWrapped);
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt3presentationdnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt3presentationdnodeinstance.h
index f7ace39b392..df41c2085fc 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt3presentationdnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt3presentationdnodeinstance.h
@@ -33,8 +33,8 @@ namespace Internal {
 class Qt3DPresentationNodeInstance : public ObjectNodeInstance
 {
 public:
-    typedef QSharedPointer<Qt3DPresentationNodeInstance> Pointer;
-    typedef QWeakPointer<Qt3DPresentationNodeInstance> WeakPointer;
+    using Pointer = QSharedPointer<Qt3DPresentationNodeInstance>;
+    using WeakPointer = QWeakPointer<Qt3DPresentationNodeInstance>;
 
     static Pointer create(QObject *objectToBeWrapped);
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
index bf78df2212e..8aab24178be 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
@@ -38,8 +38,8 @@ namespace Internal {
 class QuickItemNodeInstance : public ObjectNodeInstance
 {
 public:
-    typedef QSharedPointer<QuickItemNodeInstance> Pointer;
-    typedef QWeakPointer<QuickItemNodeInstance> WeakPointer;
+    using Pointer = QSharedPointer<QuickItemNodeInstance>;
+    using WeakPointer = QWeakPointer<QuickItemNodeInstance>;
 
     ~QuickItemNodeInstance() override;