Update documentation for renaming of repo. to Qt3D.

This is the first part of a number of additions to the Qt3D documentation as part
of the repository changeover.

Task-number: QTBUG-22962

Change-Id: I5025f4ef8ddf830175b221856a97dfb48c454df2
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

39 files changed, 178 insertions, 179 deletions

diff --git a/README b/README
index 1b91ff9cf..454b40336 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
 This directory contains the Qt3D project for Qt5:
-   * QtQuick3D QML bindings and
+   * Qt3D QML bindings and
    * Qt3D C++ APIs
 
 
-Building QtQuick3D
+Building Qt3D
 ==================
 
 Qt5 is a rapidly changing bleeding edge environment.  This branch is our initial
@@ -15,22 +15,22 @@ advanced use only.
 No guarantees about API stability or even if this works at all are supplied, use
 at your own risk.
 
-First fetch the Qt5 source tree and QtQuick3D qml2 branch:
+First fetch the Qt5 source tree and Qt3D master branch:
 
     cd ~/depot
     git clone ssh://codereview.qt-project.org:29418/qt/qt5.git
     cd qt5
     ./init-repository --codereview-username <username> \
-        --module-subset=qtbase,qtsvg,qtdeclarative,qttools,qtxmlpatterns,qtdoc,qlalr,qtrepotools,qtqa,qtlocation,qtquick3d
+        --module-subset=qtbase,qtsvg,qtdeclarative,qttools,qtxmlpatterns,qtdoc,qlalr,qtrepotools,qtqa,qtlocation,qt3d
     git submodule foreach "git fetch gerrit && git reset --hard gerrit/master"
-    cd qtquick3d
+    cd qt3d
     scp -p -P 29418 codereview.qt-project.org:hooks/commit-msg .git/hooks/
     git fetch gerrit
-    git checkout --track -b qml2 gerrit/qml2
+    git checkout --track -b master gerrit/master
 
 If you are reading this file then somehow you probably already got this far anyway.
 
-Now build Qt5, which will also build QtQuick3D as a module:
+Now build Qt5, which will also build Qt3D as a module:
 
     cd ~/build
     mkdir qt5
@@ -39,7 +39,7 @@ Now build Qt5, which will also build QtQuick3D as a module:
         -nomake examples -declarative -opengl -svg && make -j 4
 
 
-Whats in QtQuick3D
+What's in Qt3D
 ==================
 
 Directory structure:
@@ -54,13 +54,13 @@ src/imports/
 util/
     Various utilities that are useful when working with Qt3D.
 examples/
-    Some examples of using QtQuiick3D (QML bindings) and Qt3D (C++ API).
+    Some examples of using Qt3D QML bindings and Qt3D C++ API.
 demos/
-    Some more complex demos of using QtQuiick3D (QML bindings) and Qt3D (C++ API).
+    Some more complex demos of using Qt3D QML bindings and Qt3D C++ API.
 tests/auto/qml3d/
-    Unit tests for the QtQuick3D bindings.
+    Unit tests for the QML bindings.
 tests/auto/threed/
-    Unit tests for the Qt3D C++ API
+    Unit tests for the C++ API
 doc/
     Documentation.
 devices/symbian/
@@ -77,11 +77,11 @@ into "doc/html" in the build directory.
 Packages
 ========
 
-This section is only for those developing QtQuick3D.  Read on to discover how
+This section is only for those developing Qt3D.  Read on to discover how
 the building of packages works.  This section is also important if you want to
-change how the structure of the QtQuick3D pro files work.
+change how the structure of the Qt3D pro files work.
 
-QtQuick3D is intended to be built in one of two ways:
+Qt3D is intended to be built in one of two ways:
 
 1) Normal developer way:
         qmake && make
@@ -89,15 +89,15 @@ QtQuick3D is intended to be built in one of two ways:
         qmake CONFIG+=package && INSTALL_ROOT=tmp make install
 
 In 1) the .pro files will cause the toolchain to place the libraries, plugins
-header files and other components of QtQuick3D directly into place, as part of
+header files and other components of Qt3D directly into place, as part of
 the compile process.  What does "in place" mean?  Run "qmake -query" to see
 the paths where the files are placed - QML plugins go in $$[QT_INSTALL_IMPORTS]
 for example.  In this mode, there is no need to run "make install" because the
 files are already in their target destination.  Here the "target destination"
 means the Qt which is being built against.
 
-First note that QtQuick3D has to be installed into the target Qt.  This is because
-QtQuick3D has QML plugins and resources, as well as shared libraries, all of which
+First note that Qt3D has to be installed into the target Qt.  This is because
+Qt3D has QML plugins and resources, as well as shared libraries, all of which
 must be resolved by the QMLViewer of the target Qt at runtime.  Here where "qmake"
 is referred to it means the qmake inside the target Qt.  Since QtDeclarative
 recommends using QMLViewer when developing and debugging QML Apps, in the developer
@@ -106,7 +106,7 @@ case - which is what Qt3D is for - it has to install directly into the target Qt
 In this mode 1) after the main library is compiled subsequent targets can simply
 resolve includes and link time dependencies by use of qt3d.prf and qtquick3d.prf.
 These two files are installed into the target Qt's makespecs/features directory
-during the processing of the quick3d.pro file.
+during the processing of the qt3d.pro file.
 
 In 2) the libraries, plugins and so on are sitting inside the build tree after
 the compile step.  As a result in order to resolve includes and dependencies
diff --git a/doc/src/acceptance/qt3d-acceptance.qdoc b/doc/src/acceptance/qt3d-acceptance.qdoc
index a60c6dfa3..686b66028 100644
--- a/doc/src/acceptance/qt3d-acceptance.qdoc
+++ b/doc/src/acceptance/qt3d-acceptance.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
@@ -31,7 +31,7 @@
     \keyword Acceptance
 
     As described in the \l{index.html}{Introduction} Qt3D is the C++ framework
