Rename QAdditiveBlend -> QAdditiveClipBlend

Also rename backend type accordingly.

Task-number: QTBUG-58903
Change-Id: Ia1ad670937487dd84768e79d8c2be59ed3b6d0a5
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>

14 files changed, 103 insertions, 103 deletions

diff --git a/src/animation/backend/additiveblend.cpp b/src/animation/backend/additiveclipblend.cpp
index 6364e54a7..ea7db4621 100644
--- a/src/animation/backend/additiveblend.cpp
+++ b/src/animation/backend/additiveclipblend.cpp
@@ -34,10 +34,10 @@
 **
 ****************************************************************************/
 
-#include "additiveblend_p.h"
+#include "additiveclipblend_p.h"
 #include <Qt3DAnimation/qclipblendnodecreatedchange.h>
-#include <Qt3DAnimation/qadditiveblend.h>
-#include <Qt3DAnimation/private/qadditiveblend_p.h>
+#include <Qt3DAnimation/qadditiveclipblend.h>
+#include <Qt3DAnimation/private/qadditiveclipblend_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 
 QT_BEGIN_NAMESPACE
@@ -46,17 +46,17 @@ namespace Qt3DAnimation {
 
 namespace Animation {
 
-AdditiveBlend::AdditiveBlend()
+AdditiveClipBlend::AdditiveClipBlend()
     : ClipBlendNode(ClipBlendNode::AdditiveBlendType)
     , m_blendFactor(0.0f)
 {
 }
 
-AdditiveBlend::~AdditiveBlend()
+AdditiveClipBlend::~AdditiveClipBlend()
 {
 }
 
-void AdditiveBlend::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
+void AdditiveClipBlend::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     if (e->type() == Qt3DCore::PropertyUpdated) {
         Qt3DCore::QPropertyUpdatedChangePtr change = qSharedPointerCast<Qt3DCore::QPropertyUpdatedChange>(e);
@@ -65,16 +65,16 @@ void AdditiveBlend::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 }
 
-float AdditiveBlend::blend(float value1, float value2) const
+float AdditiveClipBlend::blend(float value1, float value2) const
 {
     return value1 + (m_blendFactor * value2);
 }
 
-void AdditiveBlend::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
+void AdditiveClipBlend::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
 {
     ClipBlendNode::initializeFromPeer(change);
-    const auto creationChangeData = qSharedPointerCast<Qt3DAnimation::QClipBlendNodeCreatedChange<Qt3DAnimation::QAdditiveBlendData>>(change);
-    const Qt3DAnimation::QAdditiveBlendData cloneData = creationChangeData->data;
+    const auto creationChangeData = qSharedPointerCast<Qt3DAnimation::QClipBlendNodeCreatedChange<Qt3DAnimation::QAdditiveClipBlendData>>(change);
+    const Qt3DAnimation::QAdditiveClipBlendData cloneData = creationChangeData->data;
     m_blendFactor = cloneData.blendFactor;
 }
 
diff --git a/src/animation/backend/additiveblend_p.h b/src/animation/backend/additiveclipblend_p.h
index d67e95b51..8664eb549 100644
--- a/src/animation/backend/additiveblend_p.h
+++ b/src/animation/backend/additiveclipblend_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DANIMATION_ANIMATION_ADDITIVEBLEND_P_H
-#define QT3DANIMATION_ANIMATION_ADDITIVEBLEND_P_H
+#ifndef QT3DANIMATION_ANIMATION_ADDITIVECLIPBLEND_P_H
+#define QT3DANIMATION_ANIMATION_ADDITIVECLIPBLEND_P_H
 
 //
 //  W A R N I N G
@@ -56,11 +56,11 @@ namespace Qt3DAnimation {
 
 namespace Animation {
 
-class Q_AUTOTEST_EXPORT AdditiveBlend : public ClipBlendNode
+class Q_AUTOTEST_EXPORT AdditiveClipBlend : public ClipBlendNode
 {
 public:
-    AdditiveBlend();
-    ~AdditiveBlend();
+    AdditiveClipBlend();
+    ~AdditiveClipBlend();
 
     inline float blendFactor() const { return m_blendFactor; }
     void setBlendFactor(float blendFactor) { m_blendFactor = blendFactor; } // For unit tests
@@ -80,4 +80,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DANIMATION_ANIMATION_ADDITIVEBLEND_P_H
+#endif // QT3DANIMATION_ANIMATION_ADDITIVECLIPBLEND_P_H
diff --git a/src/animation/backend/backend.pri b/src/animation/backend/backend.pri
index ab0d242dc..bb69eb473 100644
--- a/src/animation/backend/backend.pri
+++ b/src/animation/backend/backend.pri
@@ -23,9 +23,9 @@ HEADERS += \
     $$PWD/animationutils_p.h \
     $$PWD/buildblendtreesjob_p.h \
     $$PWD/evaluateblendclipanimatorjob_p.h \
-    $$PWD/additiveblend_p.h \
     $$PWD/animationcliploader_p.h \
-    $$PWD/lerpclipblend_p.h
+    $$PWD/lerpclipblend_p.h \
+    $$PWD/additiveclipblend_p.h
 
 SOURCES += \
     $$PWD/handler.cpp \
@@ -46,6 +46,6 @@ SOURCES += \
     $$PWD/animationutils.cpp \
     $$PWD/buildblendtreesjob.cpp \
     $$PWD/evaluateblendclipanimatorjob.cpp \
-    $$PWD/additiveblend.cpp \
     $$PWD/animationcliploader.cpp \
-    $$PWD/lerpclipblend.cpp
+    $$PWD/lerpclipblend.cpp \
+    $$PWD/additiveclipblend.cpp
diff --git a/src/animation/frontend/frontend.pri b/src/animation/frontend/frontend.pri
index ce9bee2cf..01f74eedd 100644
--- a/src/animation/frontend/frontend.pri
+++ b/src/animation/frontend/frontend.pri
@@ -17,8 +17,6 @@ HEADERS += \
     $$PWD/qchannelmapping_p.h \
     $$PWD/qclipblendnodecreatedchange.h \
     $$PWD/qclipblendnodecreatedchange_p.h \
-    $$PWD/qadditiveblend.h \
-    $$PWD/qadditiveblend_p.h \
     $$PWD/qanimationcontroller.h \
     $$PWD/qanimationcontroller_p.h \
     $$PWD/qanimationgroup.h \
@@ -36,7 +34,9 @@ HEADERS += \
     $$PWD/qanimationcliploader.h \
     $$PWD/qanimationcliploader_p.h \
     $$PWD/qlerpclipblend.h \
-    $$PWD/qlerpclipblend_p.h
+    $$PWD/qlerpclipblend_p.h \
+    $$PWD/qadditiveclipblend.h \
+    $$PWD/qadditiveclipblend_p.h
 
 SOURCES += \
     $$PWD/qanimationaspect.cpp \
@@ -48,7 +48,6 @@ SOURCES += \
     $$PWD/qchannelmapper.cpp \
     $$PWD/qchannelmapping.cpp \
     $$PWD/qclipblendnodecreatedchange.cpp \
-    $$PWD/qadditiveblend.cpp \
     $$PWD/qanimationcontroller.cpp \
     $$PWD/qanimationgroup.cpp \
     $$PWD/qkeyframeanimation.cpp \
@@ -57,6 +56,7 @@ SOURCES += \
     $$PWD/qmorphtarget.cpp \
     $$PWD/qvertexblendanimation.cpp \
     $$PWD/qanimationcliploader.cpp \
-    $$PWD/qlerpclipblend.cpp
+    $$PWD/qlerpclipblend.cpp \
+    $$PWD/qadditiveclipblend.cpp
 
 INCLUDEPATH += $$PWD
diff --git a/src/animation/frontend/qadditiveblend.cpp b/src/animation/frontend/qadditiveclipblend.cpp
index 977f36919..90cc92e55 100644
--- a/src/animation/frontend/qadditiveblend.cpp
+++ b/src/animation/frontend/qadditiveclipblend.cpp
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#include "qadditiveblend.h"
-#include "qadditiveblend_p.h"
+#include "qadditiveclipblend.h"
+#include "qadditiveclipblend_p.h"
 #include <Qt3DAnimation/qclipblendnodecreatedchange.h>
 
 QT_BEGIN_NAMESPACE
@@ -44,8 +44,8 @@ namespace Qt3DAnimation {
 
 
 /*!
-    \qmltype AdditiveBlend
-    \instantiates Qt3DAnimation::QAdditiveBlend
+    \qmltype AdditiveClipBlend
+    \instantiates Qt3DAnimation::QAdditiveClipBlend
     \inqmlmodule Qt3D.Animation
 
     \brief Performs an addition of two animation clips based on a
@@ -53,7 +53,7 @@ namespace Qt3DAnimation {
 
     \since 5.9
 
-    AdditiveBlend can be useful to create advanced animation effects based on
+    AdditiveClipBlend can be useful to create advanced animation effects based on
     individual animation clips. For instance, given a player character, additive
     blending could be used to combine a walking animation clip with an injured
     animation clip based on a blend factor that increases the more the player
@@ -65,7 +65,7 @@ namespace Qt3DAnimation {
 */
 
 /*!
-    \class Qt3DAnimation::QAdditiveBlend
+    \class Qt3DAnimation::QAdditiveClipBlend
     \inmodule Qt3DAnimation
     \inherits Qt3DAnimation::QAbstractClipBlendNode
 
@@ -74,7 +74,7 @@ namespace Qt3DAnimation {
 
     \since 5.9
 
-    QAdditiveBlend can be useful to create advanced animation effects based on
+    QAdditiveClipBlend can be useful to create advanced animation effects based on
     individual animation clips. For instance, given a player character, additive
     blending could be used to combine a walking animation clip with an injured
     animation clip based on a blend factor that increases the more the player
@@ -85,56 +85,56 @@ namespace Qt3DAnimation {
     \sa QBlendedClipAnimator
 */
 
-QAdditiveBlendPrivate::QAdditiveBlendPrivate()
+QAdditiveClipBlendPrivate::QAdditiveClipBlendPrivate()
     : QAbstractClipBlendNodePrivate()
     , m_blendFactor(0.0f)
 {
 }
 
-QAdditiveBlend::QAdditiveBlend(Qt3DCore::QNode *parent)
-    : QAbstractClipBlendNode(*new QAdditiveBlendPrivate(), parent)
+QAdditiveClipBlend::QAdditiveClipBlend(Qt3DCore::QNode *parent)
+    : QAbstractClipBlendNode(*new QAdditiveClipBlendPrivate(), parent)
 {
 }
 
-QAdditiveBlend::QAdditiveBlend(QAdditiveBlendPrivate &dd, Qt3DCore::QNode *parent)
+QAdditiveClipBlend::QAdditiveClipBlend(QAdditiveClipBlendPrivate &dd, Qt3DCore::QNode *parent)
     : QAbstractClipBlendNode(dd, parent)
 {
 }
 
-QAdditiveBlend::~QAdditiveBlend()
+QAdditiveClipBlend::~QAdditiveClipBlend()
 {
 }
 
-Qt3DCore::QNodeCreatedChangeBasePtr QAdditiveBlend::createNodeCreationChange() const
+Qt3DCore::QNodeCreatedChangeBasePtr QAdditiveClipBlend::createNodeCreationChange() const
 {
-    Q_D(const QAdditiveBlend);
-    auto creationChange = QClipBlendNodeCreatedChangePtr<QAdditiveBlendData>::create(this);
-    QAdditiveBlendData &data = creationChange->data;
+    Q_D(const QAdditiveClipBlend);
+    auto creationChange = QClipBlendNodeCreatedChangePtr<QAdditiveClipBlendData>::create(this);
+    QAdditiveClipBlendData &data = creationChange->data;
     data.blendFactor = d->m_blendFactor;
     return creationChange;
 }
 
 /*!
-    \qmlproperty real AdditiveBlend::blendFactor
+    \qmlproperty real AdditiveClipBlend::blendFactor
 
     Specifies the blending factor between 0 and 1 to control the blending of
     two animation clips.
 */
 /*!
-    \property QAdditiveBlend::blendFactor
+    \property QAdditiveClipBlend::blendFactor
 
     Specifies the blending factor between 0 and 1 to control the blending of
     two animation clips.
  */
-float QAdditiveBlend::blendFactor() const
+float QAdditiveClipBlend::blendFactor() const
 {
-    Q_D(const QAdditiveBlend);
+    Q_D(const QAdditiveClipBlend);
     return d->m_blendFactor;
 }
 
-void QAdditiveBlend::setBlendFactor(float blendFactor)
+void QAdditiveClipBlend::setBlendFactor(float blendFactor)
 {
-    Q_D(QAdditiveBlend);
+    Q_D(QAdditiveClipBlend);
     if (d->m_blendFactor == blendFactor)
         return;
 
@@ -143,7 +143,7 @@ void QAdditiveBlend::setBlendFactor(float blendFactor)
 }
 
 /*!
-    \qmlproperty list<AnimationClip> AdditiveBlend::clips
+    \qmlproperty list<AnimationClip> AdditiveClipBlend::clips
 
     Holds the list of AnimationClip nodes against which the blending is performed.
 
@@ -152,19 +152,19 @@ void QAdditiveBlend::setBlendFactor(float blendFactor)
 
 
 /*!
-    \fn void QAdditiveBlend::addClip(QAnimationClip *clip);
+    \fn void QAdditiveClipBlend::addClip(QAnimationClip *clip);
     Adds a \a clip to the blending node's clips list.
 
     \note Only the two first AnimationClip are used, subsequent ones are ignored
  */
 
 /*!
-    \fn void QAdditiveBlend::removeClip(QAnimationClip *clip);
+    \fn void QAdditiveClipBlend::removeClip(QAnimationClip *clip);
     Removes a \a clip from the blending node's clips list.
  */
 
 /*!
-    \fn QVector<QAnimationClip *> QAdditiveBlend::clips() const;
+    \fn QVector<QAnimationClip *> QAdditiveClipBlend::clips() const;
     Returns the list of QAnimationClip against which the blending is performed.
  */
 
diff --git a/src/animation/frontend/qadditiveblend.h b/src/animation/frontend/qadditiveclipblend.h
index 76075988b..eb1de9abb 100644
--- a/src/animation/frontend/qadditiveblend.h
+++ b/src/animation/frontend/qadditiveclipblend.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DANIMATION_QADDITIVEBLEND_H
-#define QT3DANIMATION_QADDITIVEBLEND_H
+#ifndef QT3DANIMATION_QADDITIVECLIPBLEND_H
+#define QT3DANIMATION_QADDITIVECLIPBLEND_H
 
 #include <Qt3DAnimation/qabstractclipblendnode.h>
 
@@ -43,15 +43,15 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DAnimation {
 
-class QAdditiveBlendPrivate;
+class QAdditiveClipBlendPrivate;
 
-class QT3DANIMATIONSHARED_EXPORT QAdditiveBlend : public QAbstractClipBlendNode
+class QT3DANIMATIONSHARED_EXPORT QAdditiveClipBlend : public QAbstractClipBlendNode
 {
     Q_OBJECT
     Q_PROPERTY(float blendFactor READ blendFactor WRITE setBlendFactor NOTIFY blendFactorChanged)
 public:
-    explicit QAdditiveBlend(Qt3DCore::QNode *parent = nullptr);
-    ~QAdditiveBlend();
+    explicit QAdditiveClipBlend(Qt3DCore::QNode *parent = nullptr);
+    ~QAdditiveClipBlend();
 
     float blendFactor() const;
 
@@ -62,10 +62,10 @@ Q_SIGNALS:
     void blendFactorChanged(float blendFactor);
 
 protected:
-    explicit QAdditiveBlend(QAdditiveBlendPrivate &dd, Qt3DCore::QNode *parent = nullptr);
+    explicit QAdditiveClipBlend(QAdditiveClipBlendPrivate &dd, Qt3DCore::QNode *parent = nullptr);
 
 private:
-    Q_DECLARE_PRIVATE(QAdditiveBlend)
+    Q_DECLARE_PRIVATE(QAdditiveClipBlend)
     Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
 };
 
@@ -73,4 +73,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DANIMATION_QADDITIVEBLEND_H
+#endif // QT3DANIMATION_QADDITIVECLIPBLEND_H
diff --git a/src/animation/frontend/qadditiveblend_p.h b/src/animation/frontend/qadditiveclipblend_p.h
index e21872098..0506fc459 100644
--- a/src/animation/frontend/qadditiveblend_p.h
+++ b/src/animation/frontend/qadditiveclipblend_p.h
@@ -55,18 +55,18 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DAnimation {
 
-class QAdditiveBlend;
+class QAdditiveClipBlend;
 
-class QAdditiveBlendPrivate : public QAbstractClipBlendNodePrivate
+class QAdditiveClipBlendPrivate : public QAbstractClipBlendNodePrivate
 {
 public:
-    QAdditiveBlendPrivate();
+    QAdditiveClipBlendPrivate();
 
-    Q_DECLARE_PUBLIC(QAdditiveBlend)
+    Q_DECLARE_PUBLIC(QAdditiveClipBlend)
     float m_blendFactor;
 };
 
-struct QAdditiveBlendData
+struct QAdditiveClipBlendData
 {
     float blendFactor;
 };
diff --git a/src/animation/frontend/qanimationaspect.cpp b/src/animation/frontend/qanimationaspect.cpp
index 2fac063c2..56dd012ed 100644
--- a/src/animation/frontend/qanimationaspect.cpp
+++ b/src/animation/frontend/qanimationaspect.cpp
@@ -45,12 +45,12 @@
 #include <Qt3DAnimation/qchannelmapping.h>
 #include <Qt3DAnimation/qchannelmapper.h>
 #include <Qt3DAnimation/qlerpclipblend.h>
-#include <Qt3DAnimation/qadditiveblend.h>
+#include <Qt3DAnimation/qadditiveclipblend.h>
 #include <Qt3DAnimation/private/handler_p.h>
 #include <Qt3DAnimation/private/managers_p.h>
 #include <Qt3DAnimation/private/nodefunctor_p.h>
 #include <Qt3DAnimation/private/lerpclipblend_p.h>
-#include <Qt3DAnimation/private/additiveblend_p.h>
+#include <Qt3DAnimation/private/additiveclipblend_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -109,9 +109,9 @@ QAnimationAspect::QAnimationAspect(QAnimationAspectPrivate &dd, QObject *parent)
     registerBackendType<QLerpClipBlend>(
                 QSharedPointer<Animation::ClipBlendNodeFunctor<Animation::LerpClipBlend, Animation::ClipAnimatorManager>>::create(d->m_handler.data(),
                                                                                                                                   d->m_handler->clipBlendNodeManager()));
-    registerBackendType<QAdditiveBlend>(
-                QSharedPointer<Animation::ClipBlendNodeFunctor<Animation::AdditiveBlend, Animation::ClipAnimatorManager>>::create(d->m_handler.data(),
-                                                                                                                             d->m_handler->clipBlendNodeManager()));
+    registerBackendType<QAdditiveClipBlend>(
+                QSharedPointer<Animation::ClipBlendNodeFunctor<Animation::AdditiveClipBlend, Animation::ClipAnimatorManager>>::create(d->m_handler.data(),
+                                                                                                                                      d->m_handler->clipBlendNodeManager()));
 }
 
 /*! \internal */
diff --git a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp
index 6f52de389..29b4fe076 100644
--- a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp
+++ b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp
@@ -45,7 +45,7 @@
 #include <Qt3DAnimation/qclipanimator.h>
 #include <Qt3DAnimation/qchannelmapping.h>
 #include <Qt3DAnimation/qlerpclipblend.h>
-#include <Qt3DAnimation/qadditiveblend.h>
+#include <Qt3DAnimation/qadditiveclipblend.h>
 
 #include <Qt3DAnimation/qkeyframeanimation.h>
 #include <Qt3DAnimation/qanimationcontroller.h>
@@ -81,8 +81,8 @@ void Qt3DQuick3DAnimationPlugin::registerTypes(const char *uri)
                             Qt3DAnimation::Animation::Quick::Quick3DChannelMapper>(uri, 2, 9, "ChannelMapper");
     qmlRegisterExtendedUncreatableType<Qt3DAnimation::QAbstractClipBlendNode,
                                        Qt3DAnimation::Animation::Quick::Quick3DAbstractClipBlendNode>(uri, 2, 9, "AbstractClipBlendNode", QStringLiteral("QAbstractClipBlendNode is abstract"));
-    qmlRegisterType<Qt3DAnimation::QAdditiveBlend>(uri, 2, 9, "AdditiveBlend");
     qmlRegisterType<Qt3DAnimation::QLerpClipBlend>(uri, 2, 9, "LerpClipBlend");
+    qmlRegisterType<Qt3DAnimation::QAdditiveClipBlend>(uri, 2, 9, "AdditiveClipBlend");
 
     qmlRegisterUncreatableType<Qt3DAnimation::QAbstractAnimation>(uri, 2, 9, "AbstractAnimation", QStringLiteral("AbstractAnimation is abstract"));
     qmlRegisterExtendedType<Qt3DAnimation::QKeyframeAnimation, Qt3DAnimation::Quick::QQuick3DKeyframeAnimation>(uri, 2, 9, "KeyframeAnimation");
diff --git a/tests/auto/animation/additiveblend/additiveblend.pro b/tests/auto/animation/additiveclipblend/additiveclipblend.pro
index e61417c73..09b2e1156 100644
--- a/tests/auto/animation/additiveblend/additiveblend.pro
+++ b/tests/auto/animation/additiveclipblend/additiveclipblend.pro
@@ -1,12 +1,12 @@
 TEMPLATE = app
 
-TARGET = tst_additiveblend
+TARGET = tst_additiveclipblend
 
 QT += 3dcore 3dcore-private 3danimation 3danimation-private testlib
 
 CONFIG += testcase
 
 SOURCES += \
-    tst_additiveblend.cpp
+    tst_additiveclipblend.cpp
 
 include(../../core/common/common.pri)
diff --git a/tests/auto/animation/additiveblend/tst_additiveblend.cpp b/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
index c94efedd8..4875d67cc 100644
--- a/tests/auto/animation/additiveblend/tst_additiveblend.cpp
+++ b/tests/auto/animation/additiveclipblend/tst_additiveclipblend.cpp
@@ -28,14 +28,14 @@
 
 
 #include <QtTest/QTest>
-#include <Qt3DAnimation/qadditiveblend.h>
+#include <Qt3DAnimation/qadditiveclipblend.h>
 #include <Qt3DAnimation/qanimationcliploader.h>
-#include <Qt3DAnimation/private/qadditiveblend_p.h>
-#include <Qt3DAnimation/private/additiveblend_p.h>
+#include <Qt3DAnimation/private/qadditiveclipblend_p.h>
+#include <Qt3DAnimation/private/additiveclipblend_p.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include "qbackendnodetester.h"
 
-class tst_AdditiveBlend : public Qt3DCore::QBackendNodeTester
+class tst_AdditiveClipBlend : public Qt3DCore::QBackendNodeTester
 {
     Q_OBJECT
 
@@ -44,7 +44,7 @@ private Q_SLOTS:
     void checkInitialState()
     {
         // GIVEN
-        Qt3DAnimation::Animation::AdditiveBlend backendAdditiveBlend;
+        Qt3DAnimation::Animation::AdditiveClipBlend backendAdditiveBlend;
 
         // THEN
         QCOMPARE(backendAdditiveBlend.isEnabled(), false);
@@ -56,14 +56,14 @@ private Q_SLOTS:
     void checkInitializeFromPeer()
     {
         // GIVEN
-        Qt3DAnimation::QAdditiveBlend additiveBlend;
+        Qt3DAnimation::QAdditiveClipBlend additiveBlend;
         Qt3DAnimation::QAnimationClipLoader clip;
         additiveBlend.setBlendFactor(0.8f);
         additiveBlend.addClip(&clip);
 
         {
             // WHEN
-            Qt3DAnimation::Animation::AdditiveBlend backendAdditiveBlend;
+            Qt3DAnimation::Animation::AdditiveClipBlend backendAdditiveBlend;
             simulateInitialization(&additiveBlend, &backendAdditiveBlend);
 
             // THEN
@@ -75,7 +75,7 @@ private Q_SLOTS:
         }
         {
             // WHEN
-            Qt3DAnimation::Animation::AdditiveBlend backendAdditiveBlend;
+            Qt3DAnimation::Animation::AdditiveClipBlend backendAdditiveBlend;
             additiveBlend.setEnabled(false);
             simulateInitialization(&additiveBlend, &backendAdditiveBlend);
 
@@ -88,7 +88,7 @@ private Q_SLOTS:
     void checkSceneChangeEvents()
     {
         // GIVEN
-        Qt3DAnimation::Animation::AdditiveBlend backendAdditiveBlend;
+        Qt3DAnimation::Animation::AdditiveClipBlend backendAdditiveBlend;
         {
             // WHEN
             const bool newValue = false;
@@ -132,7 +132,7 @@ private Q_SLOTS:
         QFETCH(float, value2);
         QFETCH(float, blendFactor);
         QFETCH(float, result);
-        Qt3DAnimation::Animation::AdditiveBlend addBlend;
+        Qt3DAnimation::Animation::AdditiveClipBlend addBlend;
 
         // WHEN
         addBlend.setBlendFactor(blendFactor);
@@ -143,6 +143,6 @@ private Q_SLOTS:
     }
 };
 
-QTEST_MAIN(tst_AdditiveBlend)
+QTEST_MAIN(tst_AdditiveClipBlend)
 
-#include "tst_additiveblend.moc"
+#include "tst_additiveclipblend.moc"
diff --git a/tests/auto/animation/animation.pro b/tests/auto/animation/animation.pro
index e62c431d6..e756290f7 100644
--- a/tests/auto/animation/animation.pro
+++ b/tests/auto/animation/animation.pro
@@ -24,6 +24,6 @@ qtConfig(private_tests) {
         clipblendnode \
         lerpclipblend \
         clipblendnodevisitor \
-        qadditiveblend \
-        additiveblend
+        qadditiveclipblend \
+        additiveclipblend
 }
diff --git a/tests/auto/animation/qadditiveblend/qadditiveblend.pro b/tests/auto/animation/qadditiveclipblend/qadditiveclipblend.pro
index b3f2a4599..e5c6797ee 100644
--- a/tests/auto/animation/qadditiveblend/qadditiveblend.pro
+++ b/tests/auto/animation/qadditiveclipblend/qadditiveclipblend.pro
@@ -1,12 +1,12 @@
 TEMPLATE = app
 
-TARGET = tst_qadditiveblend
+TARGET = tst_qadditiveclipblend
 
 QT += 3dcore 3dcore-private 3danimation 3danimation-private testlib
 
 CONFIG += testcase
 
 SOURCES += \
-    tst_qadditiveblend.cpp
+    tst_qadditiveclipblend.cpp
 
 include(../../core/common/common.pri)
diff --git a/tests/auto/animation/qadditiveblend/tst_qadditiveblend.cpp b/tests/auto/animation/qadditiveclipblend/tst_qadditiveclipblend.cpp
index 369ca0078..f0e40ca67 100644
--- a/tests/auto/animation/qadditiveblend/tst_qadditiveblend.cpp
+++ b/tests/auto/animation/qadditiveclipblend/tst_qadditiveclipblend.cpp
@@ -28,9 +28,9 @@
 
 
 #include <QtTest/QTest>
-#include <Qt3DAnimation/qadditiveblend.h>
+#include <Qt3DAnimation/qadditiveclipblend.h>
 #include <Qt3DAnimation/qanimationcliploader.h>
-#include <Qt3DAnimation/private/qadditiveblend_p.h>
+#include <Qt3DAnimation/private/qadditiveclipblend_p.h>
 #include <QObject>
 #include <QSignalSpy>
 #include <Qt3DCore/qpropertyupdatedchange.h>
@@ -39,7 +39,7 @@
 #include <Qt3DCore/qnodecreatedchange.h>
 #include "testpostmanarbiter.h"
 
-class tst_QAdditiveBlend : public QObject
+class tst_QAdditiveClipBlend : public QObject
 {
     Q_OBJECT
 
@@ -48,7 +48,7 @@ private Q_SLOTS:
     void checkDefaultConstruction()
     {
         // GIVEN
-        Qt3DAnimation::QAdditiveBlend addBlend;
+        Qt3DAnimation::QAdditiveClipBlend addBlend;
 
         // THEN
         QCOMPARE(addBlend.blendFactor(), 0.0f);
@@ -57,7 +57,7 @@ private Q_SLOTS:
     void checkPropertyChanges()
     {
         // GIVEN
-        Qt3DAnimation::QAdditiveBlend addBlend;
+        Qt3DAnimation::QAdditiveClipBlend addBlend;
 
         {
             // WHEN
@@ -83,7 +83,7 @@ private Q_SLOTS:
     void checkCreationData()
     {
         // GIVEN
-        Qt3DAnimation::QAdditiveBlend addBlend;
+        Qt3DAnimation::QAdditiveClipBlend addBlend;
         Qt3DAnimation::QAnimationClipLoader clip1;
         Qt3DAnimation::QAnimationClipLoader clip2;
 
@@ -104,8 +104,8 @@ private Q_SLOTS:
         {
             QCOMPARE(creationChanges.size(), 3); // 1 + 2 clips
 
-            const auto creationChangeData = qSharedPointerCast<Qt3DAnimation::QClipBlendNodeCreatedChange<Qt3DAnimation::QAdditiveBlendData>>(creationChanges.first());
-            const Qt3DAnimation::QAdditiveBlendData cloneData = creationChangeData->data;
+            const auto creationChangeData = qSharedPointerCast<Qt3DAnimation::QClipBlendNodeCreatedChange<Qt3DAnimation::QAdditiveClipBlendData>>(creationChanges.first());
+            const Qt3DAnimation::QAdditiveClipBlendData cloneData = creationChangeData->data;
 
             QCOMPARE(addBlend.blendFactor(), cloneData.blendFactor);
             QCOMPARE(addBlend.id(), creationChangeData->subjectId());
@@ -130,8 +130,8 @@ private Q_SLOTS:
         {
             QCOMPARE(creationChanges.size(), 3); // 1 + 2 clips
 
-            const auto creationChangeData = qSharedPointerCast<Qt3DAnimation::QClipBlendNodeCreatedChange<Qt3DAnimation::QAdditiveBlendData>>(creationChanges.first());
-            const Qt3DAnimation::QAdditiveBlendData cloneData = creationChangeData->data;
+            const auto creationChangeData = qSharedPointerCast<Qt3DAnimation::QClipBlendNodeCreatedChange<Qt3DAnimation::QAdditiveClipBlendData>>(creationChanges.first());
+            const Qt3DAnimation::QAdditiveClipBlendData cloneData = creationChangeData->data;
 
             QCOMPARE(addBlend.blendFactor(), cloneData.blendFactor);
             QCOMPARE(addBlend.id(), creationChangeData->subjectId());
@@ -149,7 +149,7 @@ private Q_SLOTS:
     {
         // GIVEN
         TestArbiter arbiter;
-        Qt3DAnimation::QAdditiveBlend addBlend;
+        Qt3DAnimation::QAdditiveClipBlend addBlend;
         arbiter.setArbiterOnNode(&addBlend);
 
         {
@@ -180,6 +180,6 @@ private Q_SLOTS:
 
 };
 
-QTEST_MAIN(tst_QAdditiveBlend)
+QTEST_MAIN(tst_QAdditiveClipBlend)
 
-#include "tst_qadditiveblend.moc"
+#include "tst_qadditiveclipblend.moc"