Rename QNodeAddedPropertyChange -> QPropertyNodeAddedChange

Task-number: QTBUG-51494
Change-Id: I7f59bad66eb086e2249c580be2fd9f4bad159eb3
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

43 files changed, 130 insertions, 130 deletions

diff --git a/src/core/changes/changes.pri b/src/core/changes/changes.pri
index 92385d508..1043fba2d 100644
--- a/src/core/changes/changes.pri
+++ b/src/core/changes/changes.pri
@@ -11,8 +11,6 @@ HEADERS += \
     $$PWD/qcomponentremovedchange_p.h \
     $$PWD/qbackendnodepropertychange.h \
     $$PWD/qbackendnodepropertychange_p.h \
-    $$PWD/qnodeaddedpropertychange.h \
-    $$PWD/qnodeaddedpropertychange_p.h \
     $$PWD/qnoderemovedpropertychange.h \
     $$PWD/qnoderemovedpropertychange_p.h \
     $$PWD/qnodedestroyedchange.h \
@@ -32,7 +30,9 @@ HEADERS += \
     $$PWD/qstaticpropertyvalueaddedchangebase.h \
     $$PWD/qstaticpropertyvalueaddedchangebase_p.h \
     $$PWD/qstaticpropertyvalueremovedchangebase.h \
-    $$PWD/qstaticpropertyvalueremovedchangebase_p.h
+    $$PWD/qstaticpropertyvalueremovedchangebase_p.h \
+    $$PWD/qpropertynodeaddedchange.h \
+    $$PWD/qpropertynodeaddedchange_p.h
 
 SOURCES += \
     $$PWD/qscenechange.cpp \
@@ -41,7 +41,6 @@ SOURCES += \
     $$PWD/qcomponentaddedchange.cpp \
     $$PWD/qcomponentremovedchange.cpp \
     $$PWD/qbackendnodepropertychange.cpp \
-    $$PWD/qnodeaddedpropertychange.cpp \
     $$PWD/qnoderemovedpropertychange.cpp \
     $$PWD/qpropertyvalueaddedchangebase.cpp \
     $$PWD/qpropertyvalueremovedchangebase.cpp \
@@ -50,4 +49,5 @@ SOURCES += \
     $$PWD/qstaticpropertyupdatedchangebase.cpp \
     $$PWD/qpropertyupdatedchange.cpp \
     $$PWD/qstaticpropertyvalueaddedchangebase.cpp \
-    $$PWD/qstaticpropertyvalueremovedchangebase.cpp
+    $$PWD/qstaticpropertyvalueremovedchangebase.cpp \
+    $$PWD/qpropertynodeaddedchange.cpp
diff --git a/src/core/changes/qnodeaddedpropertychange.cpp b/src/core/changes/qpropertynodeaddedchange.cpp
index 7a95d2bf7..4425938e1 100644
--- a/src/core/changes/qnodeaddedpropertychange.cpp
+++ b/src/core/changes/qpropertynodeaddedchange.cpp
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "qnodeaddedpropertychange.h"
-#include "qnodeaddedpropertychange_p.h"
+#include "qpropertynodeaddedchange.h"
+#include "qpropertynodeaddedchange_p.h"
 #include <Qt3DCore/private/qnode_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -46,62 +46,62 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DCore {
 
 /*!
- * \class Qt3DCore::QNodeAddedPropertyChange
+ * \class Qt3DCore::QPropertyNodeAddedChange
  * \inmodule Qt3DCore
  *
  * TODO
  */
 
 /*!
- * \typedef Qt3DCore::QNodeAddedPropertyChangePtr
- * \relates Qt3DCore::QNodeAddedPropertyChange
+ * \typedef Qt3DCore::QPropertyNodeAddedChangePtr
+ * \relates Qt3DCore::QPropertyNodeAddedChange
  *
- * A shared pointer for QNodeAddedPropertyChange.
+ * A shared pointer for QPropertyNodeAddedChange.
  */
 
 /*!
- * Constructs a new QNodeAddedPropertyChange with \a subjectId, \a addedNodeId, and
+ * Constructs a new QPropertyNodeAddedChange with \a subjectId, \a addedNodeId, and
  * \a priority.
  */
-QNodeAddedPropertyChange::QNodeAddedPropertyChange(QNodeId subjectId, QNode *node)
-    : QStaticPropertyValueAddedChangeBase(*new QNodeAddedPropertyChangePrivate, subjectId)
+QPropertyNodeAddedChange::QPropertyNodeAddedChange(QNodeId subjectId, QNode *node)
+    : QStaticPropertyValueAddedChangeBase(*new QPropertyNodeAddedChangePrivate, subjectId)
 {
-    Q_D(QNodeAddedPropertyChange);
+    Q_D(QPropertyNodeAddedChange);
     d->m_addedNodeIdTypePair = QNodeIdTypePair(node->id(), node->metaObject());
 }
 
