Rename QNodeRemovedPropertyChange -> QPropertyNodeRemovedChange

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

62 files changed, 170 insertions, 170 deletions

diff --git a/src/core/changes/changes.pri b/src/core/changes/changes.pri
index 1043fba2d..b03e317d2 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/qnoderemovedpropertychange.h \
-    $$PWD/qnoderemovedpropertychange_p.h \
     $$PWD/qnodedestroyedchange.h \
     $$PWD/qpropertyvalueaddedchangebase.h \
     $$PWD/qpropertyvalueaddedchangebase_p.h \
@@ -32,7 +30,9 @@ HEADERS += \
     $$PWD/qstaticpropertyvalueremovedchangebase.h \
     $$PWD/qstaticpropertyvalueremovedchangebase_p.h \
     $$PWD/qpropertynodeaddedchange.h \
-    $$PWD/qpropertynodeaddedchange_p.h
+    $$PWD/qpropertynodeaddedchange_p.h \
+    $$PWD/qpropertynoderemovedchange_p.h \
+    $$PWD/qpropertynoderemovedchange.h
 
 SOURCES += \
     $$PWD/qscenechange.cpp \
@@ -41,7 +41,6 @@ SOURCES += \
     $$PWD/qcomponentaddedchange.cpp \
     $$PWD/qcomponentremovedchange.cpp \
     $$PWD/qbackendnodepropertychange.cpp \
-    $$PWD/qnoderemovedpropertychange.cpp \
     $$PWD/qpropertyvalueaddedchangebase.cpp \
     $$PWD/qpropertyvalueremovedchangebase.cpp \
     $$PWD/qpropertyupdatedchangebase.cpp \
@@ -50,4 +49,5 @@ SOURCES += \
     $$PWD/qpropertyupdatedchange.cpp \
     $$PWD/qstaticpropertyvalueaddedchangebase.cpp \
     $$PWD/qstaticpropertyvalueremovedchangebase.cpp \
-    $$PWD/qpropertynodeaddedchange.cpp
+    $$PWD/qpropertynodeaddedchange.cpp \
+    $$PWD/qpropertynoderemovedchange.cpp
diff --git a/src/core/changes/qnoderemovedpropertychange.cpp b/src/core/changes/qpropertynoderemovedchange.cpp
index c58eddbcc..a3f69973c 100644
--- a/src/core/changes/qnoderemovedpropertychange.cpp
+++ b/src/core/changes/qpropertynoderemovedchange.cpp
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "qnoderemovedpropertychange.h"
-#include "qnoderemovedpropertychange_p.h"
+#include "qpropertynoderemovedchange.h"
+#include "qpropertynoderemovedchange_p.h"
 #include <Qt3DCore/private/qnode_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -46,62 +46,62 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DCore {
 
 /*!
- * \class Qt3DCore::QNodeRemovedPropertyChange
+ * \class Qt3DCore::QPropertyNodeRemovedChange
  * \inmodule Qt3DCore
  *
  * TODO
  */
 
 /*!
- * \typedef Qt3DCore::QNodeRemovedPropertyChangePtr
- * \relates Qt3DCore::QNodeRemovedPropertyChange
+ * \typedef Qt3DCore::QPropertyNodeRemovedChangePtr
+ * \relates Qt3DCore::QPropertyNodeRemovedChange
  *
- * A shared pointer for QNodeRemovedPropertyChange.
+ * A shared pointer for QPropertyNodeRemovedChange.
  */
 
 /*!
- * Constructs a new QNodeRemovedPropertyChange with \a subjectId, \a node, and
+ * Constructs a new QPropertyNodeRemovedChange with \a subjectId, \a node, and
  * \a priority.
  */
-QNodeRemovedPropertyChange::QNodeRemovedPropertyChange(QNodeId subjectId, QNode *node)
-    : QStaticPropertyValueRemovedChangeBase(*new QNodeRemovedPropertyChangePrivate, subjectId)
+QPropertyNodeRemovedChange::QPropertyNodeRemovedChange(QNodeId subjectId, QNode *node)
+    : QStaticPropertyValueRemovedChangeBase(*new QPropertyNodeRemovedChangePrivate, subjectId)
 {
-    Q_D(QNodeRemovedPropertyChange);
+    Q_D(QPropertyNodeRemovedChange);
     d->m_removedNodeIdTypePair = QNodeIdTypePair(node->id(), QNodePrivate::get(node)->m_typeInfo);
 }
 
-QNodeRemovedPropertyChange::QNodeRemovedPropertyChange(QNodeId subjectId)
-    : QStaticPropertyValueRemovedChangeBase(*new QNodeRemovedPropertyChangePrivate, subjectId)
+QPropertyNodeRemovedChange::QPropertyNodeRemovedChange(QNodeId subjectId)
+    : QStaticPropertyValueRemovedChangeBase(*new QPropertyNodeRemovedChangePrivate, subjectId)
 {
 }
 
 /*!
  * \return the id of the node removed to the property.
  */
-QNodeId QNodeRemovedPropertyChange::removedNodeId() const
+QNodeId QPropertyNodeRemovedChange::removedNodeId() const
 {
-    Q_D(const QNodeRemovedPropertyChange);
+    Q_D(const QPropertyNodeRemovedChange);
     return d->m_removedNodeIdTypePair.id;
 }
 
 /*!
  * \return the metaObject of the node removed to the property.
  */
-const QMetaObject *QNodeRemovedPropertyChange::metaObject() const
+const QMetaObject *QPropertyNodeRemovedChange::metaObject() const
 {
-    Q_D(const QNodeRemovedPropertyChange);
+    Q_D(const QPropertyNodeRemovedChange);
     return d->m_removedNodeIdTypePair.type;
 }
 
-void QNodeRemovedPropertyChange::setRemovedValue(const QVariant &value)
+void QPropertyNodeRemovedChange::setRemovedValue(const QVariant &value)
 {
-    Q_D(QNodeRemovedPropertyChange);
+    Q_D(QPropertyNodeRemovedChange);
     d->m_removedValue = value;
 }
 
-QVariant QNodeRemovedPropertyChange::removedValue() const
+QVariant QPropertyNodeRemovedChange::removedValue() const
 {
-    Q_D(const QNodeRemovedPropertyChange);
+    Q_D(const QPropertyNodeRemovedChange);
     return d->m_removedValue;
 }
 
diff --git a/src/core/changes/qnoderemovedpropertychange.h b/src/core/changes/qpropertynoderemovedchange.h
index a73e2f85b..800dc2441 100644
--- a/src/core/changes/qnoderemovedpropertychange.h
+++ b/src/core/changes/qpropertynoderemovedchange.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DCORE_QNODEREMOVEDPROPERTYCHANGE_H
-#define QT3DCORE_QNODEREMOVEDPROPERTYCHANGE_H
+#ifndef QT3DCORE_QPROPERTYNODEREMOVEDCHANGE_H
+#define QT3DCORE_QPROPERTYNODEREMOVEDCHANGE_H
 
 #include <Qt3DCore/qstaticpropertyvalueremovedchangebase.h>
 #include <Qt3DCore/qnode.h>
