88 files changed, 347 insertions, 347 deletions
diff --git a/src/declarative/extra/extra.pri b/src/declarative/extra/extra.pri
index 5e5e74e..47cc8f8 100644
--- a/src/declarative/extra/extra.pri
+++ b/src/declarative/extra/extra.pri
@@ -2,9 +2,9 @@ SOURCES += \
            extra/qnumberformat.cpp \
            extra/qmlnumberformatter.cpp \
            extra/qmldatetimeformatter.cpp \
-           extra/qfxintegermodel.cpp \
-           extra/qfxanimatedimageitem.cpp \
-           extra/qfxparticles.cpp \
+           extra/qmlgraphicsintegermodel.cpp \
+           extra/qmlgraphicsanimatedimageitem.cpp \
+           extra/qmlgraphicsparticles.cpp \
            extra/qmlbehavior.cpp \
            extra/qmlfontloader.cpp
 
@@ -12,10 +12,10 @@ HEADERS += \
            extra/qnumberformat.h \
            extra/qmlnumberformatter.h \
            extra/qmldatetimeformatter.h \
-           extra/qfxintegermodel.h \
-           extra/qfxanimatedimageitem.h \
-           extra/qfxanimatedimageitem_p.h \
-           extra/qfxparticles.h \
+           extra/qmlgraphicsintegermodel.h \
+           extra/qmlgraphicsanimatedimageitem.h \
+           extra/qmlgraphicsanimatedimageitem_p.h \
+           extra/qmlgraphicsparticles.h \
            extra/qmlbehavior.h \
            extra/qmlfontloader.h
 
diff --git a/src/declarative/extra/qfxanimatedimageitem.cpp b/src/declarative/extra/qmlgraphicsanimatedimageitem.cpp
index 8a6046e..c22e56d 100644
--- a/src/declarative/extra/qfxanimatedimageitem.cpp
+++ b/src/declarative/extra/qmlgraphicsanimatedimageitem.cpp
@@ -42,8 +42,8 @@
 #include <QMovie>
 #include <QtDeclarative/qmlcontext.h>
 #include <QtDeclarative/qmlengine.h>
-#include "qfxanimatedimageitem.h"
-#include "qfxanimatedimageitem_p.h"
+#include "qmlgraphicsanimatedimageitem.h"
+#include "qmlgraphicsanimatedimageitem_p.h"
 #include <QNetworkRequest>
 #include <QNetworkReply>
 
diff --git a/src/declarative/extra/qfxanimatedimageitem.h b/src/declarative/extra/qmlgraphicsanimatedimageitem.h
index 782f920..c62a98e 100644
--- a/src/declarative/extra/qfxanimatedimageitem.h
+++ b/src/declarative/extra/qmlgraphicsanimatedimageitem.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QFXANIMATEDIMAGEITEM_H
-#define QFXANIMATEDIMAGEITEM_H
+#ifndef QMLGRAPHICSANIMATEDIMAGEITEM_H
+#define QMLGRAPHICSANIMATEDIMAGEITEM_H
 
-#include <QtDeclarative/qfximage.h>
+#include <QtDeclarative/qmlgraphicsimage.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/extra/qfxanimatedimageitem_p.h b/src/declarative/extra/qmlgraphicsanimatedimageitem_p.h
index e61c488..04f1b6e 100644
--- a/src/declarative/extra/qfxanimatedimageitem_p.h
+++ b/src/declarative/extra/qmlgraphicsanimatedimageitem_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXANIMATEDIMAGE_P_H
-#define QFXANIMATEDIMAGE_P_H
+#ifndef QMLGRAPHICSANIMATEDIMAGE_P_H
+#define QMLGRAPHICSANIMATEDIMAGE_P_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <private/qfximage_p.h>
+#include <private/qmlgraphicsimage_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -78,4 +78,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QFXANIMATEDIMAGE_P_H
+#endif // QMLGRAPHICSANIMATEDIMAGE_P_H
diff --git a/src/declarative/extra/qfxintegermodel.cpp b/src/declarative/extra/qmlgraphicsintegermodel.cpp
index 496cd3e..e83b9c9 100644
--- a/src/declarative/extra/qfxintegermodel.cpp
+++ b/src/declarative/extra/qmlgraphicsintegermodel.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qfxintegermodel.h"
+#include "qmlgraphicsintegermodel.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/extra/qfxintegermodel.h b/src/declarative/extra/qmlgraphicsintegermodel.h
index cf69bdc..3cad05e 100644
--- a/src/declarative/extra/qfxintegermodel.h
+++ b/src/declarative/extra/qmlgraphicsintegermodel.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXINTMODEL_H
-#define QFXINTMODEL_H
+#ifndef QMLGRAPHICSINTMODEL_H
+#define QMLGRAPHICSINTMODEL_H
 
 #include <QtCore/QObject>
 #include <QtDeclarative/qml.h>
diff --git a/src/declarative/extra/qfxparticles.cpp b/src/declarative/extra/qmlgraphicsparticles.cpp
index 0bb4826..dba3ac4 100644
--- a/src/declarative/extra/qfxparticles.cpp
+++ b/src/declarative/extra/qmlgraphicsparticles.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "private/qfxitem_p.h"
+#include "private/qmlgraphicsitem_p.h"
 
 #include <stdlib.h>
 #include <math.h>
@@ -50,12 +50,12 @@
 #ifndef INT_MAX
 #define INT_MAX 2147483647
 #endif
-#include <qfxpixmapcache.h>
+#include <qmlgraphicspixmapcache.h>
 #include <private/qfxperf_p.h>
 #include <private/qmlanimation_p.h>
 #include <QNetworkReply>
 
-#include "qfxparticles.h"
+#include "qmlgraphicsparticles.h"
 #include <QPainter>
 #include <QtGui/qdrawutil.h>
 #include <QVarLengthArray>
diff --git a/src/declarative/extra/qfxparticles.h b/src/declarative/extra/qmlgraphicsparticles.h
index 5e5a581..eed0d62 100644
--- a/src/declarative/extra/qfxparticles.h
+++ b/src/declarative/extra/qmlgraphicsparticles.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QFXPARTICLES_H
-#define QFXPARTICLES_H
+#ifndef QMLGRAPHICSPARTICLES_H
+#define QMLGRAPHICSPARTICLES_H
 
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/fx/fx.pri b/src/declarative/fx/fx.pri
index fc4e640..7759ab1 100644
--- a/src/declarative/fx/fx.pri
+++ b/src/declarative/fx/fx.pri
@@ -1,84 +1,84 @@
 HEADERS += \
-           fx/qfxanchors.h \
-           fx/qfxanchors_p.h \
-           fx/qfxevents_p.h \
-           fx/qfxflickable.h \
-           fx/qfxflickable_p.h \
-           fx/qfxflipable.h \
-           fx/qfxgridview.h \
-           fx/qfximage.h \
-           fx/qfximagebase.h \
-           fx/qfxborderimage.h \
-           fx/qfxpainteditem.h \
-           fx/qfxpainteditem_p.h \
-           fx/qfximage_p.h \
-           fx/qfxborderimage_p.h \
-           fx/qfximagebase_p.h \
-           fx/qfxitem.h \
-           fx/qfxitem_p.h \
-           fx/qfxfocuspanel.h \
-           fx/qfxfocusscope.h \
-           fx/qfxpositioners.h \
-           fx/qfxpositioners_p.h \
-           fx/qfxloader.h \
-           fx/qfxloader_p.h \
-           fx/qfxmouseregion.h \
-           fx/qfxmouseregion_p.h \
-           fx/qfxpath.h \
-           fx/qfxpath_p.h \
-           fx/qfxpathview.h \
-           fx/qfxpathview_p.h \
-           fx/qfxrect.h \
-           fx/qfxrect_p.h \
-           fx/qfxrepeater.h \
-           fx/qfxrepeater_p.h \
-           fx/qfxscalegrid_p.h \
-           fx/qfxtextinput.h \
-           fx/qfxtextinput_p.h \
-           fx/qfxtextedit.h \
-           fx/qfxtextedit_p.h \
-           fx/qfxtext.h \
-           fx/qfxtext_p.h \
-           fx/qfxpixmapcache.h \
-           fx/qfxvisualitemmodel.h \
-           fx/qfxlistview.h \
-           fx/qfxgraphicsobjectcontainer.h \
-           fx/qfxlayoutitem.h \
-           fx/qfxeffects.cpp
+           fx/qmlgraphicsanchors.h \
+           fx/qmlgraphicsanchors_p.h \
+           fx/qmlgraphicsevents_p.h \
+           fx/qmlgraphicsflickable.h \
+           fx/qmlgraphicsflickable_p.h \
+           fx/qmlgraphicsflipable.h \
+           fx/qmlgraphicsgridview.h \
+           fx/qmlgraphicsimage.h \
+           fx/qmlgraphicsimagebase.h \
+           fx/qmlgraphicsborderimage.h \
+           fx/qmlgraphicspainteditem.h \
+           fx/qmlgraphicspainteditem_p.h \
+           fx/qmlgraphicsimage_p.h \
+           fx/qmlgraphicsborderimage_p.h \
+           fx/qmlgraphicsimagebase_p.h \
+           fx/qmlgraphicsitem.h \
+           fx/qmlgraphicsitem_p.h \
+           fx/qmlgraphicsfocuspanel.h \
+           fx/qmlgraphicsfocusscope.h \
+           fx/qmlgraphicspositioners.h \
+           fx/qmlgraphicspositioners_p.h \
+           fx/qmlgraphicsloader.h \
+           fx/qmlgraphicsloader_p.h \
+           fx/qmlgraphicsmouseregion.h \
+           fx/qmlgraphicsmouseregion_p.h \
+           fx/qmlgraphicspath.h \
+           fx/qmlgraphicspath_p.h \
+           fx/qmlgraphicspathview.h \
+           fx/qmlgraphicspathview_p.h \
+           fx/qmlgraphicsrect.h \
+           fx/qmlgraphicsrect_p.h \
+           fx/qmlgraphicsrepeater.h \
+           fx/qmlgraphicsrepeater_p.h \
+           fx/qmlgraphicsscalegrid_p.h \
+           fx/qmlgraphicstextinput.h \
+           fx/qmlgraphicstextinput_p.h \
+           fx/qmlgraphicstextedit.h \
+           fx/qmlgraphicstextedit_p.h \
+           fx/qmlgraphicstext.h \
+           fx/qmlgraphicstext_p.h \
+           fx/qmlgraphicspixmapcache.h \
+           fx/qmlgraphicsvisualitemmodel.h \
+           fx/qmlgraphicslistview.h \
+           fx/qmlgraphicsgraphicsobjectcontainer.h \
+           fx/qmlgraphicslayoutitem.h \
+           fx/qmlgraphicseffects.cpp
 
 SOURCES += \