-QNodeAddedPropertyChange::QNodeAddedPropertyChange(QNodeId subjectId)
-    : QStaticPropertyValueAddedChangeBase(*new QNodeAddedPropertyChangePrivate, subjectId)
+QPropertyNodeAddedChange::QPropertyNodeAddedChange(QNodeId subjectId)
+    : QStaticPropertyValueAddedChangeBase(*new QPropertyNodeAddedChangePrivate, subjectId)
 {
 }
 
 /*!
  * \return the id of the node added to the property.
  */
-QNodeId QNodeAddedPropertyChange::addedNodeId() const
+QNodeId QPropertyNodeAddedChange::addedNodeId() const
 {
-    Q_D(const QNodeAddedPropertyChange);
+    Q_D(const QPropertyNodeAddedChange);
     return d->m_addedNodeIdTypePair.id;
 }
 
 /*!
  * \return the meta object of the node added to the property.
  */
-const QMetaObject *QNodeAddedPropertyChange::metaObject() const
+const QMetaObject *QPropertyNodeAddedChange::metaObject() const
 {
-    Q_D(const QNodeAddedPropertyChange);
+    Q_D(const QPropertyNodeAddedChange);
     return d->m_addedNodeIdTypePair.type;
 }
 
-void QNodeAddedPropertyChange::setAddedValue(const QVariant &value)
+void QPropertyNodeAddedChange::setAddedValue(const QVariant &value)
 {
-    Q_D(QNodeAddedPropertyChange);
+    Q_D(QPropertyNodeAddedChange);
     d->m_addedValue = value;
 }
 
-QVariant QNodeAddedPropertyChange::addedValue() const
+QVariant QPropertyNodeAddedChange::addedValue() const
 {
-    Q_D(const QNodeAddedPropertyChange);
+    Q_D(const QPropertyNodeAddedChange);
     return d->m_addedValue;
 }
 
diff --git a/src/core/changes/qnodeaddedpropertychange.h b/src/core/changes/qpropertynodeaddedchange.h
index 5050ba612..28334e01d 100644
--- a/src/core/changes/qnodeaddedpropertychange.h
+++ b/src/core/changes/qpropertynodeaddedchange.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DCORE_QNODEADDEDPROPERTYCHANGE_H
-#define QT3DCORE_QNODEADDEDPROPERTYCHANGE_H
+#ifndef QT3DCORE_QPROPERTYNODEADDEDCHANGE_H
+#define QT3DCORE_QPROPERTYNODEADDEDCHANGE_H
 
 #include <Qt3DCore/qstaticpropertyvalueaddedchangebase.h>
 #include <Qt3DCore/qnode.h>
@@ -48,14 +48,14 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QNodeAddedPropertyChangePrivate;
+class QPropertyNodeAddedChangePrivate;
 
 // TODO: Split this class into two. One for general values, one specifically for QNodeIds
-class QT3DCORESHARED_EXPORT QNodeAddedPropertyChange : public QStaticPropertyValueAddedChangeBase
+class QT3DCORESHARED_EXPORT QPropertyNodeAddedChange : public QStaticPropertyValueAddedChangeBase
 {
 public:
-    QNodeAddedPropertyChange(QNodeId subjectId, QNode *node);
-    QNodeAddedPropertyChange(QNodeId subjectId);
+    QPropertyNodeAddedChange(QNodeId subjectId, QNode *node);
+    QPropertyNodeAddedChange(QNodeId subjectId);
 
     QNodeId addedNodeId() const;
     const QMetaObject *metaObject() const;
@@ -64,13 +64,13 @@ public:
     QVariant addedValue() const;
 
 private:
-    Q_DECLARE_PRIVATE(QNodeAddedPropertyChange)
+    Q_DECLARE_PRIVATE(QPropertyNodeAddedChange)
 };
 
-typedef QSharedPointer<QNodeAddedPropertyChange> QNodeAddedPropertyChangePtr;
+typedef QSharedPointer<QPropertyNodeAddedChange> QPropertyNodeAddedChangePtr;
 
 } // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3DCORE_QNODEADDEDPROPERTYCHANGE_H
+#endif // QT3DCORE_QPROPERTYNODEADDEDCHANGE_H
diff --git a/src/core/changes/qnodeaddedpropertychange_p.h b/src/core/changes/qpropertynodeaddedchange_p.h
index 1a3defc04..c71bed761 100644
--- a/src/core/changes/qnodeaddedpropertychange_p.h
+++ b/src/core/changes/qpropertynodeaddedchange_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DCORE_QNODEADDEDPROPERTYCHANGE_P_H
-#define QT3DCORE_QNODEADDEDPROPERTYCHANGE_P_H
+#ifndef QT3DCORE_QPROPERTYNODEADDEDCHANGE_P_H
+#define QT3DCORE_QPROPERTYNODEADDEDCHANGE_P_H
 
 //
 //  W A R N I N G