-    that underlies QtQuick3D.
+    that underlies Qt3D.
 
     This section of the documentation contains some recommended
     acceptance tests for use when verifying that Qt3D has been
@@ -90,7 +90,7 @@
 
     A pre-requisite for the acceptance tests is that Qt and Qt3D have
     been built and installed in accordance with the
-    \l{Building QtQuick3D}{build instructions}.  In particular, Qt must
+    \l{Building Qt3D}{build instructions}.  In particular, Qt must
     be configured with OpenGL support and QGLWidget must be working.
 
     First, run all unit tests on the platform or device and verify that
@@ -188,10 +188,10 @@
     \c{QT_DEBUG_PLUGINS} environment variable to 1 to get extra
     information about why the plug-in could not be loaded.
 
-    \section1 QtQuick3D Verification
+    \section1 Qt3D Verification
 
-    Run the QtQuick3D version of the bouncing
-    \l{Teapot Example in QtQuick3D}{Teapot Example} using
+    Run the Qt3D version of the bouncing
+    \l{Teapot Example in QML}{Teapot Example} using
     "qmlviewer -opengl teapot-bounce.qml".  The teapot should have a
     shiny appearence (compared to the grey teapot above) and bounce
     up and down:
@@ -201,13 +201,13 @@
     It should be possible to rotate the teapot using the mouse
     and keyboard.
 
-    Note that when running QtQuick3D examples on a device that both the
+    Note that when running Qt3D examples on a device that both the
     QML files and the model files must be copied to the device (the model
     file is "teapot.bez" in the case of the bouncing teapot example).
 
     \section1 Object picking
 
-    Run the QtQuick3D \l{Tea Service Demo in QML}{Tea Service} demo
+    Run the Qt3D \l{Tea Service Demo in QML}{Tea Service} demo
     with "qmlviewer -opengl teaservice.qml".  Click on the teapot, teacups,
     and teaspoons to make them jump up, and click on the teapot
     spout and handle for other effects.  This example tests object
diff --git a/doc/src/classes.qdoc b/doc/src/classes.qdoc
index a81d9e5cb..7cf758183 100644
--- a/doc/src/classes.qdoc
+++ b/doc/src/classes.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/declarative_scenegraphs.qdoc b/doc/src/declarative_scenegraphs.qdoc
index 5acc21d33..9e46bed82 100644
--- a/doc/src/declarative_scenegraphs.qdoc
+++ b/doc/src/declarative_scenegraphs.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
@@ -32,7 +32,7 @@
     \title Declarative Scenegraph Creation
     \page qt3d-declarative-scenegraph.html
     \keyword Declarative Scenegraph Scene QML Quick
-    \brief Basics of scene construction in Qt Quick 3D (QML)
+    \brief Basics of scene construction in Qt3D (QML)
 
     Qt3D implements a scene-graph to make rendering more efficient in terms of
     both computation and space requirements.  Loosely defined, a scene-graph is
@@ -107,7 +107,7 @@
     optimisations reduce the amount of context switching required by OpenGL when drawing,
     and can substantially improve performance in complicated scenes.
 
-    \section1 Scene Graphs in Qt Quick 3D for Qt 4.x
+    \section1 QML 3D Scene Graphs in Qt3D for Qt 4.x
 
     While C++ allows users to manually construct and manipulate scene-graphs, Qt3D's
     extension into QtQuick does not currently allow the same degree of flexibility.
@@ -128,9 +128,9 @@
 
     These problems are addressed in Qt5.
 
-    \section1 Scene Graphs in Qt Quick 3D for Qt 5
+    \section1 QML 3D Scene Graphs in Qt3D for Qt 5
 
-    In Qt5 the Quick 3D implementation of Qt3D substantially improves this situation.  Instead
+    In Qt5 the QML implementation of Qt3D substantially improves this situation.  Instead
     of creating individual scene-graphs for each Mesh/Item3D, the user now creates a single
     holistic scenegraph for each viewport.  Addition of Item3D elements to a scene creates a
     hierarchy of scene-graph branches which are then optimised and drawn in a single call for
diff --git a/doc/src/demos/monkeygod.qdoc b/doc/src/demos/monkeygod.qdoc
index 86973fcb8..6f991b8b3 100644
--- a/doc/src/demos/monkeygod.qdoc
+++ b/doc/src/demos/monkeygod.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
@@ -29,7 +29,7 @@
     \example quick3d/monkeygod
     \title Monkey God in QML
 
-    The Monkey God demo in QML shows how QML/3D can be used to build
+    The Monkey God demo in QML shows how QML/Qt3D can be used to build
     up complex 3D scenes including materials and animations.
 
     \image monkeygod-screenshot.png
diff --git a/doc/src/demos/pageflip.qdoc b/doc/src/demos/pageflip.qdoc
index 486ab2f09..fe5aac97c 100644
--- a/doc/src/demos/pageflip.qdoc
+++ b/doc/src/demos/pageflip.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/demos/shapes.qdoc b/doc/src/demos/shapes.qdoc
index 3bba9d934..2abb9d09b 100644
--- a/doc/src/demos/shapes.qdoc
+++ b/doc/src/demos/shapes.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/demos/teaservice-qml.qdoc b/doc/src/demos/teaservice-qml.qdoc
index 77cdf0649..68a3ed80e 100644
--- a/doc/src/demos/teaservice-qml.qdoc
+++ b/doc/src/demos/teaservice-qml.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/demos/teaservice.qdoc b/doc/src/demos/teaservice.qdoc
index 2a0672275..32d2d7a7f 100644
--- a/doc/src/demos/teaservice.qdoc
+++ b/doc/src/demos/teaservice.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/examples/basket.qdoc b/doc/src/examples/basket.qdoc
index 92a429a32..474c33968 100644
--- a/doc/src/examples/basket.qdoc
+++ b/doc/src/examples/basket.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
@@ -29,9 +29,9 @@
     \example quick3d/basket
     \title Basket Example
 