-           fx/qfxanchors.cpp \
-           fx/qfxevents.cpp \
-           fx/qfxflickable.cpp \
-           fx/qfxflipable.cpp \
-           fx/qfxgridview.cpp \
-           fx/qfximage.cpp \
-           fx/qfxborderimage.cpp \
-           fx/qfximagebase.cpp \
-           fx/qfxpainteditem.cpp \
-           fx/qfxitem.cpp \
-           fx/qfxfocuspanel.cpp \
-           fx/qfxfocusscope.cpp \
-           fx/qfxpositioners.cpp \
-           fx/qfxloader.cpp \
-           fx/qfxmouseregion.cpp \
-           fx/qfxpath.cpp \
-           fx/qfxpathview.cpp \
-           fx/qfxrect.cpp \
-           fx/qfxrepeater.cpp \
-           fx/qfxscalegrid.cpp \
-           fx/qfxtextinput.cpp \
-           fx/qfxtext.cpp \
-           fx/qfxtextedit.cpp \
-           fx/qfxpixmapcache.cpp \
-           fx/qfxvisualitemmodel.cpp \
-           fx/qfxlistview.cpp \
-           fx/qfxgraphicsobjectcontainer.cpp \
-           fx/qfxlayoutitem.cpp \
+           fx/qmlgraphicsanchors.cpp \
+           fx/qmlgraphicsevents.cpp \
+           fx/qmlgraphicsflickable.cpp \
+           fx/qmlgraphicsflipable.cpp \
+           fx/qmlgraphicsgridview.cpp \
+           fx/qmlgraphicsimage.cpp \
+           fx/qmlgraphicsborderimage.cpp \
+           fx/qmlgraphicsimagebase.cpp \
+           fx/qmlgraphicspainteditem.cpp \
+           fx/qmlgraphicsitem.cpp \
+           fx/qmlgraphicsfocuspanel.cpp \
+           fx/qmlgraphicsfocusscope.cpp \
+           fx/qmlgraphicspositioners.cpp \
+           fx/qmlgraphicsloader.cpp \
+           fx/qmlgraphicsmouseregion.cpp \
+           fx/qmlgraphicspath.cpp \
+           fx/qmlgraphicspathview.cpp \
+           fx/qmlgraphicsrect.cpp \
+           fx/qmlgraphicsrepeater.cpp \
+           fx/qmlgraphicsscalegrid.cpp \
+           fx/qmlgraphicstextinput.cpp \
+           fx/qmlgraphicstext.cpp \
+           fx/qmlgraphicstextedit.cpp \
+           fx/qmlgraphicspixmapcache.cpp \
+           fx/qmlgraphicsvisualitemmodel.cpp \
+           fx/qmlgraphicslistview.cpp \
+           fx/qmlgraphicsgraphicsobjectcontainer.cpp \
+           fx/qmlgraphicslayoutitem.cpp \
 
 contains(QT_CONFIG, webkit) {
     QT+=webkit
-    SOURCES += fx/qfxwebview.cpp
-    HEADERS += fx/qfxwebview.h
+    SOURCES += fx/qmlgraphicswebview.cpp
+    HEADERS += fx/qmlgraphicswebview.h
 }
 
diff --git a/src/declarative/fx/qfxanchors.cpp b/src/declarative/fx/qmlgraphicsanchors.cpp
index 3908520..d0e26d8 100644
--- a/src/declarative/fx/qfxanchors.cpp
+++ b/src/declarative/fx/qmlgraphicsanchors.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qfxanchors_p.h"
-#include "qfxitem.h"
-#include "qfxitem_p.h"
+#include "qmlgraphicsanchors_p.h"
+#include "qmlgraphicsitem.h"
+#include "qmlgraphicsitem_p.h"
 #include <QDebug>
 #include <QtDeclarative/qmlinfo.h>
 
@@ -958,5 +958,5 @@ bool QmlGraphicsAnchorsPrivate::checkVAnchorValid(QmlGraphicsAnchorLine anchor)
 
 QT_END_NAMESPACE
 
-#include "moc_qfxanchors.cpp"
+#include "moc_qmlgraphicsanchors.cpp"
 
diff --git a/src/declarative/fx/qfxanchors.h b/src/declarative/fx/qmlgraphicsanchors.h
index 9e2bac6..de7214d 100644
--- a/src/declarative/fx/qfxanchors.h
+++ b/src/declarative/fx/qmlgraphicsanchors.h
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#ifndef QFXANCHORS_H
-#define QFXANCHORS_H
+#ifndef QMLGRAPHICSANCHORS_H
+#define QMLGRAPHICSANCHORS_H
 
 #include <QtCore/QObject>
 #include <QtDeclarative/qfxglobal.h>
 #include <QtDeclarative/qml.h>
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/fx/qfxanchors_p.h b/src/declarative/fx/qmlgraphicsanchors_p.h
index 50f1dc4..3986cd6 100644
--- a/src/declarative/fx/qfxanchors_p.h
+++ b/src/declarative/fx/qmlgraphicsanchors_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXANCHORS_P_H
-#define QFXANCHORS_P_H
+#ifndef QMLGRAPHICSANCHORS_P_H
+#define QMLGRAPHICSANCHORS_P_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qfxanchors.h"
+#include "qmlgraphicsanchors.h"
 #include "private/qobject_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/fx/qfxborderimage.cpp b/src/declarative/fx/qmlgraphicsborderimage.cpp
index 1ee2f71..c346366 100644
--- a/src/declarative/fx/qfxborderimage.cpp
+++ b/src/declarative/fx/qmlgraphicsborderimage.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qfxborderimage.h"
-#include "qfxborderimage_p.h"
+#include "qmlgraphicsborderimage.h"
+#include "qmlgraphicsborderimage_p.h"
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QFile>
diff --git a/src/declarative/fx/qfxborderimage.h b/src/declarative/fx/qmlgraphicsborderimage.h
index b6f99a3..e3c50bb 100644
--- a/src/declarative/fx/qfxborderimage.h
+++ b/src/declarative/fx/qmlgraphicsborderimage.h
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#ifndef QFXBORDERIMAGE_H
-#define QFXBORDERIMAGE_H
+#ifndef QMLGRAPHICSBORDERIMAGE_H
+#define QMLGRAPHICSBORDERIMAGE_H
 
 #include <QtNetwork/qnetworkreply.h>
-#include "qfximagebase.h"
+#include "qmlgraphicsimagebase.h"
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
@@ -102,4 +102,4 @@ QT_END_NAMESPACE
 QML_DECLARE_TYPE(QmlGraphicsBorderImage)
 QT_END_HEADER
 