@@ -62,15 +62,15 @@ namespace Qt3DCore {
 class QPropertyUpdatedChange;
 class QFrameAllocator;
 
-class QNodeAddedPropertyChangePrivate : public QStaticPropertyValueAddedChangeBasePrivate
+class QPropertyNodeAddedChangePrivate : public QStaticPropertyValueAddedChangeBasePrivate
 {
 public:
-    QNodeAddedPropertyChangePrivate()
+    QPropertyNodeAddedChangePrivate()
         : m_addedNodeIdTypePair()
     {
     }
 
-    Q_DECLARE_PUBLIC(QNodeAddedPropertyChange)
+    Q_DECLARE_PUBLIC(QPropertyNodeAddedChange)
 
     QNodeIdTypePair m_addedNodeIdTypePair;
     QVariant m_addedValue;
@@ -80,4 +80,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3DCORE_QNODEADDEDPROPERTYCHANGE_P_H
+#endif // QT3DCORE_QPROPERTYNODEADDEDCHANGE_P_H
diff --git a/src/core/changes/qpropertyvalueaddedchangebase.cpp b/src/core/changes/qpropertyvalueaddedchangebase.cpp
index f982f6d5f..ae406ffae 100644
--- a/src/core/changes/qpropertyvalueaddedchangebase.cpp
+++ b/src/core/changes/qpropertyvalueaddedchangebase.cpp
@@ -59,7 +59,7 @@ QPropertyValueAddedChangeBasePrivate::~QPropertyValueAddedChangeBasePrivate()
  *
  * The QPropertyValueAddedChangeBase class is the base class for all QSceneChange events that
  * have the changeType() PropertyValueAdded. You should not need to instantiate this class.
- * Usually you should be using one of its subclasses such as QNodeAddedPropertyChange.
+ * Usually you should be using one of its subclasses such as QPropertyNodeAddedChange.
  *
  * You can subclass this to create your own node added types for communication between
  * your QNode and QBackendNode subclasses when writing your own aspects.
diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp
index f95ccaf7c..e5cfb9cc9 100644
--- a/src/core/nodes/qnode.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qdynamicpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 #include <Qt3DCore/qnodedestroyedchange.h>
 #include <Qt3DCore/qaspectengine.h>
@@ -151,10 +151,10 @@ void QNodePrivate::_q_addChild(QNode *childNode)
     if (!m_scene)
         return;
 
-    // We need to send a QNodeAddedPropertyChange to the backend
+    // We need to send a QPropertyNodeAddedChange to the backend
     // to notify the backend that we have a new child
     if (m_changeArbiter != nullptr) {
-        const auto change = QNodeAddedPropertyChangePtr::create(m_id, childNode);
+        const auto change = QPropertyNodeAddedChangePtr::create(m_id, childNode);
         change->setPropertyName("children");
         notifyObservers(change);
     }
@@ -195,7 +195,7 @@ void QNodePrivate::_q_removeChild(QNode *childNode)
  * If \a parent is not null, then we must tell its new parent about this QNode now
  * being a child of it on the backend. If this QNode did not have a parent upon
  * entry to this function, then we must first send a QNodeCreatedChange to the backend
- * prior to sending the QNodeAddedPropertyChange to its parent.
+ * prior to sending the QPropertyNodeAddedChange to its parent.
  *
  * Note: This function should never be called from the ctor directly as the type may
  * not be fully created yet and creating creation changes involves calling a virtual
diff --git a/src/input/backend/action.cpp b/src/input/backend/action.cpp
index 4c8053854..b76c93e8c 100644
--- a/src/input/backend/action.cpp
+++ b/src/input/backend/action.cpp
@@ -42,7 +42,7 @@
 #include <Qt3DInput/qabstractactioninput.h>
 #include <Qt3DInput/private/qaction_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 #include <Qt3DCore/qbackendnodepropertychange.h>
 
@@ -89,7 +89,7 @@ void Action::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     switch (e->type()) {
     case Qt3DCore::PropertyValueAdded: {
-        const auto change = qSharedPointerCast<Qt3DCore::QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("input"))
             m_inputs.push_back(change->addedNodeId());
         break;
diff --git a/src/input/backend/axis.cpp b/src/input/backend/axis.cpp
index 54c1f6e2f..87db8ae1f 100644
--- a/src/input/backend/axis.cpp
+++ b/src/input/backend/axis.cpp
@@ -42,7 +42,7 @@
 #include <Qt3DInput/qabstractaxisinput.h>
 #include <Qt3DInput/private/qaxis_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 #include <Qt3DCore/qbackendnodepropertychange.h>
 
@@ -89,7 +89,7 @@ void Axis::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     switch (e->type()) {
     case Qt3DCore::PropertyValueAdded: {
-        const auto change = qSharedPointerCast<Qt3DCore::QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("input"))
             m_inputs.push_back(change->addedNodeId());
         break;
diff --git a/src/input/backend/inputchord.cpp b/src/input/backend/inputchord.cpp
index 91fa810c7..f5d7e88a7 100644
--- a/src/input/backend/inputchord.cpp
+++ b/src/input/backend/inputchord.cpp
@@ -41,7 +41,7 @@
 #include <Qt3DInput/qinputchord.h>
 #include <Qt3DInput/private/qinputchord_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -109,7 +109,7 @@ void InputChord::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case Qt3DCore::PropertyValueAdded: {
-        const auto change = qSharedPointerCast<Qt3DCore::QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("chord")) {
             m_chords.push_back(change->addedNodeId());
             m_inputsToTrigger.push_back(change->addedNodeId());
diff --git a/src/input/backend/inputsequence.cpp b/src/input/backend/inputsequence.cpp
index c1878dfa5..6e31c3d33 100644
--- a/src/input/backend/inputsequence.cpp
+++ b/src/input/backend/inputsequence.cpp
@@ -42,7 +42,7 @@
 #include <Qt3DInput/qabstractphysicaldevice.h>
 #include <Qt3DInput/private/qinputsequence_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 #include <QDateTime>
 
@@ -134,7 +134,7 @@ void InputSequence::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case Qt3DCore::PropertyValueAdded: {
-        const auto change = qSharedPointerCast<Qt3DCore::QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("sequence")) {
             m_sequences.push_back(change->addedNodeId());
             m_inputsToTrigger.push_back(change->addedNodeId());
diff --git a/src/input/backend/logicaldevice.cpp b/src/input/backend/logicaldevice.cpp
index 12be3fb3a..57e1b859b 100644
--- a/src/input/backend/logicaldevice.cpp
+++ b/src/input/backend/logicaldevice.cpp
@@ -44,7 +44,7 @@
 #include <Qt3DInput/private/inputmanagers_p.h>
 #include <Qt3DInput/private/qlogicaldevice_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -77,7 +77,7 @@ void LogicalDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     switch (e->type()) {
     case Qt3DCore::PropertyValueAdded: {
-        const auto change = qSharedPointerCast<Qt3DCore::QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("axis"))
             m_axes.push_back(change->addedNodeId());
         else if (change->propertyName() == QByteArrayLiteral("action"))
diff --git a/src/input/backend/qabstractphysicaldevicebackendnode.cpp b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
index 48ad11ad9..c97ab3f79 100644
--- a/src/input/backend/qabstractphysicaldevicebackendnode.cpp
+++ b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
@@ -49,7 +49,7 @@
 #include <Qt3DInput/private/qinputaspect_p.h>
 
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 #include <Qt3DCore/private/qabstractaspect_p.h>
 
@@ -179,7 +179,7 @@ void QAbstractPhysicalDeviceBackendNode::sceneChangeEvent(const Qt3DCore::QScene
     Q_D(QAbstractPhysicalDeviceBackendNode);
     switch (e->type()) {
     case Qt3DCore::PropertyValueAdded: {
-        const auto change = qSharedPointerCast<Qt3DCore::QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("axisSettings")) {
             const auto axisSettingId = change->addedNodeId();
             Input::AxisSetting *axisSetting = d->getAxisSetting(axisSettingId);
diff --git a/src/input/frontend/qabstractphysicaldevice.cpp b/src/input/frontend/qabstractphysicaldevice.cpp
index abafacab3..e445ae90d 100644
--- a/src/input/frontend/qabstractphysicaldevice.cpp
+++ b/src/input/frontend/qabstractphysicaldevice.cpp
@@ -42,7 +42,7 @@
 #include <Qt3DInput/qphysicaldevicecreatedchange.h>
 #include <Qt3DInput/qaxissetting.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 #include <Qt3DCore/private/qnode_p.h>
 
@@ -157,7 +157,7 @@ void QAbstractPhysicalDevice::addAxisSetting(QAxisSetting *axisSetting)
     Q_D(QAbstractPhysicalDevice);
     if (axisSetting && !d->m_axisSettings.contains(axisSetting)) {
         if (d->m_changeArbiter) {
-            const auto change = Qt3DCore::QNodeAddedPropertyChangePtr::create(id(), axisSetting);
+            const auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(id(), axisSetting);
             change->setPropertyName("axisSettings");
             d->notifyObservers(change);
         }
diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp
index 8bb088a91..3f46d7b75 100644
--- a/src/input/frontend/qaction.cpp
+++ b/src/input/frontend/qaction.cpp
@@ -41,7 +41,7 @@
 #include "qaction_p.h"
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 #include <Qt3DCore/qnodecreatedchange.h>
 #include <Qt3DInput/qabstractactioninput.h>
@@ -121,7 +121,7 @@ void QAction::addInput(QAbstractActionInput *input)
             input->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = Qt3DCore::QNodeAddedPropertyChangePtr::create(id(), input);
+            const auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(id(), input);
             change->setPropertyName("input");
             d->notifyObservers(change);
         }
diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp
index 23c3ba58d..f49e20690 100644
--- a/src/input/frontend/qaxis.cpp
+++ b/src/input/frontend/qaxis.cpp
@@ -40,7 +40,7 @@
 #include "qaxis_p.h"
 #include <Qt3DInput/qabstractaxisinput.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 #include <Qt3DCore/qnodecreatedchange.h>
 
@@ -79,7 +79,7 @@ void QAxis::addInput(QAbstractAxisInput *input)
             input->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = Qt3DCore::QNodeAddedPropertyChangePtr::create(id(), input);
+            const auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(id(), input);
             change->setPropertyName("input");
             d->notifyObservers(change);
         }
diff --git a/src/input/frontend/qinputchord.cpp b/src/input/frontend/qinputchord.cpp
index 596b40891..6d39a5ccc 100644
--- a/src/input/frontend/qinputchord.cpp
+++ b/src/input/frontend/qinputchord.cpp
@@ -41,7 +41,7 @@
 #include <Qt3DCore/qnodecreatedchange.h>
 #include <Qt3DInput/qabstractphysicaldevice.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -151,7 +151,7 @@ void QInputChord::addChord(QAbstractActionInput *input)
             input->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = Qt3DCore::QNodeAddedPropertyChangePtr::create(id(), input);
+            const auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(id(), input);
             change->setPropertyName("chord");
             d->notifyObservers(change);
         }
diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp
index 99d0ab7c8..ff74418a1 100644
--- a/src/input/frontend/qinputsequence.cpp
+++ b/src/input/frontend/qinputsequence.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DInput/qabstractphysicaldevice.h>
 #include <Qt3DInput/qabstractactioninput.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -197,7 +197,7 @@ void QInputSequence::addSequence(QAbstractActionInput *input)
             input->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = Qt3DCore::QNodeAddedPropertyChangePtr::create(id(), input);
+            const auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(id(), input);
             change->setPropertyName("sequence");
             d->notifyObservers(change);
         }
diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp
index 368b31d8d..9d053c4bf 100644
--- a/src/input/frontend/qlogicaldevice.cpp
+++ b/src/input/frontend/qlogicaldevice.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DInput/qaxis.h>
 #include <Qt3DCore/qnodecreatedchange.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -159,7 +159,7 @@ void QLogicalDevice::addAction(QAction *action)
             action->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = Qt3DCore::QNodeAddedPropertyChangePtr::create(id(), action);
+            const auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(id(), action);
             change->setPropertyName("action");
             d->notifyObservers(change);
         }
@@ -213,7 +213,7 @@ void QLogicalDevice::addAxis(QAxis *axis)
             axis->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = Qt3DCore::QNodeAddedPropertyChangePtr::create(id(), axis);
+            const auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(id(), axis);
             change->setPropertyName("axis");
             d->notifyObservers(change);
         }
diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp
index 707ffa930..a590ad6ea 100644
--- a/src/render/backend/rendertarget.cpp
+++ b/src/render/backend/rendertarget.cpp
@@ -42,7 +42,7 @@
 #include <Qt3DRender/private/qrendertarget_p.h>
 #include <Qt3DRender/qrendertargetoutput.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 #include <QVariant>
 
@@ -91,7 +91,7 @@ void RenderTarget::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     switch (e->type()) {
     case Qt3DCore::PropertyValueAdded: {
-        const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("output")) {
             appendRenderOutput(change->addedNodeId());
             markDirty(AbstractRenderer::AllDirty);
diff --git a/src/render/framegraph/layerfilternode.cpp b/src/render/framegraph/layerfilternode.cpp
index d30a6232a..ea10535c2 100644
--- a/src/render/framegraph/layerfilternode.cpp
+++ b/src/render/framegraph/layerfilternode.cpp
@@ -41,7 +41,7 @@
 #include "qlayerfilter.h"
 #include <Qt3DRender/private/qlayerfilter_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -68,7 +68,7 @@ void LayerFilterNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     switch (e->type()) {
     case PropertyValueAdded: {
-        const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("layer"))
             m_layerIds.append(change->addedNodeId());
         break;
diff --git a/src/render/framegraph/qlayerfilter.cpp b/src/render/framegraph/qlayerfilter.cpp
index 45548d2d1..efc16f83c 100644
--- a/src/render/framegraph/qlayerfilter.cpp
+++ b/src/render/framegraph/qlayerfilter.cpp
@@ -41,7 +41,7 @@
 #include "qlayerfilter_p.h"
 #include "qlayer.h"
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -108,7 +108,7 @@ void QLayerFilter::addLayer(QLayer *layer)
             layer->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = Qt3DCore::QNodeAddedPropertyChangePtr::create(id(), layer);
+            const auto change = Qt3DCore::QPropertyNodeAddedChangePtr::create(id(), layer);
             change->setPropertyName("layer");
             d->notifyObservers(change);
         }
diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp
index 2beb91e53..cb6a3494c 100644
--- a/src/render/framegraph/qrenderpassfilter.cpp
+++ b/src/render/framegraph/qrenderpassfilter.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DRender/qfilterkey.h>
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -84,7 +84,7 @@ void QRenderPassFilter::addMatch(QFilterKey *filterKey)
             filterKey->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), filterKey);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), filterKey);
             change->setPropertyName("match");
             d->notifyObservers(change);
         }