-    \section2 Basket in QtQuick3D
+    \section2 Basket in QML
 
-    The QtQuick3D version of the basket example is very similar in
+    The QML version of the basket example is very similar in
     structure to the C++ version above, but much simpler.
     We start by defining a viewport with a specific camera position:
 
diff --git a/doc/src/examples/nesting.qdoc b/doc/src/examples/nesting.qdoc
index b4438bb87..c068de3a2 100644
--- a/doc/src/examples/nesting.qdoc
+++ b/doc/src/examples/nesting.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/examples/teapot-qml.qdoc b/doc/src/examples/teapot-qml.qdoc
index 5374edb7f..82bfe8aa0 100644
--- a/doc/src/examples/teapot-qml.qdoc
+++ b/doc/src/examples/teapot-qml.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
@@ -27,9 +27,9 @@
 
 /*!
     \example quick3d/teapot_qml
-    \title Teapot Example in QtQuick3D
+    \title Teapot Example in QML
 
-    This example shows to use QtQuick3D to display a teapot on
+    This example shows to use QML in Qt3D to display a teapot on
     the screen.  The QML is fairly simple:
 
     \snippet quick3d/teapot_qml/qml/teapot.qml 1
diff --git a/doc/src/examples/teapot.qdoc b/doc/src/examples/teapot.qdoc
index d85fca48e..c07221ad3 100644
--- a/doc/src/examples/teapot.qdoc
+++ b/doc/src/examples/teapot.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
@@ -31,7 +31,7 @@
 
     The Teapot example shows how Qt3D can be used to draw a simple
     teapot object with a perspective camera view in C++.  There is
-    also a \l{Teapot Example in QtQuick3D}{QtQuick3D version} of the teapot
+    also a \l{Teapot Example in QML}{QML version} of the teapot
     example.
 
     We start by defining a class that inherits from QGLView, which
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index cc208bced..d1b1bc98a 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
@@ -27,44 +27,43 @@
 
 /*!
     \page index.html
-    \title QtQuick3D Reference Documentation
-    \keyword QtQuick3D Reference Documentation
+    \title Qt3D Reference Documentation
+    \keyword Qt3D Reference Documentation
 
     \image qt3d-logo.png
 
-    QtQuick3D adds 3D content to \l{http://qt.nokia.com/qtquick/}{Qt Quick's} cross-platform ability and coding power.
+    Qt3D adds 3D content to \l{http://qt.nokia.com/qtquick/}{Qt Quick's} cross-platform ability and coding power.
     Developers of fluid user interfaces can now enhance their applications with 3D
     content in the same way icons and pixmaps would be used in a 2D application.
 
-    QtQuick3D is a product resulting from the \l{http://doc.qt.nokia.com/qt3d-snapshot}{Qt3D project}.  Qt3D is a set of powerful
+    Qt3D is a product resulting from the \l{http://doc.qt.nokia.com/qt3d-snapshot}{Qt3D project}.  Qt3D is a set of powerful
     cross-platform C++ API's for 3D programming using OpenGL.
 
-    QtQuick3D is made up of the QML bindings for Qt3D (called QML3D) plus
-    Qt Creator integration, and other supporting tools.  Qt3D may be used to
-    extend QtQuick3D by creating new user-defined QML3D items using C++.
+    Qt3D is made up of the QML bindings for Qt3D plus Qt Creator integration, and other
+    supporting tools.  Qt3D may be used to extend these QML bindings by creating new user-defined QML Qt3D items using C++.
 
-    OpenGL hardware was designed for 3D acceleration and QtQuick3D allows applications
+    OpenGL hardware was designed for 3D acceleration and Qt3D allows applications
     to utilise that 3D hardware fully.
 
-    QtQuick3D is the Qt Quick product for scripting 3D applications in QML. Apps can be
+    Qt3D's QML bindings are the Qt Quick product for scripting 3D applications in QML. Apps can be
     2D QML applications with a small amount of simple 3D content; through to complex
     3D scenes, containing 3D assets - such as complex 3D models, and shader effects.
 
-    In QtQuick3D scripts are written in QML, and rendered with the power of Qt & C++.
+    In Qt3D scripts are written in QML, and rendered with the power of Qt & the Qt3D C++ API.
 
-    Qt3D research continues and if the features you're looking for are not in QtQuick3D
+    Qt3D research continues and if the features you're looking for are not available in QML
     yet you may find them in the \l{http://doc.qt.nokia.com/qt3d-snapshot/index.html}{Qt3D research project}.
 
     Check the Qt3D research project for upcoming features like \bold{stereoscopic support},
     which will enable your programs to take advantage of special hardware that displays a different image to each eye.
-    We are readying QtQuick3D for stereo support and in some places you may see references to it,
+    We are readying QML Qt3D for stereo support and in some places you may see references to it,
     however it is \bold{not supported yet}.
 
-    QtQuick3D displays \bold{3D content} that is \bold{ready to be enhanced} by stereoscopic
-    hardware, but out-of-the-box QtQuick3D works just fine on regular non-stereo displays
+    Qt3D displays \bold{3D content} that is \bold{ready to be enhanced} by stereoscopic
+    hardware, but out-of-the-box Qt3D works just fine on regular non-stereo displays
     and does not require special glasses or displays to use it.
 
-    See the \l{Tutorials and Examples} for an introduction to using QtQuick3D and Qt3D.
+    See the \l{Tutorials and Examples} for an introduction to using Qt3D in C++ and QML.
 
     \raw HTML
         <table cellpadding="2" cellspacing="1" border="0" width="100%" class="indextable">
@@ -87,7 +86,7 @@
         <li><a href="sceneformats-obj.html">Scene format plug-ins</a></li>
         <li><a href="qt3d-contrib.html">Contributing</a></li>
         <li><a href="qt3d-acceptance.html">Acceptance tests</a></li>
-        <li><a href="qt3d-troubleshooting.html">Troubleshooting Quick3D</a></li>
+        <li><a href="qt3d-troubleshooting.html">Troubleshooting Qt3D</a></li>
         </ul>
         </td>
         <td valign="top">
@@ -107,8 +106,8 @@
         <ul>
         <li><a href="qt3d-all-classes.html">All Classes</a></li>
         <li><a href="qgl.html">QGL Namespace</a></li>
-        <li><a href="qt3d-qml3d.html">QtQuick3D Elements</a></li>
-        <li><a href="qt3d-qml3d-shapes.html">QML/3D Stock Shapes</a></li>
+        <li><a href="qt3d-qml3d.html">Qt3D Elements</a></li>
+        <li><a href="qt3d-qml3d-shapes.html">QML Qt3D Stock Shapes</a></li>
         </ul>
         </td>
         </tr>
diff --git a/doc/src/qline3d-math.qdoc b/doc/src/qline3d-math.qdoc
index beacf1b21..d40374052 100644
--- a/doc/src/qline3d-math.qdoc
+++ b/doc/src/qline3d-math.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/qt3d-all-modules.qdoc b/doc/src/qt3d-all-modules.qdoc
index bf22a1f85..3781e32d1 100644
--- a/doc/src/qt3d-all-modules.qdoc
+++ b/doc/src/qt3d-all-modules.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/qt3d-arrays.qdoc b/doc/src/qt3d-arrays.qdoc
index 387d3d039..6c961d97d 100644
--- a/doc/src/qt3d-arrays.qdoc
+++ b/doc/src/qt3d-arrays.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/qt3d-building.qdoc b/doc/src/qt3d-building.qdoc
index b38761a3c..50abf9f81 100644
--- a/doc/src/qt3d-building.qdoc
+++ b/doc/src/qt3d-building.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
@@ -27,40 +27,40 @@
 
 /*!
     \page qt3d-building.html
-    \title Building QtQuick3D
-    \keyword Building QtQuick3D
+    \title Building Qt3D
+    \keyword Building Qt3D
 
-    \section1 QtQuick3D Binary Packages
+    \section1 Qt3D Binary Packages
 
-    Do you have to build QtQuick3D?  Check if binary packages are available
+    Do you have to build Qt3D?  Check if binary packages are available
     for your platform on the \l{http://qt.nokia.com/downloads}{Qt downloads page}.
 
     This page gives guidelines on how to build Qt3D either from a source package
     or from a repository snapshot.
 
-    \section1 Obtaining QtQuick3D sources
+    \section1 Obtaining Qt3D sources
 
-    If you want to work with the latest bleeding edge QtQuick3D features, or if
-    you would like to modify or contribute to QtQuick3D you can build it from
+    If you want to work with the latest bleeding edge Qt3D features, or if
+    you would like to modify or contribute to Qt3D you can build it from
     our source repository.
 
-    The source for QtQuick3D is hosted on Gitorious as the git repository
-    \l{http://qt.gitorious.org/qt-quick3d/qt-quick3d}{\c{qt-quick3d/qt-quick3d.git}}.
+    The source for Qt3D is hosted on Gitorious as the git repository
+    \l{http://qt.gitorious.org/qt/qt-quick3d}{\c{qt/qt-quick3d.git}}.
     It can be cloned as follows:
 
     \code
     $ mkdir -p $HOME/depot/qt
     $ cd $HOME/depot/qt
-    $ git clone git://gitorious.org/qt-quick3d/qt-quick3d.git
+    $ git clone git://gitorious.org/qt/qt3d.git
     \endcode
 
-    More stable versions of the QtQuick3D source code is available as source
+    More stable versions of the Qt3D source code is available as source
     packages from \l{ftp://ftp.qt.nokia.com/qt3d/noarch}{Qt3D downloads page}.
     Just unzip or untar it into your \c{depot} directory.
 
-    \section1 Building QtQuick3D
+    \section1 Building Qt3D
 
-    QtQuick3D requires Qt 4.7.  The QtSDK currently ships with Qt 4.7 so if
+    Qt3D requires Qt 4.7.  The QtSDK currently ships with Qt 4.7 so if
     you're using the SDK you should be fine.  Alternatively you can build
     against a Qt that you have compiled from source.  Just make sure that
     when you build Qt, that you use the -developer-build option, and do not
@@ -75,13 +75,13 @@
          -no-phonon -opengl -declarative -nomake demos -nomake examples
     make
     \endcode
-    ...this line turns off many features that aren't needed for QtQuick3D, and
+    ...this line turns off many features that aren't needed for Qt3D, and
     it also explicitly asks for declarative and opengl (even though those are
     on by default) so that an error will be generated if OpenGL is not available.
 
-    \section1 Building QtQuick3D Using QtCreator / QtSDK
+    \section1 Building Qt3D Using QtCreator / QtSDK
 
-    Here is a step-by-step guide to building QtQuick3D using the
+    Here is a step-by-step guide to building Qt3D using the
     \l{http://qt.nokia.com/products/appdev/developer-tools/developer-tools}{QtCreator IDE}.
     QtCreator is the development environment for the QtSDK.  Here we're using
     version 2.0 on Mac OSX, but other operating systems and versions should
@@ -95,10 +95,10 @@
 
     \image build-qt3d-qtcreator-1.png
 
-    \bold{Step 1} - Open the QtQuick3D project.
+    \bold{Step 1} - Open the Qt3D project.
 
-    Choose \c{Open} from the \c{File} menu and navigate to the quick3d.pro project
-    file \c {$HOME/depot/qt/quick3d/quick3d.pro}.  Click \c{Open}.
+    Choose \c{Open} from the \c{File} menu and navigate to the qt3d.pro project
+    file \c {$HOME/depot/qt/qt3d/qt3d.pro}.  Click \c{Open}.
 
     \image build-qt3d-qtcreator-2.png
 
@@ -135,7 +135,7 @@
 
     \image build-qt3d-qtcreator-5.png
 
-    Click the projects tab at the left to display the QtQuick3D target's \c{Build Settings}
+    Click the projects tab at the left to display the Qt3D target's \c{Build Settings}
     pane.  Here you can specify a Shadow Build directory.  It is always a good idea to
     build in a shadow directory, instead of inside the source tree.
 
@@ -169,7 +169,7 @@
 
     Ok, \bold{now} hit the build button.
 
-    \bold{Step 4} - Build QtQuick3D and run a test App.
+    \bold{Step 4} - Build Qt3D and run a test App.
 
     Qt3D will go ahead and compile all its libraries, plugins and QML imports.
 
@@ -212,12 +212,12 @@
     \section1 Building from the Command Line
 
     On Linux assuming that you have built Qt 4.7 in
-    \c{$HOME/build/qt/4.7}, you would configure and build QtQuick3D as follows:
+    \c{$HOME/build/qt/4.7}, you would configure and build Qt3D as follows:
 
     \code
-    $ mkdir -p $HOME/build/qt/quick3d
-    $ cd $HOME/build/qt/quick3d
-    $ $HOME/build/qt/4.7/bin/qmake $HOME/depot/qt/quick3d/quick3d.pro
+    $ mkdir -p $HOME/build/qt/qt3d
+    $ cd $HOME/build/qt/qt3d
+    $ $HOME/build/qt/4.7/bin/qmake $HOME/depot/qt/qt3d/qt3d.pro
     $ make -j 4
     $ bin/moon
     \endcode
@@ -230,9 +230,9 @@
     On Windows (with Visual Studio) those commands look like this:
 
     \code
-    mkdir \build\qt\quick3d
-    cd \build\qt\quick3d
-    qmake \depot\qt\quick3d\quick3d.pro
+    mkdir \build\qt\qt3d
+    cd \build\qt\qt3d
+    qmake \depot\qt\qt3d\qt3d.pro
     nmake
     bin\moon
     \endcode
@@ -244,16 +244,16 @@
     On Symbian (with RVCT) those commands look like this:
 
     \code
-    mkdir C:\depot\qt\quick3d
-    cd C:\depot\qt\quick3d
+    mkdir C:\depot\qt\qt3d
+    cd C:\depot\qt\qt3d
     qmake CONFIG+=old_importer
     sbs -c armv5_urel
     cd devices\symbian
-    createpackage QtQuick3D_template.pkg release-armv5
+    createpackage Qt3D_template.pkg release-armv5
     runonphone --sis QtQuick3D.sis
     \endcode
 
-    Once you have built QtQuick3D, you can run the "teapot" example:
+    Once you have built Qt3D, you can run the "teapot" example:
 
     \code
     $ cd $HOME/build/qt/quick3d
@@ -265,11 +265,11 @@
 
     \image teapot-screenshot.png
 
-    QtQuick3D has been tested with Qt/X11 and Qt/Embedded under Linux, on MacOSX
+    Qt3D has been tested with Qt/X11 and Qt/Embedded under Linux, on MacOSX
     and Windows XP.  It also runs on Symbian^3 and MeeGo/Maemo.
 
     Patches for other platforms are welcome.
 
-    \l{index.html}{Return to the main QtQuick3D page} or
+    \l{index.html}{Return to the main Qt3D page} or
     \l{qt3d-examples.html}{Continue to the Tutorials and Examples}.
 */