@@ -48,14 +48,14 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 
-class QNodeRemovedPropertyChangePrivate;
+class QPropertyNodeRemovedChangePrivate;
 
 // TODO: Split this class into two. One for general values, one specifically for QNodeIds
-class QT3DCORESHARED_EXPORT QNodeRemovedPropertyChange : public QStaticPropertyValueRemovedChangeBase
+class QT3DCORESHARED_EXPORT QPropertyNodeRemovedChange : public QStaticPropertyValueRemovedChangeBase
 {
 public:
-    QNodeRemovedPropertyChange(QNodeId subjectId, QNode *node);
-    QNodeRemovedPropertyChange(QNodeId subjectId);
+    QPropertyNodeRemovedChange(QNodeId subjectId, QNode *node);
+    QPropertyNodeRemovedChange(QNodeId subjectId);
 
     QNodeId removedNodeId() const;
     const QMetaObject *metaObject() const;
@@ -64,13 +64,13 @@ public:
     QVariant removedValue() const;
 
 private:
-    Q_DECLARE_PRIVATE(QNodeRemovedPropertyChange)
+    Q_DECLARE_PRIVATE(QPropertyNodeRemovedChange)
 };
 
-typedef QSharedPointer<QNodeRemovedPropertyChange> QNodeRemovedPropertyChangePtr;
+typedef QSharedPointer<QPropertyNodeRemovedChange> QPropertyNodeRemovedChangePtr;
 
 } // namespace Qt3DCore
 
 QT_END_NAMESPACE
 
-#endif // QT3DCORE_QNODEREMOVEDPROPERTYCHANGE_H
+#endif // QT3DCORE_QPROPERTYNODEREMOVEDCHANGE_H
diff --git a/src/core/changes/qnoderemovedpropertychange_p.h b/src/core/changes/qpropertynoderemovedchange_p.h
index ea85dd167..f5dd82409 100644
--- a/src/core/changes/qnoderemovedpropertychange_p.h
+++ b/src/core/changes/qpropertynoderemovedchange_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DCORE_QNODEREMOVEDPROPERTYCHANGE_P_H
-#define QT3DCORE_QNODEREMOVEDPROPERTYCHANGE_P_H
+#ifndef QT3DCORE_QPROPERTYNODEREMOVEDCHANGE_P_H
+#define QT3DCORE_QPROPERTYNODEREMOVEDCHANGE_P_H
 
 //
 //  W A R N I N G
@@ -62,15 +62,15 @@ namespace Qt3DCore {
 class QPropertyUpdatedChange;
 class QFrameAllocator;
 
-class QNodeRemovedPropertyChangePrivate : public QStaticPropertyValueRemovedChangeBasePrivate
+class QPropertyNodeRemovedChangePrivate : public QStaticPropertyValueRemovedChangeBasePrivate
 {
 public:
-    QNodeRemovedPropertyChangePrivate()
+    QPropertyNodeRemovedChangePrivate()
         : m_removedNodeIdTypePair()
     {
     }
 
-    Q_DECLARE_PUBLIC(QNodeRemovedPropertyChange)
+    Q_DECLARE_PUBLIC(QPropertyNodeRemovedChange)
 
     const char *m_propertyName;
     QNodeIdTypePair m_removedNodeIdTypePair;
@@ -81,4 +81,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3DCORE_QNODEREMOVEDPROPERTYCHANGE_P_H
+#endif // QT3DCORE_QPROPERTYNODEREMOVEDCHANGE_P_H
diff --git a/src/core/changes/qpropertyvalueremovedchangebase.cpp b/src/core/changes/qpropertyvalueremovedchangebase.cpp
index 5644f28f0..0892aa7c2 100644
--- a/src/core/changes/qpropertyvalueremovedchangebase.cpp
+++ b/src/core/changes/qpropertyvalueremovedchangebase.cpp
@@ -59,7 +59,7 @@ QPropertyValueRemovedChangeBasePrivate::~QPropertyValueRemovedChangeBasePrivate(
  *
  * The QPropertyValueRemovedChangeBase class is the base class for all QSceneChange events that
  * have the changeType() PropertyValueRemoved. You should not need to instantiate this class.
- * Usually you should be using one of its subclasses such as QNodeRemovedPropertyChange.
+ * Usually you should be using one of its subclasses such as QPropertyNodeRemovedChange.
  *
  * You can subclass this to create your own node Removed 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 e5cfb9cc9..70027ba2f 100644
--- a/src/core/nodes/qnode.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -44,7 +44,7 @@
 #include <Qt3DCore/qdynamicpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DCore/qnodedestroyedchange.h>
 #include <Qt3DCore/qaspectengine.h>
 #include <Qt3DCore/private/qdestructionidandtypecollector_p.h>
@@ -178,7 +178,7 @@ void QNodePrivate::_q_removeChild(QNode *childNode)
 
     // We notify the backend that we lost a child
     if (m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(m_id, childNode);
+        const auto change = QPropertyNodeRemovedChangePtr::create(m_id, childNode);
         change->setPropertyName("children");
         notifyObservers(change);
     }
diff --git a/src/input/backend/action.cpp b/src/input/backend/action.cpp
index b76c93e8c..832c0013d 100644
--- a/src/input/backend/action.cpp
+++ b/src/input/backend/action.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DInput/private/qaction_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DCore/qbackendnodepropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -96,7 +96,7 @@ void Action::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case Qt3DCore::PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("input"))
             m_inputs.removeOne(change->removedNodeId());
     }
diff --git a/src/input/backend/axis.cpp b/src/input/backend/axis.cpp
index 87db8ae1f..d27d1ee1a 100644
--- a/src/input/backend/axis.cpp
+++ b/src/input/backend/axis.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DInput/private/qaxis_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DCore/qbackendnodepropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -96,7 +96,7 @@ void Axis::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case Qt3DCore::PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("input"))
             m_inputs.removeOne(change->removedNodeId());
     }
diff --git a/src/input/backend/inputchord.cpp b/src/input/backend/inputchord.cpp
index f5d7e88a7..7ecd611a8 100644
--- a/src/input/backend/inputchord.cpp
+++ b/src/input/backend/inputchord.cpp
@@ -42,7 +42,7 @@
 #include <Qt3DInput/private/qinputchord_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -118,7 +118,7 @@ void InputChord::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case Qt3DCore::PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("chord")) {
             m_chords.removeOne(change->removedNodeId());
             m_inputsToTrigger.removeOne(change->removedNodeId());
diff --git a/src/input/backend/inputsequence.cpp b/src/input/backend/inputsequence.cpp
index 6e31c3d33..aae88f9a1 100644
--- a/src/input/backend/inputsequence.cpp
+++ b/src/input/backend/inputsequence.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DInput/private/qinputsequence_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <QDateTime>
 
 QT_BEGIN_NAMESPACE