-#endif // QFXBORDERIMAGE_H
+#endif // QMLGRAPHICSBORDERIMAGE_H
diff --git a/src/declarative/fx/qfxborderimage_p.h b/src/declarative/fx/qmlgraphicsborderimage_p.h
index 75a638c..fb905cd 100644
--- a/src/declarative/fx/qfxborderimage_p.h
+++ b/src/declarative/fx/qmlgraphicsborderimage_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXBORDERIMAGE_P_H
-#define QFXBORDERIMAGE_P_H
+#ifndef QMLGRAPHICSBORDERIMAGE_P_H
+#define QMLGRAPHICSBORDERIMAGE_P_H
 
 //
 //  W A R N I N G
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "qfximagebase_p.h"
-#include "qfxscalegrid_p.h"
+#include "qmlgraphicsimagebase_p.h"
+#include "qmlgraphicsscalegrid_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -94,4 +94,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QFXBORDERIMAGE_P_H
+#endif // QMLGRAPHICSBORDERIMAGE_P_H
diff --git a/src/declarative/fx/qfxeffects.cpp b/src/declarative/fx/qmlgraphicseffects.cpp
index ebdd880..ebdd880 100644
--- a/src/declarative/fx/qfxeffects.cpp
+++ b/src/declarative/fx/qmlgraphicseffects.cpp
diff --git a/src/declarative/fx/qfxevents.cpp b/src/declarative/fx/qmlgraphicsevents.cpp
index fe249f9..468b223 100644
--- a/src/declarative/fx/qfxevents.cpp
+++ b/src/declarative/fx/qmlgraphicsevents.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qfxevents_p.h"
+#include "qmlgraphicsevents_p.h"
 
 QT_BEGIN_NAMESPACE
 /*!
diff --git a/src/declarative/fx/qfxevents_p.h b/src/declarative/fx/qmlgraphicsevents_p.h
index e558c42..f093932 100644
--- a/src/declarative/fx/qfxevents_p.h
+++ b/src/declarative/fx/qmlgraphicsevents_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXEVENTS_P_H
-#define QFXEVENTS_P_H
+#ifndef QMLGRAPHICSEVENTS_P_H
+#define QMLGRAPHICSEVENTS_P_H
 
 //
 //  W A R N I N G
@@ -134,4 +134,4 @@ QT_END_NAMESPACE
 QML_DECLARE_TYPE(QmlGraphicsKeyEvent)
 QML_DECLARE_TYPE(QmlGraphicsMouseEvent)
 
-#endif // QFXEVENTS_P_H
+#endif // QMLGRAPHICSEVENTS_P_H
diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qmlgraphicsflickable.cpp
index 34e3e75..ed964aa 100644
--- a/src/declarative/fx/qfxflickable.cpp
+++ b/src/declarative/fx/qmlgraphicsflickable.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qfxflickable.h"
-#include "qfxflickable_p.h"
+#include "qmlgraphicsflickable.h"
+#include "qmlgraphicsflickable_p.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QPointer>
diff --git a/src/declarative/fx/qfxflickable.h b/src/declarative/fx/qmlgraphicsflickable.h
index 634fe88..f7ef0088 100644
--- a/src/declarative/fx/qfxflickable.h
+++ b/src/declarative/fx/qmlgraphicsflickable.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QFXFLICKABLE_H
-#define QFXFLICKABLE_H
+#ifndef QMLGRAPHICSFLICKABLE_H
+#define QMLGRAPHICSFLICKABLE_H
 
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/fx/qfxflickable_p.h b/src/declarative/fx/qmlgraphicsflickable_p.h
index 5e9863f..d9f917d 100644
--- a/src/declarative/fx/qfxflickable_p.h
+++ b/src/declarative/fx/qmlgraphicsflickable_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXFLICKABLE_P_H
-#define QFXFLICKABLE_P_H
+#ifndef QMLGRAPHICSFLICKABLE_P_H
+#define QMLGRAPHICSFLICKABLE_P_H
 
 //
 //  W A R N I N G
@@ -54,8 +54,8 @@
 //
 
 #include "qdatetime.h"
-#include "qfxflickable.h"
-#include "qfxitem_p.h"
+#include "qmlgraphicsflickable.h"
+#include "qmlgraphicsitem_p.h"
 #include "qml.h"
 #include "private/qmltimeline_p.h"
 #include "private/qmlanimation_p.h"
diff --git a/src/declarative/fx/qfxflipable.cpp b/src/declarative/fx/qmlgraphicsflipable.cpp
index 090f8a0..4df35f1 100644
--- a/src/declarative/fx/qfxflipable.cpp
+++ b/src/declarative/fx/qmlgraphicsflipable.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qfxflipable.h"
-#include "private/qfxitem_p.h"
+#include "qmlgraphicsflipable.h"
+#include "private/qmlgraphicsitem_p.h"
 #include "QtGui/qgraphicstransform.h"
 #include <QtDeclarative/qmlinfo.h>
 
@@ -233,4 +233,4 @@ void QmlGraphicsFlipablePrivate::updateSceneTransformFromParent()
 
 QT_END_NAMESPACE
 
-#include "moc_qfxflipable.cpp"
+#include "moc_qmlgraphicsflipable.cpp"
diff --git a/src/declarative/fx/qfxflipable.h b/src/declarative/fx/qmlgraphicsflipable.h
index 1b10d48..7f92d65 100644
--- a/src/declarative/fx/qfxflipable.h
+++ b/src/declarative/fx/qmlgraphicsflipable.h
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#ifndef QFXFLIPABLE_H
-#define QFXFLIPABLE_H
+#ifndef QMLGRAPHICSFLIPABLE_H
+#define QMLGRAPHICSFLIPABLE_H
 
 #include <QtCore/QObject>
 #include <QtGui/QTransform>
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 #include <QtGui/qvector3d.h>
 
 QT_BEGIN_HEADER
@@ -91,4 +91,4 @@ QML_DECLARE_TYPE(QmlGraphicsFlipable)
 
 QT_END_HEADER
 
-#endif // QFXFLIPABLE_H
+#endif // QMLGRAPHICSFLIPABLE_H
diff --git a/src/declarative/fx/qfxfocuspanel.cpp b/src/declarative/fx/qmlgraphicsfocuspanel.cpp
index 3d246a0..db8fcdb 100644
--- a/src/declarative/fx/qfxfocuspanel.cpp
+++ b/src/declarative/fx/qmlgraphicsfocuspanel.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qfxfocuspanel.h"
+#include "qmlgraphicsfocuspanel.h"
 #include <QtGui/qgraphicsscene.h>
 #include <QEvent>
 
diff --git a/src/declarative/fx/qfxfocuspanel.h b/src/declarative/fx/qmlgraphicsfocuspanel.h
index 43eb96e..2c4f792 100644
--- a/src/declarative/fx/qfxfocuspanel.h
+++ b/src/declarative/fx/qmlgraphicsfocuspanel.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QFXFOCUSPANEL_H
-#define QFXFOCUSPANEL_H
+#ifndef QMLGRAPHICSFOCUSPANEL_H
+#define QMLGRAPHICSFOCUSPANEL_H
 
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 
 QT_BEGIN_HEADER
 
@@ -74,4 +74,4 @@ QML_DECLARE_TYPE(QmlGraphicsFocusPanel)
 
 QT_END_HEADER
 
-#endif // QFXFOCUSPANEL_H
+#endif // QMLGRAPHICSFOCUSPANEL_H
diff --git a/src/declarative/fx/qfxfocusscope.cpp b/src/declarative/fx/qmlgraphicsfocusscope.cpp
index 468d532..e957085 100644
--- a/src/declarative/fx/qfxfocusscope.cpp
+++ b/src/declarative/fx/qmlgraphicsfocusscope.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qfxfocusscope.h"
+#include "qmlgraphicsfocusscope.h"
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/fx/qfxfocusscope.h b/src/declarative/fx/qmlgraphicsfocusscope.h
index 126ccfc..28d1f4f 100644
--- a/src/declarative/fx/qfxfocusscope.h
+++ b/src/declarative/fx/qmlgraphicsfocusscope.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QFXFOCUSSCOPE_H
-#define QFXFOCUSSCOPE_H
+#ifndef QMLGRAPHICSFOCUSSCOPE_H
+#define QMLGRAPHICSFOCUSSCOPE_H
 
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 
 QT_BEGIN_HEADER
 
@@ -65,4 +65,4 @@ QML_DECLARE_TYPE(QmlGraphicsFocusScope)
 
 QT_END_HEADER
 
-#endif // QFXFOCUSSCOPE_H
+#endif // QMLGRAPHICSFOCUSSCOPE_H
diff --git a/src/declarative/fx/qfxgraphicsobjectcontainer.cpp b/src/declarative/fx/qmlgraphicsgraphicsobjectcontainer.cpp
index 0c9dc69..87193cd 100644
--- a/src/declarative/fx/qfxgraphicsobjectcontainer.cpp
+++ b/src/declarative/fx/qmlgraphicsgraphicsobjectcontainer.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qfxgraphicsobjectcontainer.h"
+#include "qmlgraphicsgraphicsobjectcontainer.h"
 #include <QGraphicsObject>
 #include <QGraphicsWidget>
 #include <QGraphicsSceneResizeEvent>
-#include <private/qfxitem_p.h>
+#include <private/qmlgraphicsitem_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -227,4 +227,4 @@ void QmlGraphicsGraphicsObjectContainerPrivate::_q_updateSize()
 
 QT_END_NAMESPACE
 
-#include "moc_qfxgraphicsobjectcontainer.cpp"
+#include "moc_qmlgraphicsgraphicsobjectcontainer.cpp"
diff --git a/src/declarative/fx/qfxgraphicsobjectcontainer.h b/src/declarative/fx/qmlgraphicsgraphicsobjectcontainer.h
index 2ed5c1f..0189e2f 100644
--- a/src/declarative/fx/qfxgraphicsobjectcontainer.h
+++ b/src/declarative/fx/qmlgraphicsgraphicsobjectcontainer.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QFXGRAPHICSOBJECTCONTAINER_H
-#define QFXGRAPHICSOBJECTCONTAINER_H
+#ifndef QMLGRAPHICSGRAPHICSOBJECTCONTAINER_H
+#define QMLGRAPHICSGRAPHICSOBJECTCONTAINER_H
 
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 
 QT_BEGIN_HEADER
 
@@ -87,4 +87,4 @@ QML_DECLARE_TYPE(QmlGraphicsGraphicsObjectContainer)
 
 QT_END_HEADER
 
-#endif // QFXGRAPHICSOBJECTCONTAINER_H
+#endif // QMLGRAPHICSGRAPHICSOBJECTCONTAINER_H
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qmlgraphicsgridview.cpp
index 5ed82d7..d512b8c 100644
--- a/src/declarative/fx/qfxgridview.cpp
+++ b/src/declarative/fx/qmlgraphicsgridview.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qfxvisualitemmodel.h"
+#include "qmlgraphicsvisualitemmodel.h"
 #include "qlistmodelinterface.h"
 #include "qmleasefollow.h"
-#include "private/qfxflickable_p.h"
-#include "qfxgridview.h"
+#include "private/qmlgraphicsflickable_p.h"
+#include "qmlgraphicsgridview.h"
 
 #include <QKeyEvent>
 
diff --git a/src/declarative/fx/qfxgridview.h b/src/declarative/fx/qmlgraphicsgridview.h
index fd0a459..1582529 100644
--- a/src/declarative/fx/qfxgridview.h
+++ b/src/declarative/fx/qmlgraphicsgridview.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QFXGRIDVIEW_H
-#define QFXGRIDVIEW_H
+#ifndef QMLGRAPHICSGRIDVIEW_H
+#define QMLGRAPHICSGRIDVIEW_H
 
-#include <QtDeclarative/qfxflickable.h>
+#include <QtDeclarative/qmlgraphicsflickable.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qmlgraphicsimage.cpp
index 34b3399..a6156ce 100644
--- a/src/declarative/fx/qfximage.cpp
+++ b/src/declarative/fx/qmlgraphicsimage.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qfximage.h"
-#include "qfximage_p.h"
+#include "qmlgraphicsimage.h"
+#include "qmlgraphicsimage_p.h"
 
 #include <QKeyEvent>
 #include <QPainter>
diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qmlgraphicsimage.h
index 1f52b17..167ecd4 100644
--- a/src/declarative/fx/qfximage.h
+++ b/src/declarative/fx/qmlgraphicsimage.h
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#ifndef QFXIMAGE_H
-#define QFXIMAGE_H
+#ifndef QMLGRAPHICSIMAGE_H
+#define QMLGRAPHICSIMAGE_H
 
 #include <QtNetwork/qnetworkreply.h>
-#include "qfximagebase.h"
+#include "qmlgraphicsimagebase.h"
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
@@ -87,4 +87,4 @@ QT_END_NAMESPACE
 QML_DECLARE_TYPE(QmlGraphicsImage)
 QT_END_HEADER
 
-#endif // QFXIMAGE_H
+#endif // QMLGRAPHICSIMAGE_H
diff --git a/src/declarative/fx/qfximage_p.h b/src/declarative/fx/qmlgraphicsimage_p.h
index 30f7665..c5bcf8e 100644
--- a/src/declarative/fx/qfximage_p.h
+++ b/src/declarative/fx/qmlgraphicsimage_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXIMAGE_P_H
-#define QFXIMAGE_P_H
+#ifndef QMLGRAPHICSIMAGE_P_H
+#define QMLGRAPHICSIMAGE_P_H
 
 //
 //  W A R N I N G
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "qfxitem_p.h"
-#include "qfximagebase_p.h"
+#include "qmlgraphicsitem_p.h"
+#include "qmlgraphicsimagebase_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -74,4 +74,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QFXIMAGE_P_H
+#endif // QMLGRAPHICSIMAGE_P_H
diff --git a/src/declarative/fx/qfximagebase.cpp b/src/declarative/fx/qmlgraphicsimagebase.cpp
index 5afb79a..d71438d 100644
--- a/src/declarative/fx/qfximagebase.cpp
+++ b/src/declarative/fx/qmlgraphicsimagebase.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "qfximagebase.h"
-#include "qfximagebase_p.h"
+#include "qmlgraphicsimagebase.h"
+#include "qmlgraphicsimagebase_p.h"
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QFile>
 #include <QtDeclarative/qmlengine.h>
-#include <QtDeclarative/qfxpixmapcache.h>
+#include <QtDeclarative/qmlgraphicspixmapcache.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/fx/qfximagebase.h b/src/declarative/fx/qmlgraphicsimagebase.h
index b43e9a2..3ad0e4b 100644
--- a/src/declarative/fx/qfximagebase.h
+++ b/src/declarative/fx/qmlgraphicsimagebase.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QFXIMAGEBASE_H
-#define QFXIMAGEBASE_H
+#ifndef QMLGRAPHICSIMAGEBASE_H
+#define QMLGRAPHICSIMAGEBASE_H
 
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
@@ -87,4 +87,4 @@ private:
 QT_END_NAMESPACE
 QT_END_HEADER
 
-#endif // QFXIMAGEBASE_H
+#endif // QMLGRAPHICSIMAGEBASE_H
diff --git a/src/declarative/fx/qfximagebase_p.h b/src/declarative/fx/qmlgraphicsimagebase_p.h
index 9025c51..5fd5f11 100644
--- a/src/declarative/fx/qfximagebase_p.h
+++ b/src/declarative/fx/qmlgraphicsimagebase_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXIMAGEBASE_P_H
-#define QFXIMAGEBASE_P_H
+#ifndef QMLGRAPHICSIMAGEBASE_P_H
+#define QMLGRAPHICSIMAGEBASE_P_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qfxitem_p.h"
+#include "qmlgraphicsitem_p.h"
 #include <QtCore/QPointer>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qmlgraphicsitem.cpp
index 7a3cded..d5b31d0 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qmlgraphicsitem.cpp
@@ -59,9 +59,9 @@
 #include "qmlview.h"
 #include "qmlstategroup.h"
 
-#include "qfxitem_p.h"
-#include "qfxitem.h"
-#include "qfxevents_p.h"
+#include "qmlgraphicsitem_p.h"
+#include "qmlgraphicsitem.h"
+#include "qmlgraphicsevents_p.h"
 #include <qmlcomponent.h>
 
 QT_BEGIN_NAMESPACE
@@ -76,7 +76,7 @@ QML_DEFINE_NOCREATE_TYPE(QGraphicsTransform);
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Scale,QGraphicsScale)
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rotation,QGraphicsRotation)
 
-#include "qfxeffects.cpp"
+#include "qmlgraphicseffects.cpp"
 
 /*!
     \qmlclass Transform
@@ -2917,5 +2917,5 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Keys,QmlGraphicsKeysAttached)
 QML_DECLARE_TYPE(QmlGraphicsKeyNavigationAttached)
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,KeyNavigation,QmlGraphicsKeyNavigationAttached)
 
-#include "moc_qfxitem.cpp"
+#include "moc_qmlgraphicsitem.cpp"
 #include "qfxitem.moc"
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qmlgraphicsitem.h
index ac094ad..0672dd6 100644
--- a/src/declarative/fx/qfxitem.h
+++ b/src/declarative/fx/qmlgraphicsitem.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXITEM_H
-#define QFXITEM_H
+#ifndef QMLGRAPHICSITEM_H
+#define QMLGRAPHICSITEM_H
 
 #include <QtCore/QObject>
 #include <QtCore/QList>
@@ -235,4 +235,4 @@ QML_DECLARE_TYPE(QGraphicsRotation)
 
 QT_END_HEADER
 
-#endif // QFXITEM_H
+#endif // QMLGRAPHICSITEM_H
diff --git a/src/declarative/fx/qfxitem_p.h b/src/declarative/fx/qmlgraphicsitem_p.h
index 87b33be..799374a 100644
--- a/src/declarative/fx/qfxitem_p.h
+++ b/src/declarative/fx/qmlgraphicsitem_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXITEM_P_H
-#define QFXITEM_P_H
+#ifndef QMLGRAPHICSITEM_P_H
+#define QMLGRAPHICSITEM_P_H
 
 //
 //  W A R N I N G
@@ -53,11 +53,11 @@
 // We mean it.
 //
 
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 #include <QtDeclarative/qmlstate.h>
-#include <QtDeclarative/qfxanchors.h>
+#include <QtDeclarative/qmlgraphicsanchors.h>
 #include <private/qmlnullablevalue_p.h>
-#include <private/qfxanchors_p.h>
+#include <private/qmlgraphicsanchors_p.h>
 #include <QtDeclarative/qml.h>
 #include <QtDeclarative/qmlcontext.h>
 #include <QtCore/qlist.h>
@@ -242,4 +242,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QFXITEM_P_H
+#endif // QMLGRAPHICSITEM_P_H
diff --git a/src/declarative/fx/qfxlayoutitem.cpp b/src/declarative/fx/qmlgraphicslayoutitem.cpp
index 201dea2..b75f787 100644
--- a/src/declarative/fx/qfxlayoutitem.cpp
+++ b/src/declarative/fx/qmlgraphicslayoutitem.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qfxlayoutitem.h"
+#include "qmlgraphicslayoutitem.h"
 #include <QDebug>
 #include <limits.h>
 
diff --git a/src/declarative/fx/qfxlayoutitem.h b/src/declarative/fx/qmlgraphicslayoutitem.h
index 35e6e74..184001a 100644
--- a/src/declarative/fx/qfxlayoutitem.h
+++ b/src/declarative/fx/qmlgraphicslayoutitem.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXGRAPHICSLAYOUTITEM_H
-#define QFXGRAPHICSLAYOUTITEM_H
+#ifndef QMLGRAPHICSGRAPHICSLAYOUTITEM_H
+#define QMLGRAPHICSGRAPHICSLAYOUTITEM_H
 #include <QGraphicsLayoutItem>
 #include <QmlGraphicsItem>
 #include <QSizeF>
diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qmlgraphicslistview.cpp
index f85380a..62ca23d 100644
--- a/src/declarative/fx/qfxlistview.cpp
+++ b/src/declarative/fx/qmlgraphicslistview.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "private/qfxflickable_p.h"
+#include "private/qmlgraphicsflickable_p.h"
 #include "qmleasefollow.h"
 #include "qlistmodelinterface.h"
-#include "qfxvisualitemmodel.h"
-#include "qfxlistview.h"
+#include "qmlgraphicsvisualitemmodel.h"
+#include "qmlgraphicslistview.h"
 #include <qmlexpression.h>
 
 #include <QKeyEvent>
diff --git a/src/declarative/fx/qfxlistview.h b/src/declarative/fx/qmlgraphicslistview.h
index 19e88c7..1c19c38 100644
--- a/src/declarative/fx/qfxlistview.h
+++ b/src/declarative/fx/qmlgraphicslistview.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QFXLISTVIEW_H
-#define QFXLISTVIEW_H
+#ifndef QMLGRAPHICSLISTVIEW_H
+#define QMLGRAPHICSLISTVIEW_H
 
-#include <QtDeclarative/qfxflickable.h>
+#include <QtDeclarative/qmlgraphicsflickable.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/fx/qfxloader.cpp b/src/declarative/fx/qmlgraphicsloader.cpp
index af51282..b2a9c4f 100644
--- a/src/declarative/fx/qfxloader.cpp
+++ b/src/declarative/fx/qmlgraphicsloader.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qfxloader_p.h"
+#include "qmlgraphicsloader_p.h"
 #include <private/qmlengine_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -387,4 +387,4 @@ QmlGraphicsItem *QmlGraphicsLoader::item() const
 
 QT_END_NAMESPACE
 
-#include "moc_qfxloader.cpp"
+#include "moc_qmlgraphicsloader.cpp"
diff --git a/src/declarative/fx/qfxloader.h b/src/declarative/fx/qmlgraphicsloader.h
index b838ed0..98f764f 100644
--- a/src/declarative/fx/qfxloader.h
+++ b/src/declarative/fx/qmlgraphicsloader.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QFXLOADER_H
-#define QFXLOADER_H
+#ifndef QMLGRAPHICSLOADER_H
+#define QMLGRAPHICSLOADER_H
 
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 
 QT_BEGIN_HEADER
 
@@ -104,4 +104,4 @@ QML_DECLARE_TYPE(QmlGraphicsLoader)
 
 QT_END_HEADER
 
-#endif // QFXLOADER_H
+#endif // QMLGRAPHICSLOADER_H
diff --git a/src/declarative/fx/qfxloader_p.h b/src/declarative/fx/qmlgraphicsloader_p.h
index 336c884..ea55334 100644
--- a/src/declarative/fx/qfxloader_p.h
+++ b/src/declarative/fx/qmlgraphicsloader_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXLOADER_P_H
-#define QFXLOADER_P_H
+#ifndef QMLGRAPHICSLOADER_P_H
+#define QMLGRAPHICSLOADER_P_H
 
 //
 //  W A R N I N G
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "qfxitem_p.h"
-#include "qfxloader.h"
+#include "qmlgraphicsitem_p.h"
+#include "qmlgraphicsloader.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -79,4 +79,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QFXLOADER_P_H
+#endif // QMLGRAPHICSLOADER_P_H
diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qmlgraphicsmouseregion.cpp
index 8acf32c..7ad1ac2 100644
--- a/src/declarative/fx/qfxmouseregion.cpp
+++ b/src/declarative/fx/qmlgraphicsmouseregion.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qfxmouseregion.h"
-#include "qfxmouseregion_p.h"
-#include "qfxevents_p.h"
+#include "qmlgraphicsmouseregion.h"
+#include "qmlgraphicsmouseregion_p.h"
+#include "qmlgraphicsevents_p.h"
 #include <QGraphicsSceneMouseEvent>
 
 
diff --git a/src/declarative/fx/qfxmouseregion.h b/src/declarative/fx/qmlgraphicsmouseregion.h
index 41c3d0e..9874fbf 100644
--- a/src/declarative/fx/qfxmouseregion.h
+++ b/src/declarative/fx/qmlgraphicsmouseregion.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QFXMOUSEREGION_H
-#define QFXMOUSEREGION_H
+#ifndef QMLGRAPHICSMOUSEREGION_H
+#define QMLGRAPHICSMOUSEREGION_H
 
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 
 QT_BEGIN_HEADER
 
@@ -177,4 +177,4 @@ QML_DECLARE_TYPE(QmlGraphicsMouseRegion)
 
 QT_END_HEADER
 
-#endif // QFXMOUSEREGION_H
+#endif // QMLGRAPHICSMOUSEREGION_H
diff --git a/src/declarative/fx/qfxmouseregion_p.h b/src/declarative/fx/qmlgraphicsmouseregion_p.h
index 66efb6f..71b31b4 100644
--- a/src/declarative/fx/qfxmouseregion_p.h
+++ b/src/declarative/fx/qmlgraphicsmouseregion_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXMOUSEREGION_P_H
-#define QFXMOUSEREGION_P_H
+#ifndef QMLGRAPHICSMOUSEREGION_P_H
+#define QMLGRAPHICSMOUSEREGION_P_H
 
 //
 //  W A R N I N G
@@ -56,7 +56,7 @@
 #include "qdatetime.h"
 #include "qbasictimer.h"
 #include "qgraphicssceneevent.h"
-#include "qfxitem_p.h"
+#include "qmlgraphicsitem_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -111,4 +111,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QFXMOUSEREGION_P_H
+#endif // QMLGRAPHICSMOUSEREGION_P_H
diff --git a/src/declarative/fx/qfxpainteditem.cpp b/src/declarative/fx/qmlgraphicspainteditem.cpp
index 24d9602..43d0318 100644
--- a/src/declarative/fx/qfxpainteditem.cpp
+++ b/src/declarative/fx/qmlgraphicspainteditem.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qfxpainteditem.h"
-#include "qfxpainteditem_p.h"
+#include "qmlgraphicspainteditem.h"
+#include "qmlgraphicspainteditem_p.h"
 
 #include <QDebug>
 #include <QPen>
diff --git a/src/declarative/fx/qfxpainteditem.h b/src/declarative/fx/qmlgraphicspainteditem.h
index 33f938c..7ff55a5 100644
--- a/src/declarative/fx/qfxpainteditem.h
+++ b/src/declarative/fx/qmlgraphicspainteditem.h
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#ifndef QFXIMAGEITEM_H
-#define QFXIMAGEITEM_H
+#ifndef QMLGRAPHICSIMAGEITEM_H
+#define QMLGRAPHICSIMAGEITEM_H
 
 #include <QtDeclarative/qfxglobal.h>
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/fx/qfxpainteditem_p.h b/src/declarative/fx/qmlgraphicspainteditem_p.h
index cc7f697..d5cd673 100644
--- a/src/declarative/fx/qfxpainteditem_p.h
+++ b/src/declarative/fx/qmlgraphicspainteditem_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXIMAGEITEM_P_H
-#define QFXIMAGEITEM_P_H
+#ifndef QMLGRAPHICSIMAGEITEM_P_H
+#define QMLGRAPHICSIMAGEITEM_P_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <private/qfxitem_p.h>
+#include <private/qmlgraphicsitem_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/fx/qfxpath.cpp b/src/declarative/fx/qmlgraphicspath.cpp
index a9bd233..15dbfef 100644
--- a/src/declarative/fx/qfxpath.cpp
+++ b/src/declarative/fx/qmlgraphicspath.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qfxpath.h"
-#include "qfxpath_p.h"
+#include "qmlgraphicspath.h"
+#include "qmlgraphicspath_p.h"
 #include <private/qfxperf_p.h>
 #include <private/qbezier_p.h>
 #include <QSet>
diff --git a/src/declarative/fx/qfxpath.h b/src/declarative/fx/qmlgraphicspath.h
index e724474..db6c84f 100644
--- a/src/declarative/fx/qfxpath.h
+++ b/src/declarative/fx/qmlgraphicspath.h
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#ifndef QFXPATH_H
-#define QFXPATH_H
+#ifndef QMLGRAPHICSPATH_H
+#define QMLGRAPHICSPATH_H
 
 #include <QtCore/QObject>
 #include <QtGui/QPainterPath>
 #include <QtDeclarative/qml.h>
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 
 
 QT_BEGIN_HEADER
@@ -256,4 +256,4 @@ QML_DECLARE_TYPE(QmlGraphicsPath)
 
 QT_END_HEADER
 
-#endif // QFXPATH_H
+#endif // QMLGRAPHICSPATH_H
diff --git a/src/declarative/fx/qfxpath_p.h b/src/declarative/fx/qmlgraphicspath_p.h
index 49bd0d8..7c0e1ea 100644
--- a/src/declarative/fx/qfxpath_p.h
+++ b/src/declarative/fx/qmlgraphicspath_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXPATH_P_H
-#define QFXPATH_P_H
+#ifndef QMLGRAPHICSPATH_P_H
+#define QMLGRAPHICSPATH_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@
 //
 
 #include "private/qobject_p.h"
-#include "qfxpath.h"
+#include "qmlgraphicspath.h"
 #include "qml.h"
 
 
diff --git a/src/declarative/fx/qfxpathview.cpp b/src/declarative/fx/qmlgraphicspathview.cpp
index fd7d734..48d9fc8 100644
--- a/src/declarative/fx/qfxpathview.cpp
+++ b/src/declarative/fx/qmlgraphicspathview.cpp
@@ -46,8 +46,8 @@
 #include "qlistmodelinterface.h"
 #include "qmlopenmetaobject.h"
 
-#include "qfxpathview.h"
-#include "qfxpathview_p.h"
+#include "qmlgraphicspathview.h"
+#include "qmlgraphicspathview_p.h"
 #include <QGraphicsSceneEvent>
 
 static const int FlickThreshold = 5;
diff --git a/src/declarative/fx/qfxpathview.h b/src/declarative/fx/qmlgraphicspathview.h
index e961106..3bb5d1f 100644
--- a/src/declarative/fx/qfxpathview.h
+++ b/src/declarative/fx/qmlgraphicspathview.h
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#ifndef QFXPATHVIEW_H
-#define QFXPATHVIEW_H
+#ifndef QMLGRAPHICSPATHVIEW_H
+#define QMLGRAPHICSPATHVIEW_H
 
-#include <QtDeclarative/qfxitem.h>
-#include <QtDeclarative/qfxpath.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
+#include <QtDeclarative/qmlgraphicspath.h>
 
 QT_BEGIN_HEADER
 
@@ -135,4 +135,4 @@ QML_DECLARE_TYPE(QmlGraphicsPathView)
 QML_DECLARE_TYPEINFO(QmlGraphicsPathView, QML_HAS_ATTACHED_PROPERTIES)
 QT_END_HEADER
 
-#endif // QFXPATHVIEW_H
+#endif // QMLGRAPHICSPATHVIEW_H
diff --git a/src/declarative/fx/qfxpathview_p.h b/src/declarative/fx/qmlgraphicspathview_p.h
index 23b468c..22ee075 100644
--- a/src/declarative/fx/qfxpathview_p.h
+++ b/src/declarative/fx/qmlgraphicspathview_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXPATHVIEW_P_H
-#define QFXPATHVIEW_P_H
+#ifndef QMLGRAPHICSPATHVIEW_P_H
+#define QMLGRAPHICSPATHVIEW_P_H
 
 //
 //  W A R N I N G
@@ -54,9 +54,9 @@
 //
 
 #include "qdatetime.h"
-#include "qfxpathview.h"
-#include "qfxitem_p.h"
-#include "qfxvisualitemmodel.h"
+#include "qmlgraphicspathview.h"
+#include "qmlgraphicsitem_p.h"
+#include "qmlgraphicsvisualitemmodel.h"
 #include "qml.h"
 #include "private/qmlanimation_p.h"
 
diff --git a/src/declarative/fx/qfxpixmapcache.cpp b/src/declarative/fx/qmlgraphicspixmapcache.cpp
index 4d6104c..e347a8b 100644
--- a/src/declarative/fx/qfxpixmapcache.cpp
+++ b/src/declarative/fx/qmlgraphicspixmapcache.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qfxpixmapcache.h"
+#include "qmlgraphicspixmapcache.h"
 #include <QImageReader>
 #include <QHash>
 #include <QNetworkReply>
diff --git a/src/declarative/fx/qfxpixmapcache.h b/src/declarative/fx/qmlgraphicspixmapcache.h
index 2a5c4fa..5094665 100644
--- a/src/declarative/fx/qfxpixmapcache.h
+++ b/src/declarative/fx/qmlgraphicspixmapcache.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXPIXMAPCACHE_H
-#define QFXPIXMAPCACHE_H
+#ifndef QMLGRAPHICSPIXMAPCACHE_H
+#define QMLGRAPHICSPIXMAPCACHE_H
 
 #include <QtCore/QString>
 #include <QtGui/QPixmap>
@@ -69,4 +69,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QFXPIXMAPCACHE_H
+#endif // QMLGRAPHICSPIXMAPCACHE_H
diff --git a/src/declarative/fx/qfxpositioners.cpp b/src/declarative/fx/qmlgraphicspositioners.cpp
index d7ae49d..31950e6 100644
--- a/src/declarative/fx/qfxpositioners.cpp
+++ b/src/declarative/fx/qmlgraphicspositioners.cpp
@@ -46,8 +46,8 @@
 #include "qmlstategroup.h"
 #include "qmlstateoperations.h"
 #include "private/qfxperf_p.h"
-#include "qfxpositioners.h"
-#include "qfxpositioners_p.h"
+#include "qmlgraphicspositioners.h"
+#include "qmlgraphicspositioners_p.h"
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/fx/qfxpositioners.h b/src/declarative/fx/qmlgraphicspositioners.h
index 29c121c..e252ed8 100644
--- a/src/declarative/fx/qfxpositioners.h
+++ b/src/declarative/fx/qmlgraphicspositioners.h
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#ifndef QFXLAYOUTS_H
-#define QFXLAYOUTS_H
+#ifndef QMLGRAPHICSLAYOUTS_H
+#define QMLGRAPHICSLAYOUTS_H
 
 #include <QtCore/QObject>
 #include <QtCore/QString>
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 #include <QtDeclarative/qmlstate.h>
 
 
diff --git a/src/declarative/fx/qfxpositioners_p.h b/src/declarative/fx/qmlgraphicspositioners_p.h
index fdc11bb..f8ca6fd 100644
--- a/src/declarative/fx/qfxpositioners_p.h
+++ b/src/declarative/fx/qmlgraphicspositioners_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXLAYOUTS_P_H
-#define QFXLAYOUTS_P_H
+#ifndef QMLGRAPHICSLAYOUTS_P_H
+#define QMLGRAPHICSLAYOUTS_P_H
 
 //
 //  W A R N I N G
@@ -53,10 +53,10 @@
 // We mean it.
 //
 
-#include <private/qfxitem_p.h>
+#include <private/qmlgraphicsitem_p.h>
 #include <QtCore/QObject>
 #include <QtCore/QString>
-#include <QtDeclarative/qfxpositioners.h>
+#include <QtDeclarative/qmlgraphicspositioners.h>
 #include <QtDeclarative/qmlstate.h>
 #include <private/qmltransitionmanager_p.h>
 #include <QtDeclarative/qmlstateoperations.h>
diff --git a/src/declarative/fx/qfxrect.cpp b/src/declarative/fx/qmlgraphicsrect.cpp
index 7ebacf0..1784ae1 100644
--- a/src/declarative/fx/qfxrect.cpp
+++ b/src/declarative/fx/qmlgraphicsrect.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qfxrect.h"
-#include "qfxrect_p.h"
+#include "qmlgraphicsrect.h"
+#include "qmlgraphicsrect_p.h"
 
 #include <QPainter>
 #include <QtCore/qmath.h>
diff --git a/src/declarative/fx/qfxrect.h b/src/declarative/fx/qmlgraphicsrect.h
index 5154a8a..454b2f1 100644
--- a/src/declarative/fx/qfxrect.h
+++ b/src/declarative/fx/qmlgraphicsrect.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QFXRECT_H
-#define QFXRECT_H
+#ifndef QMLGRAPHICSRECT_H
+#define QMLGRAPHICSRECT_H
 
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 #include <QtGui/qbrush.h>
 
 
@@ -186,4 +186,4 @@ QML_DECLARE_TYPE(QmlGraphicsRect)
 
 QT_END_HEADER
 
-#endif // QFXRECT_H
+#endif // QMLGRAPHICSRECT_H
diff --git a/src/declarative/fx/qfxrect_p.h b/src/declarative/fx/qmlgraphicsrect_p.h
index d67209e..f44e8de 100644
--- a/src/declarative/fx/qfxrect_p.h
+++ b/src/declarative/fx/qmlgraphicsrect_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXRECT_P_H
-#define QFXRECT_P_H
+#ifndef QMLGRAPHICSRECT_P_H
+#define QMLGRAPHICSRECT_P_H
 
 //
 //  W A R N I N G
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qfxitem_p.h"
+#include "qmlgraphicsitem_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -106,4 +106,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QFXRECT_P_H
+#endif // QMLGRAPHICSRECT_P_H
diff --git a/src/declarative/fx/qfxrepeater.cpp b/src/declarative/fx/qmlgraphicsrepeater.cpp
index e8e44cc..608f948 100644
--- a/src/declarative/fx/qfxrepeater.cpp
+++ b/src/declarative/fx/qmlgraphicsrepeater.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qfxrepeater.h"
-#include "qfxrepeater_p.h"
+#include "qmlgraphicsrepeater.h"
+#include "qmlgraphicsrepeater_p.h"
 #include "qmllistaccessor.h"
-#include "qfxvisualitemmodel.h"
+#include "qmlgraphicsvisualitemmodel.h"
 #include <qlistmodelinterface.h>
 
 
diff --git a/src/declarative/fx/qfxrepeater.h b/src/declarative/fx/qmlgraphicsrepeater.h
index f8a03cc..9cb7d45 100644
--- a/src/declarative/fx/qfxrepeater.h
+++ b/src/declarative/fx/qmlgraphicsrepeater.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QFXREPEATER_H
-#define QFXREPEATER_H
+#ifndef QMLGRAPHICSREPEATER_H
+#define QMLGRAPHICSREPEATER_H
 
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 
 QT_BEGIN_HEADER
 
@@ -100,4 +100,4 @@ QML_DECLARE_TYPE(QmlGraphicsRepeater)
 
 QT_END_HEADER
 
-#endif // QFXREPEATER_H
+#endif // QMLGRAPHICSREPEATER_H
diff --git a/src/declarative/fx/qfxrepeater_p.h b/src/declarative/fx/qmlgraphicsrepeater_p.h
index eb35352..7c111da 100644
--- a/src/declarative/fx/qfxrepeater_p.h
+++ b/src/declarative/fx/qmlgraphicsrepeater_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXREPEATER_P_H
-#define QFXREPEATER_P_H
+#ifndef QMLGRAPHICSREPEATER_P_H
+#define QMLGRAPHICSREPEATER_P_H
 
 //
 //  W A R N I N G
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "qfxitem_p.h"
-#include "qfxrepeater.h"
+#include "qmlgraphicsitem_p.h"
+#include "qmlgraphicsrepeater.h"
 #include <QPointer>
 
 
@@ -78,4 +78,4 @@ public:
 };
 
 QT_END_NAMESPACE
-#endif // QFXREPEATER_P_H
+#endif // QMLGRAPHICSREPEATER_P_H
diff --git a/src/declarative/fx/qfxscalegrid.cpp b/src/declarative/fx/qmlgraphicsscalegrid.cpp
index 2012616..fdf44cf 100644
--- a/src/declarative/fx/qfxscalegrid.cpp
+++ b/src/declarative/fx/qmlgraphicsscalegrid.cpp
@@ -42,7 +42,7 @@
 #include <QBuffer>
 #include <qml.h>
 #include <QDebug>
-#include "qfxscalegrid_p.h"
+#include "qmlgraphicsscalegrid_p.h"
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/fx/qfxscalegrid_p.h b/src/declarative/fx/qmlgraphicsscalegrid_p.h
index f065f9d..040db4c 100644
--- a/src/declarative/fx/qfxscalegrid_p.h
+++ b/src/declarative/fx/qmlgraphicsscalegrid_p.h
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#ifndef QFXSCALEGRID_H
-#define QFXSCALEGRID_H
+#ifndef QMLGRAPHICSSCALEGRID_H
+#define QMLGRAPHICSSCALEGRID_H
 
 #include <QtCore/QString>
 #include <QtCore/QObject>
 #include <QtDeclarative/qfxglobal.h>
-#include <QtDeclarative/qfxpixmapcache.h>
+#include <QtDeclarative/qmlgraphicspixmapcache.h>
 #include <QtDeclarative/qml.h>
-#include "qfxborderimage.h"
+#include "qmlgraphicsborderimage.h"
 
 
 QT_BEGIN_HEADER
@@ -130,4 +130,4 @@ QML_DECLARE_TYPE(QmlGraphicsScaleGrid)
 
 QT_END_HEADER
 
-#endif // QFXSCALEGRID_H
+#endif // QMLGRAPHICSSCALEGRID_H
diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qmlgraphicstext.cpp
index 77b3ab4..f5ea55f 100644
--- a/src/declarative/fx/qfxtext.cpp
+++ b/src/declarative/fx/qmlgraphicstext.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qfxtext.h"
-#include "qfxtext_p.h"
+#include "qmlgraphicstext.h"
+#include "qmlgraphicstext_p.h"
 
 #include <private/qtextcontrol_p.h>
 #include <private/qfxperf_p.h>
diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qmlgraphicstext.h
index bc2fb4f..619de87 100644
--- a/src/declarative/fx/qfxtext.h
+++ b/src/declarative/fx/qmlgraphicstext.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef QFXTEXT_H
-#define QFXTEXT_H
+#ifndef QMLGRAPHICSTEXT_H
+#define QMLGRAPHICSTEXT_H
 
-#include <QtDeclarative/qfxitem.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/fx/qfxtext_p.h b/src/declarative/fx/qmlgraphicstext_p.h
index 436aa08..bf14c6f 100644
--- a/src/declarative/fx/qfxtext_p.h
+++ b/src/declarative/fx/qmlgraphicstext_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXTEXT_P_H
-#define QFXTEXT_P_H
+#ifndef QMLGRAPHICSTEXT_P_H
+#define QMLGRAPHICSTEXT_P_H
 
 //
 //  W A R N I N G
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "qfxitem.h"
-#include "qfxitem_p.h"
+#include "qmlgraphicsitem.h"
+#include "qmlgraphicsitem_p.h"
 #include "qml.h"
 #include <QtGui/qtextlayout.h>
 
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qmlgraphicstextedit.cpp
index ddb9194..24c64c1 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qmlgraphicstextedit.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include <qfxtextedit.h>
-#include "qfxtextedit_p.h"
+#include <qmlgraphicstextedit.h>
+#include "qmlgraphicstextedit_p.h"
 #include <private/qtextcontrol_p.h>
 #include <private/qfxperf_p.h>
-#include "qfxevents_p.h"
+#include "qmlgraphicsevents_p.h"
 #include <QTextLayout>
 #include <QTextLine>
 #include <QTextDocument>
diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qmlgraphicstextedit.h
index 28eb180..57f7449 100644
--- a/src/declarative/fx/qfxtextedit.h
+++ b/src/declarative/fx/qmlgraphicstextedit.h
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#ifndef QFXTEXTEDIT_H
-#define QFXTEXTEDIT_H
+#ifndef QMLGRAPHICSTEXTEDIT_H
+#define QMLGRAPHICSTEXTEDIT_H
 
-#include <QtDeclarative/qfxtext.h>
-#include <QtDeclarative/qfxpainteditem.h>
+#include <QtDeclarative/qmlgraphicstext.h>
+#include <QtDeclarative/qmlgraphicspainteditem.h>
 
 #include <QtGui/qtextdocument.h>
 #include <QtGui/qtextoption.h>
diff --git a/src/declarative/fx/qfxtextedit_p.h b/src/declarative/fx/qmlgraphicstextedit_p.h
index ca65109..7a163f8 100644
--- a/src/declarative/fx/qfxtextedit_p.h
+++ b/src/declarative/fx/qmlgraphicstextedit_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXTEXTEDIT_P_H
-#define QFXTEXTEDIT_P_H
+#ifndef QMLGRAPHICSTEXTEDIT_P_H
+#define QMLGRAPHICSTEXTEDIT_P_H
 
 //
 //  W A R N I N G
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "qfxitem.h"
-#include "qfxpainteditem_p.h"
+#include "qmlgraphicsitem.h"
+#include "qmlgraphicspainteditem_p.h"
 #include "qml.h"
 
 
diff --git a/src/declarative/fx/qfxtextinput.cpp b/src/declarative/fx/qmlgraphicstextinput.cpp
index 930768d..17e6f7c 100644
--- a/src/declarative/fx/qfxtextinput.cpp
+++ b/src/declarative/fx/qmlgraphicstextinput.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qfxtextinput.h"
-#include "qfxtextinput_p.h"
+#include "qmlgraphicstextinput.h"
+#include "qmlgraphicstextinput_p.h"
 #include "qmlinfo.h"
 #include <QValidator>
 #include <QApplication>
diff --git a/src/declarative/fx/qfxtextinput.h b/src/declarative/fx/qmlgraphicstextinput.h
index ada32f9..1b143e0 100644
--- a/src/declarative/fx/qfxtextinput.h
+++ b/src/declarative/fx/qmlgraphicstextinput.h
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#ifndef QFXTEXTINPUT_H
-#define QFXTEXTINPUT_H
+#ifndef QMLGRAPHICSTEXTINPUT_H
+#define QMLGRAPHICSTEXTINPUT_H
 
-#include "qfxtext.h"
-#include "qfxpainteditem.h"
+#include "qmlgraphicstext.h"
+#include "qmlgraphicspainteditem.h"
 #include <QGraphicsSceneMouseEvent>
 #include <QIntValidator>
 
@@ -206,4 +206,4 @@ QML_DECLARE_TYPE(QIntValidator)
 
 QT_END_HEADER
 
-#endif // QFXTEXTINPUT_H
+#endif // QMLGRAPHICSTEXTINPUT_H
diff --git a/src/declarative/fx/qfxtextinput_p.h b/src/declarative/fx/qmlgraphicstextinput_p.h
index be8c946..010dfe1 100644
--- a/src/declarative/fx/qfxtextinput_p.h
+++ b/src/declarative/fx/qmlgraphicstextinput_p.h
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#ifndef QFXTEXTINPUT_P_H
-#define QFXTEXTINPUT_P_H
+#ifndef QMLGRAPHICSTEXTINPUT_P_H
+#define QMLGRAPHICSTEXTINPUT_P_H
 
-#include "qfxtextinput.h"
+#include "qmlgraphicstextinput.h"
 #include "qml.h"
-#include "qfxpainteditem_p.h"
+#include "qmlgraphicspainteditem_p.h"
 #include "private/qlinecontrol_p.h"
 #include <QPointer>
 //
diff --git a/src/declarative/fx/qfxvisualitemmodel.cpp b/src/declarative/fx/qmlgraphicsvisualitemmodel.cpp
index 681e360..b9b0237 100644
--- a/src/declarative/fx/qfxvisualitemmodel.cpp
+++ b/src/declarative/fx/qmlgraphicsvisualitemmodel.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qlistmodelinterface.h"
-#include "qfxitem.h"
+#include "qmlgraphicsitem.h"
 #include <qmlcontext.h>
 #include <qmlexpression.h>
 #include "qmlpackage.h"
@@ -51,7 +51,7 @@
 #include "qmlopenmetaobject.h"
 #include "qmllistaccessor.h"
 #include "qmlinfo.h"
-#include "qfxvisualitemmodel.h"
+#include "qmlgraphicsvisualitemmodel.h"
 #include "private/qguard_p.h"
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/fx/qfxvisualitemmodel.h b/src/declarative/fx/qmlgraphicsvisualitemmodel.h
index 7f7a13f..fb36531 100644
--- a/src/declarative/fx/qfxvisualitemmodel.h
+++ b/src/declarative/fx/qmlgraphicsvisualitemmodel.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QFXVISUALDATAMODEL_H
-#define QFXVISUALDATAMODEL_H
+#ifndef QMLGRAPHICSVISUALDATAMODEL_H
+#define QMLGRAPHICSVISUALDATAMODEL_H
 
 #include <QtCore/qobject.h>
 #include <QtCore/qabstractitemmodel.h>
@@ -200,4 +200,4 @@ QML_DECLARE_TYPE(QmlGraphicsVisualDataModel)
 
 QT_END_HEADER
 
-#endif // QFXVISUALDATAMODEL_H
+#endif // QMLGRAPHICSVISUALDATAMODEL_H
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qmlgraphicswebview.cpp
index e6f0a1d..d9044cf 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qmlgraphicswebview.cpp
@@ -58,8 +58,8 @@
 #include "qmlstate.h"
 #include "qlistmodelinterface.h"
 
-#include "qfxwebview.h"
-#include <private/qfxpainteditem_p.h>
+#include "qmlgraphicswebview.h"
+#include <private/qmlgraphicspainteditem_p.h>
 
 QT_BEGIN_NAMESPACE
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,WebView,QmlGraphicsWebView)
diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qmlgraphicswebview.h
index e567197..81f7bcd 100644
--- a/src/declarative/fx/qfxwebview.h
+++ b/src/declarative/fx/qmlgraphicswebview.h
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#ifndef QFXWEBVIEW_H
-#define QFXWEBVIEW_H
+#ifndef QMLGRAPHICSWEBVIEW_H
+#define QMLGRAPHICSWEBVIEW_H
 
 #include <QtGui/QAction>
 #include <QtCore/QUrl>
 #include <QtDeclarative/qfxglobal.h>
-#include <QtDeclarative/qfxpainteditem.h>
+#include <QtDeclarative/qmlgraphicspainteditem.h>
 #include <QtNetwork/qnetworkaccessmanager.h>
 #include <QtWebKit/QWebPage>
 
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index 1bd9199..5c328cf 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -46,8 +46,8 @@
 #include "qmlstateoperations.h"
 #include <QtCore/qdebug.h>
 #include <QtDeclarative/qmlinfo.h>
-#include <private/qfxanchors_p.h>
-#include <private/qfxitem_p.h>
+#include <private/qmlgraphicsanchors_p.h>
+#include <private/qmlgraphicsitem_p.h>
 #include <QtGui/qgraphicsitem.h>
 #include <QtCore/qmath.h>
 
diff --git a/src/declarative/util/qmlstateoperations.h b/src/declarative/util/qmlstateoperations.h
index 903998d..f2bcd49 100644
--- a/src/declarative/util/qmlstateoperations.h
+++ b/src/declarative/util/qmlstateoperations.h
@@ -43,8 +43,8 @@
 #define QMLSTATEOPERATIONS_H
 
 #include <QtDeclarative/qmlstate.h>
-#include <QtDeclarative/qfxitem.h>
-#include <QtDeclarative/qfxanchors.h>
+#include <QtDeclarative/qmlgraphicsitem.h>
+#include <QtDeclarative/qmlgraphicsanchors.h>
 #include <QtDeclarative/qmlscriptstring.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp
index ac67cb8..91d443a 100644
--- a/src/declarative/util/qmlview.cpp
+++ b/src/declarative/util/qmlview.cpp
@@ -52,7 +52,7 @@
 #include "qbasictimer.h"
 
 #include "qml.h"
-#include "qfxitem.h"
+#include "qmlgraphicsitem.h"
 #include "private/qperformancelog_p.h"
 #include "private/qfxperf_p.h"