@@ -119,7 +119,7 @@ void QRenderPassFilter::addParameter(QParameter *parameter)
             parameter->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), parameter);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), parameter);
             change->setPropertyName("parameter");
             d->notifyObservers(change);
         }
diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp
index 42bae8455..7d7a48684 100644
--- a/src/render/framegraph/qrenderstateset.cpp
+++ b/src/render/framegraph/qrenderstateset.cpp
@@ -42,7 +42,7 @@
 
 #include <Qt3DRender/qrenderstate.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -98,7 +98,7 @@ void QRenderStateSet::addRenderState(QRenderState *state)
             state->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), state);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), state);
             change->setPropertyName("renderState");
             d->notifyObservers(change);
         }
diff --git a/src/render/framegraph/qsortpolicy.cpp b/src/render/framegraph/qsortpolicy.cpp
index 82e9de61a..a2477e187 100644
--- a/src/render/framegraph/qsortpolicy.cpp
+++ b/src/render/framegraph/qsortpolicy.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qsortpolicy_p.h"
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -79,7 +79,7 @@ void QSortPolicy::addSortType(Qt3DRender::QSortPolicy::SortType sortType)
         d->m_sortTypes.append(sortType);
 
         if (d->m_changeArbiter != nullptr) {
-            QNodeAddedPropertyChangePtr propertyChange(new QNodeAddedPropertyChange(id()));
+            QPropertyNodeAddedChangePtr propertyChange(new QPropertyNodeAddedChange(id()));
             propertyChange->setPropertyName("sortType");
             propertyChange->setAddedValue(QVariant::fromValue(sortType));
             d->notifyObservers(propertyChange);
diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp
index 7de5be3d7..5a215d3a0 100644
--- a/src/render/framegraph/qtechniquefilter.cpp
+++ b/src/render/framegraph/qtechniquefilter.cpp
@@ -42,7 +42,7 @@
 #include <Qt3DRender/qfilterkey.h>
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -88,7 +88,7 @@ void QTechniqueFilter::addMatch(QFilterKey *filterKey)
             filterKey->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), filterKey);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), filterKey);
             change->setPropertyName("matchAll");
             d->notifyObservers(change);
         }