@@ -143,7 +143,7 @@ void InputSequence::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case Qt3DCore::PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("sequence")) {
             m_sequences.removeOne(change->removedNodeId());
             m_inputsToTrigger.removeOne(change->removedNodeId());
diff --git a/src/input/backend/logicaldevice.cpp b/src/input/backend/logicaldevice.cpp
index 57e1b859b..fd4a637f2 100644
--- a/src/input/backend/logicaldevice.cpp
+++ b/src/input/backend/logicaldevice.cpp
@@ -45,7 +45,7 @@
 #include <Qt3DInput/private/qlogicaldevice_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -86,7 +86,7 @@ void LogicalDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case Qt3DCore::PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("axis"))
             m_axes.removeOne(change->removedNodeId());
         else if (change->propertyName() == QByteArrayLiteral("action"))
diff --git a/src/input/backend/qabstractphysicaldevicebackendnode.cpp b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
index c97ab3f79..eb66f4188 100644
--- a/src/input/backend/qabstractphysicaldevicebackendnode.cpp
+++ b/src/input/backend/qabstractphysicaldevicebackendnode.cpp
@@ -50,7 +50,7 @@
 
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DCore/private/qabstractaspect_p.h>
 
 #include <cmath>
@@ -191,7 +191,7 @@ void QAbstractPhysicalDeviceBackendNode::sceneChangeEvent(const Qt3DCore::QScene
     }
 
     case Qt3DCore::PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<Qt3DCore::QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<Qt3DCore::QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("axisSettings"))
             d->removeAxisSetting(change->removedNodeId());
         break;
diff --git a/src/input/frontend/qabstractphysicaldevice.cpp b/src/input/frontend/qabstractphysicaldevice.cpp
index e445ae90d..82d721a73 100644
--- a/src/input/frontend/qabstractphysicaldevice.cpp
+++ b/src/input/frontend/qabstractphysicaldevice.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DInput/qaxissetting.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DCore/private/qnode_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -174,7 +174,7 @@ void QAbstractPhysicalDevice::removeAxisSetting(QAxisSetting *axisSetting)
     Q_D(QAbstractPhysicalDevice);
     if (axisSetting && d->m_axisSettings.contains(axisSetting)) {
         if (d->m_changeArbiter) {
-            const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), axisSetting);
+            const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), axisSetting);
             change->setPropertyName("axisSettings");
             d->notifyObservers(change);
         }
diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp
index 3f46d7b75..2d7d29887 100644
--- a/src/input/frontend/qaction.cpp
+++ b/src/input/frontend/qaction.cpp
@@ -42,7 +42,7 @@
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DCore/qnodecreatedchange.h>
 #include <Qt3DInput/qabstractactioninput.h>
 
@@ -137,7 +137,7 @@ void QAction::removeInput(QAbstractActionInput *input)
     if (d->m_inputs.contains(input)) {
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), input);
+            const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), input);
             change->setPropertyName("input");
             d->notifyObservers(change);
         }
diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp
index f49e20690..1cee05203 100644
--- a/src/input/frontend/qaxis.cpp
+++ b/src/input/frontend/qaxis.cpp
@@ -41,7 +41,7 @@
 #include <Qt3DInput/qabstractaxisinput.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DCore/qnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
@@ -92,7 +92,7 @@ void QAxis::removeInput(QAbstractAxisInput *input)
     if (d->m_inputs.contains(input)) {
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), input);
+            const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), input);
             change->setPropertyName("input");
             d->notifyObservers(change);
         }
diff --git a/src/input/frontend/qinputchord.cpp b/src/input/frontend/qinputchord.cpp
index 6d39a5ccc..b00bccd4b 100644
--- a/src/input/frontend/qinputchord.cpp
+++ b/src/input/frontend/qinputchord.cpp
@@ -42,7 +42,7 @@
 #include <Qt3DInput/qabstractphysicaldevice.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -169,7 +169,7 @@ void QInputChord::removeChord(QAbstractActionInput *input)
     if (d->m_chords.contains(input)) {
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), input);
+            const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), input);
             change->setPropertyName("chord");
             d->notifyObservers(change);
         }
diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp
index ff74418a1..461605a64 100644
--- a/src/input/frontend/qinputsequence.cpp
+++ b/src/input/frontend/qinputsequence.cpp
@@ -44,7 +44,7 @@
 #include <Qt3DInput/qabstractactioninput.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -214,7 +214,7 @@ void QInputSequence::removeSequence(QAbstractActionInput *input)
     Q_D(QInputSequence);
     if (d->m_sequences.contains(input)) {
         if (d->m_changeArbiter != nullptr) {
-            const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), input);
+            const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), input);
             change->setPropertyName("sequence");
             d->notifyObservers(change);
         }
diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp
index 9d053c4bf..07f233e48 100644
--- a/src/input/frontend/qlogicaldevice.cpp
+++ b/src/input/frontend/qlogicaldevice.cpp
@@ -44,7 +44,7 @@
 #include <Qt3DCore/qnodecreatedchange.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -175,7 +175,7 @@ void QLogicalDevice::removeAction(QAction *action)
     if (d->m_actions.contains(action)) {
 
         if (d->m_changeArbiter != nullptr) {
-            const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), action);
+            const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), action);
             change->setPropertyName("action");
             d->notifyObservers(change);
         }
@@ -228,7 +228,7 @@ void QLogicalDevice::removeAxis(QAxis *axis)
     Q_D(QLogicalDevice);
     if (d->m_axes.contains(axis)) {
         if (d->m_changeArbiter != nullptr) {
-            const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), axis);
+            const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), axis);
             change->setPropertyName("axis");
             d->notifyObservers(change);
         }
diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp
index a590ad6ea..b0565a26b 100644
--- a/src/render/backend/rendertarget.cpp
+++ b/src/render/backend/rendertarget.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DRender/qrendertargetoutput.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -100,7 +100,7 @@ void RenderTarget::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case Qt3DCore::PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("output")) {
             removeRenderOutput(change->removedNodeId());
             markDirty(AbstractRenderer::AllDirty);
diff --git a/src/render/framegraph/layerfilternode.cpp b/src/render/framegraph/layerfilternode.cpp
index ea10535c2..d0c1533aa 100644
--- a/src/render/framegraph/layerfilternode.cpp
+++ b/src/render/framegraph/layerfilternode.cpp
@@ -42,7 +42,7 @@
 #include <Qt3DRender/private/qlayerfilter_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -75,7 +75,7 @@ void LayerFilterNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("layer"))
             m_layerIds.remove(change->removedNodeId());
         break;
diff --git a/src/render/framegraph/qlayerfilter.cpp b/src/render/framegraph/qlayerfilter.cpp
index efc16f83c..2fa07e8d8 100644
--- a/src/render/framegraph/qlayerfilter.cpp
+++ b/src/render/framegraph/qlayerfilter.cpp
@@ -42,7 +42,7 @@
 #include "qlayer.h"
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -120,7 +120,7 @@ void QLayerFilter::removeLayer(QLayer *layer)
     Q_ASSERT(layer);
     Q_D(QLayerFilter);
     if (d->m_changeArbiter != nullptr) {
-        const auto change = Qt3DCore::QNodeRemovedPropertyChangePtr::create(id(), layer);
+        const auto change = Qt3DCore::QPropertyNodeRemovedChangePtr::create(id(), layer);
         change->setPropertyName("layer");
         d->notifyObservers(change);
     }
diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp
index cb6a3494c..50b9e7de5 100644
--- a/src/render/framegraph/qrenderpassfilter.cpp
+++ b/src/render/framegraph/qrenderpassfilter.cpp
@@ -44,7 +44,7 @@
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -97,7 +97,7 @@ void QRenderPassFilter::removeMatch(QFilterKey *filterKey)
     Q_D(QRenderPassFilter);
 
     if (d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), filterKey);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), filterKey);
         change->setPropertyName("match");
         d->notifyObservers(change);
     }