diff --git a/doc/src/qt3d-contrib.qdoc b/doc/src/qt3d-contrib.qdoc
index 97a878d2c..39d2309bf 100644
--- a/doc/src/qt3d-contrib.qdoc
+++ b/doc/src/qt3d-contrib.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
@@ -27,14 +27,14 @@
 
 /*!
     \page qt3d-contrib.html
-    \title Contributing to QtQuick3D and Qt3D
+    \title Contributing to Qt3D
     \keyword Contributing to Qt3D
 
-    QtQuick3D and Qt3D are developed primarily in the Brisbane office of Qt
+    Qt3D is developed primarily in the Brisbane office of Qt
     Development Frameworks, but anyone is welcome to join the effort with
     patches, new examples, and major feature development.
 
-    Qt3D research may be a better place to contribute as the QtQuick3D has a strong
+    Qt3D research may be a better place to contribute as the main repository has a strong
     product focus.  Check the Qt3D \l{http://doc.qt.nokia.com/qt3d-snapshot/qt3d-contrib.html}{contributions page}.
 
     Jump on the IRC channel at #qt-3d on irc.freenode.net, or join our qt3d
@@ -43,12 +43,12 @@
     All contributions need to conform with the
     \l{http://qt.gitorious.org/qt/pages/QtContributionGuidelines}{Qt Contribution Model Guidelines}.
 
-    The source for QtQuick3D is hosted on Gitorious at
+    The source for the main repository of Qt3D is hosted on Gitorious at
     \l{http://qt.gitorious.org/qt-labs/quick3d}.
 
     Bugs can be reported against the "Qt3D" component of the "Qt" project
     at \l{http://bugreports.qt.nokia.com/}.
 
 
-    \l{index.html}{Return to the main QtQuick3D page}.
+    \l{index.html}{Return to the main Qt3D page}.
 */
