Renamed QCriterion to QAnnotation

Change-Id: I4b40120807a60873b38687ba8ce0b6c2dfd77127
Task-number: QTBUG-41534
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

58 files changed, 214 insertions, 218 deletions

diff --git a/examples/bigmodel-qml/ForwardRenderer.qml b/examples/bigmodel-qml/ForwardRenderer.qml
index e2d1537b3..160850d71 100644
--- a/examples/bigmodel-qml/ForwardRenderer.qml
+++ b/examples/bigmodel-qml/ForwardRenderer.qml
@@ -56,7 +56,7 @@ TechniqueFilter {
     property alias camera: cameraSelector.camera
 
     criteria : [
-        Criterion { name : "RenderingStyle"; value : "forward"}
+        Annotation { name : "RenderingStyle"; value : "forward"}
     ]
 
     Viewport {
diff --git a/examples/cylinder-qml/ForwardRenderer.qml b/examples/cylinder-qml/ForwardRenderer.qml
index e2d1537b3..160850d71 100644
--- a/examples/cylinder-qml/ForwardRenderer.qml
+++ b/examples/cylinder-qml/ForwardRenderer.qml
@@ -56,7 +56,7 @@ TechniqueFilter {
     property alias camera: cameraSelector.camera
 
     criteria : [
-        Criterion { name : "RenderingStyle"; value : "forward"}
+        Annotation { name : "RenderingStyle"; value : "forward"}
     ]
 
     Viewport {
diff --git a/examples/deferred-renderer-cpp/deferredrenderer.cpp b/examples/deferred-renderer-cpp/deferredrenderer.cpp
index 4d40365b6..5d328fcaf 100644
--- a/examples/deferred-renderer-cpp/deferredrenderer.cpp
+++ b/examples/deferred-renderer-cpp/deferredrenderer.cpp
@@ -67,15 +67,15 @@ void DeferredRenderer::setGBuffer(Qt3D::QRenderTarget *gBuffer)
     m_gBufferTargetSelector->setTarget(gBuffer);
 }
 
-void DeferredRenderer::setGeometryPassCriteria(QList<Qt3D::QCriterion *> criteria)
+void DeferredRenderer::setGeometryPassCriteria(QList<Qt3D::QAnnotation *> criteria)
 {
-    Q_FOREACH (Qt3D::QCriterion *c, criteria)
+    Q_FOREACH (Qt3D::QAnnotation *c, criteria)
         m_geometryPassFilter->addCriterion(c);
 }
 
-void DeferredRenderer::setFinalPassCriteria(QList<Qt3D::QCriterion *> criteria)
+void DeferredRenderer::setFinalPassCriteria(QList<Qt3D::QAnnotation *> criteria)
 {
-    Q_FOREACH (Qt3D::QCriterion *c, criteria)
+    Q_FOREACH (Qt3D::QAnnotation *c, criteria)
         c->setParent(m_finalPassFilter);
 }
 
diff --git a/examples/deferred-renderer-cpp/deferredrenderer.h b/examples/deferred-renderer-cpp/deferredrenderer.h
index e21988857..3f8cff183 100644
--- a/examples/deferred-renderer-cpp/deferredrenderer.h
+++ b/examples/deferred-renderer-cpp/deferredrenderer.h
@@ -48,7 +48,7 @@
 #include <Qt3DRenderer/QRenderPassFilter>
 #include <Qt3DRenderer/QRenderTargetSelector>
 #include <Qt3DRenderer/QCameraSelector>
-#include <Qt3DRenderer/QCriterion>
+#include <Qt3DRenderer/QAnnotation>
 
 class DeferredRenderer : public Qt3D::QViewport
 {
@@ -57,8 +57,8 @@ public:
 
     void setSceneCamera(Qt3D::QEntity *camera);
     void setGBuffer(Qt3D::QRenderTarget *gBuffer);
-    void setGeometryPassCriteria(QList<Qt3D::QCriterion *> criteria);
-    void setFinalPassCriteria(QList<Qt3D::QCriterion *> criteria);
+    void setGeometryPassCriteria(QList<Qt3D::QAnnotation *> criteria);
+    void setFinalPassCriteria(QList<Qt3D::QAnnotation *> criteria);
     void setGBufferLayer(const QString &layerName);
     void setScreenQuadLayer(const QString &layerName);
 
diff --git a/examples/deferred-renderer-cpp/finaleffect.cpp b/examples/deferred-renderer-cpp/finaleffect.cpp
index b863a3c05..f9f6010b9 100644
--- a/examples/deferred-renderer-cpp/finaleffect.cpp
+++ b/examples/deferred-renderer-cpp/finaleffect.cpp
@@ -50,7 +50,7 @@ FinalEffect::FinalEffect(Qt3D::QNode *parent)
     , m_gl2Technique(new Qt3D::QTechnique())
     , m_gl2Pass(new Qt3D::QRenderPass())
     , m_gl3Pass(new Qt3D::QRenderPass())
-    , m_passCriterion(new Qt3D::QCriterion(this))
+    , m_passCriterion(new Qt3D::QAnnotation(this))
 {
     m_gl3Technique->openGLFilter()->setApi(Qt3D::QOpenGLFilter::Desktop);
     m_gl3Technique->openGLFilter()->setMajorVersion(3);
@@ -85,7 +85,7 @@ FinalEffect::FinalEffect(Qt3D::QNode *parent)
     addTechnique(m_gl2Technique);
 }
 
-QList<Qt3D::QCriterion *> FinalEffect::passCriteria() const
+QList<Qt3D::QAnnotation *> FinalEffect::passCriteria() const
 {
-    return QList<Qt3D::QCriterion *>() << m_passCriterion;
+    return QList<Qt3D::QAnnotation *>() << m_passCriterion;
 }
diff --git a/examples/deferred-renderer-cpp/finaleffect.h b/examples/deferred-renderer-cpp/finaleffect.h
index 639a297c7..79d06b6af 100644
--- a/examples/deferred-renderer-cpp/finaleffect.h
+++ b/examples/deferred-renderer-cpp/finaleffect.h
@@ -50,14 +50,14 @@ class FinalEffect : public Qt3D::QEffect
 public:
     explicit FinalEffect(Qt3D::QNode *parent = 0);
 
-    QList<Qt3D::QCriterion *> passCriteria() const;
+    QList<Qt3D::QAnnotation *> passCriteria() const;
 
 private :
     Qt3D::QTechnique *m_gl3Technique;
     Qt3D::QTechnique *m_gl2Technique;
     Qt3D::QRenderPass *m_gl2Pass;
     Qt3D::QRenderPass *m_gl3Pass;
-    Qt3D::QCriterion *m_passCriterion;
+    Qt3D::QAnnotation *m_passCriterion;
 };
 
 #endif // FINALEFFECT_H
diff --git a/examples/deferred-renderer-cpp/sceneeffect.cpp b/examples/deferred-renderer-cpp/sceneeffect.cpp
index 1b2682ec1..f67c070e7 100644
--- a/examples/deferred-renderer-cpp/sceneeffect.cpp
+++ b/examples/deferred-renderer-cpp/sceneeffect.cpp
@@ -50,7 +50,7 @@ SceneEffect::SceneEffect(Qt3D::QNode *parent)
     , m_gl2Technique(new Qt3D::QTechnique())
     , m_gl2Pass(new Qt3D::QRenderPass())
     , m_gl3Pass(new Qt3D::QRenderPass())
-    , m_passCriterion(new Qt3D::QCriterion(this))
+    , m_passCriterion(new Qt3D::QAnnotation(this))
 {
 
     m_gl3Technique->openGLFilter()->setProfile(Qt3D::QOpenGLFilter::None);
@@ -87,7 +87,7 @@ SceneEffect::SceneEffect(Qt3D::QNode *parent)
     addTechnique(m_gl2Technique);
 }
 
-QList<Qt3D::QCriterion *> SceneEffect::passCriteria() const
+QList<Qt3D::QAnnotation *> SceneEffect::passCriteria() const
 {
-    return QList<Qt3D::QCriterion *>() << m_passCriterion;
+    return QList<Qt3D::QAnnotation *>() << m_passCriterion;
 }
diff --git a/examples/deferred-renderer-cpp/sceneeffect.h b/examples/deferred-renderer-cpp/sceneeffect.h
index dd07dabb9..37b98cfdf 100644
--- a/examples/deferred-renderer-cpp/sceneeffect.h
+++ b/examples/deferred-renderer-cpp/sceneeffect.h
@@ -50,14 +50,14 @@ class SceneEffect : public Qt3D::QEffect
 public:
     explicit SceneEffect(Qt3D::QNode *parent = 0);
 
-    QList<Qt3D::QCriterion *> passCriteria() const;
+    QList<Qt3D::QAnnotation *> passCriteria() const;
 
 private:
     Qt3D::QTechnique *m_gl3Technique;
     Qt3D::QTechnique *m_gl2Technique;
     Qt3D::QRenderPass *m_gl2Pass;
     Qt3D::QRenderPass *m_gl3Pass;
-    Qt3D::QCriterion *m_passCriterion;
+    Qt3D::QAnnotation *m_passCriterion;
 };
 
 #endif // SCENEEFFECT_H
diff --git a/examples/deferred-renderer-qml/DeferredRenderer.qml b/examples/deferred-renderer-qml/DeferredRenderer.qml
index 559c2ee53..810f0dce9 100644
--- a/examples/deferred-renderer-qml/DeferredRenderer.qml
+++ b/examples/deferred-renderer-qml/DeferredRenderer.qml
@@ -59,7 +59,7 @@ Viewport {
 
                 RenderPassFilter {
                     id : geometryPass
-                    criteria : Criterion { name : "pass"; value : "geometry" }
+                    criteria : Annotation { name : "pass"; value : "geometry" }
 
                     CameraSelector {
                         id : sceneCameraSelector
@@ -77,7 +77,7 @@ Viewport {
 
             RenderPassFilter {
                 id : finalPass
-                criteria : Criterion { name : "pass"; value : "final" }
+                criteria : Annotation { name : "pass"; value : "final" }
             }
 
         }
diff --git a/examples/deferred-renderer-qml/FinalEffect.qml b/examples/deferred-renderer-qml/FinalEffect.qml
index 9c5df1199..b2d45e0d7 100644
--- a/examples/deferred-renderer-qml/FinalEffect.qml
+++ b/examples/deferred-renderer-qml/FinalEffect.qml
@@ -48,7 +48,7 @@ Effect {
         Technique {
             openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
             renderPasses : RenderPass {
-                criteria : Criterion { name : "pass"; value : "final" }
+                criteria : Annotation { name : "pass"; value : "final" }
                 shaderProgram : ShaderProgram {
                     id : finalShaderGL3
                     vertexShaderCode:
@@ -106,7 +106,7 @@ Effect {
         Technique {
             openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.None; minorVersion : 0; majorVersion : 2 }
             renderPasses : RenderPass {
-                criteria : Criterion { name : "pass"; value : "final" }
+                criteria : Annotation { name : "pass"; value : "final" }
                 shaderProgram : ShaderProgram {
                     id : finalShaderGL2
                     vertexShaderCode:
diff --git a/examples/deferred-renderer-qml/SceneEffect.qml b/examples/deferred-renderer-qml/SceneEffect.qml
index 527422dfc..88cfa4873 100644
--- a/examples/deferred-renderer-qml/SceneEffect.qml
+++ b/examples/deferred-renderer-qml/SceneEffect.qml
@@ -49,7 +49,7 @@ Effect {
         Technique {
             openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
             renderPasses : RenderPass {
-                criteria : Criterion { name : "pass"; value : "geometry" }
+                criteria : Annotation { name : "pass"; value : "geometry" }
                 shaderProgram : ShaderProgram {
                     id : sceneShaderGL3
                     vertexShaderCode:
@@ -100,7 +100,7 @@ Effect {
         Technique {
             openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 0; majorVersion : 2 }
             renderPasses : RenderPass {
-                criteria : Criterion { name : "pass"; value : "geometry" }
+                criteria : Annotation { name : "pass"; value : "geometry" }
                 shaderProgram : ShaderProgram {
                     id : sceneShaderGL2
                     vertexShaderCode:
diff --git a/examples/playground-qml/ForwardRenderer.qml b/examples/playground-qml/ForwardRenderer.qml
index 04568cb1d..fe8b187a1 100644
--- a/examples/playground-qml/ForwardRenderer.qml
+++ b/examples/playground-qml/ForwardRenderer.qml
@@ -62,8 +62,8 @@ TechniqueFilter {
     property alias colorAttachmentTexture : defaultColorAttachment.texture
 
     criteria : [
-        Criterion { name : "RenderingStyle"; value : "forward";},
-        Criterion { name : "Enabled"; value : true;}
+        Annotation { name : "RenderingStyle"; value : "forward";},
+        Annotation { name : "Enabled"; value : true;}
     ]
 
     ClearBuffer {
@@ -84,7 +84,7 @@ TechniqueFilter {
                     LayerFilter {
                         id : layerFilter
                         objectName : "layerFilter"
-                        RenderPassFilter { criteria : [Criterion {name : "Name"; value : "TextureLighting";}] }
+                        RenderPassFilter { criteria : [Annotation {name : "Name"; value : "TextureLighting";}] }
                     }
                 }
             }
@@ -108,10 +108,10 @@ TechniqueFilter {
                         }
                     ]
                 }
-                RenderPassFilter { criteria : [Criterion {name : "Name"; value : "Texture";}] }
-                RenderPassFilter { criteria : [Criterion {name : "Name"; value : "Lighting";}] }
+                RenderPassFilter { criteria : [Annotation {name : "Name"; value : "Texture";}] }
+                RenderPassFilter { criteria : [Annotation {name : "Name"; value : "Lighting";}] }
             }
-            RenderPassFilter { criteria : [Criterion {name : "Name"; value : "Final";}] }
+            RenderPassFilter { criteria : [Annotation {name : "Name"; value : "Final";}] }
         }
     }
 }
diff --git a/examples/playground-qml/main.qml b/examples/playground-qml/main.qml
index 4074ba7c3..8eaffb330 100644
--- a/examples/playground-qml/main.qml
+++ b/examples/playground-qml/main.qml
@@ -257,13 +257,13 @@ Entity {
                 techniques : [
                     Technique {
                         criteria : [
-                            Criterion { name : "RenderingStyle"; value : "forward"},
-                            Criterion { name : "Enabled"; value : true}
+                            Annotation { name : "RenderingStyle"; value : "forward"},
+                            Annotation { name : "Enabled"; value : true}
                         ]
                         openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
                         renderPasses : [
                             RenderPass {
-                                criteria : [Criterion {name : "Name"; value : "TextureLighting" }]
+                                criteria : [Annotation {name : "Name"; value : "TextureLighting" }]
                                 bindings : [ // Add only the bindings needed for a shader
                                     ParameterMapper {parameterName: "vertexTexCoord"; shaderVariableName: "texCoord0"; bindingType: ParameterMapper.Attribute},
                                     ParameterMapper {parameterName: "tex"; shaderVariableName: "texture"; bindingType: ParameterMapper.Uniform},
@@ -326,7 +326,7 @@ Entity {
                                 }
                             },
                             RenderPass {
-                                criteria : [Criterion {name : "Name"; value : "Texture" }]
+                                criteria : [Annotation {name : "Name"; value : "Texture" }]
                                 shaderProgram : ShaderProgram {
                                     vertexShaderCode : "
                                     #version 140
@@ -356,7 +356,7 @@ Entity {
                                 }
                             },
                             RenderPass {
-                                criteria : [Criterion {name : "Name"; value : "Lighting" }]
+                                criteria : [Annotation {name : "Name"; value : "Lighting" }]
                                 renderStates : [BlendState {srcRGB: BlendState.One; dstRGB : BlendState.One},
                                               BlendEquation {mode: BlendEquation.FuncAdd},
                                               CullFace { mode : CullFace.Back },
@@ -413,7 +413,7 @@ Entity {
                                 }
                             },
                             RenderPass {
-                                criteria : Criterion {name : "Name"; value : "Final" }
+                                criteria : Annotation {name : "Name"; value : "Final" }
                                 shaderProgram : ShaderProgram {
                                     vertexShaderCode: "
                                     #version 140
@@ -485,8 +485,8 @@ Entity {
                     Technique {
                         openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
                         criteria : [
-                            Criterion { name : "RenderingStyle"; value : "forward"},
-                            Criterion { name : "Enabled"; value : timer.test; onValueChanged: console.log("VALUE " + value)}
+                            Annotation { name : "RenderingStyle"; value : "forward"},
+                            Annotation { name : "Enabled"; value : timer.test; onValueChanged: console.log("VALUE " + value)}
                         ]
 
                         parameters : [Parameter { name : "lightPos"; value : Qt.vector4d(10.0, 10.0, 0.0, 1.0);}]
diff --git a/examples/rollerball/AdsEffect.qml b/examples/rollerball/AdsEffect.qml
index 56000811e..d4c10d132 100644
--- a/examples/rollerball/AdsEffect.qml
+++ b/examples/rollerball/AdsEffect.qml
@@ -76,7 +76,7 @@ Effect {
                 minorVersion: 1
             }
 
-            criteria: [ Criterion { name : "renderingStyle"; value : "forward" } ]
+            criteria: [ Annotation { name : "renderingStyle"; value : "forward" } ]
 
             parameters: [
                 Parameter { name: "lightPosition";  value: Qt.vector4d( 0.0, 0.0, 0.0, 1.0 ) },
diff --git a/examples/rollerball/ForwardRenderer.qml b/examples/rollerball/ForwardRenderer.qml
index 7a100bf4d..ac8365f85 100644
--- a/examples/rollerball/ForwardRenderer.qml
+++ b/examples/rollerball/ForwardRenderer.qml
@@ -50,7 +50,7 @@ TechniqueFilter {
     property alias camera: cameraSelector.camera
 
     // Select the forward rendering Technique of any used Effect
-    criteria: [ Criterion { name: "renderingStyle"; value: "forward" } ]
+    criteria: [ Annotation { name: "renderingStyle"; value: "forward" } ]
 
     // Use the whole viewport
     Viewport {
diff --git a/examples/shadow-map-qml/AdsEffect.qml b/examples/shadow-map-qml/AdsEffect.qml
index c57645ddf..7bf1b577d 100644
--- a/examples/shadow-map-qml/AdsEffect.qml
+++ b/examples/shadow-map-qml/AdsEffect.qml
@@ -82,7 +82,7 @@ Effect {
 
             renderPasses: [
                 RenderPass {
-                    criteria: [ Criterion { name: "pass"; value: "shadowmap" } ]
+                    criteria: [ Annotation { name: "pass"; value: "shadowmap" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderSourceFile:   ":/shaders/shadowmap.vert"
@@ -96,7 +96,7 @@ Effect {
                 },
 
                 RenderPass {
-                    criteria: [ Criterion { name : "pass"; value : "forward" } ]
+                    criteria: [ Annotation { name : "pass"; value : "forward" } ]
 
                     // The bindings property allows us to map from names of parameters (uniforms or vertex attributes)
                     // within a shader to more friendly names in QML. By default the parameter names are exposed from
diff --git a/examples/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/shadow-map-qml/ShadowMapFrameGraph.qml
index b3f2c5d9a..7164c0ffc 100644
--- a/examples/shadow-map-qml/ShadowMapFrameGraph.qml
+++ b/examples/shadow-map-qml/ShadowMapFrameGraph.qml
@@ -62,7 +62,7 @@ FrameGraph {
         clearColor: Qt.rgba(0.0, 0.4, 0.7, 1.0)
 
         RenderPassFilter {
-            criteria: [ Criterion { name: "pass"; value: "shadowmap" } ]
+            criteria: [ Annotation { name: "pass"; value: "shadowmap" } ]
 
             RenderTargetSelector {
                 target: RenderTarget {
@@ -96,7 +96,7 @@ FrameGraph {
         }
 
         RenderPassFilter {
-            criteria: [ Criterion { name: "pass"; value: "forward" } ]
+            criteria: [ Annotation { name: "pass"; value: "forward" } ]
 
             ClearBuffer {
                 buffers: ClearBuffer.ColorDepthBuffer
diff --git a/examples/tessellation-modes/ForwardRenderer.qml b/examples/tessellation-modes/ForwardRenderer.qml
index 7a100bf4d..ac8365f85 100644
--- a/examples/tessellation-modes/ForwardRenderer.qml
+++ b/examples/tessellation-modes/ForwardRenderer.qml
@@ -50,7 +50,7 @@ TechniqueFilter {
     property alias camera: cameraSelector.camera
 
     // Select the forward rendering Technique of any used Effect
-    criteria: [ Criterion { name: "renderingStyle"; value: "forward" } ]
+    criteria: [ Annotation { name: "renderingStyle"; value: "forward" } ]
 
     // Use the whole viewport
     Viewport {
diff --git a/examples/tessellation-modes/TessellatedWireframeEffect.qml b/examples/tessellation-modes/TessellatedWireframeEffect.qml
index 6ef82580e..eb33bbb44 100644
--- a/examples/tessellation-modes/TessellatedWireframeEffect.qml
+++ b/examples/tessellation-modes/TessellatedWireframeEffect.qml
@@ -76,7 +76,7 @@ Effect {
                 minorVersion: 0
             }
 
-            criteria: [ Criterion { name: "renderingStyle"; value: "forward" } ]
+            criteria: [ Annotation { name: "renderingStyle"; value: "forward" } ]
 
             parameters: [
                 Parameter { name: "light.position"; value: Qt.vector4d(0.0, 0.0, 0.0, 1.0) },
diff --git a/examples/torus-qml/ForwardRenderer.qml b/examples/torus-qml/ForwardRenderer.qml
index e2d1537b3..160850d71 100644
--- a/examples/torus-qml/ForwardRenderer.qml
+++ b/examples/torus-qml/ForwardRenderer.qml
@@ -56,7 +56,7 @@ TechniqueFilter {
     property alias camera: cameraSelector.camera
 
     criteria : [
-        Criterion { name : "RenderingStyle"; value : "forward"}
+        Annotation { name : "RenderingStyle"; value : "forward"}
     ]
 
     Viewport {
diff --git a/examples/wireframe/ForwardRenderer.qml b/examples/wireframe/ForwardRenderer.qml
index 7a100bf4d..ac8365f85 100644
--- a/examples/wireframe/ForwardRenderer.qml
+++ b/examples/wireframe/ForwardRenderer.qml
@@ -50,7 +50,7 @@ TechniqueFilter {
     property alias camera: cameraSelector.camera
 
     // Select the forward rendering Technique of any used Effect
-    criteria: [ Criterion { name: "renderingStyle"; value: "forward" } ]
+    criteria: [ Annotation { name: "renderingStyle"; value: "forward" } ]
 
     // Use the whole viewport
     Viewport {
diff --git a/examples/wireframe/WireframeEffect.qml b/examples/wireframe/WireframeEffect.qml
index 2b31aa603..4ad5b63fb 100644
--- a/examples/wireframe/WireframeEffect.qml
+++ b/examples/wireframe/WireframeEffect.qml
@@ -76,7 +76,7 @@ Effect {
                 minorVersion: 1
             }
 
-            criteria: [ Criterion { name : "renderingStyle"; value : "forward" } ]
+            criteria: [ Annotation { name : "renderingStyle"; value : "forward" } ]
 
             parameters: [
                 Parameter { name: "light.position"; value: Qt.vector4d(0.0, 0.0, 0.0, 1.0) },
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index cee61165d..0ec587ed4 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -57,7 +57,7 @@
 #include <Qt3DRenderer/qcameraselector.h>
 #include <Qt3DRenderer/qeffect.h>
 #include <Qt3DRenderer/qparameter.h>
-#include <Qt3DRenderer/qcriterion.h>
+#include <Qt3DRenderer/qannotation.h>
 #include <Qt3DRenderer/qparametermapper.h>
 #include <Qt3DRenderer/qcuboidmesh.h>
 #include <Qt3DRenderer/qcylindermesh.h>
@@ -111,7 +111,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
 //    qmlRegisterCustomType<Qt3D::Effect>(uri, 2, 0, "Effect", new Qt3D::Render::Quick::ShaderPropertyParser());
     qmlRegisterExtendedType<Qt3D::QEffect, Qt3D::Render::Quick::Quick3DEffect>(uri, 2, 0, "Effect");
     qmlRegisterExtendedType<Qt3D::QTechnique, Qt3D::Render::Quick::Quick3DTechnique>(uri, 2, 0, "Technique");
-    qmlRegisterType<Qt3D::QCriterion>(uri, 2, 0, "Criterion");
+    qmlRegisterType<Qt3D::QAnnotation>(uri, 2, 0, "Annotation");
     qmlRegisterType<Qt3D::QOpenGLFilter>(uri, 2, 0, "OpenGLFilter");
     qmlRegisterUncreatableType<Qt3D::QParameter>(uri, 2, 0, "QParameter", "Quick3D should instantiate Quick3DParameter only");
     qmlRegisterType<Qt3D::Render::Quick::Quick3DParameter>(uri, 2, 0, "Parameter");
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp b/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
index 815bceb0a..4196a5a19 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
@@ -56,9 +56,9 @@ Quick3DRenderPass::Quick3DRenderPass(QObject *parent)
 {
 }
 
-QQmlListProperty<QCriterion> Quick3DRenderPass::criteriaList()
+QQmlListProperty<QAnnotation> Quick3DRenderPass::criteriaList()
 {
-    return QQmlListProperty<Qt3D::QCriterion>(this, 0,
+    return QQmlListProperty<Qt3D::QAnnotation>(this, 0,
                                               &Quick3DRenderPass::appendCriteria,
                                               &Quick3DRenderPass::criteriaCount,
                                               &Quick3DRenderPass::criterionAt,
@@ -83,28 +83,28 @@ QQmlListProperty<QRenderState> Quick3DRenderPass::renderStateList()
                                               &Quick3DRenderPass::clearRenderStates);
 }
 
-void Quick3DRenderPass::appendCriteria(QQmlListProperty<QCriterion> *list, QCriterion *criterion)
+void Quick3DRenderPass::appendCriteria(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
     rPass->parentRenderPass()->addCriterion(criterion);
 }
 
-QCriterion *Quick3DRenderPass::criterionAt(QQmlListProperty<QCriterion> *list, int index)
+QAnnotation *Quick3DRenderPass::criterionAt(QQmlListProperty<QAnnotation> *list, int index)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
     return rPass->parentRenderPass()->criteria().at(index);
 }
 
-int Quick3DRenderPass::criteriaCount(QQmlListProperty<QCriterion> *list)
+int Quick3DRenderPass::criteriaCount(QQmlListProperty<QAnnotation> *list)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
     return rPass->parentRenderPass()->criteria().count();
 }
 
-void Quick3DRenderPass::clearCriteria(QQmlListProperty<QCriterion> *list)
+void Quick3DRenderPass::clearCriteria(QQmlListProperty<QAnnotation> *list)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    Q_FOREACH (QCriterion *c, rPass->parentRenderPass()->criteria())
+    Q_FOREACH (QAnnotation *c, rPass->parentRenderPass()->criteria())
         rPass->parentRenderPass()->removeCriterion(c);
 }
 
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.h b/src/quick3d/quick3drenderer/items/quick3drenderpass.h
index 5e30a4aa0..e84efa4ab 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpass.h
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.h
@@ -58,22 +58,22 @@ namespace Quick {
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderPass : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QCriterion> criteria READ criteriaList)
+    Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> criteria READ criteriaList)
     Q_PROPERTY(QQmlListProperty<Qt3D::QParameterMapper> bindings READ bindingList)
     Q_PROPERTY(QQmlListProperty<Qt3D::QRenderState> renderStates READ renderStateList)
 public:
     explicit Quick3DRenderPass(QObject *parent = 0);
 
-    QQmlListProperty<Qt3D::QCriterion> criteriaList();
+    QQmlListProperty<Qt3D::QAnnotation> criteriaList();
     QQmlListProperty<Qt3D::QParameterMapper> bindingList();
     QQmlListProperty<Qt3D::QRenderState> renderStateList();
     inline QRenderPass *parentRenderPass() const { return qobject_cast<QRenderPass *>(parent()); }
 
 private:
-    static void appendCriteria(QQmlListProperty<Qt3D::QCriterion> *list, QCriterion *criterion);
-    static QCriterion *criterionAt(QQmlListProperty<Qt3D::QCriterion> *list, int index);
-    static int criteriaCount(QQmlListProperty<Qt3D::QCriterion> *list);
-    static void clearCriteria(QQmlListProperty<Qt3D::QCriterion> *list);
+    static void appendCriteria(QQmlListProperty<Qt3D::QAnnotation> *list, QAnnotation *criterion);
+    static QAnnotation *criterionAt(QQmlListProperty<Qt3D::QAnnotation> *list, int index);
+    static int criteriaCount(QQmlListProperty<Qt3D::QAnnotation> *list);
+    static void clearCriteria(QQmlListProperty<Qt3D::QAnnotation> *list);
 
     static void appendBinding(QQmlListProperty<Qt3D::QParameterMapper> *list, QParameterMapper *binding);
     static QParameterMapper *bindingAt(QQmlListProperty<Qt3D::QParameterMapper> *list, int index);
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp
index d0fd0df34..f867277fd 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp
@@ -54,16 +54,16 @@ Quick3DRenderPassFilter::Quick3DRenderPassFilter(QObject *parent)
 {
 }
 
-QQmlListProperty<QCriterion> Quick3DRenderPassFilter::criteriaList()
+QQmlListProperty<QAnnotation> Quick3DRenderPassFilter::criteriaList()
 {
-    return QQmlListProperty<Qt3D::QCriterion>(this, 0,
+    return QQmlListProperty<Qt3D::QAnnotation>(this, 0,
                                                        &Quick3DRenderPassFilter::appendCriterion,
                                                        &Quick3DRenderPassFilter::criteriaCount,
                                                        &Quick3DRenderPassFilter::criterionAt,
                                                        &Quick3DRenderPassFilter::clearCriteria);
 }
 
-void Quick3DRenderPassFilter::appendCriterion(QQmlListProperty<QCriterion> *list, QCriterion *criterion)
+void Quick3DRenderPassFilter::appendCriterion(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion)
 {
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter) {
@@ -72,7 +72,7 @@ void Quick3DRenderPassFilter::appendCriterion(QQmlListProperty<QCriterion> *list
     }
 }
 
-QCriterion *Quick3DRenderPassFilter::criterionAt(QQmlListProperty<QCriterion> *list, int index)
+QAnnotation *Quick3DRenderPassFilter::criterionAt(QQmlListProperty<QAnnotation> *list, int index)
 {
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter)
@@ -80,7 +80,7 @@ QCriterion *Quick3DRenderPassFilter::criterionAt(QQmlListProperty<QCriterion> *l
     return 0;
 }
 
-int Quick3DRenderPassFilter::criteriaCount(QQmlListProperty<QCriterion> *list)
+int Quick3DRenderPassFilter::criteriaCount(QQmlListProperty<QAnnotation> *list)
 {
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter)
@@ -88,11 +88,11 @@ int Quick3DRenderPassFilter::criteriaCount(QQmlListProperty<QCriterion> *list)
     return 0;
 }
 
-void Quick3DRenderPassFilter::clearCriteria(QQmlListProperty<QCriterion> *list)
+void Quick3DRenderPassFilter::clearCriteria(QQmlListProperty<QAnnotation> *list)
 {
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter) {
-        Q_FOREACH (QCriterion *criterion, filter->parentRenderPassFilter()->criteria())
+        Q_FOREACH (QAnnotation *criterion, filter->parentRenderPassFilter()->criteria())
             filter->parentRenderPassFilter()->removeCriterion(criterion);
     }
 }
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h b/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h
index 1a38545f5..67f690f7e 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h
@@ -44,7 +44,7 @@
 
 #include <Qt3DQuick/quick3dnode.h>
 #include <Qt3DRenderer/qrenderpassfilter.h>
-#include <Qt3DRenderer/qcriterion.h>
+#include <Qt3DRenderer/qannotation.h>
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 
 QT_BEGIN_NAMESPACE
@@ -58,19 +58,19 @@ namespace Quick {
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderPassFilter : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QCriterion> criteria READ criteriaList)
+    Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> criteria READ criteriaList)
 public:
     explicit Quick3DRenderPassFilter(QObject *parent = 0);
 
-    QQmlListProperty<Qt3D::QCriterion> criteriaList();
+    QQmlListProperty<Qt3D::QAnnotation> criteriaList();
 
     inline QRenderPassFilter *parentRenderPassFilter() const { return qobject_cast<Qt3D::QRenderPassFilter*>(parent()); }
 
 private:
-    static void appendCriterion(QQmlListProperty<QCriterion> *list, QCriterion *criterion);
-    static QCriterion *criterionAt(QQmlListProperty<QCriterion> *list, int index);
-    static int criteriaCount(QQmlListProperty<QCriterion> *list);
-    static void clearCriteria(QQmlListProperty<QCriterion> *list);
+    static void appendCriterion(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion);
+    static QAnnotation *criterionAt(QQmlListProperty<QAnnotation> *list, int index);
+    static int criteriaCount(QQmlListProperty<QAnnotation> *list);
+    static void clearCriteria(QQmlListProperty<QAnnotation> *list);
 };
 
 } // Quick
diff --git a/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp b/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp
index a41988ffe..e65c6b1da 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp
@@ -132,16 +132,16 @@ void Quick3DTechnique::clearRenderPasses(QQmlListProperty<QRenderPass> *list)
     }
 }
 
-QQmlListProperty<Qt3D::QCriterion> Quick3DTechnique::criteriaList()
+QQmlListProperty<Qt3D::QAnnotation> Quick3DTechnique::criteriaList()
 {
-    return QQmlListProperty<Qt3D::QCriterion>(this, 0,
+    return QQmlListProperty<Qt3D::QAnnotation>(this, 0,
                                        &Quick3DTechnique::appendCriterion,
                                        &Quick3DTechnique::criteriaCount,
                                        &Quick3DTechnique::criterionAt,
                                        &Quick3DTechnique::clearCriteriaList);
 }
 
-void Quick3DTechnique::appendCriterion(QQmlListProperty<QCriterion> *list, QCriterion *criterion)
+void Quick3DTechnique::appendCriterion(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion)
 {
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
     if (technique) {
@@ -152,7 +152,7 @@ void Quick3DTechnique::appendCriterion(QQmlListProperty<QCriterion> *list, QCrit
     }
 }
 
-QCriterion *Quick3DTechnique::criterionAt(QQmlListProperty<QCriterion> *list, int index)
+QAnnotation *Quick3DTechnique::criterionAt(QQmlListProperty<QAnnotation> *list, int index)
 {
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
     if (technique)
@@ -160,7 +160,7 @@ QCriterion *Quick3DTechnique::criterionAt(QQmlListProperty<QCriterion> *list, in
     return 0;
 }
 
-int Quick3DTechnique::criteriaCount(QQmlListProperty<QCriterion> *list)
+int Quick3DTechnique::criteriaCount(QQmlListProperty<QAnnotation> *list)
 {
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
     if (technique)
@@ -168,7 +168,7 @@ int Quick3DTechnique::criteriaCount(QQmlListProperty<QCriterion> *list)
     return 0;
 }
 
-void Quick3DTechnique::clearCriteriaList(QQmlListProperty<QCriterion> *list)
+void Quick3DTechnique::clearCriteriaList(QQmlListProperty<QAnnotation> *list)
 {
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
     if (technique) {
diff --git a/src/quick3d/quick3drenderer/items/quick3dtechnique.h b/src/quick3d/quick3drenderer/items/quick3dtechnique.h
index 3b042520f..c07fce942 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtechnique.h
+++ b/src/quick3d/quick3drenderer/items/quick3dtechnique.h
@@ -57,13 +57,13 @@ namespace Quick {
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTechnique : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QCriterion> criteria READ criteriaList NOTIFY criteriaChanged)
+    Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> criteria READ criteriaList NOTIFY criteriaChanged)
     Q_PROPERTY(QQmlListProperty<Qt3D::QRenderPass> renderPasses READ renderPassList NOTIFY renderPassesChanged)
     Q_PROPERTY(QQmlListProperty<Qt3D::QParameter> parameters READ parameterList)
 public:
     explicit Quick3DTechnique(QObject *parent = 0);
 
-    QQmlListProperty<Qt3D::QCriterion> criteriaList();
+    QQmlListProperty<Qt3D::QAnnotation> criteriaList();
     QQmlListProperty<Qt3D::QRenderPass> renderPassList();
     QQmlListProperty<Qt3D::QParameter> parameterList();
 
@@ -81,10 +81,10 @@ private:
     static int parametersCount(QQmlListProperty<QParameter> *list);
     static void clearParameterList(QQmlListProperty<QParameter> *list);
 
-    static void appendCriterion(QQmlListProperty<QCriterion> *list, QCriterion *criterion);
-    static QCriterion *criterionAt(QQmlListProperty<QCriterion> *list, int index);
-    static int criteriaCount(QQmlListProperty<QCriterion> *list);
-    static void clearCriteriaList(QQmlListProperty<QCriterion> *list);
+    static void appendCriterion(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion);
+    static QAnnotation *criterionAt(QQmlListProperty<QAnnotation> *list, int index);
+    static int criteriaCount(QQmlListProperty<QAnnotation> *list);
+    static void clearCriteriaList(QQmlListProperty<QAnnotation> *list);
 
     static void appendRenderPass(QQmlListProperty<QRenderPass> *list, QRenderPass* renderPass);
     static QRenderPass *renderPassAt(QQmlListProperty<QRenderPass> *list, int index);
diff --git a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp
index 431909d7b..44a85f72b 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp
@@ -54,16 +54,16 @@ Quick3DTechniqueFilter::Quick3DTechniqueFilter(QObject *parent)
 {
 }
 
-QQmlListProperty<Qt3D::QCriterion> Quick3DTechniqueFilter::criteriaList()
+QQmlListProperty<Qt3D::QAnnotation> Quick3DTechniqueFilter::criteriaList()
 {
-    return QQmlListProperty<Qt3D::QCriterion>(this, 0,
+    return QQmlListProperty<Qt3D::QAnnotation>(this, 0,
                                        &Quick3DTechniqueFilter::appendCriterion,
                                        &Quick3DTechniqueFilter::criteriaCount,
                                        &Quick3DTechniqueFilter::criterionAt,
                                        &Quick3DTechniqueFilter::clearCriteria);
 }
 
-void Quick3DTechniqueFilter::appendCriterion(QQmlListProperty<QCriterion> *list, QCriterion *criterion)
+void Quick3DTechniqueFilter::appendCriterion(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion)
 {
     Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
     if (filter) {
@@ -72,7 +72,7 @@ void Quick3DTechniqueFilter::appendCriterion(QQmlListProperty<QCriterion> *list,
     }
 }
 
-QCriterion *Quick3DTechniqueFilter::criterionAt(QQmlListProperty<QCriterion> *list, int index)
+QAnnotation *Quick3DTechniqueFilter::criterionAt(QQmlListProperty<QAnnotation> *list, int index)
 {
     Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
     if (filter)
@@ -80,7 +80,7 @@ QCriterion *Quick3DTechniqueFilter::criterionAt(QQmlListProperty<QCriterion> *li
     return 0;
 }
 
-int Quick3DTechniqueFilter::criteriaCount(QQmlListProperty<QCriterion> *list)
+int Quick3DTechniqueFilter::criteriaCount(QQmlListProperty<QAnnotation> *list)
 {
     Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
     if (filter)
@@ -88,11 +88,11 @@ int Quick3DTechniqueFilter::criteriaCount(QQmlListProperty<QCriterion> *list)
     return 0;
 }
 
-void Quick3DTechniqueFilter::clearCriteria(QQmlListProperty<QCriterion> *list)
+void Quick3DTechniqueFilter::clearCriteria(QQmlListProperty<QAnnotation> *list)
 {
     Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
     if (filter) {
-        Q_FOREACH (QCriterion *criterion, filter->parentTechniqueFilter()->criteria())
+        Q_FOREACH (QAnnotation *criterion, filter->parentTechniqueFilter()->criteria())
             filter->parentTechniqueFilter()->removeCriterion(criterion);
     }
 }
diff --git a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h b/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h
index 4ade42a8c..235bf1392 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h
+++ b/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h
@@ -44,7 +44,7 @@
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DRenderer/qtechniquefilter.h>
-#include <Qt3DRenderer/qcriterion.h>
+#include <Qt3DRenderer/qannotation.h>
 #include <Qt3DQuick/quick3dnode.h>
 #include <QQmlListProperty>
 
@@ -59,19 +59,19 @@ namespace Quick {
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTechniqueFilter : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QCriterion> criteria READ criteriaList)
+    Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> criteria READ criteriaList)
 
 public:
     explicit Quick3DTechniqueFilter(QObject *parent = 0);
-    QQmlListProperty<Qt3D::QCriterion> criteriaList();
+    QQmlListProperty<Qt3D::QAnnotation> criteriaList();
 
     inline QTechniqueFilter *parentTechniqueFilter() const { return qobject_cast<Qt3D::QTechniqueFilter*>(parent()); }
 
 private:
-    static void appendCriterion(QQmlListProperty<QCriterion> *list, QCriterion *criterion);
-    static QCriterion *criterionAt(QQmlListProperty<QCriterion> *list, int index);
-    static int criteriaCount(QQmlListProperty<QCriterion> *list);
-    static void clearCriteria(QQmlListProperty<QCriterion> *list);
+    static void appendCriterion(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion);
+    static QAnnotation *criterionAt(QQmlListProperty<QAnnotation> *list, int index);
+    static int criteriaCount(QQmlListProperty<QAnnotation> *list);
+    static void clearCriteria(QQmlListProperty<QAnnotation> *list);
 
 };
 
diff --git a/src/render/backend/framegraph/renderpassfilternode.cpp b/src/render/backend/framegraph/renderpassfilternode.cpp
index b677f96e5..54362bcc1 100644
--- a/src/render/backend/framegraph/renderpassfilternode.cpp
+++ b/src/render/backend/framegraph/renderpassfilternode.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "renderpassfilternode_p.h"
-#include "qcriterion.h"
+#include "qannotation.h"
 #include "qrenderpassfilter.h"
 #include <Qt3DCore/qscenepropertychange.h>
 
@@ -58,7 +58,7 @@ void RenderPassFilter::updateFromPeer(QNode *peer)
 {
     QRenderPassFilter *filter = static_cast<QRenderPassFilter *>(peer);
     m_filters.clear();
-    Q_FOREACH (QCriterion *criterion, filter->criteria())
+    Q_FOREACH (QAnnotation *criterion, filter->criteria())
         appendFilter(criterion);
 }
 
@@ -67,7 +67,7 @@ QList<QUuid> RenderPassFilter::filters() const
     return m_filters;
 }
 
-void RenderPassFilter::appendFilter(QCriterion *criterion)
+void RenderPassFilter::appendFilter(QAnnotation *criterion)
 {
     if (!m_filters.contains(criterion->uuid()))
         m_filters.append(criterion->uuid());
@@ -84,7 +84,7 @@ void RenderPassFilter::sceneChangeEvent(const QSceneChangePtr &e)
     case NodeAdded: {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
         if (propertyChange->propertyName() == QByteArrayLiteral("renderPassCriterion"))
-            appendFilter(propertyChange->value().value<QCriterion *>());
+            appendFilter(propertyChange->value().value<QAnnotation *>());
     }
         break;
     case NodeRemoved: {
diff --git a/src/render/backend/framegraph/renderpassfilternode_p.h b/src/render/backend/framegraph/renderpassfilternode_p.h
index 530044cbd..aa1bb241b 100644
--- a/src/render/backend/framegraph/renderpassfilternode_p.h
+++ b/src/render/backend/framegraph/renderpassfilternode_p.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QCriterion;
+class QAnnotation;
 class QRenderPassFilter;
 
 template <typename T, int INDEXBITS>
@@ -65,7 +65,7 @@ public:
 
     void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
     QList<QUuid> filters() const;
-    void appendFilter(QCriterion *criterion);
+    void appendFilter(QAnnotation *criterion);
     void removeFilter(const QUuid &criterionId);
     void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
diff --git a/src/render/backend/framegraph/techniquefilternode.cpp b/src/render/backend/framegraph/techniquefilternode.cpp
index 7bf7cf320..4db23a594 100644
--- a/src/render/backend/framegraph/techniquefilternode.cpp
+++ b/src/render/backend/framegraph/techniquefilternode.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "techniquefilternode_p.h"
-#include "qcriterion.h"
+#include "qannotation.h"
 #include "qtechniquefilter.h"
 #include <Qt3DRenderer/private/managers_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
@@ -59,7 +59,7 @@ void TechniqueFilter::updateFromPeer(QNode *peer)
 {
     QTechniqueFilter *filter = static_cast<QTechniqueFilter *>(peer);
     m_filters.clear();
-    Q_FOREACH (QCriterion *criterion, filter->criteria())
+    Q_FOREACH (QAnnotation *criterion, filter->criteria())
         appendFilter(criterion);
 }
 
@@ -68,7 +68,7 @@ QList<QUuid> TechniqueFilter::filters() const
     return m_filters;
 }
 
-void TechniqueFilter::appendFilter(QCriterion *criterion)
+void TechniqueFilter::appendFilter(QAnnotation *criterion)
 {
     if (!m_filters.contains(criterion->uuid()))
         m_filters.append(criterion->uuid());
@@ -85,7 +85,7 @@ void TechniqueFilter::sceneChangeEvent(const QSceneChangePtr &e)
     case NodeAdded: {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
         if (propertyChange->propertyName() == QByteArrayLiteral("techniqueCriterion"))
-            appendFilter(propertyChange->value().value<QCriterion *>());
+            appendFilter(propertyChange->value().value<QAnnotation *>());
     }
         break;
     case NodeRemoved: {
diff --git a/src/render/backend/framegraph/techniquefilternode_p.h b/src/render/backend/framegraph/techniquefilternode_p.h
index 73b809c9a..74d7dedf7 100644
--- a/src/render/backend/framegraph/techniquefilternode_p.h
+++ b/src/render/backend/framegraph/techniquefilternode_p.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QCriterion;
+class QAnnotation;
 class QTechniqueFilter;
 
 template <typename T, int INDEXBITS>
@@ -72,7 +72,7 @@ public:
     void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
-    void appendFilter(QCriterion *criterion);
+    void appendFilter(QAnnotation *criterion);
     void removeFilter(const QUuid &criterionId);
 
     QList<QUuid> m_filters;
diff --git a/src/render/backend/rendercriterion.cpp b/src/render/backend/rendercriterion.cpp
index 2bbe746f6..2632a714d 100644
--- a/src/render/backend/rendercriterion.cpp
+++ b/src/render/backend/rendercriterion.cpp
@@ -64,7 +64,7 @@ void RenderCriterion::cleanup()
 
 void RenderCriterion::updateFromPeer(QNode *peer)
 {
-    QCriterion *criterion = static_cast<QCriterion *>(peer);
+    QAnnotation *criterion = static_cast<QAnnotation *>(peer);
 
     m_value = criterion->value();
     m_name = criterion->name();
diff --git a/src/render/backend/rendercriterion_p.h b/src/render/backend/rendercriterion_p.h
index a38a6b248..c54a1f0e6 100644
--- a/src/render/backend/rendercriterion_p.h
+++ b/src/render/backend/rendercriterion_p.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_RENDER_RENDERCRITERION_H
 #define QT3D_RENDER_RENDERCRITERION_H
 
-#include <Qt3DRenderer/qcriterion.h>
+#include <Qt3DRenderer/qannotation.h>
 #include <Qt3DCore/private/qobserverinterface_p.h>
 #include <Qt3DCore/qbackendnode.h>
 
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QCriterion;
+class QAnnotation;
 
 namespace Render {
 
diff --git a/src/render/backend/rendereraspect.cpp b/src/render/backend/rendereraspect.cpp
index 63d9f53b5..a0315fb30 100644
--- a/src/render/backend/rendereraspect.cpp
+++ b/src/render/backend/rendereraspect.cpp
@@ -119,7 +119,7 @@ RendererAspect::RendererAspect(QObject *parent)
     registerBackendType<QTexture>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderTexture, Render::TextureManager>(m_renderer->textureManager())));
     registerBackendType<QShaderProgram>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderShader, Render::ShaderManager>(m_renderer->shaderManager())));
     registerBackendType<QEffect>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderEffect, Render::EffectManager>(m_renderer->effectManager())));
-    registerBackendType<QCriterion>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderCriterion, Render::CriterionManager>(m_renderer->criterionManager())));
+    registerBackendType<QAnnotation>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderCriterion, Render::CriterionManager>(m_renderer->criterionManager())));
     registerBackendType<QCameraLens>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderCameraLens, Render::CameraManager>(m_renderer->cameraManager())));
     registerBackendType<QAbstractLight>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderLight, Render::LightManager>(m_renderer->lightManager())));
     registerBackendType<QLayer>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderLayer, Render::LayerManager>(m_renderer->layerManager())));
diff --git a/src/render/backend/renderrenderpass.cpp b/src/render/backend/renderrenderpass.cpp
index 063748c5c..6b19de6f7 100644
--- a/src/render/backend/renderrenderpass.cpp
+++ b/src/render/backend/renderrenderpass.cpp
@@ -78,7 +78,7 @@ void RenderRenderPass::updateFromPeer(QNode *peer)
     // TO DO: We probably need a QParameterMapper manager
     Q_FOREACH (QParameterMapper *binding, pass->bindings())
         appendBinding(binding);
-    Q_FOREACH (QCriterion *c, pass->criteria())
+    Q_FOREACH (QAnnotation *c, pass->criteria())
         appendCriterion(c);
     Q_FOREACH (QRenderState *renderState, pass->renderStates())
         appendRenderState(renderState);
@@ -91,7 +91,7 @@ void RenderRenderPass::sceneChangeEvent(const QSceneChangePtr &e)
 
     case NodeAdded: {
         if (propertyChange->propertyName() == QByteArrayLiteral("criterion")) {
-            appendCriterion(propertyChange->value().value<QCriterion *>());
+            appendCriterion(propertyChange->value().value<QAnnotation *>());
         }
         else if (propertyChange->propertyName() == QByteArrayLiteral("shaderProgram")) {
             m_shaderUuid = propertyChange->value().toUuid();
@@ -146,7 +146,7 @@ QList<QRenderState *> RenderRenderPass::renderStates() const
     return m_renderStates.values();
 }
 
-void RenderRenderPass::appendCriterion(QCriterion *criterion)
+void RenderRenderPass::appendCriterion(QAnnotation *criterion)
 {
     if (!m_criteriaList.contains(criterion->uuid()))
         m_criteriaList.append(criterion->uuid());
diff --git a/src/render/backend/renderrenderpass_p.h b/src/render/backend/renderrenderpass_p.h
index 1363dc7f7..a98dfd64a 100644
--- a/src/render/backend/renderrenderpass_p.h
+++ b/src/render/backend/renderrenderpass_p.h
@@ -57,7 +57,7 @@ namespace Qt3D {
 class QRenderPass;
 class QAbstractShader;
 class QParameterMapper;
-class QCriterion;
+class QAnnotation;
 class QRenderState;
 
 namespace Render {
@@ -78,7 +78,7 @@ public:
     QList<QUuid> criteria() const;
     QList<QRenderState *> renderStates() const;
 
-    void appendCriterion(QCriterion *criterion);
+    void appendCriterion(QAnnotation *criterion);
     void removeCriterion(const QUuid &criterionId);
 
     void appendBinding(QParameterMapper *binding);
diff --git a/src/render/backend/rendertechnique.cpp b/src/render/backend/rendertechnique.cpp
index 2ca0256c9..4e01918aa 100644
--- a/src/render/backend/rendertechnique.cpp
+++ b/src/render/backend/rendertechnique.cpp
@@ -94,7 +94,7 @@ void RenderTechnique::updateFromPeer(QNode *peer)
             m_parameterPack.appendParameter(p);
         Q_FOREACH (QRenderPass *rPass, technique->renderPasses())
             appendRenderPass(rPass);
-        Q_FOREACH (QCriterion *criterion, technique->criteria())
+        Q_FOREACH (QAnnotation *criterion, technique->criteria())
             appendCriterion(criterion);
 
         // Copy OpenGLFilter info from frontend OpenGLFilter
@@ -127,7 +127,7 @@ void RenderTechnique::sceneChangeEvent(const QSceneChangePtr &e)
             m_parameterPack.appendParameter(propertyChange->value().value<QParameter*>());
         }
         else if (propertyChange->propertyName() == QByteArrayLiteral("criterion")) {
-            appendCriterion(propertyChange->value().value<QCriterion *>());
+            appendCriterion(propertyChange->value().value<QAnnotation *>());
         }
         break;
     }
@@ -183,7 +183,7 @@ QOpenGLFilter *RenderTechnique::openGLFilter() const
     return m_openglFilter;
 }
 
-void RenderTechnique::appendCriterion(QCriterion *criterion)
+void RenderTechnique::appendCriterion(QAnnotation *criterion)
 {
     if (!m_criteriaList.contains(criterion->uuid()))
         m_criteriaList.append(criterion->uuid());
diff --git a/src/render/backend/rendertechnique_p.h b/src/render/backend/rendertechnique_p.h
index 488c2d2a7..30065a72c 100644
--- a/src/render/backend/rendertechnique_p.h
+++ b/src/render/backend/rendertechnique_p.h
@@ -47,7 +47,7 @@
 #include <QStringList>
 #include <Qt3DCore/private/qobserverinterface_p.h>
 #include <Qt3DRenderer/private/parameterpack_p.h>
-#include <Qt3DRenderer/qcriterion.h>
+#include <Qt3DRenderer/qannotation.h>
 #include <Qt3DCore/qbackendnode.h>
 
 QT_BEGIN_NAMESPACE
@@ -57,7 +57,7 @@ namespace Qt3D {
 class QTechnique;
 class QParameter;
 class QOpenGLFilter;
-class QCriterion;
+class QAnnotation;
 class QRenderPass;
 
 namespace Render {
@@ -79,7 +79,7 @@ public:
     void appendRenderPass(QRenderPass *rPass);
     void removeRenderPass(const QUuid &renderPassId);
 
-    void appendCriterion(QCriterion *criterion);
+    void appendCriterion(QAnnotation *criterion);
     void removeCriterion(const QUuid &criterionId);
 
     QList<QUuid> criteria() const;
diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
index 1c186adfd..5ef5143bc 100644
--- a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
+++ b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
@@ -42,8 +42,7 @@
 #include "qrenderpassfilter.h"
 #include "qrenderpassfilter_p.h"
 
-#include "qcriterion.h"
-#include "qcriterion_p.h"
+#include "qannotation.h"
 #include <Qt3DCore/qscenepropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -59,13 +58,13 @@ QRenderPassFilter::QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent
 {
 }
 
-QList<QCriterion *> QRenderPassFilter::criteria() const
+QList<QAnnotation *> QRenderPassFilter::criteria() const
 {
     Q_D(const QRenderPassFilter);
     return d->m_criteriaList;
 }
 
-void QRenderPassFilter::addCriterion(QCriterion *criterion)
+void QRenderPassFilter::addCriterion(QAnnotation *criterion)
 {
     Q_D(QRenderPassFilter);
     if (!d->m_criteriaList.contains(criterion)) {
@@ -87,7 +86,7 @@ void QRenderPassFilter::addCriterion(QCriterion *criterion)
     }
 }
 
-void QRenderPassFilter::removeCriterion(QCriterion *criterion)
+void QRenderPassFilter::removeCriterion(QAnnotation *criterion)
 {
     Q_D(QRenderPassFilter);
     if (d->m_changeArbiter != Q_NULLPTR) {
@@ -105,8 +104,8 @@ void QRenderPassFilter::copy(const QNode *ref)
     const QRenderPassFilter *other = static_cast<const QRenderPassFilter*>(ref);
     Q_FOREACH (QFrameGraphItem *fgChild, other->d_func()->m_fgChildren)
         appendFrameGraphItem(qobject_cast<QFrameGraphItem *>(QNodePrivate::get(fgChild)->clone()));
-    Q_FOREACH (QCriterion *c, other->d_func()->m_criteriaList)
-        addCriterion(qobject_cast<QCriterion *>(QNodePrivate::get(c)->clone()));
+    Q_FOREACH (QAnnotation *c, other->d_func()->m_criteriaList)
+        addCriterion(qobject_cast<QAnnotation *>(QNodePrivate::get(c)->clone()));
 }
 
 } // Qt3D
diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.h b/src/render/frontend/framegraph-components/qrenderpassfilter.h
index 2258b3a3f..363ea5802 100644
--- a/src/render/frontend/framegraph-components/qrenderpassfilter.h
+++ b/src/render/frontend/framegraph-components/qrenderpassfilter.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 
 class QRenderPassFilterPrivate;
-class QCriterion;
+class QAnnotation;
 
 class QT3DRENDERERSHARED_EXPORT QRenderPassFilter : public QFrameGraphItem
 {
@@ -61,9 +61,9 @@ class QT3DRENDERERSHARED_EXPORT QRenderPassFilter : public QFrameGraphItem
 public:
     explicit QRenderPassFilter(QNode *parent = 0);
 
-    QList<QCriterion *> criteria() const;
-    void addCriterion(QCriterion *criterion);
-    void removeCriterion(QCriterion *criterion);
+    QList<QAnnotation *> criteria() const;
+    void addCriterion(QAnnotation *criterion);
+    void removeCriterion(QAnnotation *criterion);
 
 protected:
     QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent = 0);
diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter_p.h b/src/render/frontend/framegraph-components/qrenderpassfilter_p.h
index 3da27e1e2..da58d810f 100644
--- a/src/render/frontend/framegraph-components/qrenderpassfilter_p.h
+++ b/src/render/frontend/framegraph-components/qrenderpassfilter_p.h
@@ -59,7 +59,7 @@ public:
 
     Q_DECLARE_PUBLIC(QRenderPassFilter)
     QString m_renderPassName;
-    QList<QCriterion *> m_criteriaList;
+    QList<QAnnotation *> m_criteriaList;
 };
 
 } // Qt3D
diff --git a/src/render/frontend/framegraph-components/qtechniquefilter.cpp b/src/render/frontend/framegraph-components/qtechniquefilter.cpp
index 7672c9e69..4b2e024c6 100644
--- a/src/render/frontend/framegraph-components/qtechniquefilter.cpp
+++ b/src/render/frontend/framegraph-components/qtechniquefilter.cpp
@@ -42,8 +42,7 @@
 
 #include "qtechniquefilter.h"
 #include "qtechniquefilter_p.h"
-#include "qcriterion_p.h"
-#include <Qt3DRenderer/qcriterion.h>
+#include <Qt3DRenderer/qannotation.h>
 #include <Qt3DCore/qscenepropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -61,8 +60,8 @@ void QTechniqueFilter::copy(const QNode *ref)
     const QTechniqueFilter *other = static_cast<const QTechniqueFilter*>(ref);
     Q_FOREACH (QFrameGraphItem *fgChild, other->d_func()->m_fgChildren)
         appendFrameGraphItem(qobject_cast<QFrameGraphItem *>(QNodePrivate::get(fgChild)->clone()));
-    Q_FOREACH (QCriterion *crit, other->d_func()->m_criteriaList)
-        addCriterion(qobject_cast<QCriterion *>(QNodePrivate::get(crit)->clone()));
+    Q_FOREACH (QAnnotation *crit, other->d_func()->m_criteriaList)
+        addCriterion(qobject_cast<QAnnotation *>(QNodePrivate::get(crit)->clone()));
 }
 
 QTechniqueFilter::QTechniqueFilter(QNode *parent)
@@ -75,13 +74,13 @@ QTechniqueFilter::QTechniqueFilter(QTechniqueFilterPrivate &dd, QNode *parent)
 {
 }
 
-QList<QCriterion *> QTechniqueFilter::criteria() const
+QList<QAnnotation *> QTechniqueFilter::criteria() const
 {
     Q_D(const QTechniqueFilter);
     return d->m_criteriaList;
 }
 
-void QTechniqueFilter::addCriterion(QCriterion *criterion)
+void QTechniqueFilter::addCriterion(QAnnotation *criterion)
 {
     Q_D(QTechniqueFilter);
     d->m_criteriaList.append(criterion);
@@ -101,7 +100,7 @@ void QTechniqueFilter::addCriterion(QCriterion *criterion)
     }
 }
 
-void QTechniqueFilter::removeCriterion(QCriterion *criterion)
+void QTechniqueFilter::removeCriterion(QAnnotation *criterion)
 {
     Q_D(QTechniqueFilter);
     if (d->m_changeArbiter != Q_NULLPTR) {
diff --git a/src/render/frontend/framegraph-components/qtechniquefilter.h b/src/render/frontend/framegraph-components/qtechniquefilter.h
index 34e0c0176..3b7cec914 100644
--- a/src/render/frontend/framegraph-components/qtechniquefilter.h
+++ b/src/render/frontend/framegraph-components/qtechniquefilter.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 
 class QTechniqueFilterPrivate;
-class QCriterion;
+class QAnnotation;
 
 class QT3DRENDERERSHARED_EXPORT QTechniqueFilter : public QFrameGraphItem
 {
@@ -58,9 +58,9 @@ class QT3DRENDERERSHARED_EXPORT QTechniqueFilter : public QFrameGraphItem
 public:
     explicit QTechniqueFilter(QNode *parent = 0);
 
-    QList<QCriterion *> criteria() const;
-    void addCriterion(QCriterion *criterion);
-    void removeCriterion(QCriterion *criterion);
+    QList<QAnnotation *> criteria() const;
+    void addCriterion(QAnnotation *criterion);
+    void removeCriterion(QAnnotation *criterion);
 
 protected:
     QTechniqueFilter(QTechniqueFilterPrivate &dd, QNode *parent = 0);
diff --git a/src/render/frontend/framegraph-components/qtechniquefilter_p.h b/src/render/frontend/framegraph-components/qtechniquefilter_p.h
index edcc3c454..7c8be236c 100644
--- a/src/render/frontend/framegraph-components/qtechniquefilter_p.h
+++ b/src/render/frontend/framegraph-components/qtechniquefilter_p.h
@@ -56,7 +56,7 @@ public :
     QTechniqueFilterPrivate(QTechniqueFilter *qq);
 
     Q_DECLARE_PUBLIC(QTechniqueFilter)
-    QList<QCriterion *> m_criteriaList;
+    QList<QAnnotation *> m_criteriaList;
 };
 
 } // Qt3D
diff --git a/src/render/frontend/qcriterion.cpp b/src/render/frontend/qannotation.cpp
index 71226e13e..fcbd5fe03 100644
--- a/src/render/frontend/qcriterion.cpp
+++ b/src/render/frontend/qannotation.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qcriterion.h"
-#include "qcriterion_p.h"
+#include "qannotation.h"
+#include "qannotation_p.h"
 #include <private/qnode_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
 
@@ -49,52 +49,51 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 
 
-QCriterionPrivate::QCriterionPrivate(QCriterion *qq)
+QAnnotationPrivate::QAnnotationPrivate(QAnnotation *qq)
     : QNodePrivate(qq)
 {
 }
 
-void QCriterion::copy(const QNode *ref)
+void QAnnotation::copy(const QNode *ref)
 {
     QNode::copy(ref);
-    const QCriterion *criterion = static_cast<const QCriterion*>(ref);
+    const QAnnotation *criterion = static_cast<const QAnnotation*>(ref);
     d_func()->m_name = criterion->d_func()->m_name;
     d_func()->m_value = criterion->d_func()->m_value;
 }
 
-QCriterion::QCriterion(QNode *parent)
-    : QNode(*new QCriterionPrivate(this), parent)
+QAnnotation::QAnnotation(QNode *parent)
+    : QNode(*new QAnnotationPrivate(this), parent)
 {
 }
 
-void QCriterion::setValue(const QVariant &value)
+void QAnnotation::setValue(const QVariant &value)
 {
-    Q_D(QCriterion);
+    Q_D(QAnnotation);
     if (value != d->m_value) {
         d->m_value = value;
         emit valueChanged();
     }
 }
 
-void QCriterion::setName(const QString &name)
+void QAnnotation::setName(const QString &name)
 {
-    Q_D(QCriterion);
+    Q_D(QAnnotation);
     if (name != d->m_name) {
         d->m_name = name;
         emit nameChanged();
     }
 }
 
-
-QVariant QCriterion::value() const
+QVariant QAnnotation::value() const
 {
-    Q_D(const QCriterion);
+    Q_D(const QAnnotation);
     return d->m_value;
 }
 
-QString QCriterion::name() const
+QString QAnnotation::name() const
 {
-    Q_D(const QCriterion);
+    Q_D(const QAnnotation);
     return d->m_name;
 }
 
diff --git a/src/render/frontend/qcriterion.h b/src/render/frontend/qannotation.h
index c31d5b6b1..14296fadd 100644
--- a/src/render/frontend/qcriterion.h
+++ b/src/render/frontend/qannotation.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCRITERION_H
-#define QT3D_QCRITERION_H
+#ifndef QT3D_QANNOTATION_H
+#define QT3D_QANNOTATION_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qnode.h>
@@ -50,15 +50,15 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QCriterionPrivate;
+class QAnnotationPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QCriterion : public QNode
+class QT3DRENDERERSHARED_EXPORT QAnnotation : public QNode
 {
     Q_OBJECT
     Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
 public:
-    explicit QCriterion(QNode *parent = 0);
+    explicit QAnnotation(QNode *parent = 0);
 
     void setValue(const QVariant &value);
     void setName(const QString &customType);
@@ -74,14 +74,14 @@ protected:
     void copy(const QNode *ref) Q_DECL_OVERRIDE;
 
 private:
-    Q_DECLARE_PRIVATE(QCriterion)
-    QT3D_CLONEABLE(QCriterion)
+    Q_DECLARE_PRIVATE(QAnnotation)
+    QT3D_CLONEABLE(QAnnotation)
 };
 
 } // Qt3D
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3D::QCriterion *)
+Q_DECLARE_METATYPE(Qt3D::QAnnotation *)
 
-#endif // QT3D_QCRITERION_H
+#endif // QT3D_QANNOTATION_H
diff --git a/src/render/frontend/qcriterion_p.h b/src/render/frontend/qannotation_p.h
index fbe7c2dce..bac96f59d 100644
--- a/src/render/frontend/qcriterion_p.h
+++ b/src/render/frontend/qannotation_p.h
@@ -39,22 +39,22 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_QCRITERION_P_H
-#define QT3D_QCRITERION_P_H
+#ifndef QT3D_QANNOTATION_P_H
+#define QT3D_QANNOTATION_P_H
 
 #include <Qt3DCore/private/qnode_p.h>
-#include <Qt3DRenderer/qcriterion.h>
+#include <Qt3DRenderer/qannotation.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QCriterionPrivate : public QNodePrivate
+class QAnnotationPrivate : public QNodePrivate
 {
 public:
-    QCriterionPrivate(QCriterion *qq);
+    QAnnotationPrivate(QAnnotation *qq);
 
-    Q_DECLARE_PUBLIC(QCriterion)
+    Q_DECLARE_PUBLIC(QAnnotation)
     QString m_name;
     QVariant m_value;
 };
@@ -63,4 +63,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_QCRITERION_P_H
+#endif // QT3D_QANNOTATION_P_H
diff --git a/src/render/frontend/qrenderpass.cpp b/src/render/frontend/qrenderpass.cpp
index ea267418b..2e1a86829 100644
--- a/src/render/frontend/qrenderpass.cpp
+++ b/src/render/frontend/qrenderpass.cpp
@@ -43,11 +43,10 @@
 #include "qrenderpass.h"
 #include "qrenderpass_p.h"
 #include "qparameter.h"
-#include "qcriterion.h"
+#include "qannotation.h"
 #include "qparametermapper.h"
 #include "qscenepropertychange.h"
 #include "qrenderstate.h"
-#include "qcriterion_p.h"
 #include "qparametermapper_p.h"
 #include "private/qnode_p.h"
 
@@ -67,8 +66,8 @@ void QRenderPass::copy(const QNode *ref)
     const QRenderPass *other = static_cast<const QRenderPass*>(ref);
     d_func()->m_shader = qobject_cast<QShaderProgram *>(QNodePrivate::get(other->d_func()->m_shader)->clone());
 
-    Q_FOREACH (QCriterion *crit, other->d_func()->m_criteriaList)
-        addCriterion(qobject_cast<QCriterion *>(QNodePrivate::get(crit)->clone()));
+    Q_FOREACH (QAnnotation *crit, other->d_func()->m_criteriaList)
+        addCriterion(qobject_cast<QAnnotation *>(QNodePrivate::get(crit)->clone()));
     Q_FOREACH (QParameterMapper *binding, other->d_func()->m_bindings)
         addBinding(qobject_cast<QParameterMapper *>(QNodePrivate::get(binding)->clone()));
     Q_FOREACH (QRenderState *renderState, other->d_func()->m_renderStates)
@@ -139,7 +138,7 @@ QShaderProgram *QRenderPass::shaderProgram() const
     return d->m_shader;
 }
 
-void QRenderPass::addCriterion(QCriterion *criterion)
+void QRenderPass::addCriterion(QAnnotation *criterion)
 {
     Q_D(QRenderPass);
     if (!d->m_criteriaList.contains(criterion)) {
@@ -155,13 +154,13 @@ void QRenderPass::addCriterion(QCriterion *criterion)
         if (d->m_changeArbiter != Q_NULLPTR) {
             QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, this));
             change->setPropertyName(QByteArrayLiteral("criterion"));
-            change->setValue(QVariant::fromValue(qobject_cast<QCriterion *>(QNodePrivate::get(criterion)->clone())));
+            change->setValue(QVariant::fromValue(qobject_cast<QAnnotation *>(QNodePrivate::get(criterion)->clone())));
             d->notifyObservers(change);
         }
     }
 }
 
-void QRenderPass::removeCriterion(QCriterion *criterion)
+void QRenderPass::removeCriterion(QAnnotation *criterion)
 {
     Q_D(QRenderPass);
     if (d->m_changeArbiter != Q_NULLPTR) {
@@ -173,7 +172,7 @@ void QRenderPass::removeCriterion(QCriterion *criterion)
     d->m_criteriaList.removeOne(criterion);
 }
 
-QList<QCriterion *> QRenderPass::criteria() const
+QList<QAnnotation *> QRenderPass::criteria() const
 {
     Q_D(const QRenderPass);
     return d->m_criteriaList;
diff --git a/src/render/frontend/qrenderpass.h b/src/render/frontend/qrenderpass.h
index df0dd0bc8..2437dc9bd 100644
--- a/src/render/frontend/qrenderpass.h
+++ b/src/render/frontend/qrenderpass.h
@@ -47,7 +47,7 @@
 
 #include <Qt3DRenderer/qshaderprogram.h>
 #include <Qt3DRenderer/qrenderstate.h>
-#include <Qt3DRenderer/qcriterion.h>
+#include <Qt3DRenderer/qannotation.h>
 
 #include <QHash>
 #include <QList>
@@ -83,9 +83,9 @@ public:
     void setShaderProgram(QShaderProgram *shaderProgram);
     QShaderProgram *shaderProgram() const;
 
-    void addCriterion(QCriterion *criterion);
-    void removeCriterion(QCriterion *criterion);
-    QList<QCriterion *> criteria() const;
+    void addCriterion(QAnnotation *criterion);
+    void removeCriterion(QAnnotation *criterion);
+    QList<QAnnotation *> criteria() const;
     void clearCriteria();
 
     void addBinding(QParameterMapper *binding);
diff --git a/src/render/frontend/qrenderpass_p.h b/src/render/frontend/qrenderpass_p.h
index ec0e420d0..53548f1f2 100644
--- a/src/render/frontend/qrenderpass_p.h
+++ b/src/render/frontend/qrenderpass_p.h
@@ -54,7 +54,7 @@ namespace Qt3D {
 class QParameter;
 class QParameterMapper;
 class QRenderState;
-class QCriterion;
+class QAnnotation;
 typedef QList<QParameter*> ParameterList;
 
 namespace Render
@@ -73,7 +73,7 @@ public:
 
     // map Parameter names to GLSL names
     QHash<QString, QString> m_parameterNameDict;
-    QList<QCriterion *> m_criteriaList;
+    QList<QAnnotation *> m_criteriaList;
     QList<QParameterMapper *> m_bindings;
     QList<QRenderState *> m_renderStates;
     QShaderProgram *m_shader;
diff --git a/src/render/frontend/qtechnique.cpp b/src/render/frontend/qtechnique.cpp
index 0485d113c..2406a3101 100644
--- a/src/render/frontend/qtechnique.cpp
+++ b/src/render/frontend/qtechnique.cpp
@@ -74,8 +74,8 @@ void QTechnique::copy(const QNode *ref)
     const QTechnique *tech = static_cast<const QTechnique*>(ref);
     d_func()->m_openGLFilter->copy(tech->d_func()->m_openGLFilter);
 
-    Q_FOREACH (QCriterion *criterion, tech->d_func()->m_criteriaList)
-        addCriterion(qobject_cast<QCriterion *>(QNodePrivate::get(criterion)->clone()));
+    Q_FOREACH (QAnnotation *criterion, tech->d_func()->m_criteriaList)
+        addCriterion(qobject_cast<QAnnotation *>(QNodePrivate::get(criterion)->clone()));
     Q_FOREACH (QRenderPass *pass, tech->d_func()->m_renderPasses)
         addPass(qobject_cast<QRenderPass *>(QNodePrivate::get(pass)->clone()));
     Q_FOREACH (QParameter *p, tech->d_func()->m_parameters)
@@ -102,7 +102,7 @@ void QTechnique::openGLFilterChanged()
     }
 }
 
-void QTechnique::addCriterion(QCriterion *criterion)
+void QTechnique::addCriterion(QAnnotation *criterion)
 {
     Q_D(QTechnique);
     if (!d->m_criteriaList.contains(criterion)) {
@@ -124,7 +124,7 @@ void QTechnique::addCriterion(QCriterion *criterion)
     }
 }
 
-void QTechnique::removeCriterion(QCriterion *criterion)
+void QTechnique::removeCriterion(QAnnotation *criterion)
 {
     Q_D(QTechnique);
     if (d->m_changeArbiter != Q_NULLPTR) {
@@ -136,7 +136,7 @@ void QTechnique::removeCriterion(QCriterion *criterion)
     d->m_criteriaList.removeOne(criterion);
 }
 
-QList<QCriterion *> QTechnique::criteria() const
+QList<QAnnotation *> QTechnique::criteria() const
 {
     Q_D(const QTechnique);
     return d->m_criteriaList;
diff --git a/src/render/frontend/qtechnique.h b/src/render/frontend/qtechnique.h
index 024bb6532..7ff99d47e 100644
--- a/src/render/frontend/qtechnique.h
+++ b/src/render/frontend/qtechnique.h
@@ -45,7 +45,7 @@
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qnode.h>
 #include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qcriterion.h>
+#include <Qt3DRenderer/qannotation.h>
 #include <QList>
 #include <QSharedPointer>
 
@@ -65,10 +65,10 @@ class QT3DRENDERERSHARED_EXPORT QTechnique : public QNode
 public:
     explicit QTechnique(QNode *parent = 0);
 
-    void addCriterion(QCriterion *criterion);
-    void removeCriterion(QCriterion *criterion);
+    void addCriterion(QAnnotation *criterion);
+    void removeCriterion(QAnnotation *criterion);
 
-    QList<QCriterion *> criteria() const;
+    QList<QAnnotation *> criteria() const;
     void clearCriteria();
 
     void addParameter(QParameter *p);
diff --git a/src/render/frontend/qtechnique_p.h b/src/render/frontend/qtechnique_p.h
index 325ffe7f6..625231a80 100644
--- a/src/render/frontend/qtechnique_p.h
+++ b/src/render/frontend/qtechnique_p.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 
 class QTechnique;
-class QCriterion;
+class QAnnotation;
 class QParameter;
 class QRenderPass;
 class QOpenGLFilter;
@@ -62,7 +62,7 @@ public:
     ~QTechniquePrivate();
 
     Q_DECLARE_PUBLIC(QTechnique)
-    QList<QCriterion *> m_criteriaList;
+    QList<QAnnotation *> m_criteriaList;
     QList<QParameter *> m_parameters;
     QList<QRenderPass*> m_renderPasses;
     QOpenGLFilter *m_openGLFilter;
diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri
index 456491eff..9eeab15c0 100644
--- a/src/render/frontend/render-frontend.pri
+++ b/src/render/frontend/render-frontend.pri
@@ -15,7 +15,6 @@ HEADERS += \
     $$PWD/qabstractsceneloader.h \
     $$PWD/qeffect.h \
     $$PWD/qsceneloader.h \
-    $$PWD/qcriterion.h \
     $$PWD/qparameter.h \
     $$PWD/qparameter_p.h \
     $$PWD/qparametermapper.h \
@@ -59,9 +58,10 @@ HEADERS += \
     $$PWD/qrenderattachment_p.h \
     $$PWD/qrendertarget.h \
     $$PWD/qrendertarget_p.h \
-    $$PWD/qcriterion_p.h \
     $$PWD/qrenderstate_p.h \
-    $$PWD/qalphacoverage.h
+    $$PWD/qalphacoverage.h \
+    $$PWD/qannotation.h \
+    $$PWD/qannotation_p.h
 
 SOURCES += \
     $$PWD/qmaterial.cpp \
@@ -75,7 +75,6 @@ SOURCES += \
     $$PWD/qabstractsceneloader.cpp \
     $$PWD/qeffect.cpp \
     $$PWD/qsceneloader.cpp \
-    $$PWD/qcriterion.cpp \
     $$PWD/qparameter.cpp \
     $$PWD/qparametermapper.cpp \
     $$PWD/qcylindermesh.cpp \
@@ -102,4 +101,5 @@ SOURCES += \
     $$PWD/qrenderstate.cpp \
     $$PWD/qrenderattachment.cpp \
     $$PWD/qrendertarget.cpp \
-    $$PWD/qalphacoverage.cpp
+    $$PWD/qalphacoverage.cpp \
+    $$PWD/qannotation.cpp