@@ -132,7 +132,7 @@ void QRenderPassFilter::removeParameter(QParameter *parameter)
     Q_D(QRenderPassFilter);
 
     if (d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), parameter);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), parameter);
         change->setPropertyName("parameter");
         d->notifyObservers(change);
     }
diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp
index 7d7a48684..93ad04940 100644
--- a/src/render/framegraph/qrenderstateset.cpp
+++ b/src/render/framegraph/qrenderstateset.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DRender/qrenderstate.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -114,7 +114,7 @@ void QRenderStateSet::removeRenderState(QRenderState *state)
     Q_D(QRenderStateSet);
 
     if (d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), state);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), state);
         change->setPropertyName("renderState");
         d->notifyObservers(change);
     }
diff --git a/src/render/framegraph/qsortpolicy.cpp b/src/render/framegraph/qsortpolicy.cpp
index a2477e187..026e8db6c 100644
--- a/src/render/framegraph/qsortpolicy.cpp
+++ b/src/render/framegraph/qsortpolicy.cpp
@@ -39,7 +39,7 @@
 
 #include "qsortpolicy_p.h"
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -91,7 +91,7 @@ void QSortPolicy::removeSortType(SortType sortType)
 {
     Q_D(QSortPolicy);
     if (d->m_changeArbiter != nullptr) {
-        QNodeRemovedPropertyChangePtr propertyChange(new QNodeRemovedPropertyChange(id()));
+        QPropertyNodeRemovedChangePtr propertyChange(new QPropertyNodeRemovedChange(id()));
         propertyChange->setPropertyName("sortType");
         propertyChange->setRemovedValue(QVariant::fromValue(sortType));
         d->notifyObservers(propertyChange);
diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp
index 5a215d3a0..fb4f4c0b6 100644
--- a/src/render/framegraph/qtechniquefilter.cpp
+++ b/src/render/framegraph/qtechniquefilter.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -100,7 +100,7 @@ void QTechniqueFilter::removeMatch(QFilterKey *filterKey)
     Q_ASSERT(filterKey);
     Q_D(QTechniqueFilter);
     if (d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), filterKey);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), filterKey);
         change->setPropertyName("matchAll");
         d->notifyObservers(change);
     }
@@ -134,7 +134,7 @@ void QTechniqueFilter::removeParameter(QParameter *parameter)
     Q_ASSERT(parameter);
     Q_D(QTechniqueFilter);
     if (d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), parameter);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), parameter);
         change->setPropertyName("parameter");
         d->notifyObservers(change);
     }
diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp
index 18d16055e..c9277b951 100644
--- a/src/render/framegraph/renderpassfilternode.cpp
+++ b/src/render/framegraph/renderpassfilternode.cpp
@@ -44,7 +44,7 @@
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -106,7 +106,7 @@ void RenderPassFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("match")) {
             removeFilter(change->removedNodeId());
             markDirty(AbstractRenderer::AllDirty);
diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp
index 38a542260..1436db265 100644
--- a/src/render/framegraph/statesetnode.cpp
+++ b/src/render/framegraph/statesetnode.cpp
@@ -45,7 +45,7 @@
 #include <Qt3DRender/private/renderstateset_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -85,7 +85,7 @@ void StateSetNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case PropertyValueRemoved: {
-        const auto propertyChange = qSharedPointerCast<QNodeRemovedPropertyChange>(e);
+        const auto propertyChange = qSharedPointerCast<QPropertyNodeRemovedChange>(e);
         if (propertyChange->propertyName() == QByteArrayLiteral("renderState")) {
             removeRenderState(propertyChange->removedNodeId());
             markDirty(AbstractRenderer::AllDirty);
diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp
index 5586845c0..59f49af02 100644
--- a/src/render/framegraph/techniquefilternode.cpp
+++ b/src/render/framegraph/techniquefilternode.cpp
@@ -45,7 +45,7 @@
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -105,7 +105,7 @@ void TechniqueFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("matchAll")) {
             removeFilter(change->removedNodeId());
             markDirty(AbstractRenderer::AllDirty);
diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp
index 80c2cfc6e..9a0b079d9 100644
--- a/src/render/frontend/qrendertarget.cpp
+++ b/src/render/frontend/qrendertarget.cpp
@@ -42,7 +42,7 @@
 #include "qrendertargetoutput.h"
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -88,7 +88,7 @@ void QRenderTarget::removeOutput(QRenderTargetOutput *output)
     Q_D(QRenderTarget);
 
     if (output && d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), output);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), output);
         change->setPropertyName("output");
         d->notifyObservers(change);
     }
diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp
index c4283fd10..2eebb8222 100644
--- a/src/render/geometry/geometry.cpp
+++ b/src/render/geometry/geometry.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DRender/private/qgeometry_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -92,7 +92,7 @@ void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("attribute")) {
             m_attributes.removeOne(change->removedNodeId());
             m_geometryDirty = true;
diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp
index 0d979e166..5b2aeae75 100644
--- a/src/render/geometry/geometryrenderer.cpp
+++ b/src/render/geometry/geometryrenderer.cpp
@@ -44,7 +44,7 @@
 #include <Qt3DCore/qbackendnodepropertychange.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DCore/private/qnode_p.h>
 #include <QtCore/qcoreapplication.h>
 
diff --git a/src/render/geometry/qgeometry.cpp b/src/render/geometry/qgeometry.cpp
index a941a5250..c1add2866 100644
--- a/src/render/geometry/qgeometry.cpp
+++ b/src/render/geometry/qgeometry.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -127,7 +127,7 @@ void QGeometry::removeAttribute(QAttribute *attribute)
     Q_ASSERT(attribute);
     Q_D(QGeometry);
     if (d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), attribute);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), attribute);
         change->setPropertyName("attribute");
         d->notifyObservers(change);
     }
diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp
index 03463533f..1068a273a 100644
--- a/src/render/geometry/qgeometryrenderer.cpp
+++ b/src/render/geometry/qgeometryrenderer.cpp
@@ -43,7 +43,7 @@
 #include <private/qcomponent_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -382,7 +382,7 @@ void QGeometryRenderer::setGeometry(QGeometry *geometry)
     // TODO: Investigate if we can rely upon the automatic property change notifications
     // rather than having to manually send a PropertyValueRemoved followed by a PropertyValueAdded change.
     if (d->m_geometry && d->m_changeArbiter) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), d->m_geometry);