diff --git a/doc/src/qt3d-examples.qdoc b/doc/src/qt3d-examples.qdoc
index 01c8c758b..f9a89818e 100644
--- a/doc/src/qt3d-examples.qdoc
+++ b/doc/src/qt3d-examples.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
@@ -30,22 +30,22 @@
     \title Tutorials and Examples
     \keyword Tutorials and Examples
 
-    Building 3D applications in QML with QtQuick3D:
+    Building 3D applications in QML with Qt3D:
 
     \list
-    \o \l{Teapot Example in QtQuick3D}{Hello Teapot} in QtQuick3D
-    \o \l{quick3d/basket#Basket in QtQuick3D}{Basket} in QtQuick3D
-    \o \l{Object Effects}{Cube} in QtQuick3D
-    \o \l{Monkey God in QML}{Monkey God} in QtQuick3D
-    \o \l{Tea Service Demo in QML}{Tea Service} in QtQuick3D
-    \o \l{Using GLSL shaders in QtQuick3D}
+    \o \l{Teapot Example in QML}{Hello Teapot} in Qt3D
+    \o \l{qt3d/basket#Basket in QML}{Basket} in Qt3D
+    \o \l{Object Effects}{Cube} in Qt3D
+    \o \l{Monkey God in QML}{Monkey God} in Qt3D
+    \o \l{Tea Service Demo in QML}{Tea Service} in Qt3D
+    \o \l{Using GLSL shaders in QML}
     \endlist
 
-    Using C++ to extend QtQuick3D and to build applications with Qt3D:
+    Using C++ to extend QML Qt3D and to build applications with Qt3D:
 
     \list
     \o \l{Teapot Example}{Hello Teapot} - drawing a basic object in 3D.
-    \o \l{Object Effects#Cube in Qt3D}{Cube in C++} - applying transformations and materials to objects.
+    \o \l{Object Effects#Cube in QML}{Cube in C++} - applying transformations and materials to objects.
     \o \l{qt3d/nesting}{Nesting} - drawing into framebuffer objects.
     \o \l{Loading a 3DS model with Qt3D}{Penguin} - loading a 3DS model with Qt3D.
     \o \l{qt3d/pageflip}{Page Flip} - using shaders to combine textures.
diff --git a/doc/src/qt3d-geometry.qdoc b/doc/src/qt3d-geometry.qdoc
index 9ab6e7c45..4fe9d23e6 100644
--- a/doc/src/qt3d-geometry.qdoc
+++ b/doc/src/qt3d-geometry.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/qt3d-graphicsview.qdoc b/doc/src/qt3d-graphicsview.qdoc
index 3391ace5a..073138a7c 100644
--- a/doc/src/qt3d-graphicsview.qdoc
+++ b/doc/src/qt3d-graphicsview.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/qt3d-materials.qdoc b/doc/src/qt3d-materials.qdoc
index 38909cfcc..8e814e806 100644
--- a/doc/src/qt3d-materials.qdoc
+++ b/doc/src/qt3d-materials.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/qt3d-math.qdoc b/doc/src/qt3d-math.qdoc
index 5b6634050..45a9e6843 100644
--- a/doc/src/qt3d-math.qdoc
+++ b/doc/src/qt3d-math.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/qt3d-painting.qdoc b/doc/src/qt3d-painting.qdoc
index b94e03d52..05790a2b7 100644
--- a/doc/src/qt3d-painting.qdoc
+++ b/doc/src/qt3d-painting.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/qt3d-qml3d.qdoc b/doc/src/qt3d-qml3d.qdoc
index e6a7c8123..372178e6f 100644
--- a/doc/src/qt3d-qml3d.qdoc
+++ b/doc/src/qt3d-qml3d.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
@@ -27,24 +27,24 @@
 
 /*!
 \group qt3d::qml3d
-\title QtQuick3D for Scripting 3D Apps in QML
-\keyword QtQuick3D QML
+\title Qt3D for Scripting 3D Apps in QML
+\keyword Qt3D QML
 
 The following QML elements are provided by the \c{Qt3D} namespace
 for importing 3D elements into QML applications:
 
 \generatelist{related}
 
-See the \l{Teapot Example in QtQuick3D}{Teapot} example for an introduction
+See the \l{Teapot Example in QML Qt3D}{Teapot} example for an introduction
 to using these elements.
 
-QtQuick3D also provides some \l{Stock Shapes for QtQuick3D}{stock shapes}
+Qt3D also provides some \l{Stock Shapes for QML}{stock shapes}
 in the \c{Qt3D.Shapes} namespace as convenience elements.
 */
 
 /*!
 \group qt3d::qml3d::shapes
-\title Stock Shapes for QtQuick3D
+\title Stock Shapes for QML
 
 The following QML elements are provided by the \c{Qt3D.Shapes} namespace
 as convenience elements:
diff --git a/doc/src/qt3d-scene.qdoc b/doc/src/qt3d-scene.qdoc
index c7b137b36..ef9d9a3cf 100644
--- a/doc/src/qt3d-scene.qdoc
+++ b/doc/src/qt3d-scene.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/qt3d-textures.qdoc b/doc/src/qt3d-textures.qdoc
index fefa59467..3dfde2bec 100644
--- a/doc/src/qt3d-textures.qdoc
+++ b/doc/src/qt3d-textures.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/qt3d-troubleshooting.qdoc b/doc/src/qt3d-troubleshooting.qdoc
index 9fc2cb221..ff6874b46 100644
--- a/doc/src/qt3d-troubleshooting.qdoc
+++ b/doc/src/qt3d-troubleshooting.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
@@ -27,10 +27,10 @@
 
 /*!
     \page qt3d-troubleshooting.html
-    \title QtQuick3D Troubleshooting Guide
-    \keyword Building QML QtQuick3D
+    \title Qt3D Troubleshooting Guide
+    \keyword Building QML Qt3D
 
-    Quick3D has been developed with the intention of supporting a variety
+    Qt3D has been developed with the intention of supporting a variety
     of platforms and systems, and in doing so leverages the plugin and
     import architecture used by Qt.
 
@@ -38,7 +38,7 @@
     the Qt plugin architecture, however, which can cause runtime problems to
     occasionally arise.
 
-    \section1 Common Quick3D Problems
+    \section1 Common Qt3D Problems
 
     \section2 PROBLEM 1: I Can't See Warnings from my QML/3D Application
 
@@ -71,7 +71,7 @@
 
     \section2 PROBLEM 2: Qt3D Plugin File Not Found
 
-    By far the most prevalant problems encountered by Quick3D newcomers are
+    By far the most prevalant problems encountered by Qt3D newcomers are
     those relating to inability for an application to find the correct plugins
     at runtime.
 
@@ -141,11 +141,11 @@
 
     \section2 PROBLEM 7: Case mis-match on loading QML plugins
 
-    You get a blank screen when the Qt Quick 3D application runs.  The debug output
+    You get a blank screen when the Qt3D application runs.  The debug output
     (see Problem 1 above) reveals a message similar to
     \code
-    Starting C:\Qt\4.7.3\bin\qmlviewer.exe -I C:/Qt/4.7.3/imports C:/Qt/4.7.3/quick3d/bin/resources/examples/basket_qml/qml/basket.qml
-    C:/Qt/4.7.3/quick3d/bin/resources/examples/basket_qml/qml/basket.qml: File name case mismatch
+    Starting C:\Qt\4.7.3\bin\qmlviewer.exe -I C:/Qt/4.7.3/imports C:/Qt/4.7.3/qt3d/bin/resources/examples/basket_qml/qml/basket.qml
+    C:/Qt/4.7.3/qt3d/bin/resources/examples/basket_qml/qml/basket.qml: File name case mismatch
     \endcode
 
     This issue can occur when a custom install directory for Qt is used, which does not
@@ -164,22 +164,22 @@
 
     \section1 Resolution Actions
 
-    \section2 ACTION 1: Ensure that Quick3D is Building Correctly
+    \section2 ACTION 1: Ensure that Qt3D is Building Correctly
 
     As obvious as this sounds, it is sometimes the case that a problem is
-    caused simply by one of the runtime libraries or plugins for Quick3D
+    caused simply by one of the runtime libraries or plugins for Qt3D
     failing to build, even while the user's application itself builds without
     error.
 
-    Ensure that all of the components of Quick3D have built without error
+    Ensure that all of the components of Qt3D have built without error
     before attempting further resolution actions.
 
     \section2 ACTION 2: Ensure Import Files Are Correctly Located
 
-    Ensure that the Quick3D import libraries are in the directory specified by
+    Ensure that the Qt3D import libraries are in the directory specified by
     the QtQuick import path.
 
-    The core Quick3D import directory is: \c{imports\Qt3D} in the directory
+    The core Qt3D import directory is: \c{imports\Qt3D} in the directory
     where Qt is installed.
 
     This directory should contain the files as shown in the following diagram:
@@ -190,14 +190,14 @@
     \c{C:\Qt\4.7.3}.
 
     If these files are not in the correct locations copy them manually into the
-    specified locations and retry your Quick3D application before moving on to
+    specified locations and retry your Qt3D application before moving on to
     other fixes.  The dll's should have been built as part of your build process
     and the other files are shipped in the source tree, and can be simply copied
     over if somehow the build process has failed to do this.
 
     \section2 ACTION 3: Ensure Qt3D Libraries Are Correctly Located
 
-    Ensure that the Quick3D libraries can be found by the application.  The
+    Ensure that the Qt3D libraries can be found by the application.  The
     files that should be found are:
 
     \list
@@ -223,10 +223,10 @@
 
     \section2 ACTION 4: Ensure Additional Plugin Libraries Are Correctly Located
 
-    Ensure that the Quick3D plugin libraries are in the directory specified by
+    Ensure that the Qt3D plugin libraries are in the directory specified by
     the QtQuick plugins path.
 
-    The Quick3D scene format plugins (which are responsible for loading model files)
+    The Qt3D scene format plugins (which are responsible for loading model files)
     should be found in:
 
     \code
@@ -240,7 +240,7 @@
     \o qscenebezier4.dll
     \endlist
 
-    Additional Quick3D image format plugins (which are responsible for loading some
+    Additional Qt3D image format plugins (which are responsible for loading some
     image files) should be found in:
 
     \code
@@ -254,25 +254,25 @@
     \endlist
 
     If these files are not in the correct locations copy them manually into the
-    specified locations and retry your Quick3D application before moving on to
+    specified locations and retry your Qt3D application before moving on to
     other fixes.
 
     \section2 ACTION 5: Check Your Build Configuration
 
-    It is possible that Quick3D libraries which have been built against a given
+    It is possible that Qt3D libraries which have been built against a given
     set of Qt libraries have problems when used with another build of Qt.
 
     This may be resolved by trying each of the following:
 
     \list
-    \o Ensure that the Qt and Quick3D libraries use the same toolchain/compiler.
-    \o Ensure that the Qt Configuration used to build Quick3D matches that used in
+    \o Ensure that the Qt and Qt3D libraries use the same toolchain/compiler.
+    \o Ensure that the Qt Configuration used to build Qt3D matches that used in
         your runtime Qt libraries.
-    \o Ensure that the Qt used to build Quick3D and the Qt runtimes are both either
+    \o Ensure that the Qt used to build Qt3D and the Qt runtimes are both either
         Debug or Release, not a mixture of both.
     \endlist
 
-    After making this change, retry your Quick3D application before implementing
+    After making this change, retry your Qt3D application before implementing
     other troubleshooting tips.
 
     \section2 ACTION 6: Clear the Plugin Cache
@@ -281,7 +281,7 @@
     cache is stored through QSettings, and so is platform independent.
 
     It is possible that obselete plugin data for an older version of your Qt3D
-    plugins could be causing your Quick3D applications to fail.
+    plugins could be causing your Qt3D applications to fail.
 
     On Windows the entries in the plugin cache are stored in the registry, and
     typically begin with one of the following strings:
@@ -291,5 +291,5 @@
     HKEY_CURRENT_USER\Software\Trolltech\OrganizationDefaults\Qt Plugin Cache 4.2.false
     \endcode
 
-    Delete these entries and retry your Quick3D application.
+    Delete these entries and retry your Qt3D application.
 */
diff --git a/doc/src/qt3d-viewing.qdoc b/doc/src/qt3d-viewing.qdoc
index c682c363a..5cd3e1c8a 100644
--- a/doc/src/qt3d-viewing.qdoc
+++ b/doc/src/qt3d-viewing.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/tutorials/penguin.qdoc b/doc/src/tutorials/penguin.qdoc
index e973090d5..546abaef0 100644
--- a/doc/src/tutorials/penguin.qdoc
+++ b/doc/src/tutorials/penguin.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/tutorials/sceneformat.qdoc b/doc/src/tutorials/sceneformat.qdoc
index 3774b6a11..ac8754ab7 100644
--- a/doc/src/tutorials/sceneformat.qdoc
+++ b/doc/src/tutorials/sceneformat.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
diff --git a/doc/src/tutorials/shaders.qdoc b/doc/src/tutorials/shaders.qdoc
index dc20099b5..b6aa8ec6c 100644
--- a/doc/src/tutorials/shaders.qdoc
+++ b/doc/src/tutorials/shaders.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
@@ -26,12 +26,12 @@
 ****************************************************************************/
 
 /*!
-    \title Using GLSL shaders in QtQuick3D
+    \title Using GLSL shaders in QML
     \example quick3d/shaders
 
 
     In this tutorial, we will show how to apply QML property animations to
-    GLSL shaders in a QtQuick3D application.
+    GLSL shaders in a 3D application.
 
     Starting with a relatively simple shader program, we are going to
     manipulate various parameters to explain how both the shader and the QML
@@ -52,7 +52,7 @@
         </table>
     \endraw
 
-    At the highest level, shaders in QtQuick3D are created using the ShaderProgram
+    At the highest level, shaders in Qt3D are created using the ShaderProgram
     element.  The ShaderProgram element in this example has the id \a program,
     and applying it to the teapot is as simple as assigning it to the \c effect
     property of an Item3D derived element.
diff --git a/doc/src/tutorials/simpleobject.qdoc b/doc/src/tutorials/simpleobject.qdoc
index db6c3be31..0e560b5b2 100644
--- a/doc/src/tutorials/simpleobject.qdoc
+++ b/doc/src/tutorials/simpleobject.qdoc
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D documentation of the Qt Toolkit.
+** This file is part of the Qt3D documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
 ** GNU Free Documentation License
@@ -34,15 +34,15 @@
     simple cube object to demonstrate how to modify the QGLPainter
     state to achieve different effects.
 
-    \section2 Cube in QtQuick3D
+    \section2 Cube in QML
 
-    It is quite simple to achieve these effects in QtQuick3D:
+    It is quite simple to achieve these effects in Qt3D:
 
     \snippet quick3d/cube/qml/cube.qml 1
 
-    \section2 Cube in Qt3D
+    \section2 Cube in C++
 
-    In the C++ world we start by declaring a view class to show our cube
+    In the C++ side of Qt3D we start by declaring a view class to show our cube
     on the screen:
 
     \snippet qt3d/cube1/cubeview.h 1
diff --git a/examples/quick3d/monkeygod/mt.qml b/examples/quick3d/monkeygod/mt.qml
index 5abd65946..33f22ecd3 100644
--- a/examples/quick3d/monkeygod/mt.qml
+++ b/examples/quick3d/monkeygod/mt.qml
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D examples of the Qt Toolkit.
+** This file is part of the Qt3D examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/src/threed/painting/qglext_p.h b/src/threed/painting/qglext_p.h
index bcad67fdc..06c6d030a 100644
--- a/src/threed/painting/qglext_p.h
+++ b/src/threed/painting/qglext_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D module of the Qt Toolkit.
+** This file is part of the Qt3D module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/src/threed/textures/qgltextureutils_p.h b/src/threed/textures/qgltextureutils_p.h
index 65a430e55..7223744a8 100644
--- a/src/threed/textures/qgltextureutils_p.h
+++ b/src/threed/textures/qgltextureutils_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtQuick3D module of the Qt Toolkit.
+** This file is part of the Qt3D module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/tutorials/tutorials.pro b/tutorials/tutorials.pro
index 7855f3f1b..fcf1286ff 100644
--- a/tutorials/tutorials.pro
+++ b/tutorials/tutorials.pro
@@ -5,5 +5,5 @@ SUBDIRS += qt3d quick3d
 # and therefore it is not packaged for installation along with demos and
 # examples, by default.
 
-# To install these apps as part of learning Qt Quick 3D simply follow the
+# To install these apps as part of learning Qt3D simply follow the
 # technique used in the examples directories.
diff --git a/util/qt3d/qglinfo/qglinfo.cpp b/util/qt3d/qglinfo/qglinfo.cpp
index 5e67d5ed7..ed59cf010 100644
--- a/util/qt3d/qglinfo/qglinfo.cpp
+++ b/util/qt3d/qglinfo/qglinfo.cpp
@@ -92,9 +92,9 @@ void QGLInfo::initialize()
         QSettings freshStart;
         if (!freshStart.contains(QLatin1String("new_install")))
         {
-            welcome = QLatin1String("<h1>Welcome to QtQuick 3D!</h1>"
+            welcome = QLatin1String("<h1>Welcome to Qt3D!</h1>"
                                     "<p>Try running the FPS test from the "
-                                    "View menu above to confirm that Qt3Quick 3D "
+                                    "View menu above to confirm that Qt3D "
                                     "is installed correctly.</p><hr>");
         }
         freshStart.setValue(QLatin1String("new_install"), true);