@@ -122,7 +122,7 @@ void QTechniqueFilter::addParameter(QParameter *parameter)
             parameter->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), parameter);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), parameter);
             change->setPropertyName("parameter");
             d->notifyObservers(change);
         }
diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp
index 0a0c6688e..18d16055e 100644
--- a/src/render/framegraph/renderpassfilternode.cpp
+++ b/src/render/framegraph/renderpassfilternode.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DRender/private/qrenderpassfilter_p.h>
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -94,7 +94,7 @@ void RenderPassFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 
     switch (e->type()) {
     case PropertyValueAdded: {
-        const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("match")) {
             appendFilter(change->addedNodeId());
             markDirty(AbstractRenderer::AllDirty);
diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp
index 9b79b8858..38a542260 100644
--- a/src/render/framegraph/statesetnode.cpp
+++ b/src/render/framegraph/statesetnode.cpp
@@ -44,7 +44,7 @@
 #include <Qt3DRender/private/genericstate_p.h>
 #include <Qt3DRender/private/renderstateset_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -76,7 +76,7 @@ void StateSetNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     switch (e->type()) {
     case PropertyValueAdded: {
-        const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("renderState")) {
             appendRenderState(change->addedNodeId());
             markDirty(AbstractRenderer::AllDirty);
diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp
index 626a75fa9..5586845c0 100644
--- a/src/render/framegraph/techniquefilternode.cpp
+++ b/src/render/framegraph/techniquefilternode.cpp
@@ -44,7 +44,7 @@
 #include <Qt3DRender/private/managers_p.h>
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -93,7 +93,7 @@ void TechniqueFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     switch (e->type()) {
     case PropertyValueAdded: {
-        const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("matchAll")) {
             appendFilter(change->addedNodeId());
             markDirty(AbstractRenderer::AllDirty);
diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp
index 2f4237344..80c2cfc6e 100644
--- a/src/render/frontend/qrendertarget.cpp
+++ b/src/render/frontend/qrendertarget.cpp
@@ -41,7 +41,7 @@
 #include "qrendertarget_p.h"
 #include "qrendertargetoutput.h"
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -76,7 +76,7 @@ void QRenderTarget::addOutput(QRenderTargetOutput *output)
             output->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), output);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), output);
             change->setPropertyName("output");
             d->notifyObservers(change);
         }
diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp
index 595485a6c..c4283fd10 100644
--- a/src/render/geometry/geometry.cpp
+++ b/src/render/geometry/geometry.cpp
@@ -42,7 +42,7 @@
 #include <Qt3DRender/qgeometry.h>
 #include <Qt3DRender/private/qgeometry_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -83,7 +83,7 @@ void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     switch (e->type()) {
     case PropertyValueAdded: {
-        const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("attribute")) {
             m_attributes.push_back(change->addedNodeId());
             m_geometryDirty = true;
diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp
index 736057881..0d979e166 100644
--- a/src/render/geometry/geometryrenderer.cpp
+++ b/src/render/geometry/geometryrenderer.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DRender/private/qgeometryrenderer_p.h>
 #include <Qt3DCore/qbackendnodepropertychange.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 #include <Qt3DCore/private/qnode_p.h>
 #include <QtCore/qcoreapplication.h>
@@ -169,7 +169,7 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case PropertyValueAdded: {
-        const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("geometry")) {
             m_geometryId = change->addedNodeId();
             m_dirty = true;
@@ -178,7 +178,7 @@ void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("geometry")) {
             m_geometryId = QNodeId();
             m_dirty = true;
diff --git a/src/render/geometry/qgeometry.cpp b/src/render/geometry/qgeometry.cpp
index 2d77afd89..a941a5250 100644
--- a/src/render/geometry/qgeometry.cpp
+++ b/src/render/geometry/qgeometry.cpp
@@ -42,7 +42,7 @@
 #include <private/qnode_p.h>
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -112,7 +112,7 @@ void QGeometry::addAttribute(QAttribute *attribute)
             attribute->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), attribute);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), attribute);
             change->setPropertyName("attribute");
             d->notifyObservers(change);
         }
diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp
index 1c11f55e2..03463533f 100644
--- a/src/render/geometry/qgeometryrenderer.cpp
+++ b/src/render/geometry/qgeometryrenderer.cpp
@@ -42,7 +42,7 @@
 
 #include <private/qcomponent_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -396,7 +396,7 @@ void QGeometryRenderer::setGeometry(QGeometry *geometry)
     blockNotifications(blocked);
 
     if (d->m_geometry && d->m_changeArbiter) {
-        const auto change = QNodeAddedPropertyChangePtr::create(id(), d->m_geometry);
+        const auto change = QPropertyNodeAddedChangePtr::create(id(), d->m_geometry);
         change->setPropertyName("geometry");
         d->notifyObservers(change);
     }
diff --git a/src/render/materialsystem/effect.cpp b/src/render/materialsystem/effect.cpp
index 141652855..7e066feb2 100644
--- a/src/render/materialsystem/effect.cpp
+++ b/src/render/materialsystem/effect.cpp
@@ -44,7 +44,7 @@
 #include <Qt3DRender/private/qeffect_p.h>
 
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 #include <QVariant>
@@ -83,7 +83,7 @@ void Effect::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     switch (e->type()) {
     case PropertyValueAdded: {
-        const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("technique"))
             appendRenderTechnique(change->addedNodeId());
         else if (change->propertyName() == QByteArrayLiteral("parameter"))
diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp
index bb959f507..6c4b821bc 100644
--- a/src/render/materialsystem/material.cpp
+++ b/src/render/materialsystem/material.cpp
@@ -48,7 +48,7 @@
 #include <Qt3DRender/private/qmaterial_p.h>
 
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 using namespace Qt3DCore;
@@ -94,7 +94,7 @@ void Material::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case PropertyValueAdded: {
-        const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("parameter"))
             m_parameterPack.appendParameter(change->addedNodeId());
         break;
diff --git a/src/render/materialsystem/qeffect.cpp b/src/render/materialsystem/qeffect.cpp
index 249889c10..5063cc59c 100644
--- a/src/render/materialsystem/qeffect.cpp
+++ b/src/render/materialsystem/qeffect.cpp
@@ -43,7 +43,7 @@
 #include "qparameter.h"
 
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -82,7 +82,7 @@ void QEffect::addParameter(QParameter *parameter)
             parameter->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), parameter);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), parameter);
             change->setPropertyName("parameter");
             d->notifyObservers(change);
         }
@@ -127,7 +127,7 @@ void QEffect::addTechnique(QTechnique *t)
             t->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), t);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), t);
             change->setPropertyName("technique");
             d->notifyObservers(change);
         }
diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp
index c9fb322d3..b3adf2392 100644
--- a/src/render/materialsystem/qmaterial.cpp
+++ b/src/render/materialsystem/qmaterial.cpp
@@ -44,7 +44,7 @@
 #include <Qt3DRender/private/renderlogging_p.h>
 #include "qparameter.h"
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 /*!
@@ -138,7 +138,7 @@ void QMaterial::addParameter(QParameter *parameter)
             parameter->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), parameter);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), parameter);
             change->setPropertyName("parameter");
             d->notifyObservers(change);
         }
diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp
index d907fb781..434d4fa72 100644
--- a/src/render/materialsystem/qrenderpass.cpp
+++ b/src/render/materialsystem/qrenderpass.cpp
@@ -44,7 +44,7 @@
 #include "qfilterkey.h"
 #include "qrenderstate.h"
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 #include <Qt3DCore/private/qnode_p.h>
 
@@ -98,7 +98,7 @@ void QRenderPass::setShaderProgram(QShaderProgram *shaderProgram)
             shaderProgram->setParent(this);
 
         if (d->m_shader && d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), d->m_shader);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), d->m_shader);
             change->setPropertyName("shaderProgram");
             d->notifyObservers(change);
         }
@@ -126,7 +126,7 @@ void QRenderPass::addFilterKey(QFilterKey *filterKey)
             filterKey->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), filterKey);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), filterKey);
             change->setPropertyName("filterKeys");
             d->notifyObservers(change);
         }
@@ -170,7 +170,7 @@ void QRenderPass::addRenderState(QRenderState *state)
             state->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), state);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), state);
             change->setPropertyName("renderState");
             d->notifyObservers(change);
         }
@@ -217,7 +217,7 @@ void QRenderPass::addParameter(QParameter *parameter)
             parameter->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), parameter);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), parameter);
             change->setPropertyName("parameter");
             d->notifyObservers(change);
         }
diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp
index 920771b7a..d8adb9d41 100644
--- a/src/render/materialsystem/qtechnique.cpp
+++ b/src/render/materialsystem/qtechnique.cpp
@@ -42,7 +42,7 @@
 #include "qparameter.h"
 #include "qgraphicsapifilter.h"
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -100,7 +100,7 @@ void QTechnique::addFilterKey(QFilterKey *filterKey)
             filterKey->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), filterKey);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), filterKey);
             change->setPropertyName("filterKeys");
             d->notifyObservers(change);
         }
@@ -140,7 +140,7 @@ void QTechnique::addParameter(QParameter *parameter)
             parameter->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), parameter);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), parameter);
             change->setPropertyName("parameter");
             d->notifyObservers(change);
         }
@@ -179,7 +179,7 @@ void QTechnique::addRenderPass(QRenderPass *pass)
             pass->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), pass);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), pass);
             change->setPropertyName("pass");
             d->notifyObservers(change);
         }
@@ -196,7 +196,7 @@ void QTechnique::removeRenderPass(QRenderPass *pass)
     Q_ASSERT(pass);
     Q_D(QTechnique);
     if (d->m_changeArbiter) {
-        const auto change = QNodeAddedPropertyChangePtr::create(id(), pass);
+        const auto change = QPropertyNodeAddedChangePtr::create(id(), pass);
         change->setPropertyName("pass");
         d->notifyObservers(change);
     }
diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp
index 32c5f9a60..6d59d3c19 100644
--- a/src/render/materialsystem/renderpass.cpp
+++ b/src/render/materialsystem/renderpass.cpp
@@ -49,7 +49,7 @@
 #include <Qt3DRender/private/renderstateset_p.h>
 
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -87,7 +87,7 @@ void RenderPass::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     switch (e->type()) {
     case PropertyValueAdded: {
-        const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("filterKeys"))
             appendFilterKey(change->addedNodeId());
         else if (change->propertyName() == QByteArrayLiteral("shaderProgram"))
diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp
index c887f11a7..c6eb8d15d 100644
--- a/src/render/materialsystem/technique.cpp
+++ b/src/render/materialsystem/technique.cpp
@@ -49,7 +49,7 @@
 #include <Qt3DRender/private/shader_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 #include <QDebug>
@@ -103,7 +103,7 @@ void Technique::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case PropertyValueAdded: {
-        const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("pass"))
             appendRenderPass(change->addedNodeId());
         else if (change->propertyName() == QByteArrayLiteral("parameter"))
diff --git a/src/render/texture/qabstracttexture.cpp b/src/render/texture/qabstracttexture.cpp
index a406a267a..e618f6d5a 100644
--- a/src/render/texture/qabstracttexture.cpp
+++ b/src/render/texture/qabstracttexture.cpp
@@ -41,7 +41,7 @@
 #include "qabstracttexture_p.h"
 #include <Qt3DRender/qabstracttextureimage.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -279,7 +279,7 @@ void QAbstractTexture::addTextureImage(QAbstractTextureImage *textureImage)
             textureImage->setParent(this);
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = QNodeAddedPropertyChangePtr::create(id(), textureImage);
+            const auto change = QPropertyNodeAddedChangePtr::create(id(), textureImage);
             change->setPropertyName("textureImage");
             d->notifyObservers(change);
         }
diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp
index 8d99d6328..3082ed259 100644
--- a/src/render/texture/texture.cpp
+++ b/src/render/texture/texture.cpp
@@ -50,7 +50,7 @@
 #include <Qt3DRender/private/texturedatamanager_p.h>
 #include <Qt3DRender/private/qabstracttexture_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
-#include <Qt3DCore/qnodeaddedpropertychange.h>
+#include <Qt3DCore/qpropertynodeaddedchange.h>
 #include <Qt3DCore/qnoderemovedpropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -585,7 +585,7 @@ void Texture::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
         break;
 
     case PropertyValueAdded: {
-        const auto change = qSharedPointerCast<QNodeAddedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeAddedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("textureImage")) {
             m_textureImages.append(m_textureImageManager->lookupHandle(change->addedNodeId()));
         }