+        const auto change = QPropertyNodeRemovedChangePtr::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 7e066feb2..8e25e74fc 100644
--- a/src/render/materialsystem/effect.cpp
+++ b/src/render/materialsystem/effect.cpp
@@ -45,7 +45,7 @@
 
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 #include <QVariant>
 
@@ -92,7 +92,7 @@ void Effect::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("technique"))
             m_techniques.removeOne(change->removedNodeId());
         else if (change->propertyName() == QByteArrayLiteral("parameter"))
diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp
index 6c4b821bc..f2abfb9ad 100644
--- a/src/render/materialsystem/material.cpp
+++ b/src/render/materialsystem/material.cpp
@@ -49,7 +49,7 @@
 
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 using namespace Qt3DCore;
 
@@ -101,7 +101,7 @@ void Material::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("parameter"))
             m_parameterPack.removeParameter(change->removedNodeId());
         break;
diff --git a/src/render/materialsystem/qeffect.cpp b/src/render/materialsystem/qeffect.cpp
index 5063cc59c..b44cec18c 100644
--- a/src/render/materialsystem/qeffect.cpp
+++ b/src/render/materialsystem/qeffect.cpp
@@ -44,7 +44,7 @@
 
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -94,7 +94,7 @@ void QEffect::removeParameter(QParameter *parameter)
     Q_D(QEffect);
 
     if (parameter && d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), parameter);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), parameter);
         change->setPropertyName("parameter");
         d->notifyObservers(change);
     }
@@ -143,7 +143,7 @@ void QEffect::removeTechnique(QTechnique *t)
 {
     Q_D(QEffect);
     if (t && d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), t);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), t);
         change->setPropertyName("technique");
         d->notifyObservers(change);
     }
diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp
index b3adf2392..7e8ed30d5 100644
--- a/src/render/materialsystem/qmaterial.cpp
+++ b/src/render/materialsystem/qmaterial.cpp
@@ -45,7 +45,7 @@
 #include "qparameter.h"
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 /*!
  * \qmltype Material
@@ -150,7 +150,7 @@ void QMaterial::removeParameter(QParameter *parameter)
     Q_ASSERT(parameter);
     Q_D(QMaterial);
     if (d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), parameter);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), parameter);
         change->setPropertyName("parameter");
         d->notifyObservers(change);
     }
diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp
index 434d4fa72..7999661c4 100644
--- a/src/render/materialsystem/qrenderpass.cpp
+++ b/src/render/materialsystem/qrenderpass.cpp
@@ -45,7 +45,7 @@
 #include "qrenderstate.h"
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DCore/private/qnode_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -82,7 +82,7 @@ void QRenderPass::setShaderProgram(QShaderProgram *shaderProgram)
     if (d->m_shader != shaderProgram) {
 
         if (d->m_shader != nullptr && d->m_changeArbiter != nullptr) {
-            const auto change = QNodeRemovedPropertyChangePtr::create(id(), d->m_shader);
+            const auto change = QPropertyNodeRemovedChangePtr::create(id(), d->m_shader);
             change->setPropertyName("shaderProgram");
             d->notifyObservers(change);
         }
@@ -138,7 +138,7 @@ void QRenderPass::removeFilterKey(QFilterKey *filterKey)
     Q_ASSERT(filterKey);
     Q_D(QRenderPass);
     if (d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), filterKey);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), filterKey);
         change->setPropertyName("filterKeys");
         d->notifyObservers(change);
     }
@@ -185,7 +185,7 @@ void QRenderPass::removeRenderState(QRenderState *state)
     Q_ASSERT(state);
     Q_D(QRenderPass);
     if (d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), state);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), state);
         change->setPropertyName("renderState");
         d->notifyObservers(change);
     }
@@ -229,7 +229,7 @@ void QRenderPass::removeParameter(QParameter *parameter)
     Q_ASSERT(parameter);
     Q_D(QRenderPass);
     if (d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), parameter);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), parameter);
         change->setPropertyName("parameter");
         d->notifyObservers(change);
     }
diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp
index d8adb9d41..559064865 100644
--- a/src/render/materialsystem/qtechnique.cpp
+++ b/src/render/materialsystem/qtechnique.cpp
@@ -43,7 +43,7 @@
 #include "qgraphicsapifilter.h"
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -112,7 +112,7 @@ void QTechnique::removeFilterKey(QFilterKey *filterKey)
     Q_ASSERT(filterKey);
     Q_D(QTechnique);
     if (d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), filterKey);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), filterKey);
         change->setPropertyName("filterKeys");
         d->notifyObservers(change);
     }
@@ -152,7 +152,7 @@ void QTechnique::removeParameter(QParameter *parameter)
     Q_ASSERT(parameter);
     Q_D(QTechnique);
     if (d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), parameter);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), parameter);
         change->setPropertyName("parameter");
         d->notifyObservers(change);
     }
diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp
index 6d59d3c19..0f6a917a6 100644
--- a/src/render/materialsystem/renderpass.cpp
+++ b/src/render/materialsystem/renderpass.cpp
@@ -50,7 +50,7 @@
 
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -100,7 +100,7 @@ void RenderPass::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("filterKeys"))
             removeFilterKey(change->removedNodeId());
         else if (change->propertyName() == QByteArrayLiteral("shaderProgram"))
diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp
index c6eb8d15d..a3a650f7a 100644
--- a/src/render/materialsystem/technique.cpp
+++ b/src/render/materialsystem/technique.cpp
@@ -50,7 +50,7 @@
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 #include <QDebug>
 
@@ -114,7 +114,7 @@ void Technique::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 
     case PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("pass"))
             removeRenderPass(change->removedNodeId());
         else if (change->propertyName() == QByteArrayLiteral("parameter"))
diff --git a/src/render/texture/qabstracttexture.cpp b/src/render/texture/qabstracttexture.cpp
index e618f6d5a..111048a50 100644
--- a/src/render/texture/qabstracttexture.cpp
+++ b/src/render/texture/qabstracttexture.cpp
@@ -42,7 +42,7 @@
 #include <Qt3DRender/qabstracttextureimage.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -294,7 +294,7 @@ void QAbstractTexture::removeTextureImage(QAbstractTextureImage *textureImage)
     Q_ASSERT(textureImage);
     Q_D(QAbstractTexture);
     if (d->m_changeArbiter != nullptr) {
-        const auto change = QNodeRemovedPropertyChangePtr::create(id(), textureImage);
+        const auto change = QPropertyNodeRemovedChangePtr::create(id(), textureImage);
         change->setPropertyName("textureImage");
         d->notifyObservers(change);
     }
diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp
index 3082ed259..63b5b1abf 100644
--- a/src/render/texture/texture.cpp
+++ b/src/render/texture/texture.cpp
@@ -51,7 +51,7 @@
 #include <Qt3DRender/private/qabstracttexture_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -593,7 +593,7 @@ void Texture::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
         break;
 
     case PropertyValueRemoved: {
-        const auto change = qSharedPointerCast<QNodeRemovedPropertyChange>(e);
+        const auto change = qSharedPointerCast<QPropertyNodeRemovedChange>(e);
         if (change->propertyName() == QByteArrayLiteral("textureImage")) {
             m_textureImages.removeOne(m_textureImageManager->lookupHandle(change->removedNodeId()));
             // If a TextureImage is removed from a Texture, the texture image data remains on GPU
diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp
index 836140b54..a75236386 100644
--- a/tests/auto/core/nodes/tst_nodes.cpp
+++ b/tests/auto/core/nodes/tst_nodes.cpp
@@ -36,7 +36,7 @@
 #include <Qt3DCore/qcomponentremovedchange.h>
 #include <Qt3DCore/qnodedestroyedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <private/qpostman_p.h>
 
 #include <Qt3DCore/private/qlockableobserverinterface_p.h>
@@ -539,7 +539,7 @@ void tst_Nodes::checkParentChangeToNull()
     QCOMPARE(spy.events.size(), 2);
 
     QVERIFY(spy.events.first().wasLocked());
-    const Qt3DCore::QNodeRemovedPropertyChangePtr removalEvent = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QNodeRemovedPropertyChange>();
+    const Qt3DCore::QPropertyNodeRemovedChangePtr removalEvent = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QPropertyNodeRemovedChange>();
     QVERIFY(removalEvent);
     QCOMPARE(removalEvent->subjectId(), root->id());
     QCOMPARE(removalEvent->removedNodeId(), child->id());
@@ -597,7 +597,7 @@ void tst_Nodes::checkParentChangeToOtherParent()
 
     // CHECK event 1 is a Node Removed event
     QVERIFY(spyParent1.events.first().wasLocked());
-    const Qt3DCore::QNodeRemovedPropertyChangePtr event = spyParent1.events.takeFirst().change().dynamicCast<Qt3DCore::QNodeRemovedPropertyChange>();
+    const Qt3DCore::QPropertyNodeRemovedChangePtr event = spyParent1.events.takeFirst().change().dynamicCast<Qt3DCore::QPropertyNodeRemovedChange>();
     QCOMPARE(event->type(), Qt3DCore::PropertyValueRemoved);
     QCOMPARE(event->subjectId(), parent1->id());
     QCOMPARE(event->removedNodeId(), child->id());
@@ -640,7 +640,7 @@ void tst_Nodes::removingSingleChildNodeFromNode()
     QCOMPARE(spy.events.size(), 2);
 
     QVERIFY(spy.events.first().wasLocked());
-    const Qt3DCore::QNodeRemovedPropertyChangePtr removalEvent = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QNodeRemovedPropertyChange>();
+    const Qt3DCore::QPropertyNodeRemovedChangePtr removalEvent = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QPropertyNodeRemovedChange>();
     QCOMPARE(removalEvent->subjectId(), root->id());
     QCOMPARE(removalEvent->removedNodeId(), child->id());
     QCOMPARE(removalEvent->metaObject(), child->metaObject());
@@ -692,7 +692,7 @@ void tst_Nodes::removingMultipleChildNodesFromNode()
         QVERIFY(r.wasLocked());
         const Qt3DCore::QNodeId childId = childIds.at(i / 2);
         if (i % 2 == 0) {
-            Qt3DCore::QNodeRemovedPropertyChangePtr additionEvent = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QNodeRemovedPropertyChange>();
+            Qt3DCore::QPropertyNodeRemovedChangePtr additionEvent = spy.events.takeFirst().change().dynamicCast<Qt3DCore::QPropertyNodeRemovedChange>();
             QCOMPARE(additionEvent->subjectId(), root->id());
             QCOMPARE(additionEvent->removedNodeId(), childId);
             QCOMPARE(additionEvent->metaObject(), &MyQNode::staticMetaObject);
diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
index 451f449ee..d0d345fbc 100644
--- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
+++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
@@ -35,7 +35,7 @@
 #include <Qt3DCore/qcomponentremovedchange.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DCore/qscenechange.h>
 #include <Qt3DCore/qbackendnodepropertychange.h>
 #include <Qt3DCore/private/qscene_p.h>
@@ -77,7 +77,7 @@ public:
 
     void sendNodeRemovedNotification()
     {
-        Qt3DCore::QNodeRemovedPropertyChangePtr e(new Qt3DCore::QNodeRemovedPropertyChange(id()));
+        Qt3DCore::QPropertyNodeRemovedChangePtr e(new Qt3DCore::QPropertyNodeRemovedChange(id()));
         e->setPropertyName("PropertyValueRemoved");
         Qt3DCore::QNodePrivate::get(this)->notifyObservers(e);
     }
diff --git a/tests/auto/input/action/tst_action.cpp b/tests/auto/input/action/tst_action.cpp
index f1580542b..cb2192d1e 100644
--- a/tests/auto/input/action/tst_action.cpp
+++ b/tests/auto/input/action/tst_action.cpp
@@ -32,7 +32,7 @@
 #include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DInput/private/action_p.h>
 #include <Qt3DInput/QActionInput>
 #include <Qt3DInput/QAction>
@@ -133,7 +133,7 @@ private Q_SLOTS:
         QCOMPARE(backendAction.inputs().first(), inputId);
 
         // WHEN
-        const auto nodeRemovedChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), &input);
+        const auto nodeRemovedChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), &input);
         nodeRemovedChange->setPropertyName("input");
         backendAction.sceneChangeEvent(nodeRemovedChange);
 
diff --git a/tests/auto/input/axis/tst_axis.cpp b/tests/auto/input/axis/tst_axis.cpp
index 578ebf882..a074996e6 100644
--- a/tests/auto/input/axis/tst_axis.cpp
+++ b/tests/auto/input/axis/tst_axis.cpp
@@ -32,7 +32,7 @@
 #include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DInput/private/axis_p.h>
 #include <Qt3DInput/private/qabstractaxisinput_p.h>
 #include <Qt3DInput/QAnalogAxisInput>
@@ -134,7 +134,7 @@ private Q_SLOTS:
         QCOMPARE(backendAxis.inputs().first(), inputId);
 
         // WHEN
-        const auto nodeRemovedChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), &input);
+        const auto nodeRemovedChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), &input);
         nodeRemovedChange->setPropertyName("input");
         backendAxis.sceneChangeEvent(nodeRemovedChange);
 
diff --git a/tests/auto/input/qaction/tst_qaction.cpp b/tests/auto/input/qaction/tst_qaction.cpp
index 17c1b52ad..cbfc7d756 100644
--- a/tests/auto/input/qaction/tst_qaction.cpp
+++ b/tests/auto/input/qaction/tst_qaction.cpp
@@ -38,7 +38,7 @@
 
 #include <Qt3DCore/QPropertyUpdatedChange>
 #include <Qt3DCore/QPropertyNodeAddedChange>
-#include <Qt3DCore/QNodeRemovedPropertyChange>
+#include <Qt3DCore/QPropertyNodeRemovedChange>
 
 #include "testpostmanarbiter.h"
 
@@ -129,7 +129,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>();
+        Qt3DCore::QPropertyNodeRemovedChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
         QCOMPARE(nodeRemovedChange->propertyName(), "input");
         QCOMPARE(nodeRemovedChange->removedNodeId(), input->id());
         QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved);
diff --git a/tests/auto/input/qaxis/tst_qaxis.cpp b/tests/auto/input/qaxis/tst_qaxis.cpp
index 9e3bff7f4..70c9a9a48 100644
--- a/tests/auto/input/qaxis/tst_qaxis.cpp
+++ b/tests/auto/input/qaxis/tst_qaxis.cpp
@@ -37,7 +37,7 @@
 
 #include <Qt3DCore/QPropertyUpdatedChange>
 #include <Qt3DCore/QPropertyNodeAddedChange>
-#include <Qt3DCore/QNodeRemovedPropertyChange>
+#include <Qt3DCore/QPropertyNodeRemovedChange>
 
 #include "testpostmanarbiter.h"
 
@@ -126,7 +126,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>();
+        Qt3DCore::QPropertyNodeRemovedChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
         QCOMPARE(nodeRemovedChange->propertyName(), "input");
         QCOMPARE(nodeRemovedChange->removedNodeId(), input->id());
         QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved);
diff --git a/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp b/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp
index 1a5fbcd59..083fa70ce 100644
--- a/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp
+++ b/tests/auto/input/qlogicaldevice/tst_qlogicaldevice.cpp
@@ -38,7 +38,7 @@
 
 #include <Qt3DCore/QPropertyUpdatedChange>
 #include <Qt3DCore/QPropertyNodeAddedChange>
-#include <Qt3DCore/QNodeRemovedPropertyChange>
+#include <Qt3DCore/QPropertyNodeRemovedChange>
 
 #include "testpostmanarbiter.h"
 
@@ -135,7 +135,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>();
+        Qt3DCore::QPropertyNodeRemovedChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
         QCOMPARE(nodeRemovedChange->propertyName(), "action");
         QCOMPARE(nodeRemovedChange->removedNodeId(), action->id());
         QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved);
@@ -165,7 +165,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>();
+        nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
         QCOMPARE(nodeRemovedChange->propertyName(), "axis");
         QCOMPARE(nodeRemovedChange->removedNodeId(), axis->id());
         QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved);
diff --git a/tests/auto/render/geometry/tst_geometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp
index 03ffb2ac0..6a8746f47 100644
--- a/tests/auto/render/geometry/tst_geometry.cpp
+++ b/tests/auto/render/geometry/tst_geometry.cpp
@@ -33,7 +33,7 @@
 #include <Qt3DRender/qattribute.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include "testrenderer.h"
 
 class DummyAttribute : public Qt3DRender::QAttribute
@@ -136,7 +136,7 @@ private Q_SLOTS:
         QVERIFY(!renderGeometry.isDirty());
 
         // WHEN
-        const auto nodeRemovedChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), &attribute);
+        const auto nodeRemovedChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), &attribute);
         nodeRemovedChange->setPropertyName("attribute");
         renderGeometry.sceneChangeEvent(nodeRemovedChange);
 
diff --git a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
index 6bda37396..4df822557 100644
--- a/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
+++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
@@ -34,7 +34,7 @@
 #include <Qt3DRender/qgeometryfactory.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include "testrenderer.h"
 
 class TestFactory : public Qt3DRender::QGeometryFactory
@@ -303,7 +303,7 @@ private Q_SLOTS:
         QVERIFY(!renderGeometryRenderer.isDirty());
 
         // WHEN
-        const auto nodeRemovedChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), &geometry);
+        const auto nodeRemovedChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), &geometry);
         nodeRemovedChange->setPropertyName("geometry");
         renderGeometryRenderer.sceneChangeEvent(nodeRemovedChange);
 
diff --git a/tests/auto/render/material/tst_material.cpp b/tests/auto/render/material/tst_material.cpp
index d2ff45fea..561ac66eb 100644
--- a/tests/auto/render/material/tst_material.cpp
+++ b/tests/auto/render/material/tst_material.cpp
@@ -35,7 +35,7 @@
 #include <Qt3DRender/QEffect>
 #include <Qt3DCore/QPropertyUpdatedChange>
 #include <Qt3DCore/QPropertyNodeAddedChange>
-#include <Qt3DCore/QNodeRemovedPropertyChange>
+#include <Qt3DCore/QPropertyNodeRemovedChange>
 #include "testrenderer.h"
 
 using namespace Qt3DCore;
@@ -148,7 +148,7 @@ void tst_RenderMaterial::shouldHandleParametersPropertyChange()
     QVERIFY(renderer.dirtyBits() != 0);
 
     // WHEN
-    const auto removeChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), parameter.data());
+    const auto removeChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), parameter.data());
     removeChange->setPropertyName("parameter");
     backend.sceneChangeEvent(removeChange);
 
diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp
index a54f7322a..8e0974657 100644
--- a/tests/auto/render/qgeometry/tst_qgeometry.cpp
+++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp
@@ -38,7 +38,7 @@
 
 #include <Qt3DCore/QPropertyUpdatedChange>
 #include <Qt3DCore/QPropertyNodeAddedChange>
-#include <Qt3DCore/QNodeRemovedPropertyChange>
+#include <Qt3DCore/QPropertyNodeRemovedChange>
 
 #include "testpostmanarbiter.h"
 
@@ -138,7 +138,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>();
+        Qt3DCore::QPropertyNodeRemovedChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
         QCOMPARE(nodeRemovedChange->propertyName(), "attribute");
         QCOMPARE(nodeRemovedChange->removedNodeId(), attr.id());
         QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved);
diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
index 14dbf5d59..11835be2d 100644
--- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
+++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp
@@ -40,7 +40,7 @@
 
 #include <Qt3DCore/QPropertyUpdatedChange>
 #include <Qt3DCore/QPropertyNodeAddedChange>
-#include <Qt3DCore/QNodeRemovedPropertyChange>
+#include <Qt3DCore/QPropertyNodeRemovedChange>
 
 #include "testpostmanarbiter.h"
 
@@ -292,7 +292,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 2);
-        Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>();
+        Qt3DCore::QPropertyNodeRemovedChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
         QCOMPARE(nodeRemovedChange->propertyName(), "geometry");
         QCOMPARE(nodeRemovedChange->removedNodeId(), geom.id());
         QCOMPARE(nodeRemovedChange->type(), Qt3DCore::PropertyValueRemoved);
diff --git a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp
index fb4a24569..60ea33f71 100644
--- a/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp
+++ b/tests/auto/render/qlayerfilter/tst_qlayerfilter.cpp
@@ -31,7 +31,7 @@
 #include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 #include <Qt3DRender/qlayer.h>
 #include <Qt3DRender/qlayerfilter.h>
@@ -154,7 +154,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        auto removeChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>();
+        auto removeChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
         QCOMPARE(removeChange->propertyName(), "layer");
         QCOMPARE(removeChange->subjectId(), layerFilter->id());
         QCOMPARE(removeChange->removedNodeId(), layer->id());
diff --git a/tests/auto/render/qmaterial/tst_qmaterial.cpp b/tests/auto/render/qmaterial/tst_qmaterial.cpp
index 4304611b7..437cfa5ad 100644
--- a/tests/auto/render/qmaterial/tst_qmaterial.cpp
+++ b/tests/auto/render/qmaterial/tst_qmaterial.cpp
@@ -29,7 +29,7 @@
 #include <QtTest/QTest>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DRender/private/qrenderstate_p.h>
diff --git a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
index d4b5a0667..9e6e4fcc1 100644
--- a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
+++ b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
@@ -39,7 +39,7 @@
 
 #include <Qt3DCore/QPropertyUpdatedChange>
 #include <Qt3DCore/QPropertyNodeAddedChange>
-#include <Qt3DCore/QNodeRemovedPropertyChange>
+#include <Qt3DCore/QPropertyNodeRemovedChange>
 
 #include "testpostmanarbiter.h"
 
@@ -175,7 +175,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>();
+        Qt3DCore::QPropertyNodeRemovedChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
         QCOMPARE(nodeRemovedChange->propertyName(), "parameter");
         QCOMPARE(nodeRemovedChange->subjectId(), renderPassFilter->id());
         QCOMPARE(nodeRemovedChange->removedNodeId(), param1->id());
@@ -211,7 +211,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>();
+        nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
         QCOMPARE(nodeRemovedChange->propertyName(), "match");
         QCOMPARE(nodeRemovedChange->subjectId(), renderPassFilter->id());
         QCOMPARE(nodeRemovedChange->removedNodeId(), filterKey1->id());
diff --git a/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp b/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp
index 7fdd90720..073306237 100644
--- a/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp
+++ b/tests/auto/render/qrenderstateset/tst_qrenderstateset.cpp
@@ -39,7 +39,7 @@
 
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 
 #include "testpostmanarbiter.h"
 
@@ -161,7 +161,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>();
+        Qt3DCore::QPropertyNodeRemovedChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
         QCOMPARE(nodeRemovedChange->propertyName(), "renderState");
         QCOMPARE(nodeRemovedChange->subjectId(), stateSet->id());
         QCOMPARE(nodeRemovedChange->removedNodeId(), state1->id());
diff --git a/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp b/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp
index 375e670f8..cee977790 100644
--- a/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp
+++ b/tests/auto/render/qsortpolicy/tst_qsortpolicy.cpp
@@ -31,7 +31,7 @@
 #include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qpropertynodeaddedchange.h>
-#include <Qt3DCore/qnoderemovedpropertychange.h>
+#include <Qt3DCore/qpropertynoderemovedchange.h>
 #include <Qt3DCore/private/qnodecreatedchangegenerator_p.h>
 
 #include <Qt3DRender/qsortpolicy.h>
@@ -134,7 +134,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        Qt3DCore::QNodeRemovedPropertyChangePtr removeChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>();
+        Qt3DCore::QPropertyNodeRemovedChangePtr removeChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
         QCOMPARE(removeChange->propertyName(), "sortType");
         QCOMPARE(removeChange->subjectId(), sortPolicy->id());
         QCOMPARE(removeChange->removedValue().value<Qt3DRender::QSortPolicy::SortType>(), sortType1);
diff --git a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp
index 109b48f19..8438cf033 100644
--- a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp
+++ b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp
@@ -39,7 +39,7 @@
 
 #include <Qt3DCore/QPropertyUpdatedChange>
 #include <Qt3DCore/QPropertyNodeAddedChange>
-#include <Qt3DCore/QNodeRemovedPropertyChange>
+#include <Qt3DCore/QPropertyNodeRemovedChange>
 
 #include "testpostmanarbiter.h"
 
@@ -180,7 +180,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        Qt3DCore::QNodeRemovedPropertyChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>();
+        Qt3DCore::QPropertyNodeRemovedChangePtr nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
         QCOMPARE(nodeRemovedChange->propertyName(), "parameter");
         QCOMPARE(nodeRemovedChange->subjectId(), techniqueFilter->id());
         QCOMPARE(nodeRemovedChange->removedNodeId(), param1->id());
@@ -216,7 +216,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
-        nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QNodeRemovedPropertyChange>();
+        nodeRemovedChange = arbiter.events.first().staticCast<Qt3DCore::QPropertyNodeRemovedChange>();
         QCOMPARE(nodeRemovedChange->propertyName(), "matchAll");
         QCOMPARE(nodeRemovedChange->subjectId(), techniqueFilter->id());
         QCOMPARE(nodeRemovedChange->removedNodeId(), filterKey1->id());
diff --git a/tests/auto/render/renderpass/tst_renderpass.cpp b/tests/auto/render/renderpass/tst_renderpass.cpp
index edf4483ee..42233f574 100644
--- a/tests/auto/render/renderpass/tst_renderpass.cpp
+++ b/tests/auto/render/renderpass/tst_renderpass.cpp
@@ -32,7 +32,7 @@
 
 #include <Qt3DCore/QPropertyUpdatedChange>
 #include <Qt3DCore/QPropertyNodeAddedChange>
-#include <Qt3DCore/QNodeRemovedPropertyChange>
+#include <Qt3DCore/QPropertyNodeRemovedChange>
 
 #include <Qt3DRender/QFilterKey>
 #include <Qt3DRender/QRenderPass>
@@ -145,7 +145,7 @@ private slots:
         QVERIFY(renderer.dirtyBits() != 0);
 
         // WHEN
-        const auto removeChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), shader.data());
+        const auto removeChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), shader.data());
         removeChange->setPropertyName("shaderProgram");
         backend.sceneChangeEvent(removeChange);
 
@@ -173,7 +173,7 @@ private slots:
         QVERIFY(renderer.dirtyBits() != 0);
 
         // WHEN
-        const auto removeChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), annotation.data());
+        const auto removeChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), annotation.data());
         removeChange->setPropertyName("filterKeys");
         backend.sceneChangeEvent(removeChange);
 
@@ -201,7 +201,7 @@ private slots:
         QVERIFY(renderer.dirtyBits() != 0);
 
         // WHEN
-        const auto removeChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), parameter.data());
+        const auto removeChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), parameter.data());
         removeChange->setPropertyName("parameter");
         backend.sceneChangeEvent(removeChange);
 
@@ -232,7 +232,7 @@ private slots:
         QVERIFY(renderer.dirtyBits() != 0);
 
         // WHEN
-        const auto removeChange = Qt3DCore::QNodeRemovedPropertyChangePtr::create(Qt3DCore::QNodeId(), frontendState);
+        const auto removeChange = Qt3DCore::QPropertyNodeRemovedChangePtr::create(Qt3DCore::QNodeId(), frontendState);
         removeChange->setPropertyName("renderState");
         backend.sceneChangeEvent(removeChange);