Proper Qt module - part III

179 files changed, 1515 insertions, 1526 deletions

diff --git a/src/qmlandroid/app/qtqmlandroidactionbar.cpp b/src/qmlandroid/app/qtqmlandroidactionbar.cpp
index c45ada0..517f9b4 100644
--- a/src/qmlandroid/app/qtqmlandroidactionbar.cpp
+++ b/src/qmlandroid/app/qtqmlandroidactionbar.cpp
@@ -4,17 +4,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidActionBar::QtQmlAndroidActionBar(QObject *parent) :
-    QtQmlAndroidObject(parent), m_visible(true), m_elevation(0.0), m_background(0)
+QQmlAndroidActionBar::QQmlAndroidActionBar(QObject *parent) :
+    QQmlAndroidObject(parent), m_visible(true), m_elevation(0.0), m_background(0)
 {
 }
 
-bool QtQmlAndroidActionBar::isVisible() const
+bool QQmlAndroidActionBar::isVisible() const
 {
     return m_visible;
 }
 
-void QtQmlAndroidActionBar::setVisible(bool arg)
+void QQmlAndroidActionBar::setVisible(bool arg)
 {
     if (arg != isVisible()) {
         m_visible = arg;
@@ -26,12 +26,12 @@ void QtQmlAndroidActionBar::setVisible(bool arg)
     }
 }
 
-qreal QtQmlAndroidActionBar::elevation() const
+qreal QQmlAndroidActionBar::elevation() const
 {
     return m_elevation;
 }
 
-void QtQmlAndroidActionBar::setElevation(qreal elevation)
+void QQmlAndroidActionBar::setElevation(qreal elevation)
 {
     if (m_elevation != elevation) {
         m_elevation = elevation;
@@ -40,12 +40,12 @@ void QtQmlAndroidActionBar::setElevation(qreal elevation)
     }
 }
 
-QString QtQmlAndroidActionBar::title() const
+QString QQmlAndroidActionBar::title() const
 {
     return m_title;
 }
 
-void QtQmlAndroidActionBar::setTitle(const QString &title)
+void QQmlAndroidActionBar::setTitle(const QString &title)
 {
     if (m_title != title) {
         m_title = title;
@@ -54,12 +54,12 @@ void QtQmlAndroidActionBar::setTitle(const QString &title)
     }
 }
 
-QString QtQmlAndroidActionBar::subtitle() const
+QString QQmlAndroidActionBar::subtitle() const
 {
     return m_subtitle;
 }
 
-void QtQmlAndroidActionBar::setSubtitle(const QString &subtitle)
+void QQmlAndroidActionBar::setSubtitle(const QString &subtitle)
 {
     if (m_subtitle != subtitle) {
         m_subtitle = subtitle;
@@ -68,28 +68,28 @@ void QtQmlAndroidActionBar::setSubtitle(const QString &subtitle)
     }
 }
 
-QtQmlAndroidDrawable *QtQmlAndroidActionBar::background() const
+QQmlAndroidDrawable *QQmlAndroidActionBar::background() const
 {
     return m_background;
 }
 
-void QtQmlAndroidActionBar::setBackground(QtQmlAndroidDrawable *background)
+void QQmlAndroidActionBar::setBackground(QQmlAndroidDrawable *background)
 {
     if (m_background != background) {
         if (m_background) {
-            disconnect(m_background, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidActionBar::updateBackground);
+            disconnect(m_background, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidActionBar::updateBackground);
             m_background->destruct();
         }
         m_background = background;
         if (m_background) {
-            connect(m_background, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidActionBar::updateBackground);
+            connect(m_background, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidActionBar::updateBackground);
             m_background->construct();
         }
         emit backgroundChanged();
     }
 }
 
-void QtQmlAndroidActionBar::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidActionBar::onInflate(QAndroidJniObject &instance)
 {
     instance.callMethod<void>(m_visible ? "show" : "hide");
 
@@ -104,14 +104,14 @@ void QtQmlAndroidActionBar::onInflate(QAndroidJniObject &instance)
     instance.callMethod<void>("setHomeButtonEnabled", "(Z)V", true);
 }
 
-void QtQmlAndroidActionBar::objectChange(ObjectChange change)
+void QQmlAndroidActionBar::objectChange(ObjectChange change)
 {
-    QtQmlAndroidObject::objectChange(change);
+    QQmlAndroidObject::objectChange(change);
     if (change == InstanceChange)
         updateBackground();
 }
 
-void QtQmlAndroidActionBar::updateBackground()
+void QQmlAndroidActionBar::updateBackground()
 {
     if (!isValid() || !m_background)
         return;
diff --git a/src/qmlandroid/app/qtqmlandroidactionbar_p.h b/src/qmlandroid/app/qtqmlandroidactionbar_p.h
index b61b74b..9518352 100644
--- a/src/qmlandroid/app/qtqmlandroidactionbar_p.h
+++ b/src/qmlandroid/app/qtqmlandroidactionbar_p.h
@@ -6,19 +6,19 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidDrawable;
+class QQmlAndroidDrawable;
 
-class QtQmlAndroidActionBar : public QtQmlAndroidObject
+class QQmlAndroidActionBar : public QQmlAndroidObject
 {
     Q_OBJECT
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
     Q_PROPERTY(qreal elevation READ elevation WRITE setElevation NOTIFY elevationChanged)
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
     Q_PROPERTY(QString subtitle READ subtitle WRITE setSubtitle NOTIFY subtitleChanged)
-    Q_PROPERTY(QtQmlAndroidDrawable *background READ background WRITE setBackground NOTIFY backgroundChanged)
+    Q_PROPERTY(QQmlAndroidDrawable *background READ background WRITE setBackground NOTIFY backgroundChanged)
 
 public:
-    explicit QtQmlAndroidActionBar(QObject *parent = 0);
+    explicit QQmlAndroidActionBar(QObject *parent = 0);
 
     bool isVisible() const;
     void setVisible(bool visible);
@@ -32,8 +32,8 @@ public:
     QString subtitle() const;
     void setSubtitle(const QString &subtitle);
 
-    QtQmlAndroidDrawable *background() const;
-    void setBackground(QtQmlAndroidDrawable *background);
+    QQmlAndroidDrawable *background() const;
+    void setBackground(QQmlAndroidDrawable *background);
 
 Q_SIGNALS:
     void visibleChanged();
@@ -55,7 +55,7 @@ private:
     qreal m_elevation;
     QString m_title;
     QString m_subtitle;
-    QtQmlAndroidDrawable *m_background;
+    QQmlAndroidDrawable *m_background;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/app/qtqmlandroidactivity.cpp b/src/qmlandroid/app/qtqmlandroidactivity.cpp
index 677a2eb..89b4f14 100644
--- a/src/qmlandroid/app/qtqmlandroidactivity.cpp
+++ b/src/qmlandroid/app/qtqmlandroidactivity.cpp
@@ -11,25 +11,25 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidActivity::QtQmlAndroidActivity(QObject *parent) :
-    QtQmlAndroidContextWrapper(parent), m_window(new QtQmlAndroidWindow(this)),
+QQmlAndroidActivity::QQmlAndroidActivity(QObject *parent) :
+    QQmlAndroidContextWrapper(parent), m_window(new QQmlAndroidWindow(this)),
     m_contentView(0), m_optionsMenu(0), m_actionBar(0)
 {
     // TODO: multiple activities?
     setInstance(QtAndroid::androidActivity());
 }
 
-QtQmlAndroidWindow *QtQmlAndroidActivity::window() const
+QQmlAndroidWindow *QQmlAndroidActivity::window() const
 {
     return m_window;
 }
 
-QtQmlAndroidActionBar *QtQmlAndroidActivity::actionBar() const
+QQmlAndroidActionBar *QQmlAndroidActivity::actionBar() const
 {
     return m_actionBar;
 }
 
-void QtQmlAndroidActivity::setActionBar(QtQmlAndroidActionBar *bar)
+void QQmlAndroidActivity::setActionBar(QQmlAndroidActionBar *bar)
 {
     if (m_actionBar != bar) {
         if (m_actionBar)
@@ -40,59 +40,59 @@ void QtQmlAndroidActivity::setActionBar(QtQmlAndroidActionBar *bar)
     }
 }
 
-QtQmlAndroidMenu *QtQmlAndroidActivity::optionsMenu() const
+QQmlAndroidMenu *QQmlAndroidActivity::optionsMenu() const
 {
     return m_optionsMenu;
 }
 
-void QtQmlAndroidActivity::setOptionsMenu(QtQmlAndroidMenu *menu)
+void QQmlAndroidActivity::setOptionsMenu(QQmlAndroidMenu *menu)
 {
     if (m_optionsMenu != menu) {
         if (m_optionsMenu) {
-            disconnect(m_optionsMenu, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidActivity::updateOptionsMenu);
+            disconnect(m_optionsMenu, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidActivity::updateOptionsMenu);
             m_optionsMenu->destruct();
         }
         m_optionsMenu = menu;
         if (m_optionsMenu) {
-            connect(m_optionsMenu, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidActivity::updateOptionsMenu);
+            connect(m_optionsMenu, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidActivity::updateOptionsMenu);
             if (isComponentComplete())
                 m_optionsMenu->construct();
         }
     }
 }
 
-QtQmlAndroidView *QtQmlAndroidActivity::contentView() const
+QQmlAndroidView *QQmlAndroidActivity::contentView() const
 {
     return m_contentView;
 }
 
-void QtQmlAndroidActivity::setContentView(QtQmlAndroidView *view)
+void QQmlAndroidActivity::setContentView(QQmlAndroidView *view)
 {
     if (m_contentView != view) {
         if (m_contentView) {
-            disconnect(m_contentView, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidActivity::updateContentView);
+            disconnect(m_contentView, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidActivity::updateContentView);
             m_contentView->destruct();
         }
         m_contentView = view;
         if (m_contentView) {
-            connect(m_contentView, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidActivity::updateContentView);
+            connect(m_contentView, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidActivity::updateContentView);
             if (isComponentComplete())
                 m_contentView->construct();
         }
     }
 }
 
-void QtQmlAndroidActivity::classBegin()
+void QQmlAndroidActivity::classBegin()
 {
-    QtQmlAndroidContextWrapper::classBegin();
+    QQmlAndroidContextWrapper::classBegin();
 }
 
-void QtQmlAndroidActivity::componentComplete()
+void QQmlAndroidActivity::componentComplete()
 {
-    QtQmlAndroidContextWrapper::componentComplete();
+    QQmlAndroidContextWrapper::componentComplete();
 
     foreach (QObject *child, children()) {
-        QtQmlAndroidObject *object = qobject_cast<QtQmlAndroidObject *>(child);
+        QQmlAndroidObject *object = qobject_cast<QQmlAndroidObject *>(child);
         if (object)
             object->construct();
     }
@@ -104,7 +104,7 @@ void QtQmlAndroidActivity::componentComplete()
         setupWindow();
 }
 
-void QtQmlAndroidActivity::setupWindow()
+void QQmlAndroidActivity::setupWindow()
 {
     if (!isValid())
         return;
@@ -116,7 +116,7 @@ void QtQmlAndroidActivity::setupWindow()
     });
 }
 
-void QtQmlAndroidActivity::setupActionBar()
+void QQmlAndroidActivity::setupActionBar()
 {
     if (!isValid())
         return;
@@ -128,7 +128,7 @@ void QtQmlAndroidActivity::setupActionBar()
     });
 }
 
-void QtQmlAndroidActivity::updateOptionsMenu()
+void QQmlAndroidActivity::updateOptionsMenu()
 {
     if (!isValid())
         return;
@@ -143,12 +143,12 @@ void QtQmlAndroidActivity::updateOptionsMenu()
     });
 }
 
-void QtQmlAndroidActivity::invalidateOptionsMenu()
+void QQmlAndroidActivity::invalidateOptionsMenu()
 {
     QtQmlAndroid::callVoidMethod(instance(), "invalidateOptionsMenu");
 }
 
-void QtQmlAndroidActivity::updateContentView()
+void QQmlAndroidActivity::updateContentView()
 {
     if (!isValid())
         return;
diff --git a/src/qmlandroid/app/qtqmlandroidactivity_p.h b/src/qmlandroid/app/qtqmlandroidactivity_p.h
index 9977810..a32dd40 100644
--- a/src/qmlandroid/app/qtqmlandroidactivity_p.h
+++ b/src/qmlandroid/app/qtqmlandroidactivity_p.h
@@ -5,32 +5,32 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidView;
-class QtQmlAndroidMenu;
-class QtQmlAndroidWindow;
-class QtQmlAndroidActionBar;
+class QQmlAndroidView;
+class QQmlAndroidMenu;
+class QQmlAndroidWindow;
+class QQmlAndroidActionBar;
 
-class QtQmlAndroidActivity : public QtQmlAndroidContextWrapper
+class QQmlAndroidActivity : public QQmlAndroidContextWrapper
 {
     Q_OBJECT
-    Q_PROPERTY(QtQmlAndroidWindow *window READ window CONSTANT)
-    Q_PROPERTY(QtQmlAndroidActionBar *actionBar READ actionBar WRITE setActionBar)
-    Q_PROPERTY(QtQmlAndroidMenu *optionsMenu READ optionsMenu WRITE setOptionsMenu)
-    Q_PROPERTY(QtQmlAndroidView *contentView READ contentView WRITE setContentView)
+    Q_PROPERTY(QQmlAndroidWindow *window READ window CONSTANT)
+    Q_PROPERTY(QQmlAndroidActionBar *actionBar READ actionBar WRITE setActionBar)
+    Q_PROPERTY(QQmlAndroidMenu *optionsMenu READ optionsMenu WRITE setOptionsMenu)
+    Q_PROPERTY(QQmlAndroidView *contentView READ contentView WRITE setContentView)
 
 public:
-    explicit QtQmlAndroidActivity(QObject *parent = 0);
+    explicit QQmlAndroidActivity(QObject *parent = 0);
 
-    QtQmlAndroidWindow *window() const;
+    QQmlAndroidWindow *window() const;
 
-    QtQmlAndroidActionBar *actionBar() const;
-    void setActionBar(QtQmlAndroidActionBar *bar);
+    QQmlAndroidActionBar *actionBar() const;
+    void setActionBar(QQmlAndroidActionBar *bar);
 
-    QtQmlAndroidMenu *optionsMenu() const;
-    void setOptionsMenu(QtQmlAndroidMenu *menu);
+    QQmlAndroidMenu *optionsMenu() const;
+    void setOptionsMenu(QQmlAndroidMenu *menu);
 
-    QtQmlAndroidView *contentView() const;
-    void setContentView(QtQmlAndroidView *view);
+    QQmlAndroidView *contentView() const;
+    void setContentView(QQmlAndroidView *view);
 
 protected:
     void classBegin() Q_DECL_OVERRIDE;
@@ -44,10 +44,10 @@ private Q_SLOTS:
     void updateContentView();
 
 private:
-    QtQmlAndroidWindow *m_window;
-    QtQmlAndroidView *m_contentView;
-    QtQmlAndroidMenu *m_optionsMenu;
-    QtQmlAndroidActionBar *m_actionBar;
+    QQmlAndroidWindow *m_window;
+    QQmlAndroidView *m_contentView;
+    QQmlAndroidMenu *m_optionsMenu;
+    QQmlAndroidActionBar *m_actionBar;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/app/qtqmlandroidalertdialog.cpp b/src/qmlandroid/app/qtqmlandroidalertdialog.cpp
index 2e55fb4..90e1db0 100644
--- a/src/qmlandroid/app/qtqmlandroidalertdialog.cpp
+++ b/src/qmlandroid/app/qtqmlandroidalertdialog.cpp
@@ -3,17 +3,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidAlertDialog::QtQmlAndroidAlertDialog(QObject *parent) :
-    QtQmlAndroidDialog(parent)
+QQmlAndroidAlertDialog::QQmlAndroidAlertDialog(QObject *parent) :
+    QQmlAndroidDialog(parent)
 {
 }
 
-QString QtQmlAndroidAlertDialog::title() const
+QString QQmlAndroidAlertDialog::title() const
 {
     return m_title;
 }
 
-void QtQmlAndroidAlertDialog::setTitle(const QString &title)
+void QQmlAndroidAlertDialog::setTitle(const QString &title)
 {
     if (m_title != title) {
         m_title = title;
@@ -22,12 +22,12 @@ void QtQmlAndroidAlertDialog::setTitle(const QString &title)
     }
 }
 
-QString QtQmlAndroidAlertDialog::message() const
+QString QQmlAndroidAlertDialog::message() const
 {
     return m_message;
 }
 
-void QtQmlAndroidAlertDialog::setMessage(const QString &message)
+void QQmlAndroidAlertDialog::setMessage(const QString &message)
 {
     if (m_message != message) {
         m_message = message;
@@ -36,16 +36,16 @@ void QtQmlAndroidAlertDialog::setMessage(const QString &message)
     }
 }
 
-QAndroidJniObject QtQmlAndroidAlertDialog::onCreate()
+QAndroidJniObject QQmlAndroidAlertDialog::onCreate()
 {
     return QAndroidJniObject("android/app/AlertDialog",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidAlertDialog::onInflate(QAndroidJniObject& instance)
+void QQmlAndroidAlertDialog::onInflate(QAndroidJniObject& instance)
 {
-    QtQmlAndroidDialog::onInflate(instance);
+    QQmlAndroidDialog::onInflate(instance);
 
     if (!m_title.isNull())
         instance.callMethod<void>("setTitle", "(Ljava/lang/CharSequence;)V", QAndroidJniObject::fromString(m_title).object());
diff --git a/src/qmlandroid/app/qtqmlandroidalertdialog_p.h b/src/qmlandroid/app/qtqmlandroidalertdialog_p.h
index 2b8470e..246ea1b 100644
--- a/src/qmlandroid/app/qtqmlandroidalertdialog_p.h
+++ b/src/qmlandroid/app/qtqmlandroidalertdialog_p.h
@@ -5,14 +5,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidAlertDialog : public QtQmlAndroidDialog
+class QQmlAndroidAlertDialog : public QQmlAndroidDialog
 {
     Q_OBJECT
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
     Q_PROPERTY(QString message READ message WRITE setMessage NOTIFY messageChanged)
 
 public:
-    explicit QtQmlAndroidAlertDialog(QObject *parent = 0);
+    explicit QQmlAndroidAlertDialog(QObject *parent = 0);
 
     QString title() const;
     void setTitle(const QString &title);
diff --git a/src/qmlandroid/app/qtqmlandroidappmodule.cpp b/src/qmlandroid/app/qtqmlandroidappmodule.cpp
index e349968..f2deee6 100644
--- a/src/qmlandroid/app/qtqmlandroidappmodule.cpp
+++ b/src/qmlandroid/app/qtqmlandroidappmodule.cpp
@@ -14,11 +14,11 @@ namespace QtQmlAndroid {
 
 void registerAppModule(const char *uri)
 {
-    qmlRegisterType<QtQmlAndroidActionBar>(uri, 0, 21, "ActionBar");
-    qmlRegisterType<QtQmlAndroidActivity>(uri, 0, 21, "Activity");
-    qmlRegisterType<QtQmlAndroidAlertDialog>(uri, 0, 21, "AlertDialog");
-    qmlRegisterType<QtQmlAndroidDialog>(uri, 0, 21, "Dialog");
-    qmlRegisterType<QtQmlAndroidService>(uri, 0, 21, "Service");
+    qmlRegisterType<QQmlAndroidActionBar>(uri, 0, 21, "ActionBar");
+    qmlRegisterType<QQmlAndroidActivity>(uri, 0, 21, "Activity");
+    qmlRegisterType<QQmlAndroidAlertDialog>(uri, 0, 21, "AlertDialog");
+    qmlRegisterType<QQmlAndroidDialog>(uri, 0, 21, "Dialog");
+    qmlRegisterType<QQmlAndroidService>(uri, 0, 21, "Service");
 }
 
 }
diff --git a/src/qmlandroid/app/qtqmlandroiddialog.cpp b/src/qmlandroid/app/qtqmlandroiddialog.cpp
index b8f809e..77ab26c 100644
--- a/src/qmlandroid/app/qtqmlandroiddialog.cpp
+++ b/src/qmlandroid/app/qtqmlandroiddialog.cpp
@@ -3,41 +3,41 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidDialog::QtQmlAndroidDialog(QObject *parent) :
-    QtQmlAndroidContextual(parent)
+QQmlAndroidDialog::QQmlAndroidDialog(QObject *parent) :
+    QQmlAndroidContextual(parent)
 {
 }
 
-void QtQmlAndroidDialog::cancel()
+void QQmlAndroidDialog::cancel()
 {
     QtQmlAndroid::callVoidMethod(instance(), "cancel");
 }
 
-void QtQmlAndroidDialog::dismiss()
+void QQmlAndroidDialog::dismiss()
 {
     QtQmlAndroid::callVoidMethod(instance(), "dismiss");
 }
 
-void QtQmlAndroidDialog::hide()
+void QQmlAndroidDialog::hide()
 {
     QtQmlAndroid::callVoidMethod(instance(), "hide");
 }
 
-void QtQmlAndroidDialog::show()
+void QQmlAndroidDialog::show()
 {
     QtQmlAndroid::callVoidMethod(instance(), "show");
 }
 
-QAndroidJniObject QtQmlAndroidDialog::onCreate()
+QAndroidJniObject QQmlAndroidDialog::onCreate()
 {
     return QAndroidJniObject("android/app/Dialog",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidDialog::onInflate(QAndroidJniObject& instance)
+void QQmlAndroidDialog::onInflate(QAndroidJniObject& instance)
 {
-    QtQmlAndroidContextual::onInflate(instance);
+    QQmlAndroidContextual::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/app/qtqmlandroiddialog_p.h b/src/qmlandroid/app/qtqmlandroiddialog_p.h
index 6fdb457..18b1e9d 100644
--- a/src/qmlandroid/app/qtqmlandroiddialog_p.h
+++ b/src/qmlandroid/app/qtqmlandroiddialog_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidDialog : public QtQmlAndroidContextual
+class QQmlAndroidDialog : public QQmlAndroidContextual
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidDialog(QObject *parent = 0);
+    explicit QQmlAndroidDialog(QObject *parent = 0);
 
 public Q_SLOTS:
     void cancel();
diff --git a/src/qmlandroid/app/qtqmlandroidservice.cpp b/src/qmlandroid/app/qtqmlandroidservice.cpp
index 32e2870..dfc2bb9 100644
--- a/src/qmlandroid/app/qtqmlandroidservice.cpp
+++ b/src/qmlandroid/app/qtqmlandroidservice.cpp
@@ -3,17 +3,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidService::QtQmlAndroidService(QObject *parent) :
-    QtQmlAndroidContextWrapper(0, parent), m_sticky(true)
+QQmlAndroidService::QQmlAndroidService(QObject *parent) :
+    QQmlAndroidContextWrapper(0, parent), m_sticky(true)
 {
 }
 
-bool QtQmlAndroidService::isSticky() const
+bool QQmlAndroidService::isSticky() const
 {
     return m_sticky;
 }
 
-void QtQmlAndroidService::setSticky(bool sticky)
+void QQmlAndroidService::setSticky(bool sticky)
 {
     if (m_sticky != sticky) {
         m_sticky = sticky;
@@ -21,7 +21,7 @@ void QtQmlAndroidService::setSticky(bool sticky)
     }
 }
 
-void QtQmlAndroidService::start()
+void QQmlAndroidService::start()
 {
     QAndroidJniObject context = ctx();
     QAndroidJniObject service = instance();
@@ -46,7 +46,7 @@ void QtQmlAndroidService::start()
     });
 }
 
-void QtQmlAndroidService::stop()
+void QQmlAndroidService::stop()
 {
     QAndroidJniObject context = ctx();
     QAndroidJniObject service = instance();
@@ -70,14 +70,14 @@ void QtQmlAndroidService::stop()
     });
 }
 
-QAndroidJniObject QtQmlAndroidService::onCreate()
+QAndroidJniObject QQmlAndroidService::onCreate()
 {
     return QAndroidJniObject("qt/android/app/QtService");
 }
 
-void QtQmlAndroidService::onInflate(QAndroidJniObject& instance)
+void QQmlAndroidService::onInflate(QAndroidJniObject& instance)
 {
-    QtQmlAndroidContextWrapper::onInflate(instance);
+    QQmlAndroidContextWrapper::onInflate(instance);
 
     static bool nativeMethodsRegistered = false;
     if (!nativeMethodsRegistered) {
@@ -86,7 +86,7 @@ void QtQmlAndroidService::onInflate(QAndroidJniObject& instance)
     }
 }
 
-void QtQmlAndroidService::onRegisterNativeMethods(jobject service)
+void QQmlAndroidService::onRegisterNativeMethods(jobject service)
 {
     JNINativeMethod methods[] {{"onCreated", "(J)V", reinterpret_cast<void *>(onCreated)},
                                {"onDestroyed", "(J)V", reinterpret_cast<void *>(onDestroyed)},
@@ -98,29 +98,29 @@ void QtQmlAndroidService::onRegisterNativeMethods(jobject service)
     env->DeleteLocalRef(cls);
 }
 
-void QtQmlAndroidService::onCreated(JNIEnv *env, jobject object, jlong instance)
+void QQmlAndroidService::onCreated(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-//    QtQmlAndroidService *service = reinterpret_cast<QtQmlAndroidService *>(instance);
+//    QQmlAndroidService *service = reinterpret_cast<QQmlAndroidService *>(instance);
 //    if (service)
 //        QMetaObject::invokeMethod(service, "created", Qt::QueuedConnection);
 }
 
-void QtQmlAndroidService::onDestroyed(JNIEnv *env, jobject object, jlong instance)
+void QQmlAndroidService::onDestroyed(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidService *service = reinterpret_cast<QtQmlAndroidService *>(instance);
+    QQmlAndroidService *service = reinterpret_cast<QQmlAndroidService *>(instance);
     if (service)
         QMetaObject::invokeMethod(service, "stopped", Qt::QueuedConnection);
 }
 
-jboolean QtQmlAndroidService::onStartCommand(JNIEnv *env, jobject object, jlong instance, jint flags, jint startId)
+jboolean QQmlAndroidService::onStartCommand(JNIEnv *env, jobject object, jlong instance, jint flags, jint startId)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidService *service = reinterpret_cast<QtQmlAndroidService *>(instance);
+    QQmlAndroidService *service = reinterpret_cast<QQmlAndroidService *>(instance);
     bool ret = false;
     if (service) {
         QMetaObject::invokeMethod(service, "startCommand", Qt::BlockingQueuedConnection, Q_RETURN_ARG(bool, ret), Q_ARG(int, flags), Q_ARG(int, startId));
@@ -129,7 +129,7 @@ jboolean QtQmlAndroidService::onStartCommand(JNIEnv *env, jobject object, jlong
     return ret;
 }
 
-bool QtQmlAndroidService::startCommand(int flags, int startId)
+bool QQmlAndroidService::startCommand(int flags, int startId)
 {
     Q_UNUSED(flags);
     Q_UNUSED(startId);
diff --git a/src/qmlandroid/app/qtqmlandroidservice_p.h b/src/qmlandroid/app/qtqmlandroidservice_p.h
index 28b26b0..9f4887e 100644
--- a/src/qmlandroid/app/qtqmlandroidservice_p.h
+++ b/src/qmlandroid/app/qtqmlandroidservice_p.h
@@ -5,13 +5,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidService : public QtQmlAndroidContextWrapper
+class QQmlAndroidService : public QQmlAndroidContextWrapper
 {
     Q_OBJECT
     Q_PROPERTY(bool sticky READ isSticky WRITE setSticky NOTIFY stickyChanged)
 
 public:
-    explicit QtQmlAndroidService(QObject *parent = 0);
+    explicit QQmlAndroidService(QObject *parent = 0);
 
     bool isSticky() const;
     void setSticky(bool sticky);
diff --git a/src/qmlandroid/content/qtqmlandroidcontentmodule.cpp b/src/qmlandroid/content/qtqmlandroidcontentmodule.cpp
index 699f05a..7cca85f 100644
--- a/src/qmlandroid/content/qtqmlandroidcontentmodule.cpp
+++ b/src/qmlandroid/content/qtqmlandroidcontentmodule.cpp
@@ -10,7 +10,7 @@ namespace QtQmlAndroid {
 
 void registerContentModule(const char *uri)
 {
-    qmlRegisterUncreatableType<QtQmlAndroidContext>(uri, 0, 21, "Context", "Cannot create Context");
+    qmlRegisterUncreatableType<QQmlAndroidContext>(uri, 0, 21, "Context", "Cannot create Context");
 }
 
 }
diff --git a/src/qmlandroid/content/qtqmlandroidcontext.cpp b/src/qmlandroid/content/qtqmlandroidcontext.cpp
index 166eeb9..502ef4c 100644
--- a/src/qmlandroid/content/qtqmlandroidcontext.cpp
+++ b/src/qmlandroid/content/qtqmlandroidcontext.cpp
@@ -2,13 +2,13 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidContext::QtQmlAndroidContext(QObject *parent) :
-    QtQmlAndroidContextual(this, parent)
+QQmlAndroidContext::QQmlAndroidContext(QObject *parent) :
+    QQmlAndroidContextual(this, parent)
 {
 }
 
-QtQmlAndroidContext::QtQmlAndroidContext(QtQmlAndroidContext *context, QObject *parent) :
-    QtQmlAndroidContextual(context, parent)
+QQmlAndroidContext::QQmlAndroidContext(QQmlAndroidContext *context, QObject *parent) :
+    QQmlAndroidContextual(context, parent)
 {
 }
 
diff --git a/src/qmlandroid/content/qtqmlandroidcontext_p.h b/src/qmlandroid/content/qtqmlandroidcontext_p.h
index 56933d0..c81d58c 100644
--- a/src/qmlandroid/content/qtqmlandroidcontext_p.h
+++ b/src/qmlandroid/content/qtqmlandroidcontext_p.h
@@ -5,13 +5,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidContext : public QtQmlAndroidContextual
+class QQmlAndroidContext : public QQmlAndroidContextual
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidContext(QObject *parent = 0);
-    explicit QtQmlAndroidContext(QtQmlAndroidContext *context, QObject *parent = 0);
+    explicit QQmlAndroidContext(QObject *parent = 0);
+    explicit QQmlAndroidContext(QQmlAndroidContext *context, QObject *parent = 0);
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/content/qtqmlandroidcontextual.cpp b/src/qmlandroid/content/qtqmlandroidcontextual.cpp
index d133530..b64e408 100644
--- a/src/qmlandroid/content/qtqmlandroidcontextual.cpp
+++ b/src/qmlandroid/content/qtqmlandroidcontextual.cpp
@@ -4,33 +4,33 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidContextual::QtQmlAndroidContextual(QObject *parent) :
-    QtQmlAndroidObject(parent), m_context(0)
+QQmlAndroidContextual::QQmlAndroidContextual(QObject *parent) :
+    QQmlAndroidObject(parent), m_context(0)
 {
     if (!initContext())
         QMetaObject::invokeMethod(this, "resolveContext", Qt::QueuedConnection);
 }
 
-QtQmlAndroidContextual::QtQmlAndroidContextual(QtQmlAndroidContext* context, QObject *parent) :
-    QtQmlAndroidObject(parent), m_context(0)
+QQmlAndroidContextual::QQmlAndroidContextual(QQmlAndroidContext* context, QObject *parent) :
+    QQmlAndroidObject(parent), m_context(0)
 {
     if (!initContext(context))
         QMetaObject::invokeMethod(this, "resolveContext", Qt::QueuedConnection);
 }
 
-QAndroidJniObject QtQmlAndroidContextual::ctx() const
+QAndroidJniObject QQmlAndroidContextual::ctx() const
 {
     if (!m_context)
         return QAndroidJniObject();
     return m_context->instance();
 }
 
-QtQmlAndroidContext *QtQmlAndroidContextual::context() const
+QQmlAndroidContext *QQmlAndroidContextual::context() const
 {
     return m_context;
 }
 
-void QtQmlAndroidContextual::setContext(QtQmlAndroidContext *context)
+void QQmlAndroidContextual::setContext(QQmlAndroidContext *context)
 {
     if (m_context != context) {
         m_context = context;
@@ -39,18 +39,18 @@ void QtQmlAndroidContextual::setContext(QtQmlAndroidContext *context)
     }
 }
 
-void QtQmlAndroidContextual::componentComplete()
+void QQmlAndroidContextual::componentComplete()
 {
-    QtQmlAndroidObject::componentComplete();
+    QQmlAndroidObject::componentComplete();
     propagateContext();
 }
 
-static QtQmlAndroidContext *findContext(QtQmlAndroidObject *object)
+static QQmlAndroidContext *findContext(QQmlAndroidObject *object)
 {
-    QtQmlAndroidContext *context = qobject_cast<QtQmlAndroidContext *>(object);
+    QQmlAndroidContext *context = qobject_cast<QQmlAndroidContext *>(object);
     QObject *p = object->parent();
     while (p && !context) {
-        QtQmlAndroidContextual *contextual = qobject_cast<QtQmlAndroidContextual *>(p);
+        QQmlAndroidContextual *contextual = qobject_cast<QQmlAndroidContextual *>(p);
         if (contextual)
             context = contextual->context();
         p = p->parent();
@@ -58,7 +58,7 @@ static QtQmlAndroidContext *findContext(QtQmlAndroidObject *object)
     return context;
 }
 
-bool QtQmlAndroidContextual::initContext(QtQmlAndroidContext *context)
+bool QQmlAndroidContextual::initContext(QQmlAndroidContext *context)
 {
     if (!context)
         context = findContext(this);
@@ -66,19 +66,19 @@ bool QtQmlAndroidContextual::initContext(QtQmlAndroidContext *context)
     return context;
 }
 
-void QtQmlAndroidContextual::resolveContext()
+void QQmlAndroidContextual::resolveContext()
 {
     if (!m_context) {
         setContext(findContext(this));
         if (!m_context)
-            qWarning() << "QtQmlAndroidContextual: could not resolve context for" << this;
+            qWarning() << "QQmlAndroidContextual: could not resolve context for" << this;
     }
 }
 
-void QtQmlAndroidContextual::propagateContext()
+void QQmlAndroidContextual::propagateContext()
 {
     foreach (QObject *child, children()) {
-        QtQmlAndroidContextual *contextual = qobject_cast<QtQmlAndroidContextual *>(child);
+        QQmlAndroidContextual *contextual = qobject_cast<QQmlAndroidContextual *>(child);
         if (contextual)
             contextual->setContext(m_context);
     }
diff --git a/src/qmlandroid/content/qtqmlandroidcontextual_p.h b/src/qmlandroid/content/qtqmlandroidcontextual_p.h
index 849979b..18a2f1a 100644
--- a/src/qmlandroid/content/qtqmlandroidcontextual_p.h
+++ b/src/qmlandroid/content/qtqmlandroidcontextual_p.h
@@ -5,20 +5,20 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidContext;
+class QQmlAndroidContext;
 
-class QtQmlAndroidContextual : public QtQmlAndroidObject
+class QQmlAndroidContextual : public QQmlAndroidObject
 {
     Q_OBJECT
-    Q_PROPERTY(QtQmlAndroidContext *context READ context NOTIFY contextChanged)
+    Q_PROPERTY(QQmlAndroidContext *context READ context NOTIFY contextChanged)
 
 public:
-    explicit QtQmlAndroidContextual(QObject *parent = 0);
-    explicit QtQmlAndroidContextual(QtQmlAndroidContext *context, QObject *parent = 0);
+    explicit QQmlAndroidContextual(QObject *parent = 0);
+    explicit QQmlAndroidContextual(QQmlAndroidContext *context, QObject *parent = 0);
 
     QAndroidJniObject ctx() const;
-    QtQmlAndroidContext *context() const;
-    void setContext(QtQmlAndroidContext *context);
+    QQmlAndroidContext *context() const;
+    void setContext(QQmlAndroidContext *context);
 
 Q_SIGNALS:
     void contextChanged();
@@ -27,12 +27,12 @@ protected:
     void componentComplete() Q_DECL_OVERRIDE;
 
 private Q_SLOTS:
-    bool initContext(QtQmlAndroidContext *context = 0);
+    bool initContext(QQmlAndroidContext *context = 0);
     void resolveContext();
     void propagateContext();
 
 private:
-    QtQmlAndroidContext *m_context;
+    QQmlAndroidContext *m_context;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/content/qtqmlandroidcontextwrapper.cpp b/src/qmlandroid/content/qtqmlandroidcontextwrapper.cpp
index 23fcf7d..464bf8b 100644
--- a/src/qmlandroid/content/qtqmlandroidcontextwrapper.cpp
+++ b/src/qmlandroid/content/qtqmlandroidcontextwrapper.cpp
@@ -2,13 +2,13 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidContextWrapper::QtQmlAndroidContextWrapper(QObject *parent) :
-    QtQmlAndroidContext(parent)
+QQmlAndroidContextWrapper::QQmlAndroidContextWrapper(QObject *parent) :
+    QQmlAndroidContext(parent)
 {
 }
 
-QtQmlAndroidContextWrapper::QtQmlAndroidContextWrapper(QtQmlAndroidContext *context, QObject *parent) :
-    QtQmlAndroidContext(context, parent)
+QQmlAndroidContextWrapper::QQmlAndroidContextWrapper(QQmlAndroidContext *context, QObject *parent) :
+    QQmlAndroidContext(context, parent)
 {
 }
 
diff --git a/src/qmlandroid/content/qtqmlandroidcontextwrapper_p.h b/src/qmlandroid/content/qtqmlandroidcontextwrapper_p.h
index def864e..2c48cad 100644
--- a/src/qmlandroid/content/qtqmlandroidcontextwrapper_p.h
+++ b/src/qmlandroid/content/qtqmlandroidcontextwrapper_p.h
@@ -5,13 +5,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidContextWrapper : public QtQmlAndroidContext
+class QQmlAndroidContextWrapper : public QQmlAndroidContext
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidContextWrapper(QObject *parent = 0);
-    explicit QtQmlAndroidContextWrapper(QtQmlAndroidContext *context, QObject *parent = 0);
+    explicit QQmlAndroidContextWrapper(QObject *parent = 0);
+    explicit QQmlAndroidContextWrapper(QQmlAndroidContext *context, QObject *parent = 0);
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/core/qtqmlandroidobject.cpp b/src/qmlandroid/core/qtqmlandroidobject.cpp
index dd6ef5b..71929e3 100644
--- a/src/qmlandroid/core/qtqmlandroidobject.cpp
+++ b/src/qmlandroid/core/qtqmlandroidobject.cpp
@@ -7,24 +7,24 @@ QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QReadWriteLock, instanceLock)
 
-QtQmlAndroidObject::QtQmlAndroidObject(QObject *parent) :
+QQmlAndroidObject::QQmlAndroidObject(QObject *parent) :
     QObject(parent), m_complete(false)
 {
 }
 
-bool QtQmlAndroidObject::isValid() const
+bool QQmlAndroidObject::isValid() const
 {
     QReadLocker locker(instanceLock());
     return m_instance.isValid();
 }
 
-QAndroidJniObject QtQmlAndroidObject::instance() const
+QAndroidJniObject QQmlAndroidObject::instance() const
 {
     QReadLocker locker(instanceLock());
     return m_instance;
 }
 
-void QtQmlAndroidObject::setInstance(const QAndroidJniObject &instance)
+void QQmlAndroidObject::setInstance(const QAndroidJniObject &instance)
 {
     QWriteLocker locker(instanceLock());
     if (m_instance != instance) {
@@ -34,17 +34,17 @@ void QtQmlAndroidObject::setInstance(const QAndroidJniObject &instance)
     }
 }
 
-void QtQmlAndroidObject::changeInstance()
+void QQmlAndroidObject::changeInstance()
 {
     Q_ASSERT(QtQmlAndroid::isMainQtThread());
     objectChange(InstanceChange);
     emit instanceChanged();
 }
 
-void QtQmlAndroidObject::construct()
+void QQmlAndroidObject::construct()
 {
     foreach (QObject *obj, children()) {
-        QtQmlAndroidObject *child = qobject_cast<QtQmlAndroidObject *>(obj);
+        QQmlAndroidObject *child = qobject_cast<QQmlAndroidObject *>(obj);
         if (child)
             child->construct();
     }
@@ -59,7 +59,7 @@ void QtQmlAndroidObject::construct()
         method();
 }
 
-void QtQmlAndroidObject::inflate(const QAndroidJniObject &instance)
+void QQmlAndroidObject::inflate(const QAndroidJniObject &instance)
 {
     std::function<void()> method = [=]() {
         QAndroidJniObject object(instance);
@@ -74,10 +74,10 @@ void QtQmlAndroidObject::inflate(const QAndroidJniObject &instance)
         method();
 }
 
-void QtQmlAndroidObject::destruct()
+void QQmlAndroidObject::destruct()
 {
     foreach (QObject *obj, children()) {
-        QtQmlAndroidObject *child = qobject_cast<QtQmlAndroidObject *>(obj);
+        QQmlAndroidObject *child = qobject_cast<QQmlAndroidObject *>(obj);
         if (child)
             child->destruct();
     }
@@ -85,64 +85,64 @@ void QtQmlAndroidObject::destruct()
     setInstance(QAndroidJniObject());
 }
 
-QAndroidJniObject QtQmlAndroidObject::onCreate()
+QAndroidJniObject QQmlAndroidObject::onCreate()
 {
     return QAndroidJniObject();
 }
 
-void QtQmlAndroidObject::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidObject::onInflate(QAndroidJniObject &instance)
 {
     Q_UNUSED(instance);
     Q_ASSERT(!QtQmlAndroid::isMainQtThread());
 }
 
-bool QtQmlAndroidObject::isComponentComplete() const
+bool QQmlAndroidObject::isComponentComplete() const
 {
     return m_complete;
 }
 
-void QtQmlAndroidObject::classBegin()
+void QQmlAndroidObject::classBegin()
 {
 }
 
-void QtQmlAndroidObject::componentComplete()
+void QQmlAndroidObject::componentComplete()
 {
     m_complete = true;
 }
 
-void QtQmlAndroidObject::objectChange(ObjectChange change)
+void QQmlAndroidObject::objectChange(ObjectChange change)
 {
     Q_ASSERT(QtQmlAndroid::isMainQtThread());
     Q_UNUSED(change);
 }
 
-QQmlListProperty<QObject> QtQmlAndroidObject::data()
+QQmlListProperty<QObject> QQmlAndroidObject::data()
 {
-    return QQmlListProperty<QObject>(this, 0, &QtQmlAndroidObject::data_append,
-                                     &QtQmlAndroidObject::data_count, &QtQmlAndroidObject::data_at, 0);
+    return QQmlListProperty<QObject>(this, 0, &QQmlAndroidObject::data_append,
+                                     &QQmlAndroidObject::data_count, &QQmlAndroidObject::data_at, 0);
 }
 
-void QtQmlAndroidObject::data_append(QQmlListProperty<QObject> *list, QObject *object)
+void QQmlAndroidObject::data_append(QQmlListProperty<QObject> *list, QObject *object)
 {
-    if (QtQmlAndroidObject *that = qobject_cast<QtQmlAndroidObject *>(list->object))
+    if (QQmlAndroidObject *that = qobject_cast<QQmlAndroidObject *>(list->object))
         object->setParent(that);
 }
 
-int QtQmlAndroidObject::data_count(QQmlListProperty<QObject> *list)
+int QQmlAndroidObject::data_count(QQmlListProperty<QObject> *list)
 {
-    if (QtQmlAndroidObject *that = qobject_cast<QtQmlAndroidObject *>(list->object))
+    if (QQmlAndroidObject *that = qobject_cast<QQmlAndroidObject *>(list->object))
         return that->children().count();
     return 0;
 }
 
-QObject *QtQmlAndroidObject::data_at(QQmlListProperty<QObject> *list, int index)
+QObject *QQmlAndroidObject::data_at(QQmlListProperty<QObject> *list, int index)
 {
-    if (QtQmlAndroidObject *that = qobject_cast<QtQmlAndroidObject *>(list->object))
+    if (QQmlAndroidObject *that = qobject_cast<QQmlAndroidObject *>(list->object))
         return that->children().value(index);
     return 0;
 }
 
-void QtQmlAndroidObject::childEvent(QChildEvent *event)
+void QQmlAndroidObject::childEvent(QChildEvent *event)
 {
     if (event->added())
         emit dataChanged();
diff --git a/src/qmlandroid/core/qtqmlandroidobject_p.h b/src/qmlandroid/core/qtqmlandroidobject_p.h
index 14a3dae..b5a5b46 100644
--- a/src/qmlandroid/core/qtqmlandroidobject_p.h
+++ b/src/qmlandroid/core/qtqmlandroidobject_p.h
@@ -12,7 +12,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidObject : public QObject, public QQmlParserStatus
+class QQmlAndroidObject : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<QObject> data READ data NOTIFY dataChanged)
@@ -20,7 +20,7 @@ class QtQmlAndroidObject : public QObject, public QQmlParserStatus
     Q_INTERFACES(QQmlParserStatus)
 
 public:
-    explicit QtQmlAndroidObject(QObject *parent = 0);
+    explicit QQmlAndroidObject(QObject *parent = 0);
 
     bool isValid() const;
     QAndroidJniObject instance() const;
@@ -63,7 +63,7 @@ private:
 
     bool m_complete;
     QAndroidJniObject m_instance;
-    friend class QtQmlAndroidActivity;
+    friend class QQmlAndroidActivity;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/core/qtqmlandroidoptional_p.h b/src/qmlandroid/core/qtqmlandroidoptional_p.h
index 668706a..749a88b 100644
--- a/src/qmlandroid/core/qtqmlandroidoptional_p.h
+++ b/src/qmlandroid/core/qtqmlandroidoptional_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTQMLANDROIDOPTIONAL_P_H
-#define QTQMLANDROIDOPTIONAL_P_H
+#ifndef QQMLANDROIDOPTIONAL_P_H
+#define QQMLANDROIDOPTIONAL_P_H
 
 #include <QtCore/QHash>
 
@@ -52,18 +52,18 @@
 
 QT_BEGIN_NAMESPACE
 
-struct QtQmlAndroidNothing {};
+struct QQmlAndroidNothing {};
 
 template<typename T>
-class QtQmlAndroidOptional
+class QQmlAndroidOptional
 {
 private:
-    typedef bool (QtQmlAndroidOptional::*RestrictedBool)() const;
+    typedef bool (QQmlAndroidOptional::*RestrictedBool)() const;
 
 public:
-    Q_DECL_CONSTEXPR inline QtQmlAndroidOptional() Q_DECL_NOTHROW : null(true) {}
+    Q_DECL_CONSTEXPR inline QQmlAndroidOptional() Q_DECL_NOTHROW : null(true) {}
 
-    inline QtQmlAndroidOptional(const QtQmlAndroidOptional &other) :
+    inline QQmlAndroidOptional(const QQmlAndroidOptional &other) :
         null(other.null)
     {
         if (!null)
@@ -71,7 +71,7 @@ public:
     }
 
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QtQmlAndroidOptional(QtQmlAndroidOptional &&other) :
+    inline QQmlAndroidOptional(QQmlAndroidOptional &&other) :
         null(other.null)
     {
         if (!null)
@@ -79,35 +79,35 @@ public:
     }
 #endif
 
-    Q_DECL_CONSTEXPR inline QtQmlAndroidOptional(QtQmlAndroidNothing) Q_DECL_NOTHROW : null(true) {}
+    Q_DECL_CONSTEXPR inline QQmlAndroidOptional(QQmlAndroidNothing) Q_DECL_NOTHROW : null(true) {}
 
-    inline QtQmlAndroidOptional(const T &value) :
+    inline QQmlAndroidOptional(const T &value) :
         null(false)
     {
         new (ptr()) T(value);
     }
 
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QtQmlAndroidOptional(T &&value) :
+    inline QQmlAndroidOptional(T &&value) :
         null(false)
     {
         new (ptr()) T(qMove(value));
     }
 #endif
 
-    inline ~QtQmlAndroidOptional()
+    inline ~QQmlAndroidOptional()
     {
         if (!null)
             ptr()->~T();
     }
 
-    inline QtQmlAndroidOptional &operator=(QtQmlAndroidNothing)
+    inline QQmlAndroidOptional &operator=(QQmlAndroidNothing)
     {
         reset();
         return *this;
     }
 
-    inline QtQmlAndroidOptional &operator=(const QtQmlAndroidOptional &other)
+    inline QQmlAndroidOptional &operator=(const QQmlAndroidOptional &other)
     {
         if (other.isNull() == isNull()) {
             if (!null)
@@ -123,7 +123,7 @@ public:
     }
 
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QtQmlAndroidOptional &operator=(QtQmlAndroidOptional &&other)
+    inline QQmlAndroidOptional &operator=(QQmlAndroidOptional &&other)
     {
         if (other.isNull() == isNull()) {
             if (!null)
@@ -139,7 +139,7 @@ public:
     }
 #endif
 
-    inline QtQmlAndroidOptional &operator=(const T &value)
+    inline QQmlAndroidOptional &operator=(const T &value)
     {
         if (!null) {
             this->value() = value;
@@ -152,7 +152,7 @@ public:
     }
 
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QtQmlAndroidOptional &operator=(T &&value)
+    inline QQmlAndroidOptional &operator=(T &&value)
     {
         if (!null) {
             this->value() = qMove(value);
@@ -170,20 +170,20 @@ public:
 #ifndef Q_QDOC
     inline T &value() Q_DECL_LVALUE_FUNCTION
     {
-        Q_ASSERT_X(!null, "QtQmlAndroidOptional::value", "QtQmlAndroidOptional is null");
+        Q_ASSERT_X(!null, "QQmlAndroidOptional::value", "QQmlAndroidOptional is null");
         return *ptr();
     }
 
     inline const T &value() const Q_DECL_LVALUE_FUNCTION
     {
-        Q_ASSERT_X(!null, "QtQmlAndroidOptional::value", "QtQmlAndroidOptional is null");
+        Q_ASSERT_X(!null, "QQmlAndroidOptional::value", "QQmlAndroidOptional is null");
         return *ptr();
     }
 
 #ifdef Q_COMPILER_RVALUE_REFS
     inline T &&value() &&
     {
-        Q_ASSERT_X(!null, "QtQmlAndroidOptional::value", "QtQmlAndroidOptional is null");
+        Q_ASSERT_X(!null, "QQmlAndroidOptional::value", "QQmlAndroidOptional is null");
         return qMove(*ptr());
     }
 #endif
@@ -198,7 +198,7 @@ public:
         return null ? defaultValue : value();
     }
 
-    inline void swap(QtQmlAndroidOptional &other) Q_DECL_NOEXCEPT_EXPR(noexcept(qSwap(value(), other.value()))
+    inline void swap(QQmlAndroidOptional &other) Q_DECL_NOEXCEPT_EXPR(noexcept(qSwap(value(), other.value()))
                                                            && noexcept(T(qMove(other.value()))))
     {
         if (null == other.null) {
@@ -227,37 +227,37 @@ public:
 #ifndef Q_QDOC
     inline T &operator*() Q_DECL_LVALUE_FUNCTION
     {
-        Q_ASSERT_X(!null, "QtQmlAndroidOptional::operator*", "QtQmlAndroidOptional is null");
+        Q_ASSERT_X(!null, "QQmlAndroidOptional::operator*", "QQmlAndroidOptional is null");
         return *ptr();
     }
 
     inline const T &operator*() const Q_DECL_LVALUE_FUNCTION
     {
-        Q_ASSERT_X(!null, "QtQmlAndroidOptional::operator*", "QtQmlAndroidOptional is null");
+        Q_ASSERT_X(!null, "QQmlAndroidOptional::operator*", "QQmlAndroidOptional is null");
         return *ptr();
     }
 
 #ifdef Q_COMPILER_RVALUE_REFS
     inline T &&operator * () &&
     {
-        Q_ASSERT_X(!null, "QtQmlAndroidOptional::operator*", "QtQmlAndroidOptional is null");
+        Q_ASSERT_X(!null, "QQmlAndroidOptional::operator*", "QQmlAndroidOptional is null");
         return qMove(*ptr());
     }
 #endif
 
     inline T *operator->()
     {
-        Q_ASSERT_X(!null, "QtQmlAndroidOptional::operator->", "QtQmlAndroidOptional is null");
+        Q_ASSERT_X(!null, "QQmlAndroidOptional::operator->", "QQmlAndroidOptional is null");
         return ptr();
     }
 
     inline const T *operator->() const
     {
-        Q_ASSERT_X(!null, "QtQmlAndroidOptional::operator->", "QtQmlAndroidOptional is null");
+        Q_ASSERT_X(!null, "QQmlAndroidOptional::operator->", "QQmlAndroidOptional is null");
         return ptr();
     }
 
-    Q_DECL_CONSTEXPR inline operator RestrictedBool() const { return null ? Q_NULLPTR : &QtQmlAndroidOptional::isNull; }
+    Q_DECL_CONSTEXPR inline operator RestrictedBool() const { return null ? Q_NULLPTR : &QQmlAndroidOptional::isNull; }
 
 #else
     inline T &operator*();
@@ -288,16 +288,16 @@ private:
 };
 
 template<typename T>
-inline QtQmlAndroidOptional<T> qMakeOptional(const T &value)
+inline QQmlAndroidOptional<T> qMakeOptional(const T &value)
 {
-    return QtQmlAndroidOptional<T>(value);
+    return QQmlAndroidOptional<T>(value);
 }
 
 template <>
-class QtQmlAndroidOptional<void>
+class QQmlAndroidOptional<void>
 {
 private:
-    typedef bool (QtQmlAndroidOptional<void>::*RestrictedBool)() const;
+    typedef bool (QQmlAndroidOptional<void>::*RestrictedBool)() const;
 public:
     // all compiler-generated special member functions are ok!
 
@@ -311,45 +311,45 @@ public:
 };
 
 template<typename T>
-Q_DECL_CONSTEXPR inline bool operator==(const QtQmlAndroidOptional<T> &lhs, const QtQmlAndroidOptional<T> &rhs)
+Q_DECL_CONSTEXPR inline bool operator==(const QQmlAndroidOptional<T> &lhs, const QQmlAndroidOptional<T> &rhs)
 {
     return (rhs.isNull() && lhs.isNull())
             || (!rhs.isNull() && !lhs.isNull() && lhs.value() == rhs.value());
 }
 
 template<typename T>
-Q_DECL_CONSTEXPR inline bool operator!=(const QtQmlAndroidOptional<T> &lhs, const QtQmlAndroidOptional<T> &rhs)
+Q_DECL_CONSTEXPR inline bool operator!=(const QQmlAndroidOptional<T> &lhs, const QQmlAndroidOptional<T> &rhs)
 {
     return !(lhs == rhs);
 }
 
 template<typename T>
-Q_DECL_CONSTEXPR inline bool operator<(const QtQmlAndroidOptional<T> &lhs, const QtQmlAndroidOptional<T> &rhs)
+Q_DECL_CONSTEXPR inline bool operator<(const QQmlAndroidOptional<T> &lhs, const QQmlAndroidOptional<T> &rhs)
 {
     return (lhs.isNull() && !rhs.isNull())
             || (!rhs.isNull() && !lhs.isNull() && lhs.value() < rhs.value());
 }
 
 template<typename T>
-Q_DECL_CONSTEXPR inline bool operator>(const QtQmlAndroidOptional<T> &lhs, const QtQmlAndroidOptional<T> &rhs)
+Q_DECL_CONSTEXPR inline bool operator>(const QQmlAndroidOptional<T> &lhs, const QQmlAndroidOptional<T> &rhs)
 {
     return rhs < lhs;
 }
 
 template<typename T>
-Q_DECL_CONSTEXPR inline bool operator<=(const QtQmlAndroidOptional<T> &lhs, const QtQmlAndroidOptional<T> &rhs)
+Q_DECL_CONSTEXPR inline bool operator<=(const QQmlAndroidOptional<T> &lhs, const QQmlAndroidOptional<T> &rhs)
 {
     return !(lhs > rhs);
 }
 
 template<typename T>
-Q_DECL_CONSTEXPR inline bool operator>=(const QtQmlAndroidOptional<T> &lhs, const QtQmlAndroidOptional<T> &rhs)
+Q_DECL_CONSTEXPR inline bool operator>=(const QQmlAndroidOptional<T> &lhs, const QQmlAndroidOptional<T> &rhs)
 {
     return !(lhs < rhs);
 }
 
 template <typename T>
-Q_DECL_CONSTEXPR inline uint qHash(const QtQmlAndroidOptional<T> &key, uint seed = 0)
+Q_DECL_CONSTEXPR inline uint qHash(const QQmlAndroidOptional<T> &key, uint seed = 0)
 {
     return key ? seed : qHash(*key, seed) ;
 }
@@ -358,4 +358,4 @@ QT_END_NAMESPACE
 
 #undef Q_DECL_LVALUE_FUNCTION
 
-#endif // QTQMLANDROIDOPTIONAL_H
+#endif // QQMLANDROIDOPTIONAL_H
diff --git a/src/qmlandroid/graphics/drawable/qtqmlandroidcolordrawable.cpp b/src/qmlandroid/graphics/drawable/qtqmlandroidcolordrawable.cpp
index 68793d7..674ef22 100644
--- a/src/qmlandroid/graphics/drawable/qtqmlandroidcolordrawable.cpp
+++ b/src/qmlandroid/graphics/drawable/qtqmlandroidcolordrawable.cpp
@@ -3,22 +3,22 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidColorDrawable::QtQmlAndroidColorDrawable(QObject *parent) :
-    QtQmlAndroidDrawable(parent), m_color(0)
+QQmlAndroidColorDrawable::QQmlAndroidColorDrawable(QObject *parent) :
+    QQmlAndroidDrawable(parent), m_color(0)
 {
 }
 
-QtQmlAndroidColorDrawable::QtQmlAndroidColorDrawable(int color, QObject *parent) :
-    QtQmlAndroidDrawable(parent), m_color(color)
+QQmlAndroidColorDrawable::QQmlAndroidColorDrawable(int color, QObject *parent) :
+    QQmlAndroidDrawable(parent), m_color(color)
 {
 }
 
-int QtQmlAndroidColorDrawable::color() const
+int QQmlAndroidColorDrawable::color() const
 {
     return m_color;
 }
 
-void QtQmlAndroidColorDrawable::setColor(int color)
+void QQmlAndroidColorDrawable::setColor(int color)
 {
     if (m_color != color) {
         m_color = color;
@@ -27,14 +27,14 @@ void QtQmlAndroidColorDrawable::setColor(int color)
     }
 }
 
-QAndroidJniObject QtQmlAndroidColorDrawable::onCreate()
+QAndroidJniObject QQmlAndroidColorDrawable::onCreate()
 {
     return QAndroidJniObject("android/graphics/drawable/ColorDrawable");
 }
 
-void QtQmlAndroidColorDrawable::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidColorDrawable::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidDrawable::onInflate(instance);
+    QQmlAndroidDrawable::onInflate(instance);
 
     instance.callMethod<void>("setColor", "(I)V", m_color);
 }
diff --git a/src/qmlandroid/graphics/drawable/qtqmlandroidcolordrawable_p.h b/src/qmlandroid/graphics/drawable/qtqmlandroidcolordrawable_p.h
index c6ca6d9..465f646 100644
--- a/src/qmlandroid/graphics/drawable/qtqmlandroidcolordrawable_p.h
+++ b/src/qmlandroid/graphics/drawable/qtqmlandroidcolordrawable_p.h
@@ -5,14 +5,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidColorDrawable : public QtQmlAndroidDrawable
+class QQmlAndroidColorDrawable : public QQmlAndroidDrawable
 {
     Q_OBJECT
     Q_PROPERTY(int color READ color WRITE setColor NOTIFY colorChanged)
 
 public:
-    explicit QtQmlAndroidColorDrawable(QObject *parent = 0);
-    explicit QtQmlAndroidColorDrawable(int color, QObject *parent = 0);
+    explicit QQmlAndroidColorDrawable(QObject *parent = 0);
+    explicit QQmlAndroidColorDrawable(int color, QObject *parent = 0);
 
     int color() const;
     void setColor(int color);
diff --git a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawable.cpp b/src/qmlandroid/graphics/drawable/qtqmlandroiddrawable.cpp
index cc5aaf1..009a332 100644
--- a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawable.cpp
+++ b/src/qmlandroid/graphics/drawable/qtqmlandroiddrawable.cpp
@@ -2,17 +2,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidDrawable::QtQmlAndroidDrawable(QObject *parent) :
-    QtQmlAndroidObject(parent)
+QQmlAndroidDrawable::QQmlAndroidDrawable(QObject *parent) :
+    QQmlAndroidObject(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidDrawable::onCreate()
+QAndroidJniObject QQmlAndroidDrawable::onCreate()
 {
     return QAndroidJniObject("android/graphics/drawable/Drawable");
 }
 
-void QtQmlAndroidDrawable::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidDrawable::onInflate(QAndroidJniObject &instance)
 {
     Q_UNUSED(instance);
 }
diff --git a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawable_p.h b/src/qmlandroid/graphics/drawable/qtqmlandroiddrawable_p.h
index c7ba8df..6927c1d 100644
--- a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawable_p.h
+++ b/src/qmlandroid/graphics/drawable/qtqmlandroiddrawable_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidDrawable : public QtQmlAndroidObject
+class QQmlAndroidDrawable : public QQmlAndroidObject
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidDrawable(QObject *parent = 0);
+    explicit QQmlAndroidDrawable(QObject *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawablemodule.cpp b/src/qmlandroid/graphics/drawable/qtqmlandroiddrawablemodule.cpp
index 1b917a4..b6a7ec7 100644
--- a/src/qmlandroid/graphics/drawable/qtqmlandroiddrawablemodule.cpp
+++ b/src/qmlandroid/graphics/drawable/qtqmlandroiddrawablemodule.cpp
@@ -11,8 +11,8 @@ namespace QtQmlAndroid {
 
 void registerDrawableModule(const char *uri)
 {
-    qmlRegisterType<QtQmlAndroidColorDrawable>(uri, 0, 21, "ColorDrawable");
-    qmlRegisterType<QtQmlAndroidDrawable>(uri, 0, 21, "Drawable");
+    qmlRegisterType<QQmlAndroidColorDrawable>(uri, 0, 21, "ColorDrawable");
+    qmlRegisterType<QQmlAndroidDrawable>(uri, 0, 21, "Drawable");
 }
 
 }
diff --git a/src/qmlandroid/graphics/qtqmlandroidcolor.cpp b/src/qmlandroid/graphics/qtqmlandroidcolor.cpp
index f80de9f..5ff3fb0 100644
--- a/src/qmlandroid/graphics/qtqmlandroidcolor.cpp
+++ b/src/qmlandroid/graphics/qtqmlandroidcolor.cpp
@@ -3,46 +3,46 @@
 
 QT_BEGIN_NAMESPACE
 
-int QtQmlAndroidColor::alpha(int color)
+int QQmlAndroidColor::alpha(int color)
 {
     return static_cast<uint>(color) >> 24;
 }
 
-int QtQmlAndroidColor::argb(int alpha, int red, int green, int blue)
+int QQmlAndroidColor::argb(int alpha, int red, int green, int blue)
 {
     return (alpha << 24) | (red << 16) | (green << 8) | blue;
 }
 
-int QtQmlAndroidColor::blue(int color)
+int QQmlAndroidColor::blue(int color)
 {
     return color & 0xFF;
 }
 
-int QtQmlAndroidColor::green(int color)
+int QQmlAndroidColor::green(int color)
 {
     return (color >> 8) & 0xFF;
 }
 
-int QtQmlAndroidColor::red(int color)
+int QQmlAndroidColor::red(int color)
 {
     return (color >> 16) & 0xFF;
 }
 
-int QtQmlAndroidColor::rgb(int red, int green, int blue)
+int QQmlAndroidColor::rgb(int red, int green, int blue)
 {
     return (0xFF << 24) | (red << 16) | (green << 8) | blue;
 }
 
-int QtQmlAndroidColor::name(const QString &name)
+int QQmlAndroidColor::name(const QString &name)
 {
     return QColor(name).rgba();
 }
 
-QObject *QtQmlAndroidColor::provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+QObject *QQmlAndroidColor::provider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(engine);
     Q_UNUSED(scriptEngine);
-    return new QtQmlAndroidColor;
+    return new QQmlAndroidColor;
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/graphics/qtqmlandroidcolor_p.h b/src/qmlandroid/graphics/qtqmlandroidcolor_p.h
index 186ab0f..1ca0b94 100644
--- a/src/qmlandroid/graphics/qtqmlandroidcolor_p.h
+++ b/src/qmlandroid/graphics/qtqmlandroidcolor_p.h
@@ -6,7 +6,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidColor : public QObject
+class QQmlAndroidColor : public QObject
 {
     Q_OBJECT
     Q_ENUMS(Constants)
diff --git a/src/qmlandroid/graphics/qtqmlandroidgraphicsmodule.cpp b/src/qmlandroid/graphics/qtqmlandroidgraphicsmodule.cpp
index 3e60fd0..cb8e923 100644
--- a/src/qmlandroid/graphics/qtqmlandroidgraphicsmodule.cpp
+++ b/src/qmlandroid/graphics/qtqmlandroidgraphicsmodule.cpp
@@ -10,7 +10,7 @@ namespace QtQmlAndroid {
 
 void registerGraphicsModule(const char *uri)
 {
-    qmlRegisterSingletonType<QtQmlAndroidColor>(uri, 0, 21, "Color", QtQmlAndroidColor::provider);
+    qmlRegisterSingletonType<QQmlAndroidColor>(uri, 0, 21, "Color", QQmlAndroidColor::provider);
 }
 
 }
diff --git a/src/qmlandroid/qtqmlandroidmodule.cpp b/src/qmlandroid/qtqmlandroidmodule.cpp
index f5f7e29..fe4e393 100644
--- a/src/qmlandroid/qtqmlandroidmodule.cpp
+++ b/src/qmlandroid/qtqmlandroidmodule.cpp
@@ -10,18 +10,7 @@ namespace QtQmlAndroid {
 
 void registerAndroidModule(const char *uri)
 {
-    qmlRegisterSingletonType<QtQmlAndroidR>(uri, 0, 21, "R", QtQmlAndroidR::provider);
-
-//    QtQmlAndroid::registerAppModule("android.app");
-//    QtQmlAndroid::registerContentModule("android.content");
-//    QtQmlAndroid::registerGraphicsModule("android.graphics");
-//    QtQmlAndroid::registerDrawableModule("android.graphics.drawable");
-//    QtQmlAndroid::registerSupportV4WidgetModule("android.support.v4.widget");
-//    QtQmlAndroid::registerSupportV7AppModule("android.support.v7.app");
-//    QtQmlAndroid::registerSupportV7WidgetModule("android.support.v7.widget");
-//    QtQmlAndroid::registerViewModule("android.view");
-//    QtQmlAndroid::registerAnimationModule("android.view.animation");
-//    QtQmlAndroid::registerWidgetModule("android.widget");
+    qmlRegisterSingletonType<QQmlAndroidR>(uri, 0, 21, "R", QQmlAndroidR::provider);
 }
 
 }
diff --git a/src/qmlandroid/qtqmlandroidr.cpp b/src/qmlandroid/qtqmlandroidr.cpp
index ef3374b..b1fdcb8 100644
--- a/src/qmlandroid/qtqmlandroidr.cpp
+++ b/src/qmlandroid/qtqmlandroidr.cpp
@@ -4,7 +4,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidR::QtQmlAndroidR() :
+QQmlAndroidR::QQmlAndroidR() :
     m_anim(0),
     m_animator(0),
     m_array(0),
@@ -50,165 +50,165 @@ static QQmlPropertyMap *getFields(const char *className, QObject *parent)
     return map;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::anim()
+QQmlPropertyMap *QQmlAndroidR::anim()
 {
     if (!m_anim)
         m_anim = getFields("android/R$anim", this);
     return m_anim;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::animator()
+QQmlPropertyMap *QQmlAndroidR::animator()
 {
     if (!m_animator)
         m_animator = getFields("android/R$animator", this);
     return m_animator;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::array()
+QQmlPropertyMap *QQmlAndroidR::array()
 {
     if (!m_array)
         m_array = getFields("android/R$array", this);
     return m_array;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::attr()
+QQmlPropertyMap *QQmlAndroidR::attr()
 {
     if (!m_attr)
         m_attr = getFields("android/R$attr", this);
     return m_attr;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::boolean()
+QQmlPropertyMap *QQmlAndroidR::boolean()
 {
     if (!m_boolean)
         m_boolean = getFields("android/R$boolean", this);
     return m_boolean;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::color()
+QQmlPropertyMap *QQmlAndroidR::color()
 {
     if (!m_color)
         m_color = getFields("android/R$color", this);
     return m_color;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::dimen()
+QQmlPropertyMap *QQmlAndroidR::dimen()
 {
     if (!m_dimen)
         m_dimen = getFields("android/R$dimen", this);
     return m_dimen;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::drawable()
+QQmlPropertyMap *QQmlAndroidR::drawable()
 {
     if (!m_drawable)
         m_drawable = getFields("android/R$drawable", this);
     return m_drawable;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::fraction()
+QQmlPropertyMap *QQmlAndroidR::fraction()
 {
     if (!m_fraction)
         m_fraction = getFields("android/R$fraction", this);
     return m_fraction;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::id()
+QQmlPropertyMap *QQmlAndroidR::id()
 {
     if (!m_id)
         m_id = getFields("android/R$id", this);
     return m_id;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::integer()
+QQmlPropertyMap *QQmlAndroidR::integer()
 {
     if (!m_integer)
         m_integer = getFields("android/R$integer", this);
     return m_integer;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::interpolator()
+QQmlPropertyMap *QQmlAndroidR::interpolator()
 {
     if (!m_interpolator)
         m_interpolator = getFields("android/R$interpolator", this);
     return m_interpolator;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::layout()
+QQmlPropertyMap *QQmlAndroidR::layout()
 {
     if (!m_layout)
         m_layout = getFields("android/R$layout", this);
     return m_layout;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::menu()
+QQmlPropertyMap *QQmlAndroidR::menu()
 {
     if (!m_menu)
         m_menu = getFields("android/R$menu", this);
     return m_menu;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::mipmap()
+QQmlPropertyMap *QQmlAndroidR::mipmap()
 {
     if (!m_mipmap)
         m_mipmap = getFields("android/R$mipmap", this);
     return m_mipmap;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::plurals()
+QQmlPropertyMap *QQmlAndroidR::plurals()
 {
     if (!m_plurals)
         m_plurals = getFields("android/R$plurals", this);
     return m_plurals;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::raw()
+QQmlPropertyMap *QQmlAndroidR::raw()
 {
     if (!m_raw)
         m_raw = getFields("android/R$raw", this);
     return m_raw;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::string()
+QQmlPropertyMap *QQmlAndroidR::string()
 {
     if (!m_string)
         m_string = getFields("android/R$string", this);
     return m_string;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::style()
+QQmlPropertyMap *QQmlAndroidR::style()
 {
     if (!m_style)
         m_style = getFields("android/R$style", this);
     return m_style;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::styleable()
+QQmlPropertyMap *QQmlAndroidR::styleable()
 {
     if (!m_styleable)
         m_styleable = getFields("android/R$styleable", this);
     return m_styleable;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::transition()
+QQmlPropertyMap *QQmlAndroidR::transition()
 {
     if (!m_transition)
         m_transition = getFields("android/R$transition", this);
     return m_transition;
 }
 
-QQmlPropertyMap *QtQmlAndroidR::xml()
+QQmlPropertyMap *QQmlAndroidR::xml()
 {
     if (!m_xml)
         m_xml = getFields("android/R$xml", this);
     return m_xml;
 }
 
-QObject *QtQmlAndroidR::provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+QObject *QQmlAndroidR::provider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(engine);
     Q_UNUSED(scriptEngine);
-    return new QtQmlAndroidR;
+    return new QQmlAndroidR;
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/qtqmlandroidr_p.h b/src/qmlandroid/qtqmlandroidr_p.h
index e17441a..d997057 100644
--- a/src/qmlandroid/qtqmlandroidr_p.h
+++ b/src/qmlandroid/qtqmlandroidr_p.h
@@ -9,7 +9,7 @@ QT_BEGIN_NAMESPACE
 class QJSEngine;
 class QQmlEngine;
 
-class QtQmlAndroidR : public QObject
+class QQmlAndroidR : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlPropertyMap *anim READ anim CONSTANT)
@@ -36,7 +36,7 @@ class QtQmlAndroidR : public QObject
     Q_PROPERTY(QQmlPropertyMap *xml READ xml CONSTANT)
 
 public:
-    QtQmlAndroidR();
+    QQmlAndroidR();
 
     QQmlPropertyMap *anim();
     QQmlPropertyMap *animator();
diff --git a/src/qmlandroid/support/qtqmlandroidsupportmodule.cpp b/src/qmlandroid/support/qtqmlandroidsupportmodule.cpp
index e892f05..a1744f4 100644
--- a/src/qmlandroid/support/qtqmlandroidsupportmodule.cpp
+++ b/src/qmlandroid/support/qtqmlandroidsupportmodule.cpp
@@ -17,20 +17,20 @@ namespace QtQmlAndroid {
 
 void registerSupportV4WidgetModule(const char *uri)
 {
-    qmlRegisterType<QtQmlAndroidDrawerLayout>(uri, 0, 21, "DrawerLayout");
-    qmlRegisterType<QtQmlAndroidSwipeRefreshLayout>(uri, 0, 21, "SwipeRefreshLayout");
+    qmlRegisterType<QQmlAndroidDrawerLayout>(uri, 0, 21, "DrawerLayout");
+    qmlRegisterType<QQmlAndroidSwipeRefreshLayout>(uri, 0, 21, "SwipeRefreshLayout");
 }
 
 void registerSupportV7AppModule(const char *uri)
 {
-    qmlRegisterType<QtQmlAndroidActionBarDrawerToggle>(uri, 0, 21, "ActionBarDrawerToggle");
+    qmlRegisterType<QQmlAndroidActionBarDrawerToggle>(uri, 0, 21, "ActionBarDrawerToggle");
 }
 
 void registerSupportV7WidgetModule(const char *uri)
 {
-    qmlRegisterType<QtQmlAndroidCardView>(uri, 0, 21, "CardView");
-    qmlRegisterType<QtQmlAndroidRecyclerAdapter>(uri, 0, 21, "RecyclerAdapter");
-    qmlRegisterType<QtQmlAndroidRecyclerView>(uri, 0, 21, "RecyclerView");
+    qmlRegisterType<QQmlAndroidCardView>(uri, 0, 21, "CardView");
+    qmlRegisterType<QQmlAndroidRecyclerAdapter>(uri, 0, 21, "RecyclerAdapter");
+    qmlRegisterType<QQmlAndroidRecyclerView>(uri, 0, 21, "RecyclerView");
 }
 
 }
diff --git a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayout.cpp b/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayout.cpp
index 996b5f2..f873cd0 100644
--- a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayout.cpp
+++ b/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayout.cpp
@@ -4,42 +4,42 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidDrawerLayout::QtQmlAndroidDrawerLayout(QtQmlAndroidView *parent) :
-    QtQmlAndroidViewGroup(parent)
+QQmlAndroidDrawerLayout::QQmlAndroidDrawerLayout(QQmlAndroidView *parent) :
+    QQmlAndroidViewGroup(parent)
 {
 }
 
-QtQmlAndroidDrawerLayoutParams *QtQmlAndroidDrawerLayout::qmlAttachedProperties(QObject *object)
+QQmlAndroidDrawerLayoutParams *QQmlAndroidDrawerLayout::qmlAttachedProperties(QObject *object)
 {
-    QtQmlAndroidView *view = qobject_cast<QtQmlAndroidView*>(object);
+    QQmlAndroidView *view = qobject_cast<QQmlAndroidView*>(object);
     if (view)
-        return new QtQmlAndroidDrawerLayoutParams(view);
+        return new QQmlAndroidDrawerLayoutParams(view);
     return 0;
 }
 
-void QtQmlAndroidDrawerLayout::closeDrawers()
+void QQmlAndroidDrawerLayout::closeDrawers()
 {
     QtQmlAndroid::callVoidMethod(instance(), "closeDrawers");
 }
 
-void QtQmlAndroidDrawerLayout::closeDrawer(int gravity)
+void QQmlAndroidDrawerLayout::closeDrawer(int gravity)
 {
     QtQmlAndroid::callIntMethod(instance(), "closeDrawer", gravity);
 }
 
-QAndroidJniObject QtQmlAndroidDrawerLayout::onCreate()
+QAndroidJniObject QQmlAndroidDrawerLayout::onCreate()
 {
     return QAndroidJniObject("android/support/v4/widget/DrawerLayout",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidDrawerLayout::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidDrawerLayout::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidViewGroup::onInflate(instance);
+    QQmlAndroidViewGroup::onInflate(instance);
 
     foreach (QObject *child, QObject::children()) {
-        QtQmlAndroidActionBarDrawerToggle *toggle = qobject_cast<QtQmlAndroidActionBarDrawerToggle *>(child);
+        QQmlAndroidActionBarDrawerToggle *toggle = qobject_cast<QQmlAndroidActionBarDrawerToggle *>(child);
         if (toggle)
             toggle->onCreate(ctx(), instance);
     }
diff --git a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayout_p.h b/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayout_p.h
index 6501a1b..67d1765 100644
--- a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayout_p.h
+++ b/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayout_p.h
@@ -6,14 +6,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidDrawerLayout : public QtQmlAndroidViewGroup
+class QQmlAndroidDrawerLayout : public QQmlAndroidViewGroup
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidDrawerLayout(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidDrawerLayout(QQmlAndroidView *parent = 0);
 
-    static QtQmlAndroidDrawerLayoutParams *qmlAttachedProperties(QObject *object);
+    static QQmlAndroidDrawerLayoutParams *qmlAttachedProperties(QObject *object);
 
 public Q_SLOTS:
     void closeDrawers();
@@ -26,6 +26,6 @@ protected:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QtQmlAndroidDrawerLayout, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QQmlAndroidDrawerLayout, QML_HAS_ATTACHED_PROPERTIES)
 
 #endif // QTQMLANDROIDDRAWERLAYOUT_P_H
diff --git a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayoutparams.cpp b/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayoutparams.cpp
index b45804f..874d97c 100644
--- a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayoutparams.cpp
+++ b/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayoutparams.cpp
@@ -4,17 +4,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidDrawerLayoutParams::QtQmlAndroidDrawerLayoutParams(QtQmlAndroidView *view) :
-    QtQmlAndroidMarginLayoutParams(view), m_gravity(0)
+QQmlAndroidDrawerLayoutParams::QQmlAndroidDrawerLayoutParams(QQmlAndroidView *view) :
+    QQmlAndroidMarginLayoutParams(view), m_gravity(0)
 {
 }
 
-int QtQmlAndroidDrawerLayoutParams::gravity() const
+int QQmlAndroidDrawerLayoutParams::gravity() const
 {
     return m_gravity;
 }
 
-void QtQmlAndroidDrawerLayoutParams::setGravity(int value)
+void QQmlAndroidDrawerLayoutParams::setGravity(int value)
 {
     if (m_gravity != value) {
         m_gravity = value;
@@ -23,16 +23,16 @@ void QtQmlAndroidDrawerLayoutParams::setGravity(int value)
     }
 }
 
-QAndroidJniObject QtQmlAndroidDrawerLayoutParams::onCreate()
+QAndroidJniObject QQmlAndroidDrawerLayoutParams::onCreate()
 {
     return QAndroidJniObject("android/support/v4/widget/DrawerLayout$LayoutParams",
                              "(III)V",
                              MATCH_PARENT, MATCH_PARENT, m_gravity);
 }
 
-void QtQmlAndroidDrawerLayoutParams::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidDrawerLayoutParams::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidMarginLayoutParams::onInflate(instance);
+    QQmlAndroidMarginLayoutParams::onInflate(instance);
 
     instance.setField<int>("gravity", m_gravity);
 }
diff --git a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayoutparams_p.h b/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayoutparams_p.h
index 715250a..151bc01 100644
--- a/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayoutparams_p.h
+++ b/src/qmlandroid/support/v4/widget/qtqmlandroiddrawerlayoutparams_p.h
@@ -5,13 +5,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidDrawerLayoutParams : public QtQmlAndroidMarginLayoutParams
+class QQmlAndroidDrawerLayoutParams : public QQmlAndroidMarginLayoutParams
 {
     Q_OBJECT
     Q_PROPERTY(int gravity READ gravity WRITE setGravity NOTIFY gravityChanged) // TODO Gravity
 
 public:
-    explicit QtQmlAndroidDrawerLayoutParams(QtQmlAndroidView *view);
+    explicit QQmlAndroidDrawerLayoutParams(QQmlAndroidView *view);
 
     int gravity() const;
     void setGravity(int gravity);
diff --git a/src/qmlandroid/support/v4/widget/qtqmlandroidswiperefreshlayout.cpp b/src/qmlandroid/support/v4/widget/qtqmlandroidswiperefreshlayout.cpp
index 1e12746..4b28d9d 100644
--- a/src/qmlandroid/support/v4/widget/qtqmlandroidswiperefreshlayout.cpp
+++ b/src/qmlandroid/support/v4/widget/qtqmlandroidswiperefreshlayout.cpp
@@ -3,23 +3,23 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidSwipeRefreshLayout::QtQmlAndroidSwipeRefreshLayout(QtQmlAndroidView *parent) :
-    QtQmlAndroidViewGroup(parent), m_refreshing(false)
+QQmlAndroidSwipeRefreshLayout::QQmlAndroidSwipeRefreshLayout(QQmlAndroidView *parent) :
+    QQmlAndroidViewGroup(parent), m_refreshing(false)
 {
 }
 
-bool QtQmlAndroidSwipeRefreshLayout::isRefreshing() const
+bool QQmlAndroidSwipeRefreshLayout::isRefreshing() const
 {
     return m_refreshing;
 }
 
-void QtQmlAndroidSwipeRefreshLayout::setRefreshing(bool refreshing)
+void QQmlAndroidSwipeRefreshLayout::setRefreshing(bool refreshing)
 {
     if (updateRefreshing(refreshing))
         QtQmlAndroid::callBoolMethod(instance(), "setRefreshing", refreshing);
 }
 
-bool QtQmlAndroidSwipeRefreshLayout::updateRefreshing(bool refreshing)
+bool QQmlAndroidSwipeRefreshLayout::updateRefreshing(bool refreshing)
 {
     if (m_refreshing != refreshing) {
         m_refreshing = refreshing;
@@ -29,16 +29,16 @@ bool QtQmlAndroidSwipeRefreshLayout::updateRefreshing(bool refreshing)
     return false;
 }
 
-QAndroidJniObject QtQmlAndroidSwipeRefreshLayout::onCreate()
+QAndroidJniObject QQmlAndroidSwipeRefreshLayout::onCreate()
 {
     return QAndroidJniObject("android/support/v4/widget/SwipeRefreshLayout",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidSwipeRefreshLayout::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidSwipeRefreshLayout::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidViewGroup::onInflate(instance);
+    QQmlAndroidViewGroup::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/support/v4/widget/QtSwipeRefreshLayoutListener",
                                    "(Landroid/support/v4/widget/SwipeRefreshLayout;J)V",
@@ -52,7 +52,7 @@ void QtQmlAndroidSwipeRefreshLayout::onInflate(QAndroidJniObject &instance)
     }
 }
 
-void QtQmlAndroidSwipeRefreshLayout::onRegisterNativeMethods(jobject listener)
+void QQmlAndroidSwipeRefreshLayout::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onRefresh", "(J)V", reinterpret_cast<void *>(onRefresh)}};
 
@@ -62,11 +62,11 @@ void QtQmlAndroidSwipeRefreshLayout::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QtQmlAndroidSwipeRefreshLayout::onRefresh(JNIEnv *env, jobject object, jlong instance)
+void QQmlAndroidSwipeRefreshLayout::onRefresh(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidSwipeRefreshLayout *layout = reinterpret_cast<QtQmlAndroidSwipeRefreshLayout *>(instance);
+    QQmlAndroidSwipeRefreshLayout *layout = reinterpret_cast<QQmlAndroidSwipeRefreshLayout *>(instance);
     if (layout)
         QMetaObject::invokeMethod(layout, "updateRefreshing", Qt::QueuedConnection, Q_ARG(bool, true));
 }
diff --git a/src/qmlandroid/support/v4/widget/qtqmlandroidswiperefreshlayout_p.h b/src/qmlandroid/support/v4/widget/qtqmlandroidswiperefreshlayout_p.h
index 062f27e..52b4549 100644
--- a/src/qmlandroid/support/v4/widget/qtqmlandroidswiperefreshlayout_p.h
+++ b/src/qmlandroid/support/v4/widget/qtqmlandroidswiperefreshlayout_p.h
@@ -5,13 +5,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidSwipeRefreshLayout : public QtQmlAndroidViewGroup
+class QQmlAndroidSwipeRefreshLayout : public QQmlAndroidViewGroup
 {
     Q_OBJECT
     Q_PROPERTY(bool refreshing READ isRefreshing WRITE setRefreshing NOTIFY refreshingChanged)
 
 public:
-    explicit QtQmlAndroidSwipeRefreshLayout(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidSwipeRefreshLayout(QQmlAndroidView *parent = 0);
 
     bool isRefreshing() const;
     void setRefreshing(bool refreshing);
diff --git a/src/qmlandroid/support/v7/app/qtqmlandroidactionbardrawertoggle.cpp b/src/qmlandroid/support/v7/app/qtqmlandroidactionbardrawertoggle.cpp
index b140acf..f265e25 100644
--- a/src/qmlandroid/support/v7/app/qtqmlandroidactionbardrawertoggle.cpp
+++ b/src/qmlandroid/support/v7/app/qtqmlandroidactionbardrawertoggle.cpp
@@ -2,12 +2,12 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidActionBarDrawerToggle::QtQmlAndroidActionBarDrawerToggle(QObject *parent) :
-    QtQmlAndroidObject(parent)
+QQmlAndroidActionBarDrawerToggle::QQmlAndroidActionBarDrawerToggle(QObject *parent) :
+    QQmlAndroidObject(parent)
 {
 }
 
-void QtQmlAndroidActionBarDrawerToggle::onCreate(const QAndroidJniObject &activity, const QAndroidJniObject &drawer)
+void QQmlAndroidActionBarDrawerToggle::onCreate(const QAndroidJniObject &activity, const QAndroidJniObject &drawer)
 {
     QAndroidJniObject toggle("android/support/v7/app/ActionBarDrawerToggle",
                              "(Landroid/app/Activity;Landroid/support/v4/widget/DrawerLayout;II)V",
diff --git a/src/qmlandroid/support/v7/app/qtqmlandroidactionbardrawertoggle_p.h b/src/qmlandroid/support/v7/app/qtqmlandroidactionbardrawertoggle_p.h
index 4371cb0..0a572e9 100644
--- a/src/qmlandroid/support/v7/app/qtqmlandroidactionbardrawertoggle_p.h
+++ b/src/qmlandroid/support/v7/app/qtqmlandroidactionbardrawertoggle_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidActionBarDrawerToggle : public QtQmlAndroidObject
+class QQmlAndroidActionBarDrawerToggle : public QQmlAndroidObject
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidActionBarDrawerToggle(QObject *parent = 0);
+    explicit QQmlAndroidActionBarDrawerToggle(QObject *parent = 0);
 
     void onCreate(const QAndroidJniObject &activity, const QAndroidJniObject &drawer);
 };
diff --git a/src/qmlandroid/support/v7/widget/qtqmlandroidcardview.cpp b/src/qmlandroid/support/v7/widget/qtqmlandroidcardview.cpp
index bbad2c5..1a83bee 100644
--- a/src/qmlandroid/support/v7/widget/qtqmlandroidcardview.cpp
+++ b/src/qmlandroid/support/v7/widget/qtqmlandroidcardview.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidCardView::QtQmlAndroidCardView(QtQmlAndroidView *parent) :
-    QtQmlAndroidFrameLayout(parent)
+QQmlAndroidCardView::QQmlAndroidCardView(QQmlAndroidView *parent) :
+    QQmlAndroidFrameLayout(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidCardView::onCreate()
+QAndroidJniObject QQmlAndroidCardView::onCreate()
 {
     return QAndroidJniObject("android/support/v7/widget/CardView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidCardView::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidCardView::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidFrameLayout::onInflate(instance);
+    QQmlAndroidFrameLayout::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/support/v7/widget/qtqmlandroidcardview_p.h b/src/qmlandroid/support/v7/widget/qtqmlandroidcardview_p.h
index fc1b422..562e253 100644
--- a/src/qmlandroid/support/v7/widget/qtqmlandroidcardview_p.h
+++ b/src/qmlandroid/support/v7/widget/qtqmlandroidcardview_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidCardView : public QtQmlAndroidFrameLayout
+class QQmlAndroidCardView : public QQmlAndroidFrameLayout
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidCardView(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidCardView(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/support/v7/widget/qtqmlandroidrecycleradapter.cpp b/src/qmlandroid/support/v7/widget/qtqmlandroidrecycleradapter.cpp
index 33b457b..c41f4bf 100644
--- a/src/qmlandroid/support/v7/widget/qtqmlandroidrecycleradapter.cpp
+++ b/src/qmlandroid/support/v7/widget/qtqmlandroidrecycleradapter.cpp
@@ -6,17 +6,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidRecyclerAdapter::QtQmlAndroidRecyclerAdapter(QObject *parent) :
-    QtQmlAndroidContextual(parent), m_count(0), m_delegate(0)
+QQmlAndroidRecyclerAdapter::QQmlAndroidRecyclerAdapter(QObject *parent) :
+    QQmlAndroidContextual(parent), m_count(0), m_delegate(0)
 {
 }
 
-int QtQmlAndroidRecyclerAdapter::count() const
+int QQmlAndroidRecyclerAdapter::count() const
 {
     return m_count;
 }
 
-void QtQmlAndroidRecyclerAdapter::setCount(int count)
+void QQmlAndroidRecyclerAdapter::setCount(int count)
 {
     if (m_count != count) {
         m_count = count;
@@ -25,12 +25,12 @@ void QtQmlAndroidRecyclerAdapter::setCount(int count)
     }
 }
 
-QQmlComponent *QtQmlAndroidRecyclerAdapter::delegate() const
+QQmlComponent *QQmlAndroidRecyclerAdapter::delegate() const
 {
     return m_delegate;
 }
 
-void QtQmlAndroidRecyclerAdapter::setDelegate(QQmlComponent *delegate)
+void QQmlAndroidRecyclerAdapter::setDelegate(QQmlComponent *delegate)
 {
     if (m_delegate != delegate) {
         m_delegate = delegate;
@@ -39,7 +39,7 @@ void QtQmlAndroidRecyclerAdapter::setDelegate(QQmlComponent *delegate)
     }
 }
 
-QAndroidJniObject QtQmlAndroidRecyclerAdapter::onCreate()
+QAndroidJniObject QQmlAndroidRecyclerAdapter::onCreate()
 {
     return QAndroidJniObject("qt/android/support/v7/widget/QtRecyclerAdapter",
                              "(IJ)V",
@@ -47,9 +47,9 @@ QAndroidJniObject QtQmlAndroidRecyclerAdapter::onCreate()
                              reinterpret_cast<jlong>(this));
 }
 
-void QtQmlAndroidRecyclerAdapter::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidRecyclerAdapter::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidContextual::onInflate(instance);
+    QQmlAndroidContextual::onInflate(instance);
 
     static bool nativeMethodsRegistered = false;
     if (!nativeMethodsRegistered) {
@@ -61,7 +61,7 @@ void QtQmlAndroidRecyclerAdapter::onInflate(QAndroidJniObject &instance)
         instance.callMethod<void>("setItemCount", "(I)V", m_count);
 }
 
-void QtQmlAndroidRecyclerAdapter::onRegisterNativeMethods(jobject adapter)
+void QQmlAndroidRecyclerAdapter::onRegisterNativeMethods(jobject adapter)
 {
     JNINativeMethod methods[] {{"onCreateViewHolder", "(JLandroid/view/ViewGroup;I)Lqt/android/support/v7/widget/QtRecyclerAdapter$ViewHolder;", reinterpret_cast<void *>(onCreateViewHolder)},
                                {"onBindViewHolder", "(JLqt/android/support/v7/widget/QtRecyclerAdapter$ViewHolder;I)V", reinterpret_cast<void *>(onBindViewHolder)}};
@@ -72,16 +72,16 @@ void QtQmlAndroidRecyclerAdapter::onRegisterNativeMethods(jobject adapter)
     env->DeleteLocalRef(cls);
 }
 
-jobject QtQmlAndroidRecyclerAdapter::onCreateViewHolder(JNIEnv *env, jobject object, jlong instance, jobject parent, jint viewType)
+jobject QQmlAndroidRecyclerAdapter::onCreateViewHolder(JNIEnv *env, jobject object, jlong instance, jobject parent, jint viewType)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
     Q_UNUSED(parent);
     Q_UNUSED(viewType);
-    QtQmlAndroidRecyclerAdapter *adapter = reinterpret_cast<QtQmlAndroidRecyclerAdapter *>(instance);
+    QQmlAndroidRecyclerAdapter *adapter = reinterpret_cast<QQmlAndroidRecyclerAdapter *>(instance);
     if (adapter) {
-        QtQmlAndroidView *item = 0;
-        QMetaObject::invokeMethod(adapter, "createItem", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QtQmlAndroidView *, item));
+        QQmlAndroidView *item = 0;
+        QMetaObject::invokeMethod(adapter, "createItem", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QQmlAndroidView *, item));
         item->construct();
         adapter->m_holders += QAndroidJniObject("qt/android/support/v7/widget/QtRecyclerAdapter$ViewHolder",
                                                 "(Landroid/view/View;J)V",
@@ -92,40 +92,40 @@ jobject QtQmlAndroidRecyclerAdapter::onCreateViewHolder(JNIEnv *env, jobject obj
     return 0;
 }
 
-void QtQmlAndroidRecyclerAdapter::onBindViewHolder(JNIEnv *env, jobject object, jlong instance, jobject holder, jint position)
+void QQmlAndroidRecyclerAdapter::onBindViewHolder(JNIEnv *env, jobject object, jlong instance, jobject holder, jint position)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidRecyclerAdapter *adapter = reinterpret_cast<QtQmlAndroidRecyclerAdapter *>(instance);
+    QQmlAndroidRecyclerAdapter *adapter = reinterpret_cast<QQmlAndroidRecyclerAdapter *>(instance);
     if (adapter) {
         jlong vi = QAndroidJniObject(holder).callMethod<jlong>("getInstance");
-        QtQmlAndroidView *item = reinterpret_cast<QtQmlAndroidView *>(vi);
+        QQmlAndroidView *item = reinterpret_cast<QQmlAndroidView *>(vi);
         if (item)
-            QMetaObject::invokeMethod(adapter, "setItemPosition", Qt::BlockingQueuedConnection, Q_ARG(QtQmlAndroidView *, item), Q_ARG(int, position));
+            QMetaObject::invokeMethod(adapter, "setItemPosition", Qt::BlockingQueuedConnection, Q_ARG(QQmlAndroidView *, item), Q_ARG(int, position));
     }
 }
 
-QtQmlAndroidView *QtQmlAndroidRecyclerAdapter::createItem()
+QQmlAndroidView *QQmlAndroidRecyclerAdapter::createItem()
 {
-    QtQmlAndroidView *item = 0;
+    QQmlAndroidView *item = 0;
     if (m_delegate) {
         QQmlContext *creationContext = m_delegate->creationContext();
         QQmlContext *context = new QQmlContext(creationContext ? creationContext : qmlContext(this));
         QObject *object = m_delegate->beginCreate(context);
         if (object) {
             context->setParent(object);
-            item = qobject_cast<QtQmlAndroidView *>(object);
+            item = qobject_cast<QQmlAndroidView *>(object);
             if (!item)
                 delete object;
         } else {
             delete context;
         }
     } else {
-        item = new QtQmlAndroidView;
+        item = new QQmlAndroidView;
     }
     if (item) {
         item->setContext(context());
-        item->setParentView(qobject_cast<QtQmlAndroidView *>(parent())); // TODO
+        item->setParentView(qobject_cast<QQmlAndroidView *>(parent())); // TODO
         setItemPosition(item, -1);
     }
     if (m_delegate)
@@ -133,7 +133,7 @@ QtQmlAndroidView *QtQmlAndroidRecyclerAdapter::createItem()
     return item;
 }
 
-void QtQmlAndroidRecyclerAdapter::setItemPosition(QtQmlAndroidView *item, int position)
+void QQmlAndroidRecyclerAdapter::setItemPosition(QQmlAndroidView *item, int position)
 {
     QQmlContext *context = qmlContext(item);
     if (context)
diff --git a/src/qmlandroid/support/v7/widget/qtqmlandroidrecycleradapter_p.h b/src/qmlandroid/support/v7/widget/qtqmlandroidrecycleradapter_p.h
index bed6050..5e01608 100644
--- a/src/qmlandroid/support/v7/widget/qtqmlandroidrecycleradapter_p.h
+++ b/src/qmlandroid/support/v7/widget/qtqmlandroidrecycleradapter_p.h
@@ -6,16 +6,16 @@
 QT_BEGIN_NAMESPACE
 
 class QQmlComponent;
-class QtQmlAndroidView;
+class QQmlAndroidView;
 
-class QtQmlAndroidRecyclerAdapter : public QtQmlAndroidContextual
+class QQmlAndroidRecyclerAdapter : public QQmlAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged)
     Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
 
 public:
-    explicit QtQmlAndroidRecyclerAdapter(QObject *parent = 0);
+    explicit QQmlAndroidRecyclerAdapter(QObject *parent = 0);
 
     int count() const;
     void setCount(int count);
@@ -36,8 +36,8 @@ protected:
     static void onBindViewHolder(JNIEnv *env, jobject object, jlong instance, jobject holder, jint position);
 
 private Q_SLOTS:
-    QtQmlAndroidView *createItem();
-    void setItemPosition(QtQmlAndroidView *item, int position);
+    QQmlAndroidView *createItem();
+    void setItemPosition(QQmlAndroidView *item, int position);
 
 private:
     int m_count;
diff --git a/src/qmlandroid/support/v7/widget/qtqmlandroidrecyclerview.cpp b/src/qmlandroid/support/v7/widget/qtqmlandroidrecyclerview.cpp
index f311956..b291a79 100644
--- a/src/qmlandroid/support/v7/widget/qtqmlandroidrecyclerview.cpp
+++ b/src/qmlandroid/support/v7/widget/qtqmlandroidrecyclerview.cpp
@@ -4,42 +4,42 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidRecyclerView::QtQmlAndroidRecyclerView(QtQmlAndroidView *parent) :
-    QtQmlAndroidViewGroup(parent), m_adapter(0)
+QQmlAndroidRecyclerView::QQmlAndroidRecyclerView(QQmlAndroidView *parent) :
+    QQmlAndroidViewGroup(parent), m_adapter(0)
 {
 }
 
-QtQmlAndroidRecyclerAdapter *QtQmlAndroidRecyclerView::adapter() const
+QQmlAndroidRecyclerAdapter *QQmlAndroidRecyclerView::adapter() const
 {
     return m_adapter;
 }
 
-void QtQmlAndroidRecyclerView::setAdapter(QtQmlAndroidRecyclerAdapter *adapter)
+void QQmlAndroidRecyclerView::setAdapter(QQmlAndroidRecyclerAdapter *adapter)
 {
     if (m_adapter != adapter) {
         if (m_adapter) {
             m_adapter->setContext(0);
-            disconnect(m_adapter, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidRecyclerView::updateAdapter);
+            disconnect(m_adapter, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidRecyclerView::updateAdapter);
             m_adapter->destruct();
         }
         m_adapter = adapter;
         if (m_adapter) {
             m_adapter->setContext(context());
-            connect(m_adapter, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidRecyclerView::updateAdapter);
+            connect(m_adapter, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidRecyclerView::updateAdapter);
             if (isValid())
                 m_adapter->construct();
         }
         emit adapterChanged();
     }}
 
-QAndroidJniObject QtQmlAndroidRecyclerView::onCreate()
+QAndroidJniObject QQmlAndroidRecyclerView::onCreate()
 {
     return QAndroidJniObject("android/support/v7/widget/RecyclerView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidRecyclerView::onInflate(QAndroidJniObject& instance)
+void QQmlAndroidRecyclerView::onInflate(QAndroidJniObject& instance)
 {
     m_layoutManager = QAndroidJniObject("android/support/v7/widget/LinearLayoutManager",
                                         "(Landroid/content/Context;)V",
@@ -49,17 +49,17 @@ void QtQmlAndroidRecyclerView::onInflate(QAndroidJniObject& instance)
                               "(Landroid/support/v7/widget/RecyclerView$LayoutManager;)V",
                               m_layoutManager.object());
 
-    QtQmlAndroidViewGroup::onInflate(instance);
+    QQmlAndroidViewGroup::onInflate(instance);
 }
 
-void QtQmlAndroidRecyclerView::objectChange(ObjectChange change)
+void QQmlAndroidRecyclerView::objectChange(ObjectChange change)
 {
-    QtQmlAndroidViewGroup::objectChange(change);
+    QQmlAndroidViewGroup::objectChange(change);
     if (change == InstanceChange)
         updateAdapter();
 }
 
-void QtQmlAndroidRecyclerView::updateAdapter()
+void QQmlAndroidRecyclerView::updateAdapter()
 {
     if (!isValid() || !m_adapter)
         return;
diff --git a/src/qmlandroid/support/v7/widget/qtqmlandroidrecyclerview_p.h b/src/qmlandroid/support/v7/widget/qtqmlandroidrecyclerview_p.h
index 62ed968..13d2079 100644
--- a/src/qmlandroid/support/v7/widget/qtqmlandroidrecyclerview_p.h
+++ b/src/qmlandroid/support/v7/widget/qtqmlandroidrecyclerview_p.h
@@ -5,18 +5,18 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidRecyclerAdapter;
+class QQmlAndroidRecyclerAdapter;
 
-class QtQmlAndroidRecyclerView : public QtQmlAndroidViewGroup
+class QQmlAndroidRecyclerView : public QQmlAndroidViewGroup
 {
     Q_OBJECT
-    Q_PROPERTY(QtQmlAndroidRecyclerAdapter *adapter READ adapter WRITE setAdapter NOTIFY adapterChanged)
+    Q_PROPERTY(QQmlAndroidRecyclerAdapter *adapter READ adapter WRITE setAdapter NOTIFY adapterChanged)
 
 public:
-    explicit QtQmlAndroidRecyclerView(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidRecyclerView(QQmlAndroidView *parent = 0);
 
-    QtQmlAndroidRecyclerAdapter *adapter() const;
-    void setAdapter(QtQmlAndroidRecyclerAdapter *adapter);
+    QQmlAndroidRecyclerAdapter *adapter() const;
+    void setAdapter(QQmlAndroidRecyclerAdapter *adapter);
 
 Q_SIGNALS:
     void adapterChanged();
@@ -31,7 +31,7 @@ private Q_SLOTS:
     void updateAdapter();
 
 private:
-    QtQmlAndroidRecyclerAdapter *m_adapter;
+    QQmlAndroidRecyclerAdapter *m_adapter;
     QAndroidJniObject m_layoutManager;
 };
 
diff --git a/src/qmlandroid/view/animation/qtqmlandroidacceleratedecelerateinterpolator.cpp b/src/qmlandroid/view/animation/qtqmlandroidacceleratedecelerateinterpolator.cpp
index d30725b..4fb3878 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidacceleratedecelerateinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidacceleratedecelerateinterpolator.cpp
@@ -2,12 +2,12 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidAccelerateDecelerateInterpolator::QtQmlAndroidAccelerateDecelerateInterpolator(QObject *parent) :
-    QtQmlAndroidInterpolator(parent)
+QQmlAndroidAccelerateDecelerateInterpolator::QQmlAndroidAccelerateDecelerateInterpolator(QObject *parent) :
+    QQmlAndroidInterpolator(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidAccelerateDecelerateInterpolator::onCreate()
+QAndroidJniObject QQmlAndroidAccelerateDecelerateInterpolator::onCreate()
 {
     return QAndroidJniObject("android/view/animation/AccelerateDecelerateInterpolator");
 }
diff --git a/src/qmlandroid/view/animation/qtqmlandroidacceleratedecelerateinterpolator_p.h b/src/qmlandroid/view/animation/qtqmlandroidacceleratedecelerateinterpolator_p.h
index e3b28e5..fbbc5ae 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidacceleratedecelerateinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidacceleratedecelerateinterpolator_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidAccelerateDecelerateInterpolator : public QtQmlAndroidInterpolator
+class QQmlAndroidAccelerateDecelerateInterpolator : public QQmlAndroidInterpolator
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidAccelerateDecelerateInterpolator(QObject *parent = 0);
+    explicit QQmlAndroidAccelerateDecelerateInterpolator(QObject *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/view/animation/qtqmlandroidaccelerateinterpolator.cpp b/src/qmlandroid/view/animation/qtqmlandroidaccelerateinterpolator.cpp
index 1b63fc9..28d520a 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidaccelerateinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidaccelerateinterpolator.cpp
@@ -2,19 +2,19 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidAccelerateInterpolator::QtQmlAndroidAccelerateInterpolator(QObject *parent) :
-    QtQmlAndroidInterpolator(parent)
+QQmlAndroidAccelerateInterpolator::QQmlAndroidAccelerateInterpolator(QObject *parent) :
+    QQmlAndroidInterpolator(parent)
 {
 }
 
-qreal QtQmlAndroidAccelerateInterpolator::factor() const
+qreal QQmlAndroidAccelerateInterpolator::factor() const
 {
     if (m_factor.isNull())
         return 1.0;
     return m_factor.value();
 }
 
-void QtQmlAndroidAccelerateInterpolator::setFactor(qreal factor)
+void QQmlAndroidAccelerateInterpolator::setFactor(qreal factor)
 {
     if (m_factor.isNull() || m_factor.value() != factor) {
         m_factor = factor;
@@ -22,7 +22,7 @@ void QtQmlAndroidAccelerateInterpolator::setFactor(qreal factor)
     }
 }
 
-QAndroidJniObject QtQmlAndroidAccelerateInterpolator::onCreate()
+QAndroidJniObject QQmlAndroidAccelerateInterpolator::onCreate()
 {
     if (m_factor.isNull())
         return QAndroidJniObject("android/view/animation/AccelerateInterpolator");
diff --git a/src/qmlandroid/view/animation/qtqmlandroidaccelerateinterpolator_p.h b/src/qmlandroid/view/animation/qtqmlandroidaccelerateinterpolator_p.h
index ae0a7c2..6f35f73 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidaccelerateinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidaccelerateinterpolator_p.h
@@ -6,13 +6,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidAccelerateInterpolator : public QtQmlAndroidInterpolator
+class QQmlAndroidAccelerateInterpolator : public QQmlAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal factor READ factor WRITE setFactor NOTIFY factorChanged)
 
 public:
-    explicit QtQmlAndroidAccelerateInterpolator(QObject *parent = 0);
+    explicit QQmlAndroidAccelerateInterpolator(QObject *parent = 0);
 
     qreal factor() const;
     void setFactor(qreal factor);
@@ -24,7 +24,7 @@ protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
 
 private:
-    QtQmlAndroidOptional<qreal> m_factor;
+    QQmlAndroidOptional<qreal> m_factor;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/animation/qtqmlandroidalphaanimation.cpp b/src/qmlandroid/view/animation/qtqmlandroidalphaanimation.cpp
index e282d25..4a3ccab 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidalphaanimation.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidalphaanimation.cpp
@@ -2,17 +2,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidAlphaAnimation::QtQmlAndroidAlphaAnimation(QObject *parent) :
-    QtQmlAndroidAnimation(parent), m_fromAlpha(0), m_toAlpha(0)
+QQmlAndroidAlphaAnimation::QQmlAndroidAlphaAnimation(QObject *parent) :
+    QQmlAndroidAnimation(parent), m_fromAlpha(0), m_toAlpha(0)
 {
 }
 
-qreal QtQmlAndroidAlphaAnimation::fromAlpha() const
+qreal QQmlAndroidAlphaAnimation::fromAlpha() const
 {
     return m_fromAlpha;
 }
 
-void QtQmlAndroidAlphaAnimation::setFromAlpha(qreal alpha)
+void QQmlAndroidAlphaAnimation::setFromAlpha(qreal alpha)
 {
     if (m_fromAlpha != alpha) {
         m_fromAlpha = alpha;
@@ -20,12 +20,12 @@ void QtQmlAndroidAlphaAnimation::setFromAlpha(qreal alpha)
     }
 }
 
-qreal QtQmlAndroidAlphaAnimation::toAlpha() const
+qreal QQmlAndroidAlphaAnimation::toAlpha() const
 {
     return m_toAlpha;
 }
 
-void QtQmlAndroidAlphaAnimation::setToAlpha(qreal alpha)
+void QQmlAndroidAlphaAnimation::setToAlpha(qreal alpha)
 {
     if (m_toAlpha != alpha) {
         m_toAlpha = alpha;
@@ -33,7 +33,7 @@ void QtQmlAndroidAlphaAnimation::setToAlpha(qreal alpha)
     }
 }
 
-QAndroidJniObject QtQmlAndroidAlphaAnimation::onCreate()
+QAndroidJniObject QQmlAndroidAlphaAnimation::onCreate()
 {
     return QAndroidJniObject("android/view/animation/AlphaAnimation",
                              "(FF)V",
diff --git a/src/qmlandroid/view/animation/qtqmlandroidalphaanimation_p.h b/src/qmlandroid/view/animation/qtqmlandroidalphaanimation_p.h
index f456d73..e6c2a81 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidalphaanimation_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidalphaanimation_p.h
@@ -5,14 +5,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidAlphaAnimation : public QtQmlAndroidAnimation
+class QQmlAndroidAlphaAnimation : public QQmlAndroidAnimation
 {
     Q_OBJECT
     Q_PROPERTY(qreal fromAlpha READ fromAlpha WRITE setFromAlpha NOTIFY fromAlphaChanged)
     Q_PROPERTY(qreal toAlpha READ toAlpha WRITE setToAlpha NOTIFY toAlphaChanged)
 
 public:
-    explicit QtQmlAndroidAlphaAnimation(QObject *parent = 0);
+    explicit QQmlAndroidAlphaAnimation(QObject *parent = 0);
 
     qreal fromAlpha() const;
     void setFromAlpha(qreal alpha);
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanimation.cpp b/src/qmlandroid/view/animation/qtqmlandroidanimation.cpp
index 622ea22..00f83b5 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanimation.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidanimation.cpp
@@ -4,19 +4,19 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidAnimation::QtQmlAndroidAnimation(QObject *parent) :
-    QtQmlAndroidContextual(parent), m_interpolator(0)
+QQmlAndroidAnimation::QQmlAndroidAnimation(QObject *parent) :
+    QQmlAndroidContextual(parent), m_interpolator(0)
 {
 }
 
-int QtQmlAndroidAnimation::resource() const
+int QQmlAndroidAnimation::resource() const
 {
     if (m_resource.isNull())
         return 0;
     return m_resource.value();
 }
 
-void QtQmlAndroidAnimation::setResource(int resource)
+void QQmlAndroidAnimation::setResource(int resource)
 {
     if (m_resource.isNull() || m_resource.value() != resource) {
         m_resource = resource;
@@ -24,14 +24,14 @@ void QtQmlAndroidAnimation::setResource(int resource)
     }
 }
 
-int QtQmlAndroidAnimation::duration() const
+int QQmlAndroidAnimation::duration() const
 {
     if (m_duration.isNull())
         return 0;
     return m_duration.value();
 }
 
-void QtQmlAndroidAnimation::setDuration(int duration)
+void QQmlAndroidAnimation::setDuration(int duration)
 {
     if (m_duration.isNull() || m_duration.value() != duration) {
         m_duration = duration;
@@ -40,14 +40,14 @@ void QtQmlAndroidAnimation::setDuration(int duration)
     }
 }
 
-bool QtQmlAndroidAnimation::fillAfter() const
+bool QQmlAndroidAnimation::fillAfter() const
 {
     if (m_fillAfter.isNull())
         return false;
     return m_fillAfter.value();
 }
 
-void QtQmlAndroidAnimation::setFillAfter(bool fill)
+void QQmlAndroidAnimation::setFillAfter(bool fill)
 {
     if (m_fillAfter.isNull() || m_fillAfter.value() != fill) {
         m_fillAfter = fill;
@@ -56,14 +56,14 @@ void QtQmlAndroidAnimation::setFillAfter(bool fill)
     }
 }
 
-bool QtQmlAndroidAnimation::fillBefore() const
+bool QQmlAndroidAnimation::fillBefore() const
 {
     if (m_fillBefore.isNull())
         return true;
     return m_fillBefore.value();
 }
 
-void QtQmlAndroidAnimation::setFillBefore(bool fill)
+void QQmlAndroidAnimation::setFillBefore(bool fill)
 {
     if (m_fillBefore.isNull() || m_fillBefore.value() != fill) {
         m_fillBefore = fill;
@@ -72,14 +72,14 @@ void QtQmlAndroidAnimation::setFillBefore(bool fill)
     }
 }
 
-bool QtQmlAndroidAnimation::fillEnabled() const
+bool QQmlAndroidAnimation::fillEnabled() const
 {
     if (!m_fillEnabled.isNull())
         return false;
     return m_fillEnabled.value();
 }
 
-void QtQmlAndroidAnimation::setFillEnabled(bool fill)
+void QQmlAndroidAnimation::setFillEnabled(bool fill)
 {
     if (m_fillEnabled.isNull() || m_fillEnabled.value()!= fill) {
         m_fillEnabled = fill;
@@ -88,35 +88,35 @@ void QtQmlAndroidAnimation::setFillEnabled(bool fill)
     }
 }
 
-QtQmlAndroidInterpolator *QtQmlAndroidAnimation::interpolator() const
+QQmlAndroidInterpolator *QQmlAndroidAnimation::interpolator() const
 {
     return m_interpolator;
 }
 
-void QtQmlAndroidAnimation::setInterpolator(QtQmlAndroidInterpolator *interpolator)
+void QQmlAndroidAnimation::setInterpolator(QQmlAndroidInterpolator *interpolator)
 {
     if (m_interpolator != interpolator) {
         if (m_interpolator) {
-            disconnect(m_interpolator, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidAnimation::updateInterpolator);
+            disconnect(m_interpolator, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidAnimation::updateInterpolator);
             m_interpolator->destruct();
         }
         m_interpolator = interpolator;
         if (m_interpolator) {
-            connect(m_interpolator, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidAnimation::updateInterpolator);
+            connect(m_interpolator, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidAnimation::updateInterpolator);
             if (isValid())
                 m_interpolator->construct();
         }
     }
 }
 
-int QtQmlAndroidAnimation::repeatCount() const
+int QQmlAndroidAnimation::repeatCount() const
 {
     if (m_repeatCount.isNull())
         return 0;
     return m_repeatCount.value();
 }
 
-void QtQmlAndroidAnimation::setRepeatCount(int count)
+void QQmlAndroidAnimation::setRepeatCount(int count)
 {
     if (m_repeatCount.isNull() || m_repeatCount.value() != count) {
         m_repeatCount = count;
@@ -125,14 +125,14 @@ void QtQmlAndroidAnimation::setRepeatCount(int count)
     }
 }
 
-QtQmlAndroidAnimation::RepeatMode QtQmlAndroidAnimation::repeatMode() const
+QQmlAndroidAnimation::RepeatMode QQmlAndroidAnimation::repeatMode() const
 {
     if (m_repeatMode.isNull())
         return RESTART;
     return m_repeatMode.value();
 }
 
-void QtQmlAndroidAnimation::setRepeatMode(RepeatMode mode)
+void QQmlAndroidAnimation::setRepeatMode(RepeatMode mode)
 {
     if (m_repeatMode.isNull() || m_repeatMode.value() != mode) {
         m_repeatMode = mode;
@@ -141,14 +141,14 @@ void QtQmlAndroidAnimation::setRepeatMode(RepeatMode mode)
     }
 }
 
-int QtQmlAndroidAnimation::startOffset() const
+int QQmlAndroidAnimation::startOffset() const
 {
     if (m_startOffset.isNull())
         return 0;
     return m_startOffset.value();
 }
 
-void QtQmlAndroidAnimation::setStartOffset(int offset)
+void QQmlAndroidAnimation::setStartOffset(int offset)
 {
     if (m_startOffset.isNull() || m_startOffset.value() != offset) {
         m_startOffset = offset;
@@ -157,14 +157,14 @@ void QtQmlAndroidAnimation::setStartOffset(int offset)
     }
 }
 
-QtQmlAndroidAnimation::ZAdjustment QtQmlAndroidAnimation::zAdjustment() const
+QQmlAndroidAnimation::ZAdjustment QQmlAndroidAnimation::zAdjustment() const
 {
     if (m_zAdjustment.isNull())
         return ZORDER_NORMAL;
     return m_zAdjustment.value();
 }
 
-void QtQmlAndroidAnimation::setZAdjustment(ZAdjustment adjustment)
+void QQmlAndroidAnimation::setZAdjustment(ZAdjustment adjustment)
 {
     if (m_zAdjustment.isNull() || m_zAdjustment.value() != adjustment) {
         m_zAdjustment = adjustment;
@@ -173,22 +173,22 @@ void QtQmlAndroidAnimation::setZAdjustment(ZAdjustment adjustment)
     }
 }
 
-void QtQmlAndroidAnimation::cancel()
+void QQmlAndroidAnimation::cancel()
 {
     QtQmlAndroid::callVoidMethod(instance(), "cancel");
 }
 
-void QtQmlAndroidAnimation::start()
+void QQmlAndroidAnimation::start()
 {
     QtQmlAndroid::callVoidMethod(instance(), "start");
 }
 
-void QtQmlAndroidAnimation::startNow()
+void QQmlAndroidAnimation::startNow()
 {
     QtQmlAndroid::callVoidMethod(instance(), "startNow");
 }
 
-QAndroidJniObject QtQmlAndroidAnimation::onCreate()
+QAndroidJniObject QQmlAndroidAnimation::onCreate()
 {
     if (m_resource.isNull())
         return QAndroidJniObject("android/view/animation/Animation");
@@ -200,9 +200,9 @@ QAndroidJniObject QtQmlAndroidAnimation::onCreate()
                                                      m_resource.value());
 }
 
-void QtQmlAndroidAnimation::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidAnimation::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidContextual::onInflate(instance);
+    QQmlAndroidContextual::onInflate(instance);
 
     if (m_resource.isNull()) {
         if (!m_duration.isNull())
@@ -224,13 +224,13 @@ void QtQmlAndroidAnimation::onInflate(QAndroidJniObject &instance)
     }
 }
 
-void QtQmlAndroidAnimation::objectChange(ObjectChange change)
+void QQmlAndroidAnimation::objectChange(ObjectChange change)
 {
     if (change == InstanceChange)
         updateInterpolator();
 }
 
-void QtQmlAndroidAnimation::updateInterpolator()
+void QQmlAndroidAnimation::updateInterpolator()
 {
     if (!isValid() || !m_interpolator || !m_interpolator->isValid())
         return;
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanimation_p.h b/src/qmlandroid/view/animation/qtqmlandroidanimation_p.h
index 731a8ea..14156a9 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanimation_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidanimation_p.h
@@ -6,9 +6,9 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidInterpolator;
+class QQmlAndroidInterpolator;
 
-class QtQmlAndroidAnimation : public QtQmlAndroidContextual
+class QQmlAndroidAnimation : public QQmlAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(int resource READ resource WRITE setResource NOTIFY resourceChanged)
@@ -16,7 +16,7 @@ class QtQmlAndroidAnimation : public QtQmlAndroidContextual
     Q_PROPERTY(bool fillAfter READ fillAfter WRITE setFillAfter NOTIFY fillAfterChanged)
     Q_PROPERTY(bool fillBefore READ fillBefore WRITE setFillBefore NOTIFY fillBeforeChanged)
     Q_PROPERTY(bool fillEnabled READ fillEnabled WRITE setFillEnabled NOTIFY fillEnabledChanged)
-    Q_PROPERTY(QtQmlAndroidInterpolator *interpolator READ interpolator WRITE setInterpolator NOTIFY interpolatorChanged)
+    Q_PROPERTY(QQmlAndroidInterpolator *interpolator READ interpolator WRITE setInterpolator NOTIFY interpolatorChanged)
     Q_PROPERTY(int repeatCount READ repeatCount WRITE setRepeatCount NOTIFY repeatCountChanged)
     Q_PROPERTY(RepeatMode repeatMode READ repeatMode WRITE setRepeatMode NOTIFY repeatModeChanged)
     Q_PROPERTY(int startOffset READ startOffset WRITE setStartOffset NOTIFY startOffsetChanged)
@@ -24,7 +24,7 @@ class QtQmlAndroidAnimation : public QtQmlAndroidContextual
     Q_ENUMS(RepeatMode ZAdjustment Infinity Relation)
 
 public:
-    explicit QtQmlAndroidAnimation(QObject *parent = 0);
+    explicit QQmlAndroidAnimation(QObject *parent = 0);
 
     int resource() const;
     void setResource(int resource);
@@ -51,8 +51,8 @@ public:
     bool fillEnabled() const;
     void setFillEnabled(bool enabled);
 
-    QtQmlAndroidInterpolator *interpolator() const;
-    void setInterpolator(QtQmlAndroidInterpolator *interpolator);
+    QQmlAndroidInterpolator *interpolator() const;
+    void setInterpolator(QQmlAndroidInterpolator *interpolator);
 
     int repeatCount() const;
     void setRepeatCount(int count);
@@ -104,16 +104,16 @@ private Q_SLOTS:
     void updateInterpolator();
 
 private:
-    QtQmlAndroidOptional<int> m_resource;
-    QtQmlAndroidOptional<int> m_duration;
-    QtQmlAndroidOptional<bool> m_fillAfter;
-    QtQmlAndroidOptional<bool> m_fillBefore;
-    QtQmlAndroidOptional<bool> m_fillEnabled;
-    QtQmlAndroidInterpolator *m_interpolator;
-    QtQmlAndroidOptional<int> m_repeatCount;
-    QtQmlAndroidOptional<RepeatMode> m_repeatMode;
-    QtQmlAndroidOptional<int> m_startOffset;
-    QtQmlAndroidOptional<ZAdjustment> m_zAdjustment;
+    QQmlAndroidOptional<int> m_resource;
+    QQmlAndroidOptional<int> m_duration;
+    QQmlAndroidOptional<bool> m_fillAfter;
+    QQmlAndroidOptional<bool> m_fillBefore;
+    QQmlAndroidOptional<bool> m_fillEnabled;
+    QQmlAndroidInterpolator *m_interpolator;
+    QQmlAndroidOptional<int> m_repeatCount;
+    QQmlAndroidOptional<RepeatMode> m_repeatMode;
+    QQmlAndroidOptional<int> m_startOffset;
+    QQmlAndroidOptional<ZAdjustment> m_zAdjustment;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanimationmodule.cpp b/src/qmlandroid/view/animation/qtqmlandroidanimationmodule.cpp
index bb8457e..6fc93d3 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanimationmodule.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidanimationmodule.cpp
@@ -25,23 +25,23 @@ namespace QtQmlAndroid {
 
 void registerAnimationModule(const char *uri)
 {
-    qmlRegisterType<QtQmlAndroidAccelerateDecelerateInterpolator>(uri, 0, 21, "AccelerateDecelerateInterpolator");
-    qmlRegisterType<QtQmlAndroidAccelerateInterpolator>(uri, 0, 21, "AccelerateInterpolator");
-    qmlRegisterType<QtQmlAndroidAlphaAnimation>(uri, 0, 21, "AlphaAnimation");
-    qmlRegisterType<QtQmlAndroidAnimation>(uri, 0, 21, "Animation");
-    qmlRegisterType<QtQmlAndroidAnimationSet>(uri, 0, 21, "AnimationSet");
-    qmlRegisterType<QtQmlAndroidAnticipateInterpolator>(uri, 0, 21, "AnticipateInterpolator");
-    qmlRegisterType<QtQmlAndroidAnticipateOvershootInterpolator>(uri, 0, 21, "AnticipateOvershootInterpolator");
-    qmlRegisterType<QtQmlAndroidBounceInterpolator>(uri, 0, 21, "BounceInterpolator");
-    qmlRegisterType<QtQmlAndroidCycleInterpolator>(uri, 0, 21, "CycleInterpolator");
-    qmlRegisterType<QtQmlAndroidDecelerateInterpolator>(uri, 0, 21, "DecelerateInterpolator");
-    qmlRegisterUncreatableType<QtQmlAndroidInterpolator>(uri, 0, 21, "Interpolator", "Interpolator is abstract");
-    qmlRegisterType<QtQmlAndroidLinearInterpolator>(uri, 0, 21, "LinearInterpolator");
-    qmlRegisterType<QtQmlAndroidOvershootInterpolator>(uri, 0, 21, "OvershootInterpolator");
-    qmlRegisterType<QtQmlAndroidPathInterpolator>(uri, 0, 21, "PathInterpolator");
-    qmlRegisterType<QtQmlAndroidRotateAnimation>(uri, 0, 21, "RotateAnimation");
-    qmlRegisterType<QtQmlAndroidScaleAnimation>(uri, 0, 21, "ScaleAnimation");
-    qmlRegisterType<QtQmlAndroidTranslateAnimation>(uri, 0, 21, "TranslateAnimation");
+    qmlRegisterType<QQmlAndroidAccelerateDecelerateInterpolator>(uri, 0, 21, "AccelerateDecelerateInterpolator");
+    qmlRegisterType<QQmlAndroidAccelerateInterpolator>(uri, 0, 21, "AccelerateInterpolator");
+    qmlRegisterType<QQmlAndroidAlphaAnimation>(uri, 0, 21, "AlphaAnimation");
+    qmlRegisterType<QQmlAndroidAnimation>(uri, 0, 21, "Animation");
+    qmlRegisterType<QQmlAndroidAnimationSet>(uri, 0, 21, "AnimationSet");
+    qmlRegisterType<QQmlAndroidAnticipateInterpolator>(uri, 0, 21, "AnticipateInterpolator");
+    qmlRegisterType<QQmlAndroidAnticipateOvershootInterpolator>(uri, 0, 21, "AnticipateOvershootInterpolator");
+    qmlRegisterType<QQmlAndroidBounceInterpolator>(uri, 0, 21, "BounceInterpolator");
+    qmlRegisterType<QQmlAndroidCycleInterpolator>(uri, 0, 21, "CycleInterpolator");
+    qmlRegisterType<QQmlAndroidDecelerateInterpolator>(uri, 0, 21, "DecelerateInterpolator");
+    qmlRegisterUncreatableType<QQmlAndroidInterpolator>(uri, 0, 21, "Interpolator", "Interpolator is abstract");
+    qmlRegisterType<QQmlAndroidLinearInterpolator>(uri, 0, 21, "LinearInterpolator");
+    qmlRegisterType<QQmlAndroidOvershootInterpolator>(uri, 0, 21, "OvershootInterpolator");
+    qmlRegisterType<QQmlAndroidPathInterpolator>(uri, 0, 21, "PathInterpolator");
+    qmlRegisterType<QQmlAndroidRotateAnimation>(uri, 0, 21, "RotateAnimation");
+    qmlRegisterType<QQmlAndroidScaleAnimation>(uri, 0, 21, "ScaleAnimation");
+    qmlRegisterType<QQmlAndroidTranslateAnimation>(uri, 0, 21, "TranslateAnimation");
 }
 
 }
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanimationset.cpp b/src/qmlandroid/view/animation/qtqmlandroidanimationset.cpp
index d79d330..070d550 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanimationset.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidanimationset.cpp
@@ -2,17 +2,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidAnimationSet::QtQmlAndroidAnimationSet(QObject *parent) :
-    QtQmlAndroidAnimation(parent), m_shareInterpolator(false)
+QQmlAndroidAnimationSet::QQmlAndroidAnimationSet(QObject *parent) :
+    QQmlAndroidAnimation(parent), m_shareInterpolator(false)
 {
 }
 
-bool QtQmlAndroidAnimationSet::shareInterpolator() const
+bool QQmlAndroidAnimationSet::shareInterpolator() const
 {
     return m_shareInterpolator;
 }
 
-void QtQmlAndroidAnimationSet::setShareInterpolator(bool share)
+void QQmlAndroidAnimationSet::setShareInterpolator(bool share)
 {
     if (m_shareInterpolator != share) {
         m_shareInterpolator = share;
@@ -20,19 +20,19 @@ void QtQmlAndroidAnimationSet::setShareInterpolator(bool share)
     }
 }
 
-QAndroidJniObject QtQmlAndroidAnimationSet::onCreate()
+QAndroidJniObject QQmlAndroidAnimationSet::onCreate()
 {
     return QAndroidJniObject("android/view/animation/AnimationSet",
                              "(Z)V",
                              m_shareInterpolator);
 }
 
-void QtQmlAndroidAnimationSet::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidAnimationSet::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidAnimation::onInflate(instance);
+    QQmlAndroidAnimation::onInflate(instance);
 
     foreach (QObject *object, children()) {
-        QtQmlAndroidAnimation *child = qobject_cast<QtQmlAndroidAnimation *>(object);
+        QQmlAndroidAnimation *child = qobject_cast<QQmlAndroidAnimation *>(object);
         if (child) {
             QAndroidJniObject animation = child->instance();
             if (animation.isValid())
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanimationset_p.h b/src/qmlandroid/view/animation/qtqmlandroidanimationset_p.h
index 2f96cb1..0919cdd 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanimationset_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidanimationset_p.h
@@ -5,13 +5,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidAnimationSet : public QtQmlAndroidAnimation
+class QQmlAndroidAnimationSet : public QQmlAndroidAnimation
 {
     Q_OBJECT
     Q_PROPERTY(bool shareInterpolator READ shareInterpolator WRITE setShareInterpolator NOTIFY shareInterpolatorChanged)
 
 public:
-    explicit QtQmlAndroidAnimationSet(QObject *parent = 0);
+    explicit QQmlAndroidAnimationSet(QObject *parent = 0);
 
     bool shareInterpolator() const;
     void setShareInterpolator(bool share);
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanticipateinterpolator.cpp b/src/qmlandroid/view/animation/qtqmlandroidanticipateinterpolator.cpp
index 7e2dd14..32cb12e 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanticipateinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidanticipateinterpolator.cpp
@@ -2,19 +2,19 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidAnticipateInterpolator::QtQmlAndroidAnticipateInterpolator(QObject *parent) :
-    QtQmlAndroidInterpolator(parent)
+QQmlAndroidAnticipateInterpolator::QQmlAndroidAnticipateInterpolator(QObject *parent) :
+    QQmlAndroidInterpolator(parent)
 {
 }
 
-qreal QtQmlAndroidAnticipateInterpolator::tension() const
+qreal QQmlAndroidAnticipateInterpolator::tension() const
 {
     if (m_tension.isNull())
         return 1.0;
     return m_tension.value();
 }
 
-void QtQmlAndroidAnticipateInterpolator::setTension(qreal tension)
+void QQmlAndroidAnticipateInterpolator::setTension(qreal tension)
 {
     if (m_tension.isNull() || m_tension.value() != tension) {
         m_tension = tension;
@@ -22,7 +22,7 @@ void QtQmlAndroidAnticipateInterpolator::setTension(qreal tension)
     }
 }
 
-QAndroidJniObject QtQmlAndroidAnticipateInterpolator::onCreate()
+QAndroidJniObject QQmlAndroidAnticipateInterpolator::onCreate()
 {
     if (m_tension.isNull())
         return QAndroidJniObject("android/view/animation/AnticipateInterpolator");
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanticipateinterpolator_p.h b/src/qmlandroid/view/animation/qtqmlandroidanticipateinterpolator_p.h
index 99cc093..bbc1405 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanticipateinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidanticipateinterpolator_p.h
@@ -6,13 +6,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidAnticipateInterpolator : public QtQmlAndroidInterpolator
+class QQmlAndroidAnticipateInterpolator : public QQmlAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal tension READ tension WRITE setTension NOTIFY tensionChanged)
 
 public:
-    explicit QtQmlAndroidAnticipateInterpolator(QObject *parent = 0);
+    explicit QQmlAndroidAnticipateInterpolator(QObject *parent = 0);
 
     qreal tension() const;
     void setTension(qreal tension);
@@ -24,7 +24,7 @@ protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
 
 private:
-    QtQmlAndroidOptional<qreal> m_tension;
+    QQmlAndroidOptional<qreal> m_tension;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanticipateovershootinterpolator.cpp b/src/qmlandroid/view/animation/qtqmlandroidanticipateovershootinterpolator.cpp
index 0599be4..2ecb5d2 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanticipateovershootinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidanticipateovershootinterpolator.cpp
@@ -2,19 +2,19 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidAnticipateOvershootInterpolator::QtQmlAndroidAnticipateOvershootInterpolator(QObject *parent) :
-    QtQmlAndroidInterpolator(parent)
+QQmlAndroidAnticipateOvershootInterpolator::QQmlAndroidAnticipateOvershootInterpolator(QObject *parent) :
+    QQmlAndroidInterpolator(parent)
 {
 }
 
-qreal QtQmlAndroidAnticipateOvershootInterpolator::tension() const
+qreal QQmlAndroidAnticipateOvershootInterpolator::tension() const
 {
     if (m_tension.isNull())
         return 1.0;
     return m_tension.value();
 }
 
-void QtQmlAndroidAnticipateOvershootInterpolator::setTension(qreal tension)
+void QQmlAndroidAnticipateOvershootInterpolator::setTension(qreal tension)
 {
     if (m_tension.isNull() || m_tension.value() != tension) {
         m_tension = tension;
@@ -22,14 +22,14 @@ void QtQmlAndroidAnticipateOvershootInterpolator::setTension(qreal tension)
     }
 }
 
-qreal QtQmlAndroidAnticipateOvershootInterpolator::extraTension() const
+qreal QQmlAndroidAnticipateOvershootInterpolator::extraTension() const
 {
     if (m_extraTension.isNull())
         return 1.0;
     return m_extraTension.value();
 }
 
-void QtQmlAndroidAnticipateOvershootInterpolator::setExtraTension(qreal tension)
+void QQmlAndroidAnticipateOvershootInterpolator::setExtraTension(qreal tension)
 {
     if (m_extraTension.isNull() || m_extraTension.value() != tension) {
         m_extraTension = tension;
@@ -37,7 +37,7 @@ void QtQmlAndroidAnticipateOvershootInterpolator::setExtraTension(qreal tension)
     }
 }
 
-QAndroidJniObject QtQmlAndroidAnticipateOvershootInterpolator::onCreate()
+QAndroidJniObject QQmlAndroidAnticipateOvershootInterpolator::onCreate()
 {
     if (m_tension.isNull() && m_extraTension.isNull())
         return QAndroidJniObject("android/view/animation/AnticipateOvershootInterpolator");
diff --git a/src/qmlandroid/view/animation/qtqmlandroidanticipateovershootinterpolator_p.h b/src/qmlandroid/view/animation/qtqmlandroidanticipateovershootinterpolator_p.h
index 24527d7..a133584 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidanticipateovershootinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidanticipateovershootinterpolator_p.h
@@ -6,14 +6,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidAnticipateOvershootInterpolator : public QtQmlAndroidInterpolator
+class QQmlAndroidAnticipateOvershootInterpolator : public QQmlAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal tension READ tension WRITE setTension NOTIFY tensionChanged)
     Q_PROPERTY(qreal extraTension READ extraTension WRITE setExtraTension NOTIFY extraTensionChanged)
 
 public:
-    explicit QtQmlAndroidAnticipateOvershootInterpolator(QObject *parent = 0);
+    explicit QQmlAndroidAnticipateOvershootInterpolator(QObject *parent = 0);
 
     qreal tension() const;
     void setTension(qreal tension);
@@ -29,8 +29,8 @@ protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
 
 private:
-    QtQmlAndroidOptional<qreal> m_tension;
-    QtQmlAndroidOptional<qreal> m_extraTension;
+    QQmlAndroidOptional<qreal> m_tension;
+    QQmlAndroidOptional<qreal> m_extraTension;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/animation/qtqmlandroidbounceinterpolator.cpp b/src/qmlandroid/view/animation/qtqmlandroidbounceinterpolator.cpp
index e593fd6..07235c6 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidbounceinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidbounceinterpolator.cpp
@@ -2,12 +2,12 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidBounceInterpolator::QtQmlAndroidBounceInterpolator(QObject *parent) :
-    QtQmlAndroidInterpolator(parent)
+QQmlAndroidBounceInterpolator::QQmlAndroidBounceInterpolator(QObject *parent) :
+    QQmlAndroidInterpolator(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidBounceInterpolator::onCreate()
+QAndroidJniObject QQmlAndroidBounceInterpolator::onCreate()
 {
     return QAndroidJniObject("android/view/animation/BounceInterpolator");
 }
diff --git a/src/qmlandroid/view/animation/qtqmlandroidbounceinterpolator_p.h b/src/qmlandroid/view/animation/qtqmlandroidbounceinterpolator_p.h
index 89a76ea..d2d8792 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidbounceinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidbounceinterpolator_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidBounceInterpolator : public QtQmlAndroidInterpolator
+class QQmlAndroidBounceInterpolator : public QQmlAndroidInterpolator
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidBounceInterpolator(QObject *parent = 0);
+    explicit QQmlAndroidBounceInterpolator(QObject *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/view/animation/qtqmlandroidcycleinterpolator.cpp b/src/qmlandroid/view/animation/qtqmlandroidcycleinterpolator.cpp
index 79bd557..070af6b 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidcycleinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidcycleinterpolator.cpp
@@ -2,19 +2,19 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidCycleInterpolator::QtQmlAndroidCycleInterpolator(QObject *parent) :
-    QtQmlAndroidInterpolator(parent)
+QQmlAndroidCycleInterpolator::QQmlAndroidCycleInterpolator(QObject *parent) :
+    QQmlAndroidInterpolator(parent)
 {
 }
 
-qreal QtQmlAndroidCycleInterpolator::cycles() const
+qreal QQmlAndroidCycleInterpolator::cycles() const
 {
     if (m_cycles.isNull())
         return 1.0;
     return m_cycles.value();
 }
 
-void QtQmlAndroidCycleInterpolator::setCycles(qreal cycles)
+void QQmlAndroidCycleInterpolator::setCycles(qreal cycles)
 {
     if (m_cycles.isNull() || m_cycles.value() != cycles) {
         m_cycles = cycles;
@@ -22,7 +22,7 @@ void QtQmlAndroidCycleInterpolator::setCycles(qreal cycles)
     }
 }
 
-QAndroidJniObject QtQmlAndroidCycleInterpolator::onCreate()
+QAndroidJniObject QQmlAndroidCycleInterpolator::onCreate()
 {
     if (m_cycles.isNull())
         return QAndroidJniObject("android/view/animation/CycleInterpolator");
diff --git a/src/qmlandroid/view/animation/qtqmlandroidcycleinterpolator_p.h b/src/qmlandroid/view/animation/qtqmlandroidcycleinterpolator_p.h
index f55aee7..fb50d33 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidcycleinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidcycleinterpolator_p.h
@@ -6,13 +6,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidCycleInterpolator : public QtQmlAndroidInterpolator
+class QQmlAndroidCycleInterpolator : public QQmlAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal cycles READ cycles WRITE setCycles NOTIFY cyclesChanged)
 
 public:
-    explicit QtQmlAndroidCycleInterpolator(QObject *parent = 0);
+    explicit QQmlAndroidCycleInterpolator(QObject *parent = 0);
 
     qreal cycles() const;
     void setCycles(qreal cycles);
@@ -24,7 +24,7 @@ protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
 
 private:
-    QtQmlAndroidOptional<qreal> m_cycles;
+    QQmlAndroidOptional<qreal> m_cycles;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/animation/qtqmlandroiddecelerateinterpolator.cpp b/src/qmlandroid/view/animation/qtqmlandroiddecelerateinterpolator.cpp
index 39893bf..c7ea1cc 100644
--- a/src/qmlandroid/view/animation/qtqmlandroiddecelerateinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroiddecelerateinterpolator.cpp
@@ -2,19 +2,19 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidDecelerateInterpolator::QtQmlAndroidDecelerateInterpolator(QObject *parent) :
-    QtQmlAndroidInterpolator(parent)
+QQmlAndroidDecelerateInterpolator::QQmlAndroidDecelerateInterpolator(QObject *parent) :
+    QQmlAndroidInterpolator(parent)
 {
 }
 
-qreal QtQmlAndroidDecelerateInterpolator::factor() const
+qreal QQmlAndroidDecelerateInterpolator::factor() const
 {
     if (m_factor.isNull())
         return 1.0;
     return m_factor.value();
 }
 
-void QtQmlAndroidDecelerateInterpolator::setFactor(qreal factor)
+void QQmlAndroidDecelerateInterpolator::setFactor(qreal factor)
 {
     if (m_factor.isNull() || m_factor.value() != factor) {
         m_factor = factor;
@@ -22,7 +22,7 @@ void QtQmlAndroidDecelerateInterpolator::setFactor(qreal factor)
     }
 }
 
-QAndroidJniObject QtQmlAndroidDecelerateInterpolator::onCreate()
+QAndroidJniObject QQmlAndroidDecelerateInterpolator::onCreate()
 {
     if (m_factor.isNull())
         return QAndroidJniObject("android/view/animation/DecelerateInterpolator");
diff --git a/src/qmlandroid/view/animation/qtqmlandroiddecelerateinterpolator_p.h b/src/qmlandroid/view/animation/qtqmlandroiddecelerateinterpolator_p.h
index 81e4e65..f6fe111 100644
--- a/src/qmlandroid/view/animation/qtqmlandroiddecelerateinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroiddecelerateinterpolator_p.h
@@ -6,13 +6,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidDecelerateInterpolator : public QtQmlAndroidInterpolator
+class QQmlAndroidDecelerateInterpolator : public QQmlAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal factor READ factor WRITE setFactor NOTIFY factorChanged)
 
 public:
-    explicit QtQmlAndroidDecelerateInterpolator(QObject *parent = 0);
+    explicit QQmlAndroidDecelerateInterpolator(QObject *parent = 0);
 
     qreal factor() const;
     void setFactor(qreal factor);
@@ -24,7 +24,7 @@ protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
 
 private:
-    QtQmlAndroidOptional<qreal> m_factor;
+    QQmlAndroidOptional<qreal> m_factor;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/animation/qtqmlandroidinterpolator.cpp b/src/qmlandroid/view/animation/qtqmlandroidinterpolator.cpp
index bbd344b..d410664 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidinterpolator.cpp
@@ -2,12 +2,12 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidInterpolator::QtQmlAndroidInterpolator(QObject *parent) :
-    QtQmlAndroidObject(parent)
+QQmlAndroidInterpolator::QQmlAndroidInterpolator(QObject *parent) :
+    QQmlAndroidObject(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidInterpolator::onCreate()
+QAndroidJniObject QQmlAndroidInterpolator::onCreate()
 {
     return QAndroidJniObject();
 }
diff --git a/src/qmlandroid/view/animation/qtqmlandroidinterpolator_p.h b/src/qmlandroid/view/animation/qtqmlandroidinterpolator_p.h
index d88a400..480427b 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidinterpolator_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidInterpolator : public QtQmlAndroidObject
+class QQmlAndroidInterpolator : public QQmlAndroidObject
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidInterpolator(QObject *parent = 0);
+    explicit QQmlAndroidInterpolator(QObject *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/view/animation/qtqmlandroidlinearinterpolator.cpp b/src/qmlandroid/view/animation/qtqmlandroidlinearinterpolator.cpp
index 15bdbc4..2585c2b 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidlinearinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidlinearinterpolator.cpp
@@ -2,12 +2,12 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidLinearInterpolator::QtQmlAndroidLinearInterpolator(QObject *parent) :
-    QtQmlAndroidInterpolator(parent)
+QQmlAndroidLinearInterpolator::QQmlAndroidLinearInterpolator(QObject *parent) :
+    QQmlAndroidInterpolator(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidLinearInterpolator::onCreate()
+QAndroidJniObject QQmlAndroidLinearInterpolator::onCreate()
 {
     return QAndroidJniObject("android/view/animation/LinearInterpolator");
 }
diff --git a/src/qmlandroid/view/animation/qtqmlandroidlinearinterpolator_p.h b/src/qmlandroid/view/animation/qtqmlandroidlinearinterpolator_p.h
index a708ec8..63c9a99 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidlinearinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidlinearinterpolator_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidLinearInterpolator : public QtQmlAndroidInterpolator
+class QQmlAndroidLinearInterpolator : public QQmlAndroidInterpolator
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidLinearInterpolator(QObject *parent = 0);
+    explicit QQmlAndroidLinearInterpolator(QObject *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/view/animation/qtqmlandroidovershootinterpolator.cpp b/src/qmlandroid/view/animation/qtqmlandroidovershootinterpolator.cpp
index a0708a2..b676e64 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidovershootinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidovershootinterpolator.cpp
@@ -2,19 +2,19 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidOvershootInterpolator::QtQmlAndroidOvershootInterpolator(QObject *parent) :
-    QtQmlAndroidInterpolator(parent)
+QQmlAndroidOvershootInterpolator::QQmlAndroidOvershootInterpolator(QObject *parent) :
+    QQmlAndroidInterpolator(parent)
 {
 }
 
-qreal QtQmlAndroidOvershootInterpolator::tension() const
+qreal QQmlAndroidOvershootInterpolator::tension() const
 {
     if (m_tension.isNull())
         return 2.0;
     return m_tension.value();
 }
 
-void QtQmlAndroidOvershootInterpolator::setTension(qreal tension)
+void QQmlAndroidOvershootInterpolator::setTension(qreal tension)
 {
     if (m_tension.isNull() || m_tension.value() != tension) {
         m_tension = tension;
@@ -22,7 +22,7 @@ void QtQmlAndroidOvershootInterpolator::setTension(qreal tension)
     }
 }
 
-QAndroidJniObject QtQmlAndroidOvershootInterpolator::onCreate()
+QAndroidJniObject QQmlAndroidOvershootInterpolator::onCreate()
 {
     if (m_tension.isNull())
         return QAndroidJniObject("android/view/animation/OvershootInterpolator");
diff --git a/src/qmlandroid/view/animation/qtqmlandroidovershootinterpolator_p.h b/src/qmlandroid/view/animation/qtqmlandroidovershootinterpolator_p.h
index c64c7b0..95c085e 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidovershootinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidovershootinterpolator_p.h
@@ -6,13 +6,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidOvershootInterpolator : public QtQmlAndroidInterpolator
+class QQmlAndroidOvershootInterpolator : public QQmlAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal tension READ tension WRITE setTension NOTIFY tensionChanged)
 
 public:
-    explicit QtQmlAndroidOvershootInterpolator(QObject *parent = 0);
+    explicit QQmlAndroidOvershootInterpolator(QObject *parent = 0);
 
     qreal tension() const;
     void setTension(qreal tension);
@@ -24,7 +24,7 @@ protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
 
 private:
-    QtQmlAndroidOptional<qreal> m_tension;
+    QQmlAndroidOptional<qreal> m_tension;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/animation/qtqmlandroidpathinterpolator.cpp b/src/qmlandroid/view/animation/qtqmlandroidpathinterpolator.cpp
index cb29ea2..f809438 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidpathinterpolator.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidpathinterpolator.cpp
@@ -2,19 +2,19 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidPathInterpolator::QtQmlAndroidPathInterpolator(QObject *parent) :
-    QtQmlAndroidInterpolator(parent)
+QQmlAndroidPathInterpolator::QQmlAndroidPathInterpolator(QObject *parent) :
+    QQmlAndroidInterpolator(parent)
 {
 }
 
-qreal QtQmlAndroidPathInterpolator::controlX() const
+qreal QQmlAndroidPathInterpolator::controlX() const
 {
     if (m_controlX.isNull())
         return 0.0;
     return m_controlX.value();
 }
 
-void QtQmlAndroidPathInterpolator::setControlX(qreal x)
+void QQmlAndroidPathInterpolator::setControlX(qreal x)
 {
     if (m_controlX.isNull() || m_controlX.value() != x) {
         m_controlX = x;
@@ -22,14 +22,14 @@ void QtQmlAndroidPathInterpolator::setControlX(qreal x)
     }
 }
 
-qreal QtQmlAndroidPathInterpolator::controlY() const
+qreal QQmlAndroidPathInterpolator::controlY() const
 {
     if (m_controlY.isNull())
         return 0.0;
     return m_controlY.value();
 }
 
-void QtQmlAndroidPathInterpolator::setControlY(qreal y)
+void QQmlAndroidPathInterpolator::setControlY(qreal y)
 {
     if (m_controlY.isNull() || m_controlY.value() != y) {
         m_controlY = y;
@@ -37,14 +37,14 @@ void QtQmlAndroidPathInterpolator::setControlY(qreal y)
     }
 }
 
-qreal QtQmlAndroidPathInterpolator::controlX2() const
+qreal QQmlAndroidPathInterpolator::controlX2() const
 {
     if (m_controlX2.isNull())
         return 0.0;
     return m_controlX2.value();
 }
 
-void QtQmlAndroidPathInterpolator::setControlX2(qreal x)
+void QQmlAndroidPathInterpolator::setControlX2(qreal x)
 {
     if (m_controlX2.isNull() || m_controlX2.value() != x) {
         m_controlX2 = x;
@@ -52,14 +52,14 @@ void QtQmlAndroidPathInterpolator::setControlX2(qreal x)
     }
 }
 
-qreal QtQmlAndroidPathInterpolator::controlY2() const
+qreal QQmlAndroidPathInterpolator::controlY2() const
 {
     if (m_controlY2.isNull())
         return 0.0;
     return m_controlY2.value();
 }
 
-void QtQmlAndroidPathInterpolator::setControlY2(qreal y)
+void QQmlAndroidPathInterpolator::setControlY2(qreal y)
 {
     if (m_controlY2.isNull() || m_controlY2.value() != y) {
         m_controlY2 = y;
@@ -67,7 +67,7 @@ void QtQmlAndroidPathInterpolator::setControlY2(qreal y)
     }
 }
 
-QAndroidJniObject QtQmlAndroidPathInterpolator::onCreate()
+QAndroidJniObject QQmlAndroidPathInterpolator::onCreate()
 {
     if (!m_controlX.isNull() && !m_controlY.isNull() && !m_controlX2.isNull() && !m_controlY2.isNull())
         return QAndroidJniObject("android/view/animation/PathInterpolator",
diff --git a/src/qmlandroid/view/animation/qtqmlandroidpathinterpolator_p.h b/src/qmlandroid/view/animation/qtqmlandroidpathinterpolator_p.h
index 3184a43..960995d 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidpathinterpolator_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidpathinterpolator_p.h
@@ -6,7 +6,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidPathInterpolator : public QtQmlAndroidInterpolator
+class QQmlAndroidPathInterpolator : public QQmlAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal controlX READ controlX WRITE setControlX NOTIFY controlXChanged)
@@ -15,7 +15,7 @@ class QtQmlAndroidPathInterpolator : public QtQmlAndroidInterpolator
     Q_PROPERTY(qreal controlY2 READ controlY2 WRITE setControlY2 NOTIFY controlY2Changed)
 
 public:
-    explicit QtQmlAndroidPathInterpolator(QObject *parent = 0);
+    explicit QQmlAndroidPathInterpolator(QObject *parent = 0);
 
     qreal controlX() const;
     void setControlX(qreal x);
@@ -39,10 +39,10 @@ protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
 
 private:
-    QtQmlAndroidOptional<qreal> m_controlX;
-    QtQmlAndroidOptional<qreal> m_controlY;
-    QtQmlAndroidOptional<qreal> m_controlX2;
-    QtQmlAndroidOptional<qreal> m_controlY2;
+    QQmlAndroidOptional<qreal> m_controlX;
+    QQmlAndroidOptional<qreal> m_controlY;
+    QQmlAndroidOptional<qreal> m_controlX2;
+    QQmlAndroidOptional<qreal> m_controlY2;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/animation/qtqmlandroidrotateanimation.cpp b/src/qmlandroid/view/animation/qtqmlandroidrotateanimation.cpp
index cd794a3..7a2585a 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidrotateanimation.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidrotateanimation.cpp
@@ -2,18 +2,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidRotateAnimation::QtQmlAndroidRotateAnimation(QObject *parent) :
-    QtQmlAndroidAnimation(parent), m_from(0), m_to(0),
+QQmlAndroidRotateAnimation::QQmlAndroidRotateAnimation(QObject *parent) :
+    QQmlAndroidAnimation(parent), m_from(0), m_to(0),
     m_pivotX(0), m_pivotY(0), m_pivotXType(ABSOLUTE), m_pivotYType(ABSOLUTE)
 {
 }
 
-qreal QtQmlAndroidRotateAnimation::fromDegrees() const
+qreal QQmlAndroidRotateAnimation::fromDegrees() const
 {
     return m_from;
 }
 
-void QtQmlAndroidRotateAnimation::setFromDegrees(qreal degrees)
+void QQmlAndroidRotateAnimation::setFromDegrees(qreal degrees)
 {
     if (m_from != degrees) {
         m_from = degrees;
@@ -21,12 +21,12 @@ void QtQmlAndroidRotateAnimation::setFromDegrees(qreal degrees)
     }
 }
 
-qreal QtQmlAndroidRotateAnimation::toDegrees() const
+qreal QQmlAndroidRotateAnimation::toDegrees() const
 {
     return m_to;
 }
 
-void QtQmlAndroidRotateAnimation::setToDegrees(qreal degrees)
+void QQmlAndroidRotateAnimation::setToDegrees(qreal degrees)
 {
     if (m_to != degrees) {
         m_to = degrees;
@@ -34,12 +34,12 @@ void QtQmlAndroidRotateAnimation::setToDegrees(qreal degrees)
     }
 }
 
-qreal QtQmlAndroidRotateAnimation::pivotX() const
+qreal QQmlAndroidRotateAnimation::pivotX() const
 {
     return m_pivotX;
 }
 
-void QtQmlAndroidRotateAnimation::setPivotX(qreal pivotX)
+void QQmlAndroidRotateAnimation::setPivotX(qreal pivotX)
 {
     if (m_pivotX != pivotX) {
         m_pivotX = pivotX;
@@ -47,12 +47,12 @@ void QtQmlAndroidRotateAnimation::setPivotX(qreal pivotX)
     }
 }
 
-qreal QtQmlAndroidRotateAnimation::pivotY() const
+qreal QQmlAndroidRotateAnimation::pivotY() const
 {
     return m_pivotY;
 }
 
-void QtQmlAndroidRotateAnimation::setPivotY(qreal pivotY)
+void QQmlAndroidRotateAnimation::setPivotY(qreal pivotY)
 {
     if (m_pivotY != pivotY) {
         m_pivotY = pivotY;
@@ -60,12 +60,12 @@ void QtQmlAndroidRotateAnimation::setPivotY(qreal pivotY)
     }
 }
 
-QtQmlAndroidRotateAnimation::Relation QtQmlAndroidRotateAnimation::pivotXType() const
+QQmlAndroidRotateAnimation::Relation QQmlAndroidRotateAnimation::pivotXType() const
 {
     return m_pivotXType;
 }
 
-void QtQmlAndroidRotateAnimation::setPivotXType(Relation type)
+void QQmlAndroidRotateAnimation::setPivotXType(Relation type)
 {
     if (m_pivotXType != type) {
         m_pivotXType = type;
@@ -73,12 +73,12 @@ void QtQmlAndroidRotateAnimation::setPivotXType(Relation type)
     }
 }
 
-QtQmlAndroidRotateAnimation::Relation QtQmlAndroidRotateAnimation::pivotYType() const
+QQmlAndroidRotateAnimation::Relation QQmlAndroidRotateAnimation::pivotYType() const
 {
     return m_pivotYType;
 }
 
-void QtQmlAndroidRotateAnimation::setPivotYType(Relation type)
+void QQmlAndroidRotateAnimation::setPivotYType(Relation type)
 {
     if (m_pivotYType != type) {
         m_pivotYType = type;
@@ -86,7 +86,7 @@ void QtQmlAndroidRotateAnimation::setPivotYType(Relation type)
     }
 }
 
-QAndroidJniObject QtQmlAndroidRotateAnimation::onCreate()
+QAndroidJniObject QQmlAndroidRotateAnimation::onCreate()
 {
     return QAndroidJniObject("android/view/animation/RotateAnimation",
                              "(FFIFIF)V",
diff --git a/src/qmlandroid/view/animation/qtqmlandroidrotateanimation_p.h b/src/qmlandroid/view/animation/qtqmlandroidrotateanimation_p.h
index 5c666ce..8aeb05b 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidrotateanimation_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidrotateanimation_p.h
@@ -5,7 +5,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidRotateAnimation : public QtQmlAndroidAnimation
+class QQmlAndroidRotateAnimation : public QQmlAndroidAnimation
 {
     Q_OBJECT
     Q_PROPERTY(qreal fromDegrees READ fromDegrees WRITE setFromDegrees NOTIFY fromDegreesChanged)
@@ -17,7 +17,7 @@ class QtQmlAndroidRotateAnimation : public QtQmlAndroidAnimation
     Q_ENUMS(Relation)
 
 public:
-    explicit QtQmlAndroidRotateAnimation(QObject *parent = 0);
+    explicit QQmlAndroidRotateAnimation(QObject *parent = 0);
 
     qreal fromDegrees() const;
     void setFromDegrees(qreal degrees);
diff --git a/src/qmlandroid/view/animation/qtqmlandroidscaleanimation.cpp b/src/qmlandroid/view/animation/qtqmlandroidscaleanimation.cpp
index 0f1e636..2cd7520 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidscaleanimation.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidscaleanimation.cpp
@@ -2,18 +2,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidScaleAnimation::QtQmlAndroidScaleAnimation(QObject *parent) :
-    QtQmlAndroidAnimation(parent), m_fromX(0), m_fromY(0), m_toX(0), m_toY(0),
+QQmlAndroidScaleAnimation::QQmlAndroidScaleAnimation(QObject *parent) :
+    QQmlAndroidAnimation(parent), m_fromX(0), m_fromY(0), m_toX(0), m_toY(0),
     m_pivotX(0), m_pivotY(0), m_pivotXType(ABSOLUTE), m_pivotYType(ABSOLUTE)
 {
 }
 
-qreal QtQmlAndroidScaleAnimation::fromXScale() const
+qreal QQmlAndroidScaleAnimation::fromXScale() const
 {
     return m_fromX;
 }
 
-void QtQmlAndroidScaleAnimation::setFromXScale(qreal x)
+void QQmlAndroidScaleAnimation::setFromXScale(qreal x)
 {
     if (m_fromX != x) {
         m_fromX = x;
@@ -21,12 +21,12 @@ void QtQmlAndroidScaleAnimation::setFromXScale(qreal x)
     }
 }
 
-qreal QtQmlAndroidScaleAnimation::fromYScale() const
+qreal QQmlAndroidScaleAnimation::fromYScale() const
 {
     return m_fromY;
 }
 
-void QtQmlAndroidScaleAnimation::setFromYScale(qreal y)
+void QQmlAndroidScaleAnimation::setFromYScale(qreal y)
 {
     if (m_fromY != y) {
         m_fromY = y;
@@ -34,12 +34,12 @@ void QtQmlAndroidScaleAnimation::setFromYScale(qreal y)
     }
 }
 
-qreal QtQmlAndroidScaleAnimation::toXScale() const
+qreal QQmlAndroidScaleAnimation::toXScale() const
 {
     return m_toX;
 }
 
-void QtQmlAndroidScaleAnimation::setToXScale(qreal x)
+void QQmlAndroidScaleAnimation::setToXScale(qreal x)
 {
     if (m_toX != x) {
         m_toX = x;
@@ -47,12 +47,12 @@ void QtQmlAndroidScaleAnimation::setToXScale(qreal x)
     }
 }
 
-qreal QtQmlAndroidScaleAnimation::toYScale() const
+qreal QQmlAndroidScaleAnimation::toYScale() const
 {
     return m_toY;
 }
 
-void QtQmlAndroidScaleAnimation::setToYScale(qreal y)
+void QQmlAndroidScaleAnimation::setToYScale(qreal y)
 {
     if (m_toY != y) {
         m_toY = y;
@@ -60,12 +60,12 @@ void QtQmlAndroidScaleAnimation::setToYScale(qreal y)
     }
 }
 
-qreal QtQmlAndroidScaleAnimation::pivotX() const
+qreal QQmlAndroidScaleAnimation::pivotX() const
 {
     return m_pivotX;
 }
 
-void QtQmlAndroidScaleAnimation::setPivotX(qreal pivotX)
+void QQmlAndroidScaleAnimation::setPivotX(qreal pivotX)
 {
     if (m_pivotX != pivotX) {
         m_pivotX = pivotX;
@@ -73,12 +73,12 @@ void QtQmlAndroidScaleAnimation::setPivotX(qreal pivotX)
     }
 }
 
-qreal QtQmlAndroidScaleAnimation::pivotY() const
+qreal QQmlAndroidScaleAnimation::pivotY() const
 {
     return m_pivotY;
 }
 
-void QtQmlAndroidScaleAnimation::setPivotY(qreal pivotY)
+void QQmlAndroidScaleAnimation::setPivotY(qreal pivotY)
 {
     if (m_pivotY != pivotY) {
         m_pivotY = pivotY;
@@ -86,12 +86,12 @@ void QtQmlAndroidScaleAnimation::setPivotY(qreal pivotY)
     }
 }
 
-QtQmlAndroidAnimation::Relation QtQmlAndroidScaleAnimation::pivotXType() const
+QQmlAndroidAnimation::Relation QQmlAndroidScaleAnimation::pivotXType() const
 {
     return m_pivotXType;
 }
 
-void QtQmlAndroidScaleAnimation::setPivotXType(Relation type)
+void QQmlAndroidScaleAnimation::setPivotXType(Relation type)
 {
     if (m_pivotXType != type) {
         m_pivotXType = type;
@@ -99,12 +99,12 @@ void QtQmlAndroidScaleAnimation::setPivotXType(Relation type)
     }
 }
 
-QtQmlAndroidAnimation::Relation QtQmlAndroidScaleAnimation::pivotYType() const
+QQmlAndroidAnimation::Relation QQmlAndroidScaleAnimation::pivotYType() const
 {
     return m_pivotYType;
 }
 
-void QtQmlAndroidScaleAnimation::setPivotYType(Relation type)
+void QQmlAndroidScaleAnimation::setPivotYType(Relation type)
 {
     if (m_pivotYType != type) {
         m_pivotYType = type;
@@ -112,7 +112,7 @@ void QtQmlAndroidScaleAnimation::setPivotYType(Relation type)
     }
 }
 
-QAndroidJniObject QtQmlAndroidScaleAnimation::onCreate()
+QAndroidJniObject QQmlAndroidScaleAnimation::onCreate()
 {
     return QAndroidJniObject("android/view/animation/ScaleAnimation",
                              "(FFFFIFIF)V",
diff --git a/src/qmlandroid/view/animation/qtqmlandroidscaleanimation_p.h b/src/qmlandroid/view/animation/qtqmlandroidscaleanimation_p.h
index 27a9ebe..bb2074a 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidscaleanimation_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidscaleanimation_p.h
@@ -5,7 +5,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidScaleAnimation : public QtQmlAndroidAnimation
+class QQmlAndroidScaleAnimation : public QQmlAndroidAnimation
 {
     Q_OBJECT
     Q_PROPERTY(qreal fromXScale READ fromXScale WRITE setFromXScale NOTIFY fromXScaleChanged)
@@ -18,7 +18,7 @@ class QtQmlAndroidScaleAnimation : public QtQmlAndroidAnimation
     Q_PROPERTY(Relation pivotYType READ pivotYType WRITE setPivotYType NOTIFY pivotYTypeChanged)
 
 public:
-    explicit QtQmlAndroidScaleAnimation(QObject *parent = 0);
+    explicit QQmlAndroidScaleAnimation(QObject *parent = 0);
 
     qreal fromXScale() const;
     void setFromXScale(qreal scale);
diff --git a/src/qmlandroid/view/animation/qtqmlandroidtranslateanimation.cpp b/src/qmlandroid/view/animation/qtqmlandroidtranslateanimation.cpp
index cfbd5b4..61db250 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidtranslateanimation.cpp
+++ b/src/qmlandroid/view/animation/qtqmlandroidtranslateanimation.cpp
@@ -2,18 +2,18 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidTranslateAnimation::QtQmlAndroidTranslateAnimation(QObject *parent) :
-    QtQmlAndroidAnimation(parent), m_fromX(0), m_fromY(0), m_toX(0), m_toY(0),
+QQmlAndroidTranslateAnimation::QQmlAndroidTranslateAnimation(QObject *parent) :
+    QQmlAndroidAnimation(parent), m_fromX(0), m_fromY(0), m_toX(0), m_toY(0),
     m_fromXType(ABSOLUTE), m_fromYType(ABSOLUTE), m_toXType(ABSOLUTE), m_toYType(ABSOLUTE)
 {
 }
 
-qreal QtQmlAndroidTranslateAnimation::fromX() const
+qreal QQmlAndroidTranslateAnimation::fromX() const
 {
     return m_fromX;
 }
 
-void QtQmlAndroidTranslateAnimation::setFromX(qreal x)
+void QQmlAndroidTranslateAnimation::setFromX(qreal x)
 {
     if (m_fromX != x) {
         m_fromX = x;
@@ -21,12 +21,12 @@ void QtQmlAndroidTranslateAnimation::setFromX(qreal x)
     }
 }
 
-qreal QtQmlAndroidTranslateAnimation::fromY() const
+qreal QQmlAndroidTranslateAnimation::fromY() const
 {
     return m_fromY;
 }
 
-void QtQmlAndroidTranslateAnimation::setFromY(qreal y)
+void QQmlAndroidTranslateAnimation::setFromY(qreal y)
 {
     if (m_fromY != y) {
         m_fromY = y;
@@ -34,12 +34,12 @@ void QtQmlAndroidTranslateAnimation::setFromY(qreal y)
     }
 }
 
-qreal QtQmlAndroidTranslateAnimation::toX() const
+qreal QQmlAndroidTranslateAnimation::toX() const
 {
     return m_toX;
 }
 
-void QtQmlAndroidTranslateAnimation::setToX(qreal x)
+void QQmlAndroidTranslateAnimation::setToX(qreal x)
 {
     if (m_toX != x) {
         m_toX = x;
@@ -47,12 +47,12 @@ void QtQmlAndroidTranslateAnimation::setToX(qreal x)
     }
 }
 
-qreal QtQmlAndroidTranslateAnimation::toY() const
+qreal QQmlAndroidTranslateAnimation::toY() const
 {
     return m_toY;
 }
 
-void QtQmlAndroidTranslateAnimation::setToY(qreal y)
+void QQmlAndroidTranslateAnimation::setToY(qreal y)
 {
     if (m_toY != y) {
         m_toY = y;
@@ -60,12 +60,12 @@ void QtQmlAndroidTranslateAnimation::setToY(qreal y)
     }
 }
 
-QtQmlAndroidAnimation::Relation QtQmlAndroidTranslateAnimation::fromXType() const
+QQmlAndroidAnimation::Relation QQmlAndroidTranslateAnimation::fromXType() const
 {
     return m_fromXType;
 }
 
-void QtQmlAndroidTranslateAnimation::setFromXType(Relation type)
+void QQmlAndroidTranslateAnimation::setFromXType(Relation type)
 {
     if (m_fromXType != type) {
         m_fromXType = type;
@@ -73,12 +73,12 @@ void QtQmlAndroidTranslateAnimation::setFromXType(Relation type)
     }
 }
 
-QtQmlAndroidAnimation::Relation QtQmlAndroidTranslateAnimation::fromYType() const
+QQmlAndroidAnimation::Relation QQmlAndroidTranslateAnimation::fromYType() const
 {
     return m_fromYType;
 }
 
-void QtQmlAndroidTranslateAnimation::setFromYType(Relation type)
+void QQmlAndroidTranslateAnimation::setFromYType(Relation type)
 {
     if (m_fromYType != type) {
         m_fromYType = type;
@@ -86,12 +86,12 @@ void QtQmlAndroidTranslateAnimation::setFromYType(Relation type)
     }
 }
 
-QtQmlAndroidAnimation::Relation QtQmlAndroidTranslateAnimation::toXType() const
+QQmlAndroidAnimation::Relation QQmlAndroidTranslateAnimation::toXType() const
 {
     return m_toXType;
 }
 
-void QtQmlAndroidTranslateAnimation::setToXType(Relation type)
+void QQmlAndroidTranslateAnimation::setToXType(Relation type)
 {
     if (m_toXType != type) {
         m_toXType = type;
@@ -99,12 +99,12 @@ void QtQmlAndroidTranslateAnimation::setToXType(Relation type)
     }
 }
 
-QtQmlAndroidAnimation::Relation QtQmlAndroidTranslateAnimation::toYType() const
+QQmlAndroidAnimation::Relation QQmlAndroidTranslateAnimation::toYType() const
 {
     return m_toYType;
 }
 
-void QtQmlAndroidTranslateAnimation::setToYType(Relation type)
+void QQmlAndroidTranslateAnimation::setToYType(Relation type)
 {
     if (m_toYType != type) {
         m_toYType = type;
@@ -112,7 +112,7 @@ void QtQmlAndroidTranslateAnimation::setToYType(Relation type)
     }
 }
 
-QAndroidJniObject QtQmlAndroidTranslateAnimation::onCreate()
+QAndroidJniObject QQmlAndroidTranslateAnimation::onCreate()
 {
     return QAndroidJniObject("android/view/animation/TranslateAnimation",
                              "(IFIFIFIF)V",
diff --git a/src/qmlandroid/view/animation/qtqmlandroidtranslateanimation_p.h b/src/qmlandroid/view/animation/qtqmlandroidtranslateanimation_p.h
index 65a6bd9..9ce6c83 100644
--- a/src/qmlandroid/view/animation/qtqmlandroidtranslateanimation_p.h
+++ b/src/qmlandroid/view/animation/qtqmlandroidtranslateanimation_p.h
@@ -5,7 +5,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidTranslateAnimation : public QtQmlAndroidAnimation
+class QQmlAndroidTranslateAnimation : public QQmlAndroidAnimation
 {
     Q_OBJECT
     Q_PROPERTY(qreal fromX READ fromX WRITE setFromX NOTIFY fromXChanged)
@@ -18,7 +18,7 @@ class QtQmlAndroidTranslateAnimation : public QtQmlAndroidAnimation
     Q_PROPERTY(Relation toYType READ toYType WRITE setToYType NOTIFY toYTypeChanged)
 
 public:
-    explicit QtQmlAndroidTranslateAnimation(QObject *parent = 0);
+    explicit QQmlAndroidTranslateAnimation(QObject *parent = 0);
 
     qreal fromX() const;
     void setFromX(qreal x);
diff --git a/src/qmlandroid/view/qtqmlandroidgravity_p.h b/src/qmlandroid/view/qtqmlandroidgravity_p.h
index 505576d..6d7bfb4 100644
--- a/src/qmlandroid/view/qtqmlandroidgravity_p.h
+++ b/src/qmlandroid/view/qtqmlandroidgravity_p.h
@@ -5,7 +5,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidGravity : public QObject
+class QQmlAndroidGravity : public QObject
 {
     Q_OBJECT
     Q_FLAGS(Flags)
@@ -45,7 +45,7 @@ public:
     Q_DECLARE_FLAGS(Flags, Flag)
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QtQmlAndroidGravity::Flags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QQmlAndroidGravity::Flags)
 
 QT_END_NAMESPACE
 
diff --git a/src/qmlandroid/view/qtqmlandroidlayoutparams.cpp b/src/qmlandroid/view/qtqmlandroidlayoutparams.cpp
index 3da8b6f..c72cd87 100644
--- a/src/qmlandroid/view/qtqmlandroidlayoutparams.cpp
+++ b/src/qmlandroid/view/qtqmlandroidlayoutparams.cpp
@@ -4,28 +4,28 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidLayoutParams::QtQmlAndroidLayoutParams(QtQmlAndroidView *view) :
-    QtQmlAndroidObject(view), m_dirty(false), m_view(view)
+QQmlAndroidLayoutParams::QQmlAndroidLayoutParams(QQmlAndroidView *view) :
+    QQmlAndroidObject(view), m_dirty(false), m_view(view)
 {
     m_view->setLayoutParams(this);
 }
 
-QtQmlAndroidLayoutParams *QtQmlAndroidLayoutParams::qmlAttachedProperties(QObject *object)
+QQmlAndroidLayoutParams *QQmlAndroidLayoutParams::qmlAttachedProperties(QObject *object)
 {
-    QtQmlAndroidView *view = qobject_cast<QtQmlAndroidView*>(object);
+    QQmlAndroidView *view = qobject_cast<QQmlAndroidView*>(object);
     if (view)
-        return new QtQmlAndroidLayoutParams(view);
+        return new QQmlAndroidLayoutParams(view);
     return 0;
 }
 
-int QtQmlAndroidLayoutParams::width() const
+int QQmlAndroidLayoutParams::width() const
 {
     if (m_width.isNull())
         return MATCH_PARENT;
     return m_width.value();
 }
 
-void QtQmlAndroidLayoutParams::setWidth(int value)
+void QQmlAndroidLayoutParams::setWidth(int value)
 {
     if (value != width()) {
         m_width = value;
@@ -34,14 +34,14 @@ void QtQmlAndroidLayoutParams::setWidth(int value)
     }
 }
 
-int QtQmlAndroidLayoutParams::height() const
+int QQmlAndroidLayoutParams::height() const
 {
     if (m_height.isNull())
         return MATCH_PARENT;
     return m_height.value();
 }
 
-void QtQmlAndroidLayoutParams::setHeight(int value)
+void QQmlAndroidLayoutParams::setHeight(int value)
 {
     if (value != height()) {
         m_height = value;
@@ -50,7 +50,7 @@ void QtQmlAndroidLayoutParams::setHeight(int value)
     }
 }
 
-void QtQmlAndroidLayoutParams::invalidate()
+void QQmlAndroidLayoutParams::invalidate()
 {
     if (!m_dirty && isValid()) {
         m_dirty = true;
@@ -58,14 +58,14 @@ void QtQmlAndroidLayoutParams::invalidate()
     }
 }
 
-QAndroidJniObject QtQmlAndroidLayoutParams::onCreate()
+QAndroidJniObject QQmlAndroidLayoutParams::onCreate()
 {
     return QAndroidJniObject("android/view/ViewGroup$LayoutParams",
                              "(II)V",
                              MATCH_PARENT, MATCH_PARENT);
 }
 
-void QtQmlAndroidLayoutParams::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidLayoutParams::onInflate(QAndroidJniObject &instance)
 {
     if (!m_width.isNull())
         instance.setField<int>("width", m_width.value());
@@ -73,7 +73,7 @@ void QtQmlAndroidLayoutParams::onInflate(QAndroidJniObject &instance)
         instance.setField<int>("height", m_height.value());
 }
 
-bool QtQmlAndroidLayoutParams::event(QEvent *event)
+bool QQmlAndroidLayoutParams::event(QEvent *event)
 {
     if (event->type() == QEvent::LayoutRequest) {
         if (m_dirty && isValid()) {
@@ -81,7 +81,7 @@ bool QtQmlAndroidLayoutParams::event(QEvent *event)
             m_dirty = false;
         }
     }
-    return QtQmlAndroidObject::event(event);
+    return QQmlAndroidObject::event(event);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/qtqmlandroidlayoutparams_p.h b/src/qmlandroid/view/qtqmlandroidlayoutparams_p.h
index 4d0de8a..15750d6 100644
--- a/src/qmlandroid/view/qtqmlandroidlayoutparams_p.h
+++ b/src/qmlandroid/view/qtqmlandroidlayoutparams_p.h
@@ -7,9 +7,9 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidView;
+class QQmlAndroidView;
 
-class QtQmlAndroidLayoutParams : public QtQmlAndroidObject
+class QQmlAndroidLayoutParams : public QQmlAndroidObject
 {
     Q_OBJECT
     Q_PROPERTY(int width READ width WRITE setWidth NOTIFY widthChanged)
@@ -17,9 +17,9 @@ class QtQmlAndroidLayoutParams : public QtQmlAndroidObject
     Q_ENUMS(Size)
 
 public:
-    explicit QtQmlAndroidLayoutParams(QtQmlAndroidView *view);
+    explicit QQmlAndroidLayoutParams(QQmlAndroidView *view);
 
-    static QtQmlAndroidLayoutParams *qmlAttachedProperties(QObject *object);
+    static QQmlAndroidLayoutParams *qmlAttachedProperties(QObject *object);
 
     enum Size {
         FILL_PARENT = -1,
@@ -48,13 +48,13 @@ protected:
 
 private:
     bool m_dirty;
-    QtQmlAndroidView *m_view;
-    QtQmlAndroidOptional<int> m_width;
-    QtQmlAndroidOptional<int> m_height;
+    QQmlAndroidView *m_view;
+    QQmlAndroidOptional<int> m_width;
+    QQmlAndroidOptional<int> m_height;
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QtQmlAndroidLayoutParams, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QQmlAndroidLayoutParams, QML_HAS_ATTACHED_PROPERTIES)
 
 #endif // QTQMLANDROIDLAYOUTPARAMS_P_H
diff --git a/src/qmlandroid/view/qtqmlandroidmenu.cpp b/src/qmlandroid/view/qtqmlandroidmenu.cpp
index 588de8a..96239e8 100644
--- a/src/qmlandroid/view/qtqmlandroidmenu.cpp
+++ b/src/qmlandroid/view/qtqmlandroidmenu.cpp
@@ -3,30 +3,30 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidMenu::QtQmlAndroidMenu(QObject *parent) :
-    QtQmlAndroidContextual(parent)
+QQmlAndroidMenu::QQmlAndroidMenu(QObject *parent) :
+    QQmlAndroidContextual(parent)
 {
 }
 
-QList<QtQmlAndroidMenuItem *> QtQmlAndroidMenu::items() const
+QList<QQmlAndroidMenuItem *> QQmlAndroidMenu::items() const
 {
-    QList<QtQmlAndroidMenuItem *> lst;
+    QList<QQmlAndroidMenuItem *> lst;
     foreach (QObject *child, children()) {
-        QtQmlAndroidMenuItem *item = qobject_cast<QtQmlAndroidMenuItem *>(child);
+        QQmlAndroidMenuItem *item = qobject_cast<QQmlAndroidMenuItem *>(child);
         if (item)
             lst += item;
     }
     return lst;
 }
 
-QAndroidJniObject QtQmlAndroidMenu::onCreate()
+QAndroidJniObject QQmlAndroidMenu::onCreate()
 {
     return QAndroidJniObject("qt/android/view/QtMenu");
 }
 
-void QtQmlAndroidMenu::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidMenu::onInflate(QAndroidJniObject &instance)
 {
-    foreach (QtQmlAndroidMenuItem *item, items()) {
+    foreach (QQmlAndroidMenuItem *item, items()) {
         item->construct();
         if (item->isValid())
             instance.callMethod<void>("add", "(Lqt/android/view/QtMenuItem;)V", item->instance().object());
diff --git a/src/qmlandroid/view/qtqmlandroidmenu_p.h b/src/qmlandroid/view/qtqmlandroidmenu_p.h
index f1645d1..829b20a 100644
--- a/src/qmlandroid/view/qtqmlandroidmenu_p.h
+++ b/src/qmlandroid/view/qtqmlandroidmenu_p.h
@@ -5,16 +5,16 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidMenuItem;
+class QQmlAndroidMenuItem;
 
-class QtQmlAndroidMenu : public QtQmlAndroidContextual
+class QQmlAndroidMenu : public QQmlAndroidContextual
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidMenu(QObject *parent = 0);
+    explicit QQmlAndroidMenu(QObject *parent = 0);
 
-    QList<QtQmlAndroidMenuItem *> items() const;
+    QList<QQmlAndroidMenuItem *> items() const;
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/view/qtqmlandroidmenuitem.cpp b/src/qmlandroid/view/qtqmlandroidmenuitem.cpp
index 47972f4..510891a 100644
--- a/src/qmlandroid/view/qtqmlandroidmenuitem.cpp
+++ b/src/qmlandroid/view/qtqmlandroidmenuitem.cpp
@@ -5,20 +5,20 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidMenuItem::QtQmlAndroidMenuItem(QObject *parent) :
-    QtQmlAndroidContextual(parent), m_enabled(true), m_visible(true),
+QQmlAndroidMenuItem::QQmlAndroidMenuItem(QObject *parent) :
+    QQmlAndroidContextual(parent), m_enabled(true), m_visible(true),
     m_checkable(false), m_checked(false),
     m_showAs(0), // TODO: SHOW_AS_ACTION_NEVER
     m_actionView(0)
 {
 }
 
-QString QtQmlAndroidMenuItem::title() const
+QString QQmlAndroidMenuItem::title() const
 {
     return m_title;
 }
 
-void QtQmlAndroidMenuItem::setTitle(const QString &title)
+void QQmlAndroidMenuItem::setTitle(const QString &title)
 {
     if (m_title != title) {
         m_title = title;
@@ -27,12 +27,12 @@ void QtQmlAndroidMenuItem::setTitle(const QString &title)
     }
 }
 
-bool QtQmlAndroidMenuItem::isEnabled() const
+bool QQmlAndroidMenuItem::isEnabled() const
 {
     return m_enabled;
 }
 
-void QtQmlAndroidMenuItem::setEnabled(bool enabled)
+void QQmlAndroidMenuItem::setEnabled(bool enabled)
 {
     if (m_enabled != enabled) {
         m_enabled = enabled;
@@ -41,12 +41,12 @@ void QtQmlAndroidMenuItem::setEnabled(bool enabled)
     }
 }
 
-bool QtQmlAndroidMenuItem::isVisible() const
+bool QQmlAndroidMenuItem::isVisible() const
 {
     return m_visible;
 }
 
-void QtQmlAndroidMenuItem::setVisible(bool visible)
+void QQmlAndroidMenuItem::setVisible(bool visible)
 {
     if (m_visible != visible) {
         m_visible = visible;
@@ -57,12 +57,12 @@ void QtQmlAndroidMenuItem::setVisible(bool visible)
     }
 }
 
-bool QtQmlAndroidMenuItem::isCheckable() const
+bool QQmlAndroidMenuItem::isCheckable() const
 {
     return m_checkable;
 }
 
-void QtQmlAndroidMenuItem::setCheckable(bool checkable)
+void QQmlAndroidMenuItem::setCheckable(bool checkable)
 {
     if (m_checkable != checkable) {
         m_checkable = checkable;
@@ -71,12 +71,12 @@ void QtQmlAndroidMenuItem::setCheckable(bool checkable)
     }
 }
 
-bool QtQmlAndroidMenuItem::isChecked() const
+bool QQmlAndroidMenuItem::isChecked() const
 {
     return m_checked;
 }
 
-void QtQmlAndroidMenuItem::setChecked(bool checked)
+void QQmlAndroidMenuItem::setChecked(bool checked)
 {
     if (m_checked != checked) {
         m_checked = checked;
@@ -85,12 +85,12 @@ void QtQmlAndroidMenuItem::setChecked(bool checked)
     }
 }
 
-int QtQmlAndroidMenuItem::showAs() const
+int QQmlAndroidMenuItem::showAs() const
 {
     return m_showAs;
 }
 
-void QtQmlAndroidMenuItem::setShowAs(int showAs)
+void QQmlAndroidMenuItem::setShowAs(int showAs)
 {
     if (m_showAs != showAs) {
         m_showAs = showAs;
@@ -99,21 +99,21 @@ void QtQmlAndroidMenuItem::setShowAs(int showAs)
     }
 }
 
-QtQmlAndroidView *QtQmlAndroidMenuItem::actionView() const
+QQmlAndroidView *QQmlAndroidMenuItem::actionView() const
 {
     return m_actionView;
 }
 
-void QtQmlAndroidMenuItem::setActionView(QtQmlAndroidView *view)
+void QQmlAndroidMenuItem::setActionView(QQmlAndroidView *view)
 {
     if (m_actionView != view) {
         if (m_actionView) {
-            disconnect(m_actionView, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidMenuItem::updateActionView);
+            disconnect(m_actionView, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidMenuItem::updateActionView);
             m_actionView->destruct();
         }
         m_actionView = view;
         if (m_actionView) {
-            connect(m_actionView, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidMenuItem::updateActionView);
+            connect(m_actionView, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidMenuItem::updateActionView);
             if (isValid())
                 m_actionView->construct();
         }
@@ -121,14 +121,14 @@ void QtQmlAndroidMenuItem::setActionView(QtQmlAndroidView *view)
     }
 }
 
-QAndroidJniObject QtQmlAndroidMenuItem::onCreate()
+QAndroidJniObject QQmlAndroidMenuItem::onCreate()
 {
     return QAndroidJniObject("qt/android/view/QtMenuItem",
                              "(J)V",
                              reinterpret_cast<jlong>(this));
 }
 
-void QtQmlAndroidMenuItem::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidMenuItem::onInflate(QAndroidJniObject &instance)
 {
     instance.callMethod<void>("setTitle", "(Ljava/lang/CharSequence;)V", QAndroidJniObject::fromString(m_title).object());
     instance.callMethod<void>("setEnabled", "(Z)V", m_enabled);
@@ -144,7 +144,7 @@ void QtQmlAndroidMenuItem::onInflate(QAndroidJniObject &instance)
     }
 }
 
-void QtQmlAndroidMenuItem::onRegisterNativeMethods(jobject item)
+void QQmlAndroidMenuItem::onRegisterNativeMethods(jobject item)
 {
     JNINativeMethod methods[] {{"onClick", "(J)Z", reinterpret_cast<void *>(onClick)},
                                {"onMenuItemActionCollapse", "(J)Z", reinterpret_cast<void *>(onMenuItemActionCollapse)},
@@ -156,11 +156,11 @@ void QtQmlAndroidMenuItem::onRegisterNativeMethods(jobject item)
     env->DeleteLocalRef(cls);
 }
 
-bool QtQmlAndroidMenuItem::onClick(JNIEnv *env, jobject object, jlong instance)
+bool QQmlAndroidMenuItem::onClick(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidMenuItem *item = reinterpret_cast<QtQmlAndroidMenuItem *>(instance);
+    QQmlAndroidMenuItem *item = reinterpret_cast<QQmlAndroidMenuItem *>(instance);
     if (item) {
         QMetaObject::invokeMethod(item, "click", Qt::QueuedConnection);
         return true;
@@ -168,11 +168,11 @@ bool QtQmlAndroidMenuItem::onClick(JNIEnv *env, jobject object, jlong instance)
     return false;
 }
 
-bool QtQmlAndroidMenuItem::onMenuItemActionCollapse(JNIEnv *env, jobject object, jlong instance)
+bool QQmlAndroidMenuItem::onMenuItemActionCollapse(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidMenuItem *item = reinterpret_cast<QtQmlAndroidMenuItem *>(instance);
+    QQmlAndroidMenuItem *item = reinterpret_cast<QQmlAndroidMenuItem *>(instance);
     if (item) {
         // TODO
         return true;
@@ -180,11 +180,11 @@ bool QtQmlAndroidMenuItem::onMenuItemActionCollapse(JNIEnv *env, jobject object,
     return false;
 }
 
-bool QtQmlAndroidMenuItem::onMenuItemActionExpand(JNIEnv *env, jobject object, jlong instance)
+bool QQmlAndroidMenuItem::onMenuItemActionExpand(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidMenuItem *item = reinterpret_cast<QtQmlAndroidMenuItem *>(instance);
+    QQmlAndroidMenuItem *item = reinterpret_cast<QQmlAndroidMenuItem *>(instance);
     if (item) {
         // TODO
         return true;
@@ -193,14 +193,14 @@ bool QtQmlAndroidMenuItem::onMenuItemActionExpand(JNIEnv *env, jobject object, j
 
 }
 
-void QtQmlAndroidMenuItem::objectChange(ObjectChange change)
+void QQmlAndroidMenuItem::objectChange(ObjectChange change)
 {
-    QtQmlAndroidContextual::objectChange(change);
+    QQmlAndroidContextual::objectChange(change);
     if (change == InstanceChange)
         updateActionView();
 }
 
-void QtQmlAndroidMenuItem::updateActionView()
+void QQmlAndroidMenuItem::updateActionView()
 {
     if (!isValid() || !m_actionView)
         return;
diff --git a/src/qmlandroid/view/qtqmlandroidmenuitem_p.h b/src/qmlandroid/view/qtqmlandroidmenuitem_p.h
index 10bfa95..923d132 100644
--- a/src/qmlandroid/view/qtqmlandroidmenuitem_p.h
+++ b/src/qmlandroid/view/qtqmlandroidmenuitem_p.h
@@ -5,9 +5,9 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidView;
+class QQmlAndroidView;
 
-class QtQmlAndroidMenuItem : public QtQmlAndroidContextual
+class QQmlAndroidMenuItem : public QQmlAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
@@ -16,11 +16,11 @@ class QtQmlAndroidMenuItem : public QtQmlAndroidContextual
     Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged)
     Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged)
     Q_PROPERTY(int showAs READ showAs WRITE setShowAs NOTIFY showAsChanged)
-    Q_PROPERTY(QtQmlAndroidView *actionView READ actionView WRITE setActionView NOTIFY actionViewChanged)
+    Q_PROPERTY(QQmlAndroidView *actionView READ actionView WRITE setActionView NOTIFY actionViewChanged)
     Q_ENUMS(ShowAs)
 
 public:
-    explicit QtQmlAndroidMenuItem(QObject *parent = 0);
+    explicit QQmlAndroidMenuItem(QObject *parent = 0);
 
     QString title() const;
     void setTitle(const QString &title);
@@ -48,8 +48,8 @@ public:
     int showAs() const;
     void setShowAs(int showAs);
 
-    QtQmlAndroidView *actionView() const;
-    void setActionView(QtQmlAndroidView *view);
+    QQmlAndroidView *actionView() const;
+    void setActionView(QQmlAndroidView *view);
 
 Q_SIGNALS:
     void click();
@@ -82,7 +82,7 @@ private:
     bool m_checkable;
     bool m_checked;
     int m_showAs;
-    QtQmlAndroidView *m_actionView;
+    QQmlAndroidView *m_actionView;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/qtqmlandroidview.cpp b/src/qmlandroid/view/qtqmlandroidview.cpp
index 716b8a6..5dbbaac 100644
--- a/src/qmlandroid/view/qtqmlandroidview.cpp
+++ b/src/qmlandroid/view/qtqmlandroidview.cpp
@@ -10,8 +10,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidView::QtQmlAndroidView(QtQmlAndroidView *parent) :
-    QtQmlAndroidContextual(parent), m_parent(0), m_background(0), m_backgroundResource(0),
+QQmlAndroidView::QQmlAndroidView(QQmlAndroidView *parent) :
+    QQmlAndroidContextual(parent), m_parent(0), m_background(0), m_backgroundResource(0),
     m_animation(0), m_polishing(false), m_visible(true), m_layoutParams(0),
     m_top(0), m_left(0), m_right(0), m_bottom(0)
 {
@@ -25,30 +25,30 @@ QtQmlAndroidView::QtQmlAndroidView(QtQmlAndroidView *parent) :
     requestPolish();
 }
 
-QtQmlAndroidView::~QtQmlAndroidView()
+QQmlAndroidView::~QQmlAndroidView()
 {
-    foreach (QtQmlAndroidView *child, m_children)
+    foreach (QQmlAndroidView *child, m_children)
         child->setParentView(0);
     if (m_parent)
         setParentView(0);
 }
 
-int QtQmlAndroidView::identifier() const
+int QQmlAndroidView::identifier() const
 {
     return m_id;
 }
 
-void QtQmlAndroidView::setIdentifier(int identifier)
+void QQmlAndroidView::setIdentifier(int identifier)
 {
     m_id = identifier;
 }
 
-QtQmlAndroidView *QtQmlAndroidView::parentView() const
+QQmlAndroidView *QQmlAndroidView::parentView() const
 {
     return m_parent;
 }
 
-void QtQmlAndroidView::setParentView(QtQmlAndroidView *parent)
+void QQmlAndroidView::setParentView(QQmlAndroidView *parent)
 {
     if (m_parent != parent) {
         if (m_parent)
@@ -61,54 +61,54 @@ void QtQmlAndroidView::setParentView(QtQmlAndroidView *parent)
     }
 }
 
-QList<QtQmlAndroidView *> QtQmlAndroidView::childViews() const
+QList<QQmlAndroidView *> QQmlAndroidView::childViews() const
 {
     return m_children;
 }
 
-QQmlListProperty<QtQmlAndroidView> QtQmlAndroidView::children()
+QQmlListProperty<QQmlAndroidView> QQmlAndroidView::children()
 {
-    return QQmlListProperty<QtQmlAndroidView>(this, 0, &QtQmlAndroidView::children_append, &QtQmlAndroidView::children_count,
-                                                   &QtQmlAndroidView::children_at, &QtQmlAndroidView::children_clear);
+    return QQmlListProperty<QQmlAndroidView>(this, 0, &QQmlAndroidView::children_append, &QQmlAndroidView::children_count,
+                                                   &QQmlAndroidView::children_at, &QQmlAndroidView::children_clear);
 }
 
-QtQmlAndroidLayoutParams *QtQmlAndroidView::layoutParams() const
+QQmlAndroidLayoutParams *QQmlAndroidView::layoutParams() const
 {
     return m_layoutParams;
 }
 
-void QtQmlAndroidView::setLayoutParams(QtQmlAndroidLayoutParams *params)
+void QQmlAndroidView::setLayoutParams(QQmlAndroidLayoutParams *params)
 {
     if (m_layoutParams != params) {
         if (m_layoutParams) {
-            disconnect(m_layoutParams, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidView::updateLayoutParams);
+            disconnect(m_layoutParams, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidView::updateLayoutParams);
             m_layoutParams->destruct();
         }
         m_layoutParams = params;
         if (m_layoutParams) {
-            connect(m_layoutParams, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidView::updateLayoutParams);
+            connect(m_layoutParams, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidView::updateLayoutParams);
             if (isValid())
                 m_layoutParams->construct();
         }
     }
 }
 
-QtQmlAndroidDrawable *QtQmlAndroidView::background() const
+QQmlAndroidDrawable *QQmlAndroidView::background() const
 {
     return m_background;
 }
 
-void QtQmlAndroidView::setBackground(QtQmlAndroidDrawable *background, int resource)
+void QQmlAndroidView::setBackground(QQmlAndroidDrawable *background, int resource)
 {
     if (m_background != background) {
         if (m_background) {
-            disconnect(m_background, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidView::updateBackground);
+            disconnect(m_background, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidView::updateBackground);
             m_background->destruct();
         }
         m_background = background;
         m_backgroundResource = resource;
         if (m_background) {
-            connect(m_background, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidView::updateBackground);
+            connect(m_background, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidView::updateBackground);
             if (!resource)
                 m_background->construct();
         }
@@ -116,21 +116,21 @@ void QtQmlAndroidView::setBackground(QtQmlAndroidDrawable *background, int resou
     }
 }
 
-QtQmlAndroidAnimation *QtQmlAndroidView::animation() const
+QQmlAndroidAnimation *QQmlAndroidView::animation() const
 {
     return m_animation;
 }
 
-void QtQmlAndroidView::setAnimation(QtQmlAndroidAnimation *animation)
+void QQmlAndroidView::setAnimation(QQmlAndroidAnimation *animation)
 {
     if (m_animation != animation) {
         if (m_animation) {
-            disconnect(m_animation, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidView::updateAnimation);
+            disconnect(m_animation, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidView::updateAnimation);
             m_animation->destruct();
         }
         m_animation = animation;
         if (m_animation) {
-            connect(m_animation, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidView::updateAnimation);
+            connect(m_animation, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidView::updateAnimation);
             if (isValid())
                 m_animation->construct();
         }
@@ -138,38 +138,38 @@ void QtQmlAndroidView::setAnimation(QtQmlAndroidAnimation *animation)
     }
 }
 
-int QtQmlAndroidView::backgroundColor() const
+int QQmlAndroidView::backgroundColor() const
 {
-    QtQmlAndroidColorDrawable *drawable = qobject_cast<QtQmlAndroidColorDrawable *>(m_background);
+    QQmlAndroidColorDrawable *drawable = qobject_cast<QQmlAndroidColorDrawable *>(m_background);
     if (drawable)
         return drawable->color();
     return 0; // TODO
 }
 
-void QtQmlAndroidView::setBackgroundColor(int color)
+void QQmlAndroidView::setBackgroundColor(int color)
 {
-    setBackground(new QtQmlAndroidColorDrawable(color, this));
+    setBackground(new QQmlAndroidColorDrawable(color, this));
 }
 
-int QtQmlAndroidView::backgroundResource() const
+int QQmlAndroidView::backgroundResource() const
 {
     return m_backgroundResource;
 }
 
-void QtQmlAndroidView::setBackgroundResource(int resource)
+void QQmlAndroidView::setBackgroundResource(int resource)
 {
     if (m_backgroundResource != resource) {
-        setBackground(new QtQmlAndroidDrawable(this), resource);
+        setBackground(new QQmlAndroidDrawable(this), resource);
         emit backgroundResourceChanged();
     }
 }
 
-bool QtQmlAndroidView::isVisible() const
+bool QQmlAndroidView::isVisible() const
 {
     return m_visible;
 }
 
-void QtQmlAndroidView::setVisible(bool visible)
+void QQmlAndroidView::setVisible(bool visible)
 {
     if (m_visible != visible) {
         m_visible = visible;
@@ -179,14 +179,14 @@ void QtQmlAndroidView::setVisible(bool visible)
     }
 }
 
-bool QtQmlAndroidView::hasFocus() const
+bool QQmlAndroidView::hasFocus() const
 {
     if (m_focus.isNull())
         return false;
     return m_focus.value();
 }
 
-bool QtQmlAndroidView::updateFocus(bool arg)
+bool QQmlAndroidView::updateFocus(bool arg)
 {
     if (arg != hasFocus()) {
         m_focus = arg;
@@ -196,24 +196,24 @@ bool QtQmlAndroidView::updateFocus(bool arg)
     return false;
 }
 
-qreal QtQmlAndroidView::x() const
+qreal QQmlAndroidView::x() const
 {
     return left(); // TODO: + translationX
 }
 
-qreal QtQmlAndroidView::y() const
+qreal QQmlAndroidView::y() const
 {
     return top(); // TODO: + translationY
 }
 
-int QtQmlAndroidView::top() const
+int QQmlAndroidView::top() const
 {
     if (m_top.isNull())
         return 0;
     return m_top.value();
 }
 
-void QtQmlAndroidView::setTop(int top)
+void QQmlAndroidView::setTop(int top)
 {
     if (m_top.isNull() || m_top.value() != top) {
         m_top = top;
@@ -222,14 +222,14 @@ void QtQmlAndroidView::setTop(int top)
     }
 }
 
-int QtQmlAndroidView::left() const
+int QQmlAndroidView::left() const
 {
     if (m_left.isNull())
         return 0;
     return m_left.value();
 }
 
-void QtQmlAndroidView::setLeft(int left)
+void QQmlAndroidView::setLeft(int left)
 {
     if (m_left.isNull() || m_left.value() != left) {
         m_left = left;
@@ -238,14 +238,14 @@ void QtQmlAndroidView::setLeft(int left)
     }
 }
 
-int QtQmlAndroidView::right() const
+int QQmlAndroidView::right() const
 {
     if (m_right.isNull())
         return 0;
     return m_right.value();
 }
 
-void QtQmlAndroidView::setRight(int right)
+void QQmlAndroidView::setRight(int right)
 {
     if (m_right.isNull() || m_right.value() != right) {
         m_right = right;
@@ -254,14 +254,14 @@ void QtQmlAndroidView::setRight(int right)
     }
 }
 
-int QtQmlAndroidView::bottom() const
+int QQmlAndroidView::bottom() const
 {
     if (m_bottom.isNull())
         return 0;
     return m_bottom.value();
 }
 
-void QtQmlAndroidView::setBottom(int bottom)
+void QQmlAndroidView::setBottom(int bottom)
 {
     if (m_bottom.isNull() || m_bottom.value() != bottom) {
         m_bottom = bottom;
@@ -270,27 +270,27 @@ void QtQmlAndroidView::setBottom(int bottom)
     }
 }
 
-int QtQmlAndroidView::width() const
+int QQmlAndroidView::width() const
 {
     return right() - left();
 }
 
-void QtQmlAndroidView::setWidth(int width)
+void QQmlAndroidView::setWidth(int width)
 {
     setRight(left() + width);
 }
 
-int QtQmlAndroidView::height() const
+int QQmlAndroidView::height() const
 {
     return bottom() - top();
 }
 
-void QtQmlAndroidView::setHeight(int height)
+void QQmlAndroidView::setHeight(int height)
 {
     setBottom(top() + height);
 }
 
-void QtQmlAndroidView::updateGeometry(int t, int l, int r, int b)
+void QQmlAndroidView::updateGeometry(int t, int l, int r, int b)
 {
     if (t != top()) {
         m_top = t;
@@ -314,14 +314,14 @@ void QtQmlAndroidView::updateGeometry(int t, int l, int r, int b)
     }
 }
 
-int QtQmlAndroidView::padding() const
+int QQmlAndroidView::padding() const
 {
     if (!m_padding.isNull())
         return m_padding.value();
     return 0;
 }
 
-void QtQmlAndroidView::setPadding(int padding)
+void QQmlAndroidView::setPadding(int padding)
 {
     if (m_padding.isNull() || m_padding.value() != padding) {
         m_padding = padding;
@@ -329,14 +329,14 @@ void QtQmlAndroidView::setPadding(int padding)
     }
 }
 
-int QtQmlAndroidView::paddingTop() const
+int QQmlAndroidView::paddingTop() const
 {
     if (m_paddingTop.isNull())
         return padding();
     return m_paddingTop.value();
 }
 
-void QtQmlAndroidView::setPaddingTop(int padding)
+void QQmlAndroidView::setPaddingTop(int padding)
 {
     if (m_paddingTop.isNull() || m_paddingTop.value() != padding) {
         m_paddingTop = padding;
@@ -344,14 +344,14 @@ void QtQmlAndroidView::setPaddingTop(int padding)
     }
 }
 
-int QtQmlAndroidView::paddingLeft() const
+int QQmlAndroidView::paddingLeft() const
 {
     if (m_paddingLeft.isNull())
         return padding();
     return m_paddingLeft.value();
 }
 
-void QtQmlAndroidView::setPaddingLeft(int padding)
+void QQmlAndroidView::setPaddingLeft(int padding)
 {
     if (m_paddingLeft.isNull() || m_paddingLeft.value() != padding) {
         m_paddingLeft = padding;
@@ -359,14 +359,14 @@ void QtQmlAndroidView::setPaddingLeft(int padding)
     }
 }
 
-int QtQmlAndroidView::paddingRight() const
+int QQmlAndroidView::paddingRight() const
 {
     if (m_paddingRight.isNull())
         return padding();
     return m_paddingRight.value();
 }
 
-void QtQmlAndroidView::setPaddingRight(int padding)
+void QQmlAndroidView::setPaddingRight(int padding)
 {
     if (m_paddingRight.isNull() || m_paddingRight.value() != padding) {
         m_paddingRight = padding;
@@ -374,14 +374,14 @@ void QtQmlAndroidView::setPaddingRight(int padding)
     }
 }
 
-int QtQmlAndroidView::paddingBottom() const
+int QQmlAndroidView::paddingBottom() const
 {
     if (m_paddingBottom.isNull())
         return padding();
     return m_paddingBottom.value();
 }
 
-void QtQmlAndroidView::setPaddingBottom(int padding)
+void QQmlAndroidView::setPaddingBottom(int padding)
 {
     if (m_paddingBottom.isNull() || m_paddingBottom.value() != padding) {
         m_paddingBottom = padding;
@@ -389,7 +389,7 @@ void QtQmlAndroidView::setPaddingBottom(int padding)
     }
 }
 
-void QtQmlAndroidView::viewChange(ViewChange change, const ViewChangeData &data)
+void QQmlAndroidView::viewChange(ViewChange change, const ViewChangeData &data)
 {
     switch (change) {
     case ViewParentChange:       // data.view
@@ -401,7 +401,7 @@ void QtQmlAndroidView::viewChange(ViewChange change, const ViewChangeData &data)
     }
 }
 
-void QtQmlAndroidView::addChild(QtQmlAndroidView *child)
+void QQmlAndroidView::addChild(QQmlAndroidView *child)
 {
     if (!m_children.contains(child)) {
         m_children.append(child);
@@ -410,7 +410,7 @@ void QtQmlAndroidView::addChild(QtQmlAndroidView *child)
     }
 }
 
-void QtQmlAndroidView::removeChild(QtQmlAndroidView *child)
+void QQmlAndroidView::removeChild(QQmlAndroidView *child)
 {
     if (m_children.removeOne(child)) {
         viewChange(ViewChildRemovedChange, child);
@@ -418,35 +418,35 @@ void QtQmlAndroidView::removeChild(QtQmlAndroidView *child)
     }
 }
 
-void QtQmlAndroidView::children_append(QQmlListProperty<QtQmlAndroidView> *list, QtQmlAndroidView *child)
+void QQmlAndroidView::children_append(QQmlListProperty<QQmlAndroidView> *list, QQmlAndroidView *child)
 {
-    if (QtQmlAndroidView *that = qobject_cast<QtQmlAndroidView *>(list->object))
+    if (QQmlAndroidView *that = qobject_cast<QQmlAndroidView *>(list->object))
         that->addChild(child);
 }
 
-int QtQmlAndroidView::children_count(QQmlListProperty<QtQmlAndroidView> *list)
+int QQmlAndroidView::children_count(QQmlListProperty<QQmlAndroidView> *list)
 {
-    if (QtQmlAndroidView *that = qobject_cast<QtQmlAndroidView *>(list->object))
+    if (QQmlAndroidView *that = qobject_cast<QQmlAndroidView *>(list->object))
         return that->m_children.count();
     return 0;
 }
 
-QtQmlAndroidView *QtQmlAndroidView::children_at(QQmlListProperty<QtQmlAndroidView> *list, int index)
+QQmlAndroidView *QQmlAndroidView::children_at(QQmlListProperty<QQmlAndroidView> *list, int index)
 {
-    if (QtQmlAndroidView *that = qobject_cast<QtQmlAndroidView *>(list->object))
+    if (QQmlAndroidView *that = qobject_cast<QQmlAndroidView *>(list->object))
         return that->m_children.at(index);
     return 0;
 }
 
-void QtQmlAndroidView::children_clear(QQmlListProperty<QtQmlAndroidView> *list)
+void QQmlAndroidView::children_clear(QQmlListProperty<QQmlAndroidView> *list)
 {
-    if (QtQmlAndroidView *that = qobject_cast<QtQmlAndroidView *>(list->object)) {
+    if (QQmlAndroidView *that = qobject_cast<QQmlAndroidView *>(list->object)) {
         while (!that->m_children.isEmpty())
             that->m_children.first()->setParentView(0);
     }
 }
 
-QAndroidJniObject QtQmlAndroidView::onCreate()
+QAndroidJniObject QQmlAndroidView::onCreate()
 {
     Q_ASSERT(!QtQmlAndroid::isMainQtThread());
 
@@ -455,11 +455,11 @@ QAndroidJniObject QtQmlAndroidView::onCreate()
                              ctx().object());
 }
 
-void QtQmlAndroidView::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidView::onInflate(QAndroidJniObject &instance)
 {
     Q_ASSERT(!QtQmlAndroid::isMainQtThread());
 
-    QtQmlAndroidContextual::onInflate(instance);
+    QQmlAndroidContextual::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/view/QtViewListener",
                                    "(Landroid/view/View;J)V",
@@ -493,7 +493,7 @@ void QtQmlAndroidView::onInflate(QAndroidJniObject &instance)
     }
 }
 
-void QtQmlAndroidView::onRegisterNativeMethods(jobject listener)
+void QQmlAndroidView::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onClick", "(J)V", reinterpret_cast<void *>(onClick)},
                                {"onFocusChange", "(JZ)V", reinterpret_cast<void *>(onFocusChange)},
@@ -506,38 +506,38 @@ void QtQmlAndroidView::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QtQmlAndroidView::onClick(JNIEnv *env, jobject object, jlong instance)
+void QQmlAndroidView::onClick(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidView *view = reinterpret_cast<QtQmlAndroidView *>(instance);
+    QQmlAndroidView *view = reinterpret_cast<QQmlAndroidView *>(instance);
     if (view)
         QMetaObject::invokeMethod(view, "click", Qt::QueuedConnection);
 }
 
-void QtQmlAndroidView::onFocusChange(JNIEnv *env, jobject object, jlong instance, jboolean hasFocus)
+void QQmlAndroidView::onFocusChange(JNIEnv *env, jobject object, jlong instance, jboolean hasFocus)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidView *view = reinterpret_cast<QtQmlAndroidView *>(instance);
+    QQmlAndroidView *view = reinterpret_cast<QQmlAndroidView *>(instance);
     if (view)
         QMetaObject::invokeMethod(view, "updateFocus", Qt::QueuedConnection, Q_ARG(bool, hasFocus));
 }
 
-void QtQmlAndroidView::onLayoutChange(JNIEnv *env, jobject object, jlong instance, jint left, jint top, jint right, jint bottom)
+void QQmlAndroidView::onLayoutChange(JNIEnv *env, jobject object, jlong instance, jint left, jint top, jint right, jint bottom)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidView *view = reinterpret_cast<QtQmlAndroidView *>(instance);
+    QQmlAndroidView *view = reinterpret_cast<QQmlAndroidView *>(instance);
     if (view)
         QMetaObject::invokeMethod(view, "updateGeometry", Qt::QueuedConnection, Q_ARG(int, top), Q_ARG(int, left), Q_ARG(int, right), Q_ARG(int, bottom));
 }
 
-bool QtQmlAndroidView::onLongClick(JNIEnv *env, jobject object, jlong instance)
+bool QQmlAndroidView::onLongClick(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidView *view = reinterpret_cast<QtQmlAndroidView *>(instance);
+    QQmlAndroidView *view = reinterpret_cast<QQmlAndroidView *>(instance);
     if (view) {
         //qDebug() << "onLongClick:" << view;
         QMetaObject::invokeMethod(view, "longClick", Qt::QueuedConnection);
@@ -545,7 +545,7 @@ bool QtQmlAndroidView::onLongClick(JNIEnv *env, jobject object, jlong instance)
     return true; // TODO: accept
 }
 
-void QtQmlAndroidView::requestPolish()
+void QQmlAndroidView::requestPolish()
 {
     if (!m_polishing) {
         m_polishing = true;
@@ -553,25 +553,25 @@ void QtQmlAndroidView::requestPolish()
     }
 }
 
-void QtQmlAndroidView::polish()
+void QQmlAndroidView::polish()
 {
 }
 
-bool QtQmlAndroidView::event(QEvent *event)
+bool QQmlAndroidView::event(QEvent *event)
 {
     if (event->type() == QEvent::PolishRequest) {
-        QtQmlAndroidView *view = qobject_cast<QtQmlAndroidView *>(parent());
+        QQmlAndroidView *view = qobject_cast<QQmlAndroidView *>(parent());
         if (view)
             setParentView(view);
         polish();
         m_polishing = false;
     }
-    return QtQmlAndroidContextual::event(event);
+    return QQmlAndroidContextual::event(event);
 }
 
-void QtQmlAndroidView::objectChange(ObjectChange change)
+void QQmlAndroidView::objectChange(ObjectChange change)
 {
-    QtQmlAndroidContextual::objectChange(change);
+    QQmlAndroidContextual::objectChange(change);
     if (change == InstanceChange) {
         updateLayoutParams();
         updateBackground();
@@ -579,7 +579,7 @@ void QtQmlAndroidView::objectChange(ObjectChange change)
     }
 }
 
-void QtQmlAndroidView::updateBackground()
+void QQmlAndroidView::updateBackground()
 {
     if (!isValid() || !m_background)
         return;
@@ -591,7 +591,7 @@ void QtQmlAndroidView::updateBackground()
     });
 }
 
-void QtQmlAndroidView::updateAnimation()
+void QQmlAndroidView::updateAnimation()
 {
     if (!isValid() || !m_animation || !m_animation->isValid())
         return;
@@ -603,7 +603,7 @@ void QtQmlAndroidView::updateAnimation()
     });
 }
 
-void QtQmlAndroidView::updateLayoutParams()
+void QQmlAndroidView::updateLayoutParams()
 {
     if (!isValid() || !m_layoutParams)
         return;
diff --git a/src/qmlandroid/view/qtqmlandroidview_p.h b/src/qmlandroid/view/qtqmlandroidview_p.h
index 246d4aa..c3674b4 100644
--- a/src/qmlandroid/view/qtqmlandroidview_p.h
+++ b/src/qmlandroid/view/qtqmlandroidview_p.h
@@ -7,21 +7,21 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidDrawable;
-class QtQmlAndroidAnimation;
-class QtQmlAndroidLayoutParams;
+class QQmlAndroidDrawable;
+class QQmlAndroidAnimation;
+class QQmlAndroidLayoutParams;
 
-class QtQmlAndroidView : public QtQmlAndroidContextual
+class QQmlAndroidView : public QQmlAndroidContextual
 {
     Q_OBJECT
-    Q_PROPERTY(QtQmlAndroidView *parent READ parentView WRITE setParentView NOTIFY parentChanged)
-    Q_PROPERTY(QQmlListProperty<QtQmlAndroidView> children READ children NOTIFY childrenChanged)
+    Q_PROPERTY(QQmlAndroidView *parent READ parentView WRITE setParentView NOTIFY parentChanged)
+    Q_PROPERTY(QQmlListProperty<QQmlAndroidView> children READ children NOTIFY childrenChanged)
 
-    Q_PROPERTY(QtQmlAndroidDrawable *background READ background WRITE setBackground NOTIFY backgroundChanged)
+    Q_PROPERTY(QQmlAndroidDrawable *background READ background WRITE setBackground NOTIFY backgroundChanged)
     Q_PROPERTY(int backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged)
     Q_PROPERTY(int backgroundResource READ backgroundResource WRITE setBackgroundResource NOTIFY backgroundResourceChanged)
 
-    Q_PROPERTY(QtQmlAndroidAnimation *animation READ animation WRITE setAnimation NOTIFY animationChanged)
+    Q_PROPERTY(QQmlAndroidAnimation *animation READ animation WRITE setAnimation NOTIFY animationChanged)
 
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
     Q_PROPERTY(bool focus READ hasFocus NOTIFY focusChanged)
@@ -42,23 +42,23 @@ class QtQmlAndroidView : public QtQmlAndroidContextual
     Q_PROPERTY(int paddingBottom READ paddingBottom WRITE setPaddingBottom NOTIFY paddingBottomChanged)
 
 public:
-    explicit QtQmlAndroidView(QtQmlAndroidView *parent = 0);
-    ~QtQmlAndroidView();
+    explicit QQmlAndroidView(QQmlAndroidView *parent = 0);
+    ~QQmlAndroidView();
 
     int identifier() const;
     void setIdentifier(int id);
 
-    QtQmlAndroidView *parentView() const;
-    void setParentView(QtQmlAndroidView *parent);
+    QQmlAndroidView *parentView() const;
+    void setParentView(QQmlAndroidView *parent);
 
-    QList<QtQmlAndroidView *> childViews() const;
-    QQmlListProperty<QtQmlAndroidView> children();
+    QList<QQmlAndroidView *> childViews() const;
+    QQmlListProperty<QQmlAndroidView> children();
 
-    QtQmlAndroidLayoutParams *layoutParams() const;
-    void setLayoutParams(QtQmlAndroidLayoutParams *params);
+    QQmlAndroidLayoutParams *layoutParams() const;
+    void setLayoutParams(QQmlAndroidLayoutParams *params);
 
-    QtQmlAndroidDrawable *background() const;
-    void setBackground(QtQmlAndroidDrawable *background, int resource = 0);
+    QQmlAndroidDrawable *background() const;
+    void setBackground(QQmlAndroidDrawable *background, int resource = 0);
 
     int backgroundColor() const;
     void setBackgroundColor(int color);
@@ -66,8 +66,8 @@ public:
     int backgroundResource() const;
     void setBackgroundResource(int resource);
 
-    QtQmlAndroidAnimation *animation() const;
-    void setAnimation(QtQmlAndroidAnimation *animation);
+    QQmlAndroidAnimation *animation() const;
+    void setAnimation(QQmlAndroidAnimation *animation);
 
     bool isVisible() const;
     void setVisible(bool visible);
@@ -120,11 +120,11 @@ public:
     };
 
     union ViewChangeData {
-        ViewChangeData(QtQmlAndroidView *v) : view(v) {}
+        ViewChangeData(QQmlAndroidView *v) : view(v) {}
         ViewChangeData(qreal n) : number(n) {}
         ViewChangeData(bool b) : boolean(b) {}
 
-        QtQmlAndroidView *view;
+        QQmlAndroidView *view;
         qreal number;
         bool boolean;
     };
@@ -158,13 +158,13 @@ protected:
     virtual void polish();
     virtual void viewChange(ViewChange change, const ViewChangeData &data);
 
-    void addChild(QtQmlAndroidView *child);
-    void removeChild(QtQmlAndroidView *child);
+    void addChild(QQmlAndroidView *child);
+    void removeChild(QQmlAndroidView *child);
 
-    static void children_append(QQmlListProperty<QtQmlAndroidView> *list, QtQmlAndroidView *child);
-    static int children_count(QQmlListProperty<QtQmlAndroidView> *list);
-    static QtQmlAndroidView *children_at(QQmlListProperty<QtQmlAndroidView> *list, int index);
-    static void children_clear(QQmlListProperty<QtQmlAndroidView> *list);
+    static void children_append(QQmlListProperty<QQmlAndroidView> *list, QQmlAndroidView *child);
+    static int children_count(QQmlListProperty<QQmlAndroidView> *list);
+    static QQmlAndroidView *children_at(QQmlListProperty<QQmlAndroidView> *list, int index);
+    static void children_clear(QQmlListProperty<QQmlAndroidView> *list);
 
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
     void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
@@ -188,28 +188,28 @@ private Q_SLOTS:
 
 private:
     int m_id;
-    QtQmlAndroidView *m_parent;
-    QList<QtQmlAndroidView *> m_children;
-    QtQmlAndroidDrawable *m_background;
+    QQmlAndroidView *m_parent;
+    QList<QQmlAndroidView *> m_children;
+    QQmlAndroidDrawable *m_background;
     int m_backgroundResource;
-    QtQmlAndroidAnimation *m_animation;
+    QQmlAndroidAnimation *m_animation;
     bool m_polishing;
     bool m_visible;
 
     QAndroidJniObject m_listener;
 
-    QtQmlAndroidLayoutParams *m_layoutParams;
-
-    QtQmlAndroidOptional<bool> m_focus;
-    QtQmlAndroidOptional<int> m_top;
-    QtQmlAndroidOptional<int> m_left;
-    QtQmlAndroidOptional<int> m_right;
-    QtQmlAndroidOptional<int> m_bottom;
-    QtQmlAndroidOptional<int> m_padding;
-    QtQmlAndroidOptional<int> m_paddingTop;
-    QtQmlAndroidOptional<int> m_paddingLeft;
-    QtQmlAndroidOptional<int> m_paddingRight;
-    QtQmlAndroidOptional<int> m_paddingBottom;
+    QQmlAndroidLayoutParams *m_layoutParams;
+
+    QQmlAndroidOptional<bool> m_focus;
+    QQmlAndroidOptional<int> m_top;
+    QQmlAndroidOptional<int> m_left;
+    QQmlAndroidOptional<int> m_right;
+    QQmlAndroidOptional<int> m_bottom;
+    QQmlAndroidOptional<int> m_padding;
+    QQmlAndroidOptional<int> m_paddingTop;
+    QQmlAndroidOptional<int> m_paddingLeft;
+    QQmlAndroidOptional<int> m_paddingRight;
+    QQmlAndroidOptional<int> m_paddingBottom;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/view/qtqmlandroidviewgroup.cpp b/src/qmlandroid/view/qtqmlandroidviewgroup.cpp
index cca1d50..6aa9b12 100644
--- a/src/qmlandroid/view/qtqmlandroidviewgroup.cpp
+++ b/src/qmlandroid/view/qtqmlandroidviewgroup.cpp
@@ -5,35 +5,35 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidViewGroup::QtQmlAndroidViewGroup(QtQmlAndroidView *parent) :
-    QtQmlAndroidView(parent)
+QQmlAndroidViewGroup::QQmlAndroidViewGroup(QQmlAndroidView *parent) :
+    QQmlAndroidView(parent)
 {
 }
 
-QtQmlAndroidLayoutParams *QtQmlAndroidViewGroup::qmlAttachedProperties(QObject *object)
+QQmlAndroidLayoutParams *QQmlAndroidViewGroup::qmlAttachedProperties(QObject *object)
 {
-    QtQmlAndroidView *view = qobject_cast<QtQmlAndroidView*>(object);
+    QQmlAndroidView *view = qobject_cast<QQmlAndroidView*>(object);
     if (view)
-        return new QtQmlAndroidLayoutParams(view);
+        return new QQmlAndroidLayoutParams(view);
     return 0;
 }
 
-QAndroidJniObject QtQmlAndroidViewGroup::onCreate()
+QAndroidJniObject QQmlAndroidViewGroup::onCreate()
 {
     return QAndroidJniObject("android/view/ViewGroup",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidViewGroup::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidViewGroup::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidView::onInflate(instance);
+    QQmlAndroidView::onInflate(instance);
 
-    foreach (QtQmlAndroidView *child, childViews())
+    foreach (QQmlAndroidView *child, childViews())
         instance.callMethod<void>("addView", "(Landroid/view/View;)V", child->instance().object());
 }
 
-void QtQmlAndroidViewGroup::viewChange(ViewChange change, const ViewChangeData &data)
+void QQmlAndroidViewGroup::viewChange(ViewChange change, const ViewChangeData &data)
 {
     QAndroidJniObject group = instance();
     switch (change) {
diff --git a/src/qmlandroid/view/qtqmlandroidviewgroup_p.h b/src/qmlandroid/view/qtqmlandroidviewgroup_p.h
index 875950c..7ffc4c5 100644
--- a/src/qmlandroid/view/qtqmlandroidviewgroup_p.h
+++ b/src/qmlandroid/view/qtqmlandroidviewgroup_p.h
@@ -5,14 +5,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidViewGroup : public QtQmlAndroidView
+class QQmlAndroidViewGroup : public QQmlAndroidView
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidViewGroup(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidViewGroup(QQmlAndroidView *parent = 0);
 
-    static QtQmlAndroidLayoutParams *qmlAttachedProperties(QObject *object);
+    static QQmlAndroidLayoutParams *qmlAttachedProperties(QObject *object);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
@@ -23,6 +23,6 @@ protected:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QtQmlAndroidViewGroup, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QQmlAndroidViewGroup, QML_HAS_ATTACHED_PROPERTIES)
 
 #endif // QTQMLANDROIDVIEWGROUP_P_H
diff --git a/src/qmlandroid/view/qtqmlandroidviewmodule.cpp b/src/qmlandroid/view/qtqmlandroidviewmodule.cpp
index 6ea799a..be408a6 100644
--- a/src/qmlandroid/view/qtqmlandroidviewmodule.cpp
+++ b/src/qmlandroid/view/qtqmlandroidviewmodule.cpp
@@ -16,13 +16,13 @@ namespace QtQmlAndroid {
 
 void registerViewModule(const char *uri)
 {
-    qmlRegisterUncreatableType<QtQmlAndroidGravity>(uri, 0, 21, "Gravity", "Gravity is an enum");
-    qmlRegisterUncreatableType<QtQmlAndroidLayoutParams>(uri, 0, 21, "Layout", "Layout is an attached property");
-    qmlRegisterType<QtQmlAndroidMenu>(uri, 0, 21, "Menu");
-    qmlRegisterType<QtQmlAndroidMenuItem>(uri, 0, 21, "MenuItem");
-    qmlRegisterType<QtQmlAndroidView>(uri, 0, 21, "View");
-    qmlRegisterType<QtQmlAndroidViewGroup>(uri, 0, 21, "ViewGroup");
-    qmlRegisterType<QtQmlAndroidWindow>();
+    qmlRegisterUncreatableType<QQmlAndroidGravity>(uri, 0, 21, "Gravity", "Gravity is an enum");
+    qmlRegisterUncreatableType<QQmlAndroidLayoutParams>(uri, 0, 21, "Layout", "Layout is an attached property");
+    qmlRegisterType<QQmlAndroidMenu>(uri, 0, 21, "Menu");
+    qmlRegisterType<QQmlAndroidMenuItem>(uri, 0, 21, "MenuItem");
+    qmlRegisterType<QQmlAndroidView>(uri, 0, 21, "View");
+    qmlRegisterType<QQmlAndroidViewGroup>(uri, 0, 21, "ViewGroup");
+    qmlRegisterType<QQmlAndroidWindow>();
 }
 
 }
diff --git a/src/qmlandroid/view/qtqmlandroidwindow.cpp b/src/qmlandroid/view/qtqmlandroidwindow.cpp
index 771294a..f1c9906 100644
--- a/src/qmlandroid/view/qtqmlandroidwindow.cpp
+++ b/src/qmlandroid/view/qtqmlandroidwindow.cpp
@@ -4,20 +4,20 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidWindow::QtQmlAndroidWindow(QtQmlAndroidContext *context) :
-    QtQmlAndroidContextual(context)
+QQmlAndroidWindow::QQmlAndroidWindow(QQmlAndroidContext *context) :
+    QQmlAndroidContextual(context)
 {
     setContext(context);
 }
 
-int QtQmlAndroidWindow::statusBarColor() const
+int QQmlAndroidWindow::statusBarColor() const
 {
     if (m_statusBarColor.isNull())
         return 0; // TODO
     return m_statusBarColor.value();
 }
 
-void QtQmlAndroidWindow::setStatusBarColor(int color)
+void QQmlAndroidWindow::setStatusBarColor(int color)
 {
     if (m_statusBarColor.isNull() || m_statusBarColor.value() != color) {
         m_statusBarColor = color;
@@ -26,7 +26,7 @@ void QtQmlAndroidWindow::setStatusBarColor(int color)
     }
 }
 
-void QtQmlAndroidWindow::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidWindow::onInflate(QAndroidJniObject &instance)
 {
     if (!m_statusBarColor.isNull()) {
         // TODO: WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS
diff --git a/src/qmlandroid/view/qtqmlandroidwindow_p.h b/src/qmlandroid/view/qtqmlandroidwindow_p.h
index 679e8c1..98c1ada 100644
--- a/src/qmlandroid/view/qtqmlandroidwindow_p.h
+++ b/src/qmlandroid/view/qtqmlandroidwindow_p.h
@@ -6,13 +6,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidWindow : public QtQmlAndroidContextual
+class QQmlAndroidWindow : public QQmlAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(int statusBarColor READ statusBarColor WRITE setStatusBarColor NOTIFY statusBarColorChanged)
 
 public:
-    explicit QtQmlAndroidWindow(QtQmlAndroidContext *context);
+    explicit QQmlAndroidWindow(QQmlAndroidContext *context);
 
     int statusBarColor() const;
     void setStatusBarColor(int color);
@@ -24,7 +24,7 @@ protected:
     void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
 
 private:
-    QtQmlAndroidOptional<int> m_statusBarColor;
+    QQmlAndroidOptional<int> m_statusBarColor;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidabsseekbar.cpp b/src/qmlandroid/widget/qtqmlandroidabsseekbar.cpp
index fe1391b..3c7501f 100644
--- a/src/qmlandroid/widget/qtqmlandroidabsseekbar.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidabsseekbar.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidAbsSeekBar::QtQmlAndroidAbsSeekBar(QtQmlAndroidView *parent) :
-    QtQmlAndroidProgressBar(parent)
+QQmlAndroidAbsSeekBar::QQmlAndroidAbsSeekBar(QQmlAndroidView *parent) :
+    QQmlAndroidProgressBar(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidAbsSeekBar::onCreate()
+QAndroidJniObject QQmlAndroidAbsSeekBar::onCreate()
 {
     return QAndroidJniObject("android/widget/AbsSeekBar",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidAbsSeekBar::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidAbsSeekBar::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidProgressBar::onInflate(instance);
+    QQmlAndroidProgressBar::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidabsseekbar_p.h b/src/qmlandroid/widget/qtqmlandroidabsseekbar_p.h
index 8bd5345..c68585b 100644
--- a/src/qmlandroid/widget/qtqmlandroidabsseekbar_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidabsseekbar_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidAbsSeekBar : public QtQmlAndroidProgressBar
+class QQmlAndroidAbsSeekBar : public QQmlAndroidProgressBar
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidAbsSeekBar(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidAbsSeekBar(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidadapterview.cpp b/src/qmlandroid/widget/qtqmlandroidadapterview.cpp
index c308159..0da8cd0 100644
--- a/src/qmlandroid/widget/qtqmlandroidadapterview.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidadapterview.cpp
@@ -4,28 +4,28 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidAdapterView::QtQmlAndroidAdapterView(QtQmlAndroidView *parent) :
-    QtQmlAndroidViewGroup(parent), m_adapter(0)
+QQmlAndroidAdapterView::QQmlAndroidAdapterView(QQmlAndroidView *parent) :
+    QQmlAndroidViewGroup(parent), m_adapter(0)
 {
 }
 
-QtQmlAndroidBaseAdapter *QtQmlAndroidAdapterView::adapter() const
+QQmlAndroidBaseAdapter *QQmlAndroidAdapterView::adapter() const
 {
     return m_adapter;
 }
 
-void QtQmlAndroidAdapterView::setAdapter(QtQmlAndroidBaseAdapter *adapter)
+void QQmlAndroidAdapterView::setAdapter(QQmlAndroidBaseAdapter *adapter)
 {
     if (m_adapter != adapter) {
         if (m_adapter) {
             m_adapter->setContext(0);
-            disconnect(m_adapter, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidAdapterView::updateAdapter);
+            disconnect(m_adapter, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidAdapterView::updateAdapter);
             m_adapter->destruct();
         }
         m_adapter = adapter;
         if (m_adapter) {
             m_adapter->setContext(context());
-            connect(m_adapter, &QtQmlAndroidObject::instanceChanged, this, &QtQmlAndroidAdapterView::updateAdapter);
+            connect(m_adapter, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidAdapterView::updateAdapter);
             if (isValid())
                 m_adapter->construct();
         }
@@ -33,26 +33,26 @@ void QtQmlAndroidAdapterView::setAdapter(QtQmlAndroidBaseAdapter *adapter)
     }
 }
 
-void QtQmlAndroidAdapterView::setSelection(int position)
+void QQmlAndroidAdapterView::setSelection(int position)
 {
     QtQmlAndroid::callIntMethod(instance(), "setSelection", position);
 }
 
-QAndroidJniObject QtQmlAndroidAdapterView::onCreate()
+QAndroidJniObject QQmlAndroidAdapterView::onCreate()
 {
     return QAndroidJniObject("android/widget/AdapterView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidAdapterView::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidAdapterView::onInflate(QAndroidJniObject &instance)
 {
     m_listener = QAndroidJniObject("qt/android/widget/QtAdapterViewListener",
                                    "(Landroid/widget/AdapterView;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
 
-    QtQmlAndroidViewGroup::onInflate(instance);
+    QQmlAndroidViewGroup::onInflate(instance);
 
     static bool nativeMethodsRegistered = false;
     if (!nativeMethodsRegistered) {
@@ -61,7 +61,7 @@ void QtQmlAndroidAdapterView::onInflate(QAndroidJniObject &instance)
     }
 }
 
-void QtQmlAndroidAdapterView::onRegisterNativeMethods(jobject listener)
+void QQmlAndroidAdapterView::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onItemClick", "(JI)V", reinterpret_cast<void *>(onItemClick)}};
 
@@ -71,23 +71,23 @@ void QtQmlAndroidAdapterView::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QtQmlAndroidAdapterView::onItemClick(JNIEnv *env, jobject object, jlong instance, jint position)
+void QQmlAndroidAdapterView::onItemClick(JNIEnv *env, jobject object, jlong instance, jint position)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidAdapterView *view = reinterpret_cast<QtQmlAndroidAdapterView *>(instance);
+    QQmlAndroidAdapterView *view = reinterpret_cast<QQmlAndroidAdapterView *>(instance);
     if (view)
         QMetaObject::invokeMethod(view, "click", Qt::QueuedConnection, Q_ARG(int, position));
 }
 
-void QtQmlAndroidAdapterView::objectChange(ObjectChange change)
+void QQmlAndroidAdapterView::objectChange(ObjectChange change)
 {
-    QtQmlAndroidViewGroup::objectChange(change);
+    QQmlAndroidViewGroup::objectChange(change);
     if (change == InstanceChange)
         updateAdapter();
 }
 
-void QtQmlAndroidAdapterView::updateAdapter()
+void QQmlAndroidAdapterView::updateAdapter()
 {
     if (!isValid())
         return;
diff --git a/src/qmlandroid/widget/qtqmlandroidadapterview_p.h b/src/qmlandroid/widget/qtqmlandroidadapterview_p.h
index 2edd80e..1e44b5a 100644
--- a/src/qmlandroid/widget/qtqmlandroidadapterview_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidadapterview_p.h
@@ -5,18 +5,18 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidBaseAdapter;
+class QQmlAndroidBaseAdapter;
 
-class QtQmlAndroidAdapterView : public QtQmlAndroidViewGroup
+class QQmlAndroidAdapterView : public QQmlAndroidViewGroup
 {
     Q_OBJECT
-    Q_PROPERTY(QtQmlAndroidBaseAdapter *adapter READ adapter WRITE setAdapter NOTIFY adapterChanged) // TODO: Adapter
+    Q_PROPERTY(QQmlAndroidBaseAdapter *adapter READ adapter WRITE setAdapter NOTIFY adapterChanged) // TODO: Adapter
 
 public:
-    explicit QtQmlAndroidAdapterView(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidAdapterView(QQmlAndroidView *parent = 0);
 
-    QtQmlAndroidBaseAdapter *adapter() const;
-    void setAdapter(QtQmlAndroidBaseAdapter *adapter);
+    QQmlAndroidBaseAdapter *adapter() const;
+    void setAdapter(QQmlAndroidBaseAdapter *adapter);
 
 public Q_SLOTS:
     void setSelection(int position);
@@ -39,7 +39,7 @@ private Q_SLOTS:
 
 private:
     QAndroidJniObject m_listener;
-    QtQmlAndroidBaseAdapter *m_adapter;
+    QQmlAndroidBaseAdapter *m_adapter;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidarrayadapter.cpp b/src/qmlandroid/widget/qtqmlandroidarrayadapter.cpp
index 2942673..12d860c 100644
--- a/src/qmlandroid/widget/qtqmlandroidarrayadapter.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidarrayadapter.cpp
@@ -4,17 +4,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidArrayAdapter::QtQmlAndroidArrayAdapter(QObject *parent) :
-    QtQmlAndroidBaseAdapter(parent), m_style(17367043) // TODO: android.R.layout.simple_list_item_1
+QQmlAndroidArrayAdapter::QQmlAndroidArrayAdapter(QObject *parent) :
+    QQmlAndroidBaseAdapter(parent), m_style(17367043) // TODO: android.R.layout.simple_list_item_1
 {
 }
 
-int QtQmlAndroidArrayAdapter::style() const
+int QQmlAndroidArrayAdapter::style() const
 {
     return m_style;
 }
 
-void QtQmlAndroidArrayAdapter::setStyle(int style)
+void QQmlAndroidArrayAdapter::setStyle(int style)
 {
     if (m_style != style) {
         m_style = style;
@@ -22,12 +22,12 @@ void QtQmlAndroidArrayAdapter::setStyle(int style)
     }
 }
 
-QStringList QtQmlAndroidArrayAdapter::array() const
+QStringList QQmlAndroidArrayAdapter::array() const
 {
     return m_array;
 }
 
-void QtQmlAndroidArrayAdapter::setArray(const QStringList &array)
+void QQmlAndroidArrayAdapter::setArray(const QStringList &array)
 {
     if (m_array != array) {
         m_array = array; // TODO: sync
@@ -36,17 +36,17 @@ void QtQmlAndroidArrayAdapter::setArray(const QStringList &array)
     }
 }
 
-int QtQmlAndroidArrayAdapter::count() const
+int QQmlAndroidArrayAdapter::count() const
 {
     return m_array.count();
 }
 
-QString QtQmlAndroidArrayAdapter::getItem(int position) const
+QString QQmlAndroidArrayAdapter::getItem(int position) const
 {
     return m_array.value(position);
 }
 
-void QtQmlAndroidArrayAdapter::clear()
+void QQmlAndroidArrayAdapter::clear()
 {
     if (!m_array.isEmpty()) {
         m_array.clear(); // TODO: sync
@@ -55,7 +55,7 @@ void QtQmlAndroidArrayAdapter::clear()
     }
 }
 
-QAndroidJniObject QtQmlAndroidArrayAdapter::onCreate()
+QAndroidJniObject QQmlAndroidArrayAdapter::onCreate()
 {
     return QAndroidJniObject("android/widget/ArrayAdapter",
                              "(Landroid/content/Context;I)V",
@@ -63,9 +63,9 @@ QAndroidJniObject QtQmlAndroidArrayAdapter::onCreate()
                              m_style);
 }
 
-void QtQmlAndroidArrayAdapter::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidArrayAdapter::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidBaseAdapter::onInflate(instance);
+    QQmlAndroidBaseAdapter::onInflate(instance);
 
     foreach (const QString &str, m_array)
         instance.callMethod<void>("add", "(Ljava/lang/Object;)V", QAndroidJniObject::fromString(str).object());
diff --git a/src/qmlandroid/widget/qtqmlandroidarrayadapter_p.h b/src/qmlandroid/widget/qtqmlandroidarrayadapter_p.h
index a17dd20..c2e3ce7 100644
--- a/src/qmlandroid/widget/qtqmlandroidarrayadapter_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidarrayadapter_p.h
@@ -6,14 +6,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidArrayAdapter : public QtQmlAndroidBaseAdapter
+class QQmlAndroidArrayAdapter : public QQmlAndroidBaseAdapter
 {
     Q_OBJECT
     Q_PROPERTY(int style READ style WRITE setStyle NOTIFY styleChanged)
     Q_PROPERTY(QStringList array READ array WRITE setArray NOTIFY arrayChanged)
 
 public:
-    explicit QtQmlAndroidArrayAdapter(QObject *parent = 0);
+    explicit QQmlAndroidArrayAdapter(QObject *parent = 0);
 
     int style() const;
     void setStyle(int style);
diff --git a/src/qmlandroid/widget/qtqmlandroidbaseadapter.cpp b/src/qmlandroid/widget/qtqmlandroidbaseadapter.cpp
index e0fd666..6579918 100644
--- a/src/qmlandroid/widget/qtqmlandroidbaseadapter.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidbaseadapter.cpp
@@ -2,19 +2,19 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidBaseAdapter::QtQmlAndroidBaseAdapter(QObject *parent) :
-    QtQmlAndroidContextual(parent)
+QQmlAndroidBaseAdapter::QQmlAndroidBaseAdapter(QObject *parent) :
+    QQmlAndroidContextual(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidBaseAdapter::onCreate()
+QAndroidJniObject QQmlAndroidBaseAdapter::onCreate()
 {
     return QAndroidJniObject("android/widget/BaseAdapter");
 }
 
-void QtQmlAndroidBaseAdapter::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidBaseAdapter::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidContextual::onInflate(instance);
+    QQmlAndroidContextual::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidbaseadapter_p.h b/src/qmlandroid/widget/qtqmlandroidbaseadapter_p.h
index 52cff47..3238507 100644
--- a/src/qmlandroid/widget/qtqmlandroidbaseadapter_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidbaseadapter_p.h
@@ -5,13 +5,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidBaseAdapter : public QtQmlAndroidContextual
+class QQmlAndroidBaseAdapter : public QQmlAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 
 public:
-    explicit QtQmlAndroidBaseAdapter(QObject *parent = 0);
+    explicit QQmlAndroidBaseAdapter(QObject *parent = 0);
 
     virtual int count() const = 0;
 
diff --git a/src/qmlandroid/widget/qtqmlandroidbutton.cpp b/src/qmlandroid/widget/qtqmlandroidbutton.cpp
index efd6a29..f91c3e2 100644
--- a/src/qmlandroid/widget/qtqmlandroidbutton.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidbutton.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidButton::QtQmlAndroidButton(QtQmlAndroidView *parent) :
-    QtQmlAndroidTextView(parent)
+QQmlAndroidButton::QQmlAndroidButton(QQmlAndroidView *parent) :
+    QQmlAndroidTextView(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidButton::onCreate()
+QAndroidJniObject QQmlAndroidButton::onCreate()
 {
     return QAndroidJniObject("android/widget/Button",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidButton::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidButton::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidTextView::onInflate(instance);
+    QQmlAndroidTextView::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidbutton_p.h b/src/qmlandroid/widget/qtqmlandroidbutton_p.h
index b25eb65..7750218 100644
--- a/src/qmlandroid/widget/qtqmlandroidbutton_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidbutton_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidButton : public QtQmlAndroidTextView
+class QQmlAndroidButton : public QQmlAndroidTextView
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidButton(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidButton(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidcalendarview.cpp b/src/qmlandroid/widget/qtqmlandroidcalendarview.cpp
index 6887121..0851577 100644
--- a/src/qmlandroid/widget/qtqmlandroidcalendarview.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidcalendarview.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidCalendarView::QtQmlAndroidCalendarView(QtQmlAndroidView *parent) :
-    QtQmlAndroidFrameLayout(parent)
+QQmlAndroidCalendarView::QQmlAndroidCalendarView(QQmlAndroidView *parent) :
+    QQmlAndroidFrameLayout(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidCalendarView::onCreate()
+QAndroidJniObject QQmlAndroidCalendarView::onCreate()
 {
     return QAndroidJniObject("android/widget/CalendarView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidCalendarView::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidCalendarView::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidViewGroup::onInflate(instance);
+    QQmlAndroidViewGroup::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidcalendarview_p.h b/src/qmlandroid/widget/qtqmlandroidcalendarview_p.h
index a6da75e..9378a61 100644
--- a/src/qmlandroid/widget/qtqmlandroidcalendarview_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidcalendarview_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidCalendarView : public QtQmlAndroidFrameLayout
+class QQmlAndroidCalendarView : public QQmlAndroidFrameLayout
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidCalendarView(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidCalendarView(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidcheckbox.cpp b/src/qmlandroid/widget/qtqmlandroidcheckbox.cpp
index 7461e07..46b9bb3 100644
--- a/src/qmlandroid/widget/qtqmlandroidcheckbox.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidcheckbox.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidCheckBox::QtQmlAndroidCheckBox(QtQmlAndroidView *parent) :
-    QtQmlAndroidCompoundButton(parent)
+QQmlAndroidCheckBox::QQmlAndroidCheckBox(QQmlAndroidView *parent) :
+    QQmlAndroidCompoundButton(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidCheckBox::onCreate()
+QAndroidJniObject QQmlAndroidCheckBox::onCreate()
 {
     return QAndroidJniObject("android/widget/CheckBox",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidCheckBox::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidCheckBox::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidCompoundButton::onInflate(instance);
+    QQmlAndroidCompoundButton::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidcheckbox_p.h b/src/qmlandroid/widget/qtqmlandroidcheckbox_p.h
index 1343c79..f4289ae 100644
--- a/src/qmlandroid/widget/qtqmlandroidcheckbox_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidcheckbox_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidCheckBox : public QtQmlAndroidCompoundButton
+class QQmlAndroidCheckBox : public QQmlAndroidCompoundButton
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidCheckBox(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidCheckBox(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidcompoundbutton.cpp b/src/qmlandroid/widget/qtqmlandroidcompoundbutton.cpp
index 4a521b5..289ef69 100644
--- a/src/qmlandroid/widget/qtqmlandroidcompoundbutton.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidcompoundbutton.cpp
@@ -3,23 +3,23 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidCompoundButton::QtQmlAndroidCompoundButton(QtQmlAndroidView *parent) :
-    QtQmlAndroidButton(parent), m_checked(false)
+QQmlAndroidCompoundButton::QQmlAndroidCompoundButton(QQmlAndroidView *parent) :
+    QQmlAndroidButton(parent), m_checked(false)
 {
 }
 
-bool QtQmlAndroidCompoundButton::isChecked() const
+bool QQmlAndroidCompoundButton::isChecked() const
 {
     return m_checked;
 }
 
-void QtQmlAndroidCompoundButton::setChecked(bool checked)
+void QQmlAndroidCompoundButton::setChecked(bool checked)
 {
     if (updateChecked(checked))
         QtQmlAndroid::callBoolMethod(instance(), "setChecked", checked);
 }
 
-bool QtQmlAndroidCompoundButton::updateChecked(bool arg)
+bool QQmlAndroidCompoundButton::updateChecked(bool arg)
 {
     if (arg != isChecked()) {
         m_checked = arg;
@@ -29,21 +29,21 @@ bool QtQmlAndroidCompoundButton::updateChecked(bool arg)
     return false;
 }
 
-void QtQmlAndroidCompoundButton::toggle()
+void QQmlAndroidCompoundButton::toggle()
 {
     QtQmlAndroid::callVoidMethod(instance(), "toggle");
 }
 
-QAndroidJniObject QtQmlAndroidCompoundButton::onCreate()
+QAndroidJniObject QQmlAndroidCompoundButton::onCreate()
 {
     return QAndroidJniObject("android/widget/CompoundButton",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidCompoundButton::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidCompoundButton::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidButton::onInflate(instance);
+    QQmlAndroidButton::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/widget/QtCompoundButtonListener",
                                    "(Landroid/widget/CompoundButton;J)V",
@@ -59,7 +59,7 @@ void QtQmlAndroidCompoundButton::onInflate(QAndroidJniObject &instance)
     instance.callMethod<void>("setChecked", "(Z)V", m_checked);
 }
 
-void QtQmlAndroidCompoundButton::onRegisterNativeMethods(jobject listener)
+void QQmlAndroidCompoundButton::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onCheckedChanged", "(JZ)V", reinterpret_cast<void *>(onCheckedChanged)}};
 
@@ -69,11 +69,11 @@ void QtQmlAndroidCompoundButton::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QtQmlAndroidCompoundButton::onCheckedChanged(JNIEnv *env, jobject object, jlong instance, jboolean isChecked)
+void QQmlAndroidCompoundButton::onCheckedChanged(JNIEnv *env, jobject object, jlong instance, jboolean isChecked)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidCompoundButton *button = reinterpret_cast<QtQmlAndroidCompoundButton *>(instance);
+    QQmlAndroidCompoundButton *button = reinterpret_cast<QQmlAndroidCompoundButton *>(instance);
     if (button)
         QMetaObject::invokeMethod(button, "updateChecked", Qt::QueuedConnection, Q_ARG(bool, isChecked));
 }
diff --git a/src/qmlandroid/widget/qtqmlandroidcompoundbutton_p.h b/src/qmlandroid/widget/qtqmlandroidcompoundbutton_p.h
index 5149553..a1587e6 100644
--- a/src/qmlandroid/widget/qtqmlandroidcompoundbutton_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidcompoundbutton_p.h
@@ -5,13 +5,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidCompoundButton : public QtQmlAndroidButton
+class QQmlAndroidCompoundButton : public QQmlAndroidButton
 {
     Q_OBJECT
     Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged)
 
 public:
-    explicit QtQmlAndroidCompoundButton(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidCompoundButton(QQmlAndroidView *parent = 0);
 
     bool isChecked() const;
     void setChecked(bool checked);
diff --git a/src/qmlandroid/widget/qtqmlandroiddatepicker.cpp b/src/qmlandroid/widget/qtqmlandroiddatepicker.cpp
index eb96586..5bddd10 100644
--- a/src/qmlandroid/widget/qtqmlandroiddatepicker.cpp
+++ b/src/qmlandroid/widget/qtqmlandroiddatepicker.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidDatePicker::QtQmlAndroidDatePicker(QtQmlAndroidView *parent) :
-    QtQmlAndroidFrameLayout(parent)
+QQmlAndroidDatePicker::QQmlAndroidDatePicker(QQmlAndroidView *parent) :
+    QQmlAndroidFrameLayout(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidDatePicker::onCreate()
+QAndroidJniObject QQmlAndroidDatePicker::onCreate()
 {
     return QAndroidJniObject("android/widget/DatePicker",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidDatePicker::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidDatePicker::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidFrameLayout::onInflate(instance);
+    QQmlAndroidFrameLayout::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroiddatepicker_p.h b/src/qmlandroid/widget/qtqmlandroiddatepicker_p.h
index ab4bbac..2829ffb 100644
--- a/src/qmlandroid/widget/qtqmlandroiddatepicker_p.h
+++ b/src/qmlandroid/widget/qtqmlandroiddatepicker_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidDatePicker : public QtQmlAndroidFrameLayout
+class QQmlAndroidDatePicker : public QQmlAndroidFrameLayout
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidDatePicker(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidDatePicker(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidedittext.cpp b/src/qmlandroid/widget/qtqmlandroidedittext.cpp
index 3b03a93..e2f8025 100644
--- a/src/qmlandroid/widget/qtqmlandroidedittext.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidedittext.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidEditText::QtQmlAndroidEditText(QtQmlAndroidView *parent) :
-    QtQmlAndroidTextView(parent)
+QQmlAndroidEditText::QQmlAndroidEditText(QQmlAndroidView *parent) :
+    QQmlAndroidTextView(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidEditText::onCreate()
+QAndroidJniObject QQmlAndroidEditText::onCreate()
 {
     return QAndroidJniObject("android/widget/EditText",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidEditText::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidEditText::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidTextView::onInflate(instance);
+    QQmlAndroidTextView::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidedittext_p.h b/src/qmlandroid/widget/qtqmlandroidedittext_p.h
index 5d7009e..53bdc55 100644
--- a/src/qmlandroid/widget/qtqmlandroidedittext_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidedittext_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidEditText : public QtQmlAndroidTextView
+class QQmlAndroidEditText : public QQmlAndroidTextView
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidEditText(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidEditText(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidframelayout.cpp b/src/qmlandroid/widget/qtqmlandroidframelayout.cpp
index 548acd8..83853f2 100644
--- a/src/qmlandroid/widget/qtqmlandroidframelayout.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidframelayout.cpp
@@ -2,29 +2,29 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidFrameLayout::QtQmlAndroidFrameLayout(QtQmlAndroidView *parent) :
-    QtQmlAndroidViewGroup(parent)
+QQmlAndroidFrameLayout::QQmlAndroidFrameLayout(QQmlAndroidView *parent) :
+    QQmlAndroidViewGroup(parent)
 {
 }
 
-QtQmlAndroidFrameLayoutParams *QtQmlAndroidFrameLayout::qmlAttachedProperties(QObject *object)
+QQmlAndroidFrameLayoutParams *QQmlAndroidFrameLayout::qmlAttachedProperties(QObject *object)
 {
-    QtQmlAndroidView *view = qobject_cast<QtQmlAndroidView*>(object);
+    QQmlAndroidView *view = qobject_cast<QQmlAndroidView*>(object);
     if (view)
-        return new QtQmlAndroidFrameLayoutParams(view);
+        return new QQmlAndroidFrameLayoutParams(view);
     return 0;
 }
 
-QAndroidJniObject QtQmlAndroidFrameLayout::onCreate()
+QAndroidJniObject QQmlAndroidFrameLayout::onCreate()
 {
     return QAndroidJniObject("android/widget/FrameLayout",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidFrameLayout::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidFrameLayout::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidViewGroup::onInflate(instance);
+    QQmlAndroidViewGroup::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidframelayout_p.h b/src/qmlandroid/widget/qtqmlandroidframelayout_p.h
index 43d0c9e..acc73a4 100644
--- a/src/qmlandroid/widget/qtqmlandroidframelayout_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidframelayout_p.h
@@ -6,14 +6,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidFrameLayout : public QtQmlAndroidViewGroup
+class QQmlAndroidFrameLayout : public QQmlAndroidViewGroup
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidFrameLayout(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidFrameLayout(QQmlAndroidView *parent = 0);
 
-    static QtQmlAndroidFrameLayoutParams *qmlAttachedProperties(QObject *object);
+    static QQmlAndroidFrameLayoutParams *qmlAttachedProperties(QObject *object);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
@@ -22,6 +22,6 @@ protected:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QtQmlAndroidFrameLayout, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QQmlAndroidFrameLayout, QML_HAS_ATTACHED_PROPERTIES)
 
 #endif // QTQMLANDROIDFRAMELAYOUT_P_H
diff --git a/src/qmlandroid/widget/qtqmlandroidframelayoutparams.cpp b/src/qmlandroid/widget/qtqmlandroidframelayoutparams.cpp
index afce48b..1cbc980 100644
--- a/src/qmlandroid/widget/qtqmlandroidframelayoutparams.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidframelayoutparams.cpp
@@ -3,19 +3,19 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidFrameLayoutParams::QtQmlAndroidFrameLayoutParams(QtQmlAndroidView *view) :
-    QtQmlAndroidMarginLayoutParams(view)
+QQmlAndroidFrameLayoutParams::QQmlAndroidFrameLayoutParams(QQmlAndroidView *view) :
+    QQmlAndroidMarginLayoutParams(view)
 {
 }
 
-int QtQmlAndroidFrameLayoutParams::gravity() const
+int QQmlAndroidFrameLayoutParams::gravity() const
 {
     if (m_gravity.isNull())
         return 0; // TODO
     return m_gravity.value();
 }
 
-void QtQmlAndroidFrameLayoutParams::setGravity(int value)
+void QQmlAndroidFrameLayoutParams::setGravity(int value)
 {
     if (value != gravity()) {
         m_gravity = value;
@@ -24,16 +24,16 @@ void QtQmlAndroidFrameLayoutParams::setGravity(int value)
     }
 }
 
-QAndroidJniObject QtQmlAndroidFrameLayoutParams::onCreate()
+QAndroidJniObject QQmlAndroidFrameLayoutParams::onCreate()
 {
     return QAndroidJniObject("android/widget/FrameLayout$LayoutParams",
                              "(II)V",
                              MATCH_PARENT, MATCH_PARENT);
 }
 
-void QtQmlAndroidFrameLayoutParams::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidFrameLayoutParams::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidMarginLayoutParams::onInflate(instance);
+    QQmlAndroidMarginLayoutParams::onInflate(instance);
 
     if (!m_gravity.isNull())
         instance.callMethod<void>("setGravity", "(I)V", m_gravity.value());
diff --git a/src/qmlandroid/widget/qtqmlandroidframelayoutparams_p.h b/src/qmlandroid/widget/qtqmlandroidframelayoutparams_p.h
index 9764dea..cb0feb8 100644
--- a/src/qmlandroid/widget/qtqmlandroidframelayoutparams_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidframelayoutparams_p.h
@@ -5,13 +5,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidFrameLayoutParams : public QtQmlAndroidMarginLayoutParams
+class QQmlAndroidFrameLayoutParams : public QQmlAndroidMarginLayoutParams
 {
     Q_OBJECT
     Q_PROPERTY(int gravity READ gravity WRITE setGravity NOTIFY gravityChanged)
 
 public:
-    explicit QtQmlAndroidFrameLayoutParams(QtQmlAndroidView *view);
+    explicit QQmlAndroidFrameLayoutParams(QQmlAndroidView *view);
 
     int gravity() const;
     void setGravity(int gravity);
@@ -24,7 +24,7 @@ protected:
     void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
 
 private:
-    QtQmlAndroidOptional<int> m_gravity;
+    QQmlAndroidOptional<int> m_gravity;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidimageview.cpp b/src/qmlandroid/widget/qtqmlandroidimageview.cpp
index 57bf21e..97ce984 100644
--- a/src/qmlandroid/widget/qtqmlandroidimageview.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidimageview.cpp
@@ -3,17 +3,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidImageView::QtQmlAndroidImageView(QtQmlAndroidView *parent) :
-    QtQmlAndroidView(parent), m_resource(0)
+QQmlAndroidImageView::QQmlAndroidImageView(QQmlAndroidView *parent) :
+    QQmlAndroidView(parent), m_resource(0)
 {
 }
 
-QUrl QtQmlAndroidImageView::imageURI() const
+QUrl QQmlAndroidImageView::imageURI() const
 {
     return m_uri;
 }
 
-void QtQmlAndroidImageView::setImageURI(const QUrl &uri)
+void QQmlAndroidImageView::setImageURI(const QUrl &uri)
 {
     if (m_uri != uri) {
         m_uri = uri;
@@ -28,12 +28,12 @@ void QtQmlAndroidImageView::setImageURI(const QUrl &uri)
     }
 }
 
-int QtQmlAndroidImageView::imageResource() const
+int QQmlAndroidImageView::imageResource() const
 {
     return m_resource;
 }
 
-void QtQmlAndroidImageView::setImageResource(int resource)
+void QQmlAndroidImageView::setImageResource(int resource)
 {
     if (m_resource != resource) {
         m_resource = resource;
@@ -42,14 +42,14 @@ void QtQmlAndroidImageView::setImageResource(int resource)
     }
 }
 
-int QtQmlAndroidImageView::imageTintColor() const
+int QQmlAndroidImageView::imageTintColor() const
 {
     if (m_tint.isNull())
         return 0; // TODO
     return m_tint.value();
 }
 
-void QtQmlAndroidImageView::setImageTintColor(int color)
+void QQmlAndroidImageView::setImageTintColor(int color)
 {
     if (m_tint.isNull() || m_tint.value() != color) {
         m_tint = color;
@@ -67,16 +67,16 @@ void QtQmlAndroidImageView::setImageTintColor(int color)
     }
 }
 
-QAndroidJniObject QtQmlAndroidImageView::onCreate()
+QAndroidJniObject QQmlAndroidImageView::onCreate()
 {
     return QAndroidJniObject("android/widget/ImageView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidImageView::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidImageView::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidView::onInflate(instance);
+    QQmlAndroidView::onInflate(instance);
 
     if (m_uri.isValid())
         instance.callMethod<void>("setImageURI", "(Landroid/net/Uri;)V", getUri().object());
@@ -91,7 +91,7 @@ void QtQmlAndroidImageView::onInflate(QAndroidJniObject &instance)
     }
 }
 
-QAndroidJniObject QtQmlAndroidImageView::getUri() const
+QAndroidJniObject QQmlAndroidImageView::getUri() const
 {
     QAndroidJniObject str = QAndroidJniObject::fromString(m_uri.toString());
     return QAndroidJniObject::callStaticObjectMethod("android/net/Uri", "parse", "(Ljava/lang/String;)Landroid/net/Uri;", str.object());
diff --git a/src/qmlandroid/widget/qtqmlandroidimageview_p.h b/src/qmlandroid/widget/qtqmlandroidimageview_p.h
index 7e2ba56..685631f 100644
--- a/src/qmlandroid/widget/qtqmlandroidimageview_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidimageview_p.h
@@ -7,7 +7,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidImageView : public QtQmlAndroidView
+class QQmlAndroidImageView : public QQmlAndroidView
 {
     Q_OBJECT
     Q_PROPERTY(QUrl imageURI READ imageURI WRITE setImageURI NOTIFY imageURIChanged)
@@ -15,7 +15,7 @@ class QtQmlAndroidImageView : public QtQmlAndroidView
     Q_PROPERTY(int imageTintColor READ imageTintColor WRITE setImageTintColor NOTIFY imageTintColorChanged)
 
 public:
-    explicit QtQmlAndroidImageView(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidImageView(QQmlAndroidView *parent = 0);
 
     QUrl imageURI() const;
     void setImageURI(const QUrl &uri);
@@ -40,7 +40,7 @@ private:
 
     QUrl m_uri;
     int m_resource;
-    QtQmlAndroidOptional<int> m_tint;
+    QQmlAndroidOptional<int> m_tint;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidlinearlayout.cpp b/src/qmlandroid/widget/qtqmlandroidlinearlayout.cpp
index 11ccd68..f2b9e2b 100644
--- a/src/qmlandroid/widget/qtqmlandroidlinearlayout.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidlinearlayout.cpp
@@ -2,27 +2,27 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidLinearLayout::QtQmlAndroidLinearLayout(QtQmlAndroidView *parent) :
-    QtQmlAndroidViewGroup(parent)
+QQmlAndroidLinearLayout::QQmlAndroidLinearLayout(QQmlAndroidView *parent) :
+    QQmlAndroidViewGroup(parent)
 {
 }
 
-QtQmlAndroidLinearLayoutParams *QtQmlAndroidLinearLayout::qmlAttachedProperties(QObject *object)
+QQmlAndroidLinearLayoutParams *QQmlAndroidLinearLayout::qmlAttachedProperties(QObject *object)
 {
-    QtQmlAndroidView *view = qobject_cast<QtQmlAndroidView*>(object);
+    QQmlAndroidView *view = qobject_cast<QQmlAndroidView*>(object);
     if (view)
-        return new QtQmlAndroidLinearLayoutParams(view);
+        return new QQmlAndroidLinearLayoutParams(view);
     return 0;
 }
 
-bool QtQmlAndroidLinearLayout::isBaselineAligned() const
+bool QQmlAndroidLinearLayout::isBaselineAligned() const
 {
     if (m_baselineAligned.isNull())
         return true;
     return m_baselineAligned.value();
 }
 
-void QtQmlAndroidLinearLayout::setBaselineAligned(bool aligned)
+void QQmlAndroidLinearLayout::setBaselineAligned(bool aligned)
 {
     if (aligned != isBaselineAligned()) {
         m_baselineAligned = aligned;
@@ -32,14 +32,14 @@ void QtQmlAndroidLinearLayout::setBaselineAligned(bool aligned)
     }
 }
 
-int QtQmlAndroidLinearLayout::baselineAlignedChildIndex() const
+int QQmlAndroidLinearLayout::baselineAlignedChildIndex() const
 {
     if (m_baselineAlignedChildIndex.isNull())
         return -1;
     return m_baselineAlignedChildIndex.value();
 }
 
-void QtQmlAndroidLinearLayout::setBaselineAlignedChildIndex(int index)
+void QQmlAndroidLinearLayout::setBaselineAlignedChildIndex(int index)
 {
     if (index != baselineAlignedChildIndex()) {
         m_baselineAlignedChildIndex = index;
@@ -49,14 +49,14 @@ void QtQmlAndroidLinearLayout::setBaselineAlignedChildIndex(int index)
     }
 }
 
-bool QtQmlAndroidLinearLayout::isMeasureWithLargestChildEnabled() const
+bool QQmlAndroidLinearLayout::isMeasureWithLargestChildEnabled() const
 {
     if (m_measureWithLargestChild.isNull())
         return false;
     return m_measureWithLargestChild.value();
 }
 
-void QtQmlAndroidLinearLayout::setMeasureWithLargestChildEnabled(bool enabled)
+void QQmlAndroidLinearLayout::setMeasureWithLargestChildEnabled(bool enabled)
 {
     if (enabled != isMeasureWithLargestChildEnabled()) {
         m_measureWithLargestChild = enabled;
@@ -66,14 +66,14 @@ void QtQmlAndroidLinearLayout::setMeasureWithLargestChildEnabled(bool enabled)
     }
 }
 
-QtQmlAndroidLinearLayout::Orientation QtQmlAndroidLinearLayout::orientation() const
+QQmlAndroidLinearLayout::Orientation QQmlAndroidLinearLayout::orientation() const
 {
     if (m_orientation.isNull())
         return HORIZONTAL;
     return m_orientation.value();
 }
 
-void QtQmlAndroidLinearLayout::setOrientation(Orientation value)
+void QQmlAndroidLinearLayout::setOrientation(Orientation value)
 {
     if (value != orientation()) {
         m_orientation = value;
@@ -83,14 +83,14 @@ void QtQmlAndroidLinearLayout::setOrientation(Orientation value)
     }
 }
 
-qreal QtQmlAndroidLinearLayout::weightSum() const
+qreal QQmlAndroidLinearLayout::weightSum() const
 {
     if (m_weightSum.isNull())
         return -1.0f;
     return m_weightSum.value();
 }
 
-void QtQmlAndroidLinearLayout::setWeightSum(qreal sum)
+void QQmlAndroidLinearLayout::setWeightSum(qreal sum)
 {
     if (sum != weightSum()) {
         m_weightSum = sum;
@@ -100,14 +100,14 @@ void QtQmlAndroidLinearLayout::setWeightSum(qreal sum)
     }
 }
 
-QAndroidJniObject QtQmlAndroidLinearLayout::onCreate()
+QAndroidJniObject QQmlAndroidLinearLayout::onCreate()
 {
     return QAndroidJniObject("android/widget/LinearLayout",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidLinearLayout::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidLinearLayout::onInflate(QAndroidJniObject &instance)
 {
     if (!m_baselineAligned.isNull())
         instance.callMethod<void>("setBaselineAligned", "(Z)V", m_baselineAligned.value());
@@ -118,7 +118,7 @@ void QtQmlAndroidLinearLayout::onInflate(QAndroidJniObject &instance)
     if (!m_weightSum.isNull())
         instance.callMethod<void>("setWeightSum", "(J)V", m_weightSum.value());
 
-    QtQmlAndroidViewGroup::onInflate(instance);
+    QQmlAndroidViewGroup::onInflate(instance);
 
     if (!m_baselineAlignedChildIndex.isNull())
         instance.callMethod<void>("setBaselineAlignedChildIndex", "(I)V", m_baselineAlignedChildIndex.value());
diff --git a/src/qmlandroid/widget/qtqmlandroidlinearlayout_p.h b/src/qmlandroid/widget/qtqmlandroidlinearlayout_p.h
index a778c89..46888a6 100644
--- a/src/qmlandroid/widget/qtqmlandroidlinearlayout_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidlinearlayout_p.h
@@ -7,7 +7,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidLinearLayout : public QtQmlAndroidViewGroup
+class QQmlAndroidLinearLayout : public QQmlAndroidViewGroup
 {
     Q_OBJECT
     Q_PROPERTY(bool baselineAligned READ isBaselineAligned WRITE setBaselineAligned NOTIFY baselineAlignedChanged)
@@ -18,9 +18,9 @@ class QtQmlAndroidLinearLayout : public QtQmlAndroidViewGroup
     Q_ENUMS(Orientation)
 
 public:
-    explicit QtQmlAndroidLinearLayout(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidLinearLayout(QQmlAndroidView *parent = 0);
 
-    static QtQmlAndroidLinearLayoutParams *qmlAttachedProperties(QObject *object);
+    static QQmlAndroidLinearLayoutParams *qmlAttachedProperties(QObject *object);
 
     enum Orientation {
         HORIZONTAL = 0,
@@ -57,17 +57,17 @@ protected:
     void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
 
 private:
-    QtQmlAndroidOptional<bool> m_baselineAligned;
-    QtQmlAndroidOptional<bool> m_baselineAlignedChildIndex;
+    QQmlAndroidOptional<bool> m_baselineAligned;
+    QQmlAndroidOptional<bool> m_baselineAlignedChildIndex;
     // TODO: Drawable divider
     // TODO: int gravity
-    QtQmlAndroidOptional<bool> m_measureWithLargestChild;
-    QtQmlAndroidOptional<Orientation> m_orientation;
-    QtQmlAndroidOptional<qreal> m_weightSum;
+    QQmlAndroidOptional<bool> m_measureWithLargestChild;
+    QQmlAndroidOptional<Orientation> m_orientation;
+    QQmlAndroidOptional<qreal> m_weightSum;
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QtQmlAndroidLinearLayout, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QQmlAndroidLinearLayout, QML_HAS_ATTACHED_PROPERTIES)
 
 #endif // QTQMLANDROIDLINEARLAYOUT_P_H
diff --git a/src/qmlandroid/widget/qtqmlandroidlinearlayoutparams.cpp b/src/qmlandroid/widget/qtqmlandroidlinearlayoutparams.cpp
index 6618546..7026082 100644
--- a/src/qmlandroid/widget/qtqmlandroidlinearlayoutparams.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidlinearlayoutparams.cpp
@@ -3,19 +3,19 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidLinearLayoutParams::QtQmlAndroidLinearLayoutParams(QtQmlAndroidView *view) :
-    QtQmlAndroidMarginLayoutParams(view)
+QQmlAndroidLinearLayoutParams::QQmlAndroidLinearLayoutParams(QQmlAndroidView *view) :
+    QQmlAndroidMarginLayoutParams(view)
 {
 }
 
-int QtQmlAndroidLinearLayoutParams::gravity() const
+int QQmlAndroidLinearLayoutParams::gravity() const
 {
     if (m_gravity.isNull())
         return 0; // TODO
     return m_gravity.value();
 }
 
-void QtQmlAndroidLinearLayoutParams::setGravity(int value)
+void QQmlAndroidLinearLayoutParams::setGravity(int value)
 {
     if (value != gravity()) {
         m_gravity = value;
@@ -24,14 +24,14 @@ void QtQmlAndroidLinearLayoutParams::setGravity(int value)
     }
 }
 
-qreal QtQmlAndroidLinearLayoutParams::weight() const
+qreal QQmlAndroidLinearLayoutParams::weight() const
 {
     if (m_weight.isNull())
         return 0.0; // TODO
     return m_weight.value();
 }
 
-void QtQmlAndroidLinearLayoutParams::setWeight(qreal value)
+void QQmlAndroidLinearLayoutParams::setWeight(qreal value)
 {
     if (value != weight()) {
         m_weight = value;
@@ -40,16 +40,16 @@ void QtQmlAndroidLinearLayoutParams::setWeight(qreal value)
     }
 }
 
-QAndroidJniObject QtQmlAndroidLinearLayoutParams::onCreate()
+QAndroidJniObject QQmlAndroidLinearLayoutParams::onCreate()
 {
     return QAndroidJniObject("android/widget/LinearLayout$LayoutParams",
                              "(II)V",
                              MATCH_PARENT, MATCH_PARENT);
 }
 
-void QtQmlAndroidLinearLayoutParams::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidLinearLayoutParams::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidMarginLayoutParams::onInflate(instance);
+    QQmlAndroidMarginLayoutParams::onInflate(instance);
 
     if (!m_gravity.isNull())
         instance.setField<jint>("gravity", m_gravity.value());
diff --git a/src/qmlandroid/widget/qtqmlandroidlinearlayoutparams_p.h b/src/qmlandroid/widget/qtqmlandroidlinearlayoutparams_p.h
index 627ea34..5438884 100644
--- a/src/qmlandroid/widget/qtqmlandroidlinearlayoutparams_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidlinearlayoutparams_p.h
@@ -5,14 +5,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidLinearLayoutParams : public QtQmlAndroidMarginLayoutParams
+class QQmlAndroidLinearLayoutParams : public QQmlAndroidMarginLayoutParams
 {
     Q_OBJECT
     Q_PROPERTY(int gravity READ gravity WRITE setGravity NOTIFY gravityChanged)
     Q_PROPERTY(qreal weight READ weight WRITE setWeight NOTIFY weightChanged)
 
 public:
-    explicit QtQmlAndroidLinearLayoutParams(QtQmlAndroidView *view);
+    explicit QQmlAndroidLinearLayoutParams(QQmlAndroidView *view);
 
     int gravity() const;
     void setGravity(int gravity);
@@ -29,8 +29,8 @@ protected:
     void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
 
 private:
-    QtQmlAndroidOptional<int> m_gravity;
-    QtQmlAndroidOptional<qreal> m_weight;
+    QQmlAndroidOptional<int> m_gravity;
+    QQmlAndroidOptional<qreal> m_weight;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidlistview.cpp b/src/qmlandroid/widget/qtqmlandroidlistview.cpp
index f10e75f..7719734 100644
--- a/src/qmlandroid/widget/qtqmlandroidlistview.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidlistview.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidListView::QtQmlAndroidListView(QtQmlAndroidView *parent) :
-    QtQmlAndroidAdapterView(parent)
+QQmlAndroidListView::QQmlAndroidListView(QQmlAndroidView *parent) :
+    QQmlAndroidAdapterView(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidListView::onCreate()
+QAndroidJniObject QQmlAndroidListView::onCreate()
 {
     return QAndroidJniObject("android/widget/ListView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidListView::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidListView::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidAdapterView::onInflate(instance);
+    QQmlAndroidAdapterView::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidlistview_p.h b/src/qmlandroid/widget/qtqmlandroidlistview_p.h
index a8a5221..7c7fd92 100644
--- a/src/qmlandroid/widget/qtqmlandroidlistview_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidlistview_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidListView : public QtQmlAndroidAdapterView // TODO: AbsListView
+class QQmlAndroidListView : public QQmlAndroidAdapterView // TODO: AbsListView
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidListView(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidListView(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidmarginlayoutparams.cpp b/src/qmlandroid/widget/qtqmlandroidmarginlayoutparams.cpp
index 9a08c88..e1fa751 100644
--- a/src/qmlandroid/widget/qtqmlandroidmarginlayoutparams.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidmarginlayoutparams.cpp
@@ -3,19 +3,19 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidMarginLayoutParams::QtQmlAndroidMarginLayoutParams(QtQmlAndroidView *view) :
-    QtQmlAndroidLayoutParams(view)
+QQmlAndroidMarginLayoutParams::QQmlAndroidMarginLayoutParams(QQmlAndroidView *view) :
+    QQmlAndroidLayoutParams(view)
 {
 }
 
-int QtQmlAndroidMarginLayoutParams::margin() const
+int QQmlAndroidMarginLayoutParams::margin() const
 {
     if (m_margin.isNull())
         return 0;
     return m_margin.value();
 }
 
-void QtQmlAndroidMarginLayoutParams::setMargin(int margin)
+void QQmlAndroidMarginLayoutParams::setMargin(int margin)
 {
     if (m_margin.isNull() || m_margin.value() != margin) {
         m_margin = margin;
@@ -24,14 +24,14 @@ void QtQmlAndroidMarginLayoutParams::setMargin(int margin)
     }
 }
 
-int QtQmlAndroidMarginLayoutParams::topMargin() const
+int QQmlAndroidMarginLayoutParams::topMargin() const
 {
     if (m_topMargin.isNull())
         return margin();
     return m_topMargin.value();
 }
 
-void QtQmlAndroidMarginLayoutParams::setTopMargin(int margin)
+void QQmlAndroidMarginLayoutParams::setTopMargin(int margin)
 {
     if (m_topMargin.isNull() || m_topMargin.value() != margin) {
         m_topMargin = margin;
@@ -40,14 +40,14 @@ void QtQmlAndroidMarginLayoutParams::setTopMargin(int margin)
     }
 }
 
-int QtQmlAndroidMarginLayoutParams::leftMargin() const
+int QQmlAndroidMarginLayoutParams::leftMargin() const
 {
     if (m_leftMargin.isNull())
         return margin();
     return m_leftMargin.value();
 }
 
-void QtQmlAndroidMarginLayoutParams::setLeftMargin(int margin)
+void QQmlAndroidMarginLayoutParams::setLeftMargin(int margin)
 {
     if (m_leftMargin.isNull() || m_leftMargin.value() != margin) {
         m_leftMargin = margin;
@@ -56,14 +56,14 @@ void QtQmlAndroidMarginLayoutParams::setLeftMargin(int margin)
     }
 }
 
-int QtQmlAndroidMarginLayoutParams::rightMargin() const
+int QQmlAndroidMarginLayoutParams::rightMargin() const
 {
     if (m_rightMargin.isNull())
         return margin();
     return m_rightMargin.value();
 }
 
-void QtQmlAndroidMarginLayoutParams::setRightMargin(int margin)
+void QQmlAndroidMarginLayoutParams::setRightMargin(int margin)
 {
     if (m_rightMargin.isNull() || m_rightMargin.value() != margin) {
         m_rightMargin = margin;
@@ -72,14 +72,14 @@ void QtQmlAndroidMarginLayoutParams::setRightMargin(int margin)
     }
 }
 
-int QtQmlAndroidMarginLayoutParams::bottomMargin() const
+int QQmlAndroidMarginLayoutParams::bottomMargin() const
 {
     if (m_bottomMargin.isNull())
         return margin();
     return m_bottomMargin.value();
 }
 
-void QtQmlAndroidMarginLayoutParams::setBottomMargin(int margin)
+void QQmlAndroidMarginLayoutParams::setBottomMargin(int margin)
 {
     if (m_bottomMargin.isNull() || m_bottomMargin.value() != margin) {
         m_bottomMargin = margin;
@@ -88,16 +88,16 @@ void QtQmlAndroidMarginLayoutParams::setBottomMargin(int margin)
     }
 }
 
-QAndroidJniObject QtQmlAndroidMarginLayoutParams::onCreate()
+QAndroidJniObject QQmlAndroidMarginLayoutParams::onCreate()
 {
     return QAndroidJniObject("android/view/ViewGroup$MarginLayoutParams",
                              "(II)V",
                              MATCH_PARENT, MATCH_PARENT);
 }
 
-void QtQmlAndroidMarginLayoutParams::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidMarginLayoutParams::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidLayoutParams::onInflate(instance);
+    QQmlAndroidLayoutParams::onInflate(instance);
 
     instance.callMethod<void>("setMargins",
                               "(IIII)V",
diff --git a/src/qmlandroid/widget/qtqmlandroidmarginlayoutparams_p.h b/src/qmlandroid/widget/qtqmlandroidmarginlayoutparams_p.h
index 1442473..45a7326 100644
--- a/src/qmlandroid/widget/qtqmlandroidmarginlayoutparams_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidmarginlayoutparams_p.h
@@ -5,7 +5,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidMarginLayoutParams : public QtQmlAndroidLayoutParams
+class QQmlAndroidMarginLayoutParams : public QQmlAndroidLayoutParams
 {
     Q_OBJECT
     Q_PROPERTY(int margin READ margin WRITE setMargin NOTIFY marginChanged)
@@ -15,7 +15,7 @@ class QtQmlAndroidMarginLayoutParams : public QtQmlAndroidLayoutParams
     Q_PROPERTY(int bottomMargin READ bottomMargin WRITE setBottomMargin NOTIFY bottomMarginChanged)
 
 public:
-    explicit QtQmlAndroidMarginLayoutParams(QtQmlAndroidView *view);
+    explicit QQmlAndroidMarginLayoutParams(QQmlAndroidView *view);
 
     int margin() const;
     void setMargin(int margin);
@@ -44,11 +44,11 @@ protected:
     void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
 
 private:
-    QtQmlAndroidOptional<int> m_margin;
-    QtQmlAndroidOptional<int> m_topMargin;
-    QtQmlAndroidOptional<int> m_leftMargin;
-    QtQmlAndroidOptional<int> m_rightMargin;
-    QtQmlAndroidOptional<int> m_bottomMargin;
+    QQmlAndroidOptional<int> m_margin;
+    QQmlAndroidOptional<int> m_topMargin;
+    QQmlAndroidOptional<int> m_leftMargin;
+    QQmlAndroidOptional<int> m_rightMargin;
+    QQmlAndroidOptional<int> m_bottomMargin;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidnumberpicker.cpp b/src/qmlandroid/widget/qtqmlandroidnumberpicker.cpp
index e2ed900..d95f0c5 100644
--- a/src/qmlandroid/widget/qtqmlandroidnumberpicker.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidnumberpicker.cpp
@@ -3,23 +3,23 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidNumberPicker::QtQmlAndroidNumberPicker(QtQmlAndroidView *parent) :
-    QtQmlAndroidLinearLayout(parent), m_value(0)
+QQmlAndroidNumberPicker::QQmlAndroidNumberPicker(QQmlAndroidView *parent) :
+    QQmlAndroidLinearLayout(parent), m_value(0)
 {
 }
 
-int QtQmlAndroidNumberPicker::value() const
+int QQmlAndroidNumberPicker::value() const
 {
     return m_value;
 }
 
-void QtQmlAndroidNumberPicker::setValue(int value)
+void QQmlAndroidNumberPicker::setValue(int value)
 {
     if (updateValue(value))
         QtQmlAndroid::callIntMethod(instance(), "setValue", value);
 }
 
-bool QtQmlAndroidNumberPicker::updateValue(int value)
+bool QQmlAndroidNumberPicker::updateValue(int value)
 {
     if (m_value != value) {
         m_value = value;
@@ -29,16 +29,16 @@ bool QtQmlAndroidNumberPicker::updateValue(int value)
     return false;
 }
 
-QAndroidJniObject QtQmlAndroidNumberPicker::onCreate()
+QAndroidJniObject QQmlAndroidNumberPicker::onCreate()
 {
     return QAndroidJniObject("android/widget/NumberPicker",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidNumberPicker::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidNumberPicker::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidLinearLayout::onInflate(instance);
+    QQmlAndroidLinearLayout::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/widget/QtNumberPickerListener",
                                    "(Landroid/widget/NumberPicker;J)V",
@@ -54,7 +54,7 @@ void QtQmlAndroidNumberPicker::onInflate(QAndroidJniObject &instance)
     instance.callMethod<void>("setValue", "(I)V", m_value);
 }
 
-void QtQmlAndroidNumberPicker::onRegisterNativeMethods(jobject listener)
+void QQmlAndroidNumberPicker::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onValueChange", "(JI)V", reinterpret_cast<void *>(onValueChange)}};
 
@@ -64,11 +64,11 @@ void QtQmlAndroidNumberPicker::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QtQmlAndroidNumberPicker::onValueChange(JNIEnv *env, jobject object, jlong instance, jint value)
+void QQmlAndroidNumberPicker::onValueChange(JNIEnv *env, jobject object, jlong instance, jint value)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidNumberPicker *picker = reinterpret_cast<QtQmlAndroidNumberPicker *>(instance);
+    QQmlAndroidNumberPicker *picker = reinterpret_cast<QQmlAndroidNumberPicker *>(instance);
     if (picker)
         QMetaObject::invokeMethod(picker, "updateValue", Qt::QueuedConnection, Q_ARG(int, value));
 }
diff --git a/src/qmlandroid/widget/qtqmlandroidnumberpicker_p.h b/src/qmlandroid/widget/qtqmlandroidnumberpicker_p.h
index d4584b8..4ce23d3 100644
--- a/src/qmlandroid/widget/qtqmlandroidnumberpicker_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidnumberpicker_p.h
@@ -5,13 +5,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidNumberPicker : public QtQmlAndroidLinearLayout
+class QQmlAndroidNumberPicker : public QQmlAndroidLinearLayout
 {
     Q_OBJECT
     Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)
 
 public:
-    explicit QtQmlAndroidNumberPicker(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidNumberPicker(QQmlAndroidView *parent = 0);
 
     int value() const;
     void setValue(int value);
diff --git a/src/qmlandroid/widget/qtqmlandroidpopupmenu.cpp b/src/qmlandroid/widget/qtqmlandroidpopupmenu.cpp
index a6ebf50..9e40d0b 100644
--- a/src/qmlandroid/widget/qtqmlandroidpopupmenu.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidpopupmenu.cpp
@@ -7,28 +7,28 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidPopupMenu::QtQmlAndroidPopupMenu(QObject *parent) :
-    QtQmlAndroidObject(parent), m_anchor(0)
+QQmlAndroidPopupMenu::QQmlAndroidPopupMenu(QObject *parent) :
+    QQmlAndroidObject(parent), m_anchor(0)
 {
 }
 
-QList<QtQmlAndroidMenuItem *> QtQmlAndroidPopupMenu::items() const
+QList<QQmlAndroidMenuItem *> QQmlAndroidPopupMenu::items() const
 {
-    QList<QtQmlAndroidMenuItem *> lst;
+    QList<QQmlAndroidMenuItem *> lst;
     foreach (QObject *child, children()) {
-        QtQmlAndroidMenuItem *item = qobject_cast<QtQmlAndroidMenuItem *>(child);
+        QQmlAndroidMenuItem *item = qobject_cast<QQmlAndroidMenuItem *>(child);
         if (item)
             lst += item;
     }
     return lst;
 }
 
-QtQmlAndroidView *QtQmlAndroidPopupMenu::anchor() const
+QQmlAndroidView *QQmlAndroidPopupMenu::anchor() const
 {
     return m_anchor;
 }
 
-void QtQmlAndroidPopupMenu::setAnchor(QtQmlAndroidView *anchor)
+void QQmlAndroidPopupMenu::setAnchor(QQmlAndroidView *anchor)
 {
     if (m_anchor != anchor) {
         m_anchor = anchor;
@@ -36,14 +36,14 @@ void QtQmlAndroidPopupMenu::setAnchor(QtQmlAndroidView *anchor)
     }
 }
 
-int QtQmlAndroidPopupMenu::gravity() const
+int QQmlAndroidPopupMenu::gravity() const
 {
     if (m_gravity.isNull())
         return 0; // TODO
     return m_gravity.value();
 }
 
-void QtQmlAndroidPopupMenu::setGravity(int value)
+void QQmlAndroidPopupMenu::setGravity(int value)
 {
     if (value != gravity()) {
         m_gravity = value;
@@ -51,15 +51,15 @@ void QtQmlAndroidPopupMenu::setGravity(int value)
     }
 }
 
-void QtQmlAndroidPopupMenu::show()
+void QQmlAndroidPopupMenu::show()
 {
-    QtQmlAndroidView *anchor = m_anchor ? m_anchor : qobject_cast<QtQmlAndroidView *>(parent());
+    QQmlAndroidView *anchor = m_anchor ? m_anchor : qobject_cast<QQmlAndroidView *>(parent());
     if (!anchor) {
         qWarning() << "PopupMenu parent must be either anchored or in a view.";
         return;
     }
 
-    QtQmlAndroidContext *context = anchor->context();
+    QQmlAndroidContext *context = anchor->context();
     if (!context) {
         qWarning() << "PopupMenu is not ready - no context.";
         return;
@@ -82,7 +82,7 @@ void QtQmlAndroidPopupMenu::show()
         inflate(popup);
 
         QAndroidJniObject menu = popup.callObjectMethod("getMenu", "()Landroid/view/Menu;");
-        foreach (QtQmlAndroidMenuItem *item, items()) {
+        foreach (QQmlAndroidMenuItem *item, items()) {
             QAndroidJniObject it = menu.callObjectMethod("add",
                                                          "(Ljava/lang/CharSequence;)Landroid/view/MenuItem;",
                                                          QAndroidJniObject::fromString(item->title()).object());
@@ -93,7 +93,7 @@ void QtQmlAndroidPopupMenu::show()
     });
 }
 
-void QtQmlAndroidPopupMenu::dismiss()
+void QQmlAndroidPopupMenu::dismiss()
 {
     QtQmlAndroid::callVoidMethod(instance(), "dismiss");
 }
diff --git a/src/qmlandroid/widget/qtqmlandroidpopupmenu_p.h b/src/qmlandroid/widget/qtqmlandroidpopupmenu_p.h
index bf50373..c93631b 100644
--- a/src/qmlandroid/widget/qtqmlandroidpopupmenu_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidpopupmenu_p.h
@@ -6,22 +6,22 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidView;
-class QtQmlAndroidMenuItem;
+class QQmlAndroidView;
+class QQmlAndroidMenuItem;
 
-class QtQmlAndroidPopupMenu : public QtQmlAndroidObject
+class QQmlAndroidPopupMenu : public QQmlAndroidObject
 {
     Q_OBJECT
-    Q_PROPERTY(QtQmlAndroidView *anchor READ anchor WRITE setAnchor NOTIFY anchorChanged)
+    Q_PROPERTY(QQmlAndroidView *anchor READ anchor WRITE setAnchor NOTIFY anchorChanged)
     Q_PROPERTY(int gravity READ gravity WRITE setGravity NOTIFY gravityChanged)
 
 public:
-    explicit QtQmlAndroidPopupMenu(QObject *parent = 0);
+    explicit QQmlAndroidPopupMenu(QObject *parent = 0);
 
-    QList<QtQmlAndroidMenuItem *> items() const;
+    QList<QQmlAndroidMenuItem *> items() const;
 
-    QtQmlAndroidView *anchor() const;
-    void setAnchor(QtQmlAndroidView *anchor);
+    QQmlAndroidView *anchor() const;
+    void setAnchor(QQmlAndroidView *anchor);
 
     int gravity() const;
     void setGravity(int gravity);
@@ -37,8 +37,8 @@ Q_SIGNALS:
     void itemClick();
 
 private:
-    QtQmlAndroidView *m_anchor;
-    QtQmlAndroidOptional<int> m_gravity;
+    QQmlAndroidView *m_anchor;
+    QQmlAndroidOptional<int> m_gravity;
     QAndroidJniObject m_listener;
 };
 
diff --git a/src/qmlandroid/widget/qtqmlandroidprogressbar.cpp b/src/qmlandroid/widget/qtqmlandroidprogressbar.cpp
index 1e41d82..4c8e6df 100644
--- a/src/qmlandroid/widget/qtqmlandroidprogressbar.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidprogressbar.cpp
@@ -3,17 +3,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidProgressBar::QtQmlAndroidProgressBar(QtQmlAndroidView *parent) :
-    QtQmlAndroidView(parent), m_max(100), m_progress(0), m_secondary(0), m_indeterminate(false)
+QQmlAndroidProgressBar::QQmlAndroidProgressBar(QQmlAndroidView *parent) :
+    QQmlAndroidView(parent), m_max(100), m_progress(0), m_secondary(0), m_indeterminate(false)
 {
 }
 
-bool QtQmlAndroidProgressBar::isIndeterminate() const
+bool QQmlAndroidProgressBar::isIndeterminate() const
 {
     return m_indeterminate;
 }
 
-void QtQmlAndroidProgressBar::setIndeterminate(bool indeterminate)
+void QQmlAndroidProgressBar::setIndeterminate(bool indeterminate)
 {
     if (m_indeterminate != indeterminate) {
         m_indeterminate = indeterminate;
@@ -22,18 +22,18 @@ void QtQmlAndroidProgressBar::setIndeterminate(bool indeterminate)
     }
 }
 
-int QtQmlAndroidProgressBar::progress() const
+int QQmlAndroidProgressBar::progress() const
 {
     return m_progress;
 }
 
-void QtQmlAndroidProgressBar::setProgress(int progress)
+void QQmlAndroidProgressBar::setProgress(int progress)
 {
     if (updateProgress(progress))
         QtQmlAndroid::callIntMethod(instance(), "setProgress", progress);
 }
 
-bool QtQmlAndroidProgressBar::updateProgress(int progress)
+bool QQmlAndroidProgressBar::updateProgress(int progress)
 {
     if (m_progress != progress) {
         m_progress = progress;
@@ -43,12 +43,12 @@ bool QtQmlAndroidProgressBar::updateProgress(int progress)
     return false;
 }
 
-int QtQmlAndroidProgressBar::secondaryProgress() const
+int QQmlAndroidProgressBar::secondaryProgress() const
 {
     return m_secondary;
 }
 
-void QtQmlAndroidProgressBar::setSecondaryProgress(int progress)
+void QQmlAndroidProgressBar::setSecondaryProgress(int progress)
 {
     if (m_secondary != progress) {
         m_secondary = progress;
@@ -57,12 +57,12 @@ void QtQmlAndroidProgressBar::setSecondaryProgress(int progress)
     }
 }
 
-int QtQmlAndroidProgressBar::max() const
+int QQmlAndroidProgressBar::max() const
 {
     return m_max;
 }
 
-void QtQmlAndroidProgressBar::setMax(int max)
+void QQmlAndroidProgressBar::setMax(int max)
 {
     if (m_max != max) {
         m_max = max;
@@ -71,28 +71,28 @@ void QtQmlAndroidProgressBar::setMax(int max)
     }
 }
 
-QtQmlAndroidProgressBar::Style QtQmlAndroidProgressBar::style() const
+QQmlAndroidProgressBar::Style QQmlAndroidProgressBar::style() const
 {
     if (m_style.isNull())
         return Medium;
     return m_style.value();
 }
 
-void QtQmlAndroidProgressBar::setStyle(Style style)
+void QQmlAndroidProgressBar::setStyle(Style style)
 {
     m_style = style; // TODO: warning after construction or re-construct?
 }
 
-QAndroidJniObject QtQmlAndroidProgressBar::onCreate()
+QAndroidJniObject QQmlAndroidProgressBar::onCreate()
 {
     return QAndroidJniObject("android/widget/ProgressBar",
                              "(Landroid/content/Context;Landroid/util/AttributeSet;I)V",
                              ctx().object(), 0, style());
 }
 
-void QtQmlAndroidProgressBar::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidProgressBar::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidView::onInflate(instance);
+    QQmlAndroidView::onInflate(instance);
 
     if (m_progress > 0)
         instance.callMethod<void>("setProgress", "(I)V", m_progress);
diff --git a/src/qmlandroid/widget/qtqmlandroidprogressbar_p.h b/src/qmlandroid/widget/qtqmlandroidprogressbar_p.h
index f66d871..373f8d2 100644
--- a/src/qmlandroid/widget/qtqmlandroidprogressbar_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidprogressbar_p.h
@@ -6,7 +6,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidProgressBar : public QtQmlAndroidView
+class QQmlAndroidProgressBar : public QQmlAndroidView
 {
     Q_OBJECT
     Q_PROPERTY(bool indeterminate READ isIndeterminate WRITE setIndeterminate NOTIFY indeterminateChanged)
@@ -17,7 +17,7 @@ class QtQmlAndroidProgressBar : public QtQmlAndroidView
     Q_ENUMS(Style)
 
 public:
-    explicit QtQmlAndroidProgressBar(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidProgressBar(QQmlAndroidView *parent = 0);
 
     bool isIndeterminate() const;
     void setIndeterminate(bool indeterminate);
@@ -63,7 +63,7 @@ private:
     int m_progress;
     int m_secondary;
     bool m_indeterminate;
-    QtQmlAndroidOptional<Style> m_style;
+    QQmlAndroidOptional<Style> m_style;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidradiobutton.cpp b/src/qmlandroid/widget/qtqmlandroidradiobutton.cpp
index bf9d57b..2ca0bd9 100644
--- a/src/qmlandroid/widget/qtqmlandroidradiobutton.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidradiobutton.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidRadioButton::QtQmlAndroidRadioButton(QtQmlAndroidView *parent) :
-    QtQmlAndroidCompoundButton(parent)
+QQmlAndroidRadioButton::QQmlAndroidRadioButton(QQmlAndroidView *parent) :
+    QQmlAndroidCompoundButton(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidRadioButton::onCreate()
+QAndroidJniObject QQmlAndroidRadioButton::onCreate()
 {
     return QAndroidJniObject("android/widget/RadioButton",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidRadioButton::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidRadioButton::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidCompoundButton::onInflate(instance);
+    QQmlAndroidCompoundButton::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidradiobutton_p.h b/src/qmlandroid/widget/qtqmlandroidradiobutton_p.h
index 6654949..b38dbad 100644
--- a/src/qmlandroid/widget/qtqmlandroidradiobutton_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidradiobutton_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidRadioButton : public QtQmlAndroidCompoundButton
+class QQmlAndroidRadioButton : public QQmlAndroidCompoundButton
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidRadioButton(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidRadioButton(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidradiogroup.cpp b/src/qmlandroid/widget/qtqmlandroidradiogroup.cpp
index b1556a8..5cae6b2 100644
--- a/src/qmlandroid/widget/qtqmlandroidradiogroup.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidradiogroup.cpp
@@ -4,37 +4,37 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidRadioGroup::QtQmlAndroidRadioGroup(QtQmlAndroidView *parent) :
-    QtQmlAndroidLinearLayout(parent), m_checkedButton(0)
+QQmlAndroidRadioGroup::QQmlAndroidRadioGroup(QQmlAndroidView *parent) :
+    QQmlAndroidLinearLayout(parent), m_checkedButton(0)
 {
 }
 
-QtQmlAndroidRadioButton *QtQmlAndroidRadioGroup::checkedButton() const
+QQmlAndroidRadioButton *QQmlAndroidRadioGroup::checkedButton() const
 {
     return m_checkedButton;
 }
 
-void QtQmlAndroidRadioGroup::setCheckedButton(QtQmlAndroidRadioButton *button)
+void QQmlAndroidRadioGroup::setCheckedButton(QQmlAndroidRadioButton *button)
 {
     if (updateCheckedButton(button))
         QtQmlAndroid::callIntMethod(instance(), "check", button ? button->identifier() : -1);
 }
 
-void QtQmlAndroidRadioGroup::clearCheck()
+void QQmlAndroidRadioGroup::clearCheck()
 {
     QtQmlAndroid::callVoidMethod(instance(), "clearCheck");
 }
 
-QAndroidJniObject QtQmlAndroidRadioGroup::onCreate()
+QAndroidJniObject QQmlAndroidRadioGroup::onCreate()
 {
     return QAndroidJniObject("android/widget/RadioGroup",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidRadioGroup::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidRadioGroup::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidLinearLayout::onInflate(instance);
+    QQmlAndroidLinearLayout::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/widget/QtRadioGroupListener",
                                    "(Landroid/widget/RadioGroup;J)V",
@@ -51,7 +51,7 @@ void QtQmlAndroidRadioGroup::onInflate(QAndroidJniObject &instance)
     QMetaObject::invokeMethod(this, "updateCheckedButtonId", Qt::QueuedConnection, Q_ARG(int, checkedId));
 }
 
-void QtQmlAndroidRadioGroup::onRegisterNativeMethods(jobject listener)
+void QQmlAndroidRadioGroup::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onCheckedChanged", "(JI)V", reinterpret_cast<void *>(onCheckedChanged)}};
 
@@ -61,19 +61,19 @@ void QtQmlAndroidRadioGroup::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QtQmlAndroidRadioGroup::onCheckedChanged(JNIEnv *env, jobject object, jlong instance, jint checkedId)
+void QQmlAndroidRadioGroup::onCheckedChanged(JNIEnv *env, jobject object, jlong instance, jint checkedId)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidRadioGroup *group = reinterpret_cast<QtQmlAndroidRadioGroup *>(instance);
+    QQmlAndroidRadioGroup *group = reinterpret_cast<QQmlAndroidRadioGroup *>(instance);
     if (group)
         QMetaObject::invokeMethod(group, "updateCheckedButtonId", Qt::QueuedConnection, Q_ARG(int, checkedId));
 }
 
-void QtQmlAndroidRadioGroup::updateCheckedButtonId(int checkedId)
+void QQmlAndroidRadioGroup::updateCheckedButtonId(int checkedId)
 {
     foreach (QObject *child, QObject::children()) {
-        QtQmlAndroidRadioButton *button = qobject_cast<QtQmlAndroidRadioButton *>(child);
+        QQmlAndroidRadioButton *button = qobject_cast<QQmlAndroidRadioButton *>(child);
         if (button && button->identifier() == checkedId) {
             updateCheckedButton(button);
             return;
@@ -82,7 +82,7 @@ void QtQmlAndroidRadioGroup::updateCheckedButtonId(int checkedId)
     updateCheckedButton(0);
 }
 
-bool QtQmlAndroidRadioGroup::updateCheckedButton(QtQmlAndroidRadioButton *button)
+bool QQmlAndroidRadioGroup::updateCheckedButton(QQmlAndroidRadioButton *button)
 {
     if (m_checkedButton != button) {
         m_checkedButton = button;
diff --git a/src/qmlandroid/widget/qtqmlandroidradiogroup_p.h b/src/qmlandroid/widget/qtqmlandroidradiogroup_p.h
index e40ee80..b981045 100644
--- a/src/qmlandroid/widget/qtqmlandroidradiogroup_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidradiogroup_p.h
@@ -5,18 +5,18 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidRadioButton;
+class QQmlAndroidRadioButton;
 
-class QtQmlAndroidRadioGroup : public QtQmlAndroidLinearLayout
+class QQmlAndroidRadioGroup : public QQmlAndroidLinearLayout
 {
     Q_OBJECT
-    Q_PROPERTY(QtQmlAndroidRadioButton *checkedButton READ checkedButton WRITE setCheckedButton NOTIFY checkedButtonChanged)
+    Q_PROPERTY(QQmlAndroidRadioButton *checkedButton READ checkedButton WRITE setCheckedButton NOTIFY checkedButtonChanged)
 
 public:
-    explicit QtQmlAndroidRadioGroup(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidRadioGroup(QQmlAndroidView *parent = 0);
 
-    QtQmlAndroidRadioButton *checkedButton() const;
-    void setCheckedButton(QtQmlAndroidRadioButton *button);
+    QQmlAndroidRadioButton *checkedButton() const;
+    void setCheckedButton(QQmlAndroidRadioButton *button);
 
 public Q_SLOTS:
     void clearCheck();
@@ -33,11 +33,11 @@ protected:
 
 private Q_SLOTS:
     void updateCheckedButtonId(int checkedId);
-    bool updateCheckedButton(QtQmlAndroidRadioButton *button);
+    bool updateCheckedButton(QQmlAndroidRadioButton *button);
 
 private:
     QAndroidJniObject m_listener;
-    QtQmlAndroidRadioButton* m_checkedButton;
+    QQmlAndroidRadioButton* m_checkedButton;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidratingbar.cpp b/src/qmlandroid/widget/qtqmlandroidratingbar.cpp
index 2d3ca61..d68628b 100644
--- a/src/qmlandroid/widget/qtqmlandroidratingbar.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidratingbar.cpp
@@ -3,23 +3,23 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidRatingBar::QtQmlAndroidRatingBar(QtQmlAndroidView *parent) :
-    QtQmlAndroidAbsSeekBar(parent), m_rating(0.0)
+QQmlAndroidRatingBar::QQmlAndroidRatingBar(QQmlAndroidView *parent) :
+    QQmlAndroidAbsSeekBar(parent), m_rating(0.0)
 {
 }
 
-qreal QtQmlAndroidRatingBar::rating() const
+qreal QQmlAndroidRatingBar::rating() const
 {
     return m_rating;
 }
 
-void QtQmlAndroidRatingBar::setRating(qreal rating)
+void QQmlAndroidRatingBar::setRating(qreal rating)
 {
     if (updateRating(rating))
         QtQmlAndroid::callRealMethod(instance(), "setRating", rating);
 }
 
-bool QtQmlAndroidRatingBar::updateRating(qreal rating)
+bool QQmlAndroidRatingBar::updateRating(qreal rating)
 {
     if (!qFuzzyCompare(m_rating, rating)) {
         m_rating = rating;
@@ -29,16 +29,16 @@ bool QtQmlAndroidRatingBar::updateRating(qreal rating)
     return false;
 }
 
-QAndroidJniObject QtQmlAndroidRatingBar::onCreate()
+QAndroidJniObject QQmlAndroidRatingBar::onCreate()
 {
     return QAndroidJniObject("android/widget/RatingBar",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidRatingBar::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidRatingBar::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidAbsSeekBar::onInflate(instance);
+    QQmlAndroidAbsSeekBar::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/widget/QtRatingBarListener",
                                    "(Landroid/widget/RatingBar;J)V",
@@ -54,7 +54,7 @@ void QtQmlAndroidRatingBar::onInflate(QAndroidJniObject &instance)
     instance.callMethod<void>("setRating", "(F)V", m_rating);
 }
 
-void QtQmlAndroidRatingBar::onRegisterNativeMethods(jobject listener)
+void QQmlAndroidRatingBar::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onRatingChanged", "(JFZ)V", reinterpret_cast<void *>(onRatingChanged)}};
 
@@ -64,11 +64,11 @@ void QtQmlAndroidRatingBar::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QtQmlAndroidRatingBar::onRatingChanged(JNIEnv *env, jobject object, jlong instance, jfloat rating, jboolean fromUser)
+void QQmlAndroidRatingBar::onRatingChanged(JNIEnv *env, jobject object, jlong instance, jfloat rating, jboolean fromUser)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidRatingBar *bar = reinterpret_cast<QtQmlAndroidRatingBar *>(instance);
+    QQmlAndroidRatingBar *bar = reinterpret_cast<QQmlAndroidRatingBar *>(instance);
     if (bar && fromUser)
         QMetaObject::invokeMethod(bar, "updateRating", Qt::QueuedConnection, Q_ARG(qreal, rating));
 }
diff --git a/src/qmlandroid/widget/qtqmlandroidratingbar_p.h b/src/qmlandroid/widget/qtqmlandroidratingbar_p.h
index c7b693c..e5a7adc 100644
--- a/src/qmlandroid/widget/qtqmlandroidratingbar_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidratingbar_p.h
@@ -5,13 +5,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidRatingBar : public QtQmlAndroidAbsSeekBar
+class QQmlAndroidRatingBar : public QQmlAndroidAbsSeekBar
 {
     Q_OBJECT
     Q_PROPERTY(qreal rating READ rating WRITE setRating NOTIFY ratingChanged)
 
 public:
-    explicit QtQmlAndroidRatingBar(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidRatingBar(QQmlAndroidView *parent = 0);
 
     qreal rating() const;
     void setRating(qreal rating);
diff --git a/src/qmlandroid/widget/qtqmlandroidrelativelayout.cpp b/src/qmlandroid/widget/qtqmlandroidrelativelayout.cpp
index 62be26a..3637e55 100644
--- a/src/qmlandroid/widget/qtqmlandroidrelativelayout.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidrelativelayout.cpp
@@ -2,29 +2,29 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidRelativeLayout::QtQmlAndroidRelativeLayout(QtQmlAndroidView *parent) :
-    QtQmlAndroidViewGroup(parent)
+QQmlAndroidRelativeLayout::QQmlAndroidRelativeLayout(QQmlAndroidView *parent) :
+    QQmlAndroidViewGroup(parent)
 {
 }
 
-QtQmlAndroidRelativeLayoutParams *QtQmlAndroidRelativeLayout::qmlAttachedProperties(QObject *object)
+QQmlAndroidRelativeLayoutParams *QQmlAndroidRelativeLayout::qmlAttachedProperties(QObject *object)
 {
-    QtQmlAndroidView *view = qobject_cast<QtQmlAndroidView*>(object);
+    QQmlAndroidView *view = qobject_cast<QQmlAndroidView*>(object);
     if (view)
-        return new QtQmlAndroidRelativeLayoutParams(view);
+        return new QQmlAndroidRelativeLayoutParams(view);
     return 0;
 }
 
-QAndroidJniObject QtQmlAndroidRelativeLayout::onCreate()
+QAndroidJniObject QQmlAndroidRelativeLayout::onCreate()
 {
     return QAndroidJniObject("android/widget/RelativeLayout",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidRelativeLayout::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidRelativeLayout::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidViewGroup::onInflate(instance);
+    QQmlAndroidViewGroup::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidrelativelayout_p.h b/src/qmlandroid/widget/qtqmlandroidrelativelayout_p.h
index c8d2871..981c874 100644
--- a/src/qmlandroid/widget/qtqmlandroidrelativelayout_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidrelativelayout_p.h
@@ -6,14 +6,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidRelativeLayout : public QtQmlAndroidViewGroup
+class QQmlAndroidRelativeLayout : public QQmlAndroidViewGroup
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidRelativeLayout(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidRelativeLayout(QQmlAndroidView *parent = 0);
 
-    static QtQmlAndroidRelativeLayoutParams *qmlAttachedProperties(QObject *object);
+    static QQmlAndroidRelativeLayoutParams *qmlAttachedProperties(QObject *object);
 
     enum Verb {
         LEFT_OF                  = 0,
@@ -47,6 +47,6 @@ protected:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QtQmlAndroidRelativeLayout, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QQmlAndroidRelativeLayout, QML_HAS_ATTACHED_PROPERTIES)
 
 #endif // QTQMLANDROIDRELATIVELAYOUT_P_H
diff --git a/src/qmlandroid/widget/qtqmlandroidrelativelayoutparams.cpp b/src/qmlandroid/widget/qtqmlandroidrelativelayoutparams.cpp
index adb15fb..ae86607 100644
--- a/src/qmlandroid/widget/qtqmlandroidrelativelayoutparams.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidrelativelayoutparams.cpp
@@ -4,8 +4,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidRelativeLayoutParams::QtQmlAndroidRelativeLayoutParams(QtQmlAndroidView *view) :
-    QtQmlAndroidMarginLayoutParams(view),
+QQmlAndroidRelativeLayoutParams::QQmlAndroidRelativeLayoutParams(QQmlAndroidView *view) :
+    QQmlAndroidMarginLayoutParams(view),
     m_above(0),
     m_below(0),
     m_alignTop(0),
@@ -32,12 +32,12 @@ QtQmlAndroidRelativeLayoutParams::QtQmlAndroidRelativeLayoutParams(QtQmlAndroidV
 {
 }
 
-QtQmlAndroidView *QtQmlAndroidRelativeLayoutParams::above() const
+QQmlAndroidView *QQmlAndroidRelativeLayoutParams::above() const
 {
     return m_above;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setAbove(QtQmlAndroidView *view)
+void QQmlAndroidRelativeLayoutParams::setAbove(QQmlAndroidView *view)
 {
     if (view != m_above) {
         m_above = view;
@@ -46,12 +46,12 @@ void QtQmlAndroidRelativeLayoutParams::setAbove(QtQmlAndroidView *view)
     }
 }
 
-QtQmlAndroidView *QtQmlAndroidRelativeLayoutParams::below() const
+QQmlAndroidView *QQmlAndroidRelativeLayoutParams::below() const
 {
     return m_below;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setBelow(QtQmlAndroidView *view)
+void QQmlAndroidRelativeLayoutParams::setBelow(QQmlAndroidView *view)
 {
     if (view != m_below) {
         m_below = view;
@@ -60,12 +60,12 @@ void QtQmlAndroidRelativeLayoutParams::setBelow(QtQmlAndroidView *view)
     }
 }
 
-QtQmlAndroidView *QtQmlAndroidRelativeLayoutParams::alignTop() const
+QQmlAndroidView *QQmlAndroidRelativeLayoutParams::alignTop() const
 {
     return m_alignTop;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setAlignTop(QtQmlAndroidView *view)
+void QQmlAndroidRelativeLayoutParams::setAlignTop(QQmlAndroidView *view)
 {
     if (view != m_alignTop) {
         m_alignTop = view;
@@ -74,12 +74,12 @@ void QtQmlAndroidRelativeLayoutParams::setAlignTop(QtQmlAndroidView *view)
     }
 }
 
-QtQmlAndroidView *QtQmlAndroidRelativeLayoutParams::alignLeft() const
+QQmlAndroidView *QQmlAndroidRelativeLayoutParams::alignLeft() const
 {
     return m_alignLeft;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setAlignLeft(QtQmlAndroidView *view)
+void QQmlAndroidRelativeLayoutParams::setAlignLeft(QQmlAndroidView *view)
 {
     if (view != m_alignLeft) {
         m_alignLeft = view;
@@ -88,12 +88,12 @@ void QtQmlAndroidRelativeLayoutParams::setAlignLeft(QtQmlAndroidView *view)
     }
 }
 
-QtQmlAndroidView *QtQmlAndroidRelativeLayoutParams::alignRight() const
+QQmlAndroidView *QQmlAndroidRelativeLayoutParams::alignRight() const
 {
     return m_alignRight;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setAlignRight(QtQmlAndroidView *view)
+void QQmlAndroidRelativeLayoutParams::setAlignRight(QQmlAndroidView *view)
 {
     if (view != m_alignRight) {
         m_alignRight = view;
@@ -102,12 +102,12 @@ void QtQmlAndroidRelativeLayoutParams::setAlignRight(QtQmlAndroidView *view)
     }
 }
 
-QtQmlAndroidView *QtQmlAndroidRelativeLayoutParams::alignBottom() const
+QQmlAndroidView *QQmlAndroidRelativeLayoutParams::alignBottom() const
 {
     return m_alignBottom;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setAlignBottom(QtQmlAndroidView *view)
+void QQmlAndroidRelativeLayoutParams::setAlignBottom(QQmlAndroidView *view)
 {
     if (view != m_alignBottom) {
         m_alignBottom = view;
@@ -116,12 +116,12 @@ void QtQmlAndroidRelativeLayoutParams::setAlignBottom(QtQmlAndroidView *view)
     }
 }
 
-QtQmlAndroidView *QtQmlAndroidRelativeLayoutParams::alignStart() const
+QQmlAndroidView *QQmlAndroidRelativeLayoutParams::alignStart() const
 {
     return m_alignStart;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setAlignStart(QtQmlAndroidView *view)
+void QQmlAndroidRelativeLayoutParams::setAlignStart(QQmlAndroidView *view)
 {
     if (view != m_alignStart) {
         m_alignStart = view;
@@ -130,12 +130,12 @@ void QtQmlAndroidRelativeLayoutParams::setAlignStart(QtQmlAndroidView *view)
     }
 }
 
-QtQmlAndroidView *QtQmlAndroidRelativeLayoutParams::alignEnd() const
+QQmlAndroidView *QQmlAndroidRelativeLayoutParams::alignEnd() const
 {
     return m_alignEnd;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setAlignEnd(QtQmlAndroidView *view)
+void QQmlAndroidRelativeLayoutParams::setAlignEnd(QQmlAndroidView *view)
 {
     if (view != m_alignEnd) {
         m_alignEnd = view;
@@ -144,12 +144,12 @@ void QtQmlAndroidRelativeLayoutParams::setAlignEnd(QtQmlAndroidView *view)
     }
 }
 
-QtQmlAndroidView *QtQmlAndroidRelativeLayoutParams::alignBaseline() const
+QQmlAndroidView *QQmlAndroidRelativeLayoutParams::alignBaseline() const
 {
     return m_alignBaseline;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setAlignBaseline(QtQmlAndroidView *view)
+void QQmlAndroidRelativeLayoutParams::setAlignBaseline(QQmlAndroidView *view)
 {
     if (view != m_alignBaseline) {
         m_alignBaseline = view;
@@ -158,12 +158,12 @@ void QtQmlAndroidRelativeLayoutParams::setAlignBaseline(QtQmlAndroidView *view)
     }
 }
 
-QtQmlAndroidView *QtQmlAndroidRelativeLayoutParams::toLeftOf() const
+QQmlAndroidView *QQmlAndroidRelativeLayoutParams::toLeftOf() const
 {
     return m_toLeftOf;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setToLeftOf(QtQmlAndroidView *view)
+void QQmlAndroidRelativeLayoutParams::setToLeftOf(QQmlAndroidView *view)
 {
     if (view != m_toLeftOf) {
         m_toLeftOf = view;
@@ -172,12 +172,12 @@ void QtQmlAndroidRelativeLayoutParams::setToLeftOf(QtQmlAndroidView *view)
     }
 }
 
-QtQmlAndroidView *QtQmlAndroidRelativeLayoutParams::toRightOf() const
+QQmlAndroidView *QQmlAndroidRelativeLayoutParams::toRightOf() const
 {
     return m_toRightOf;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setToRightOf(QtQmlAndroidView *view)
+void QQmlAndroidRelativeLayoutParams::setToRightOf(QQmlAndroidView *view)
 {
     if (view != m_toRightOf) {
         m_toRightOf = view;
@@ -186,12 +186,12 @@ void QtQmlAndroidRelativeLayoutParams::setToRightOf(QtQmlAndroidView *view)
     }
 }
 
-QtQmlAndroidView *QtQmlAndroidRelativeLayoutParams::toStartOf() const
+QQmlAndroidView *QQmlAndroidRelativeLayoutParams::toStartOf() const
 {
     return m_toStartOf;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setToStartOf(QtQmlAndroidView *view)
+void QQmlAndroidRelativeLayoutParams::setToStartOf(QQmlAndroidView *view)
 {
     if (view != m_toStartOf) {
         m_toStartOf = view;
@@ -200,12 +200,12 @@ void QtQmlAndroidRelativeLayoutParams::setToStartOf(QtQmlAndroidView *view)
     }
 }
 
-QtQmlAndroidView *QtQmlAndroidRelativeLayoutParams::toEndOf() const
+QQmlAndroidView *QQmlAndroidRelativeLayoutParams::toEndOf() const
 {
     return m_toEndOf;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setToEndOf(QtQmlAndroidView *view)
+void QQmlAndroidRelativeLayoutParams::setToEndOf(QQmlAndroidView *view)
 {
     if (view != m_toEndOf) {
         m_toEndOf = view;
@@ -214,12 +214,12 @@ void QtQmlAndroidRelativeLayoutParams::setToEndOf(QtQmlAndroidView *view)
     }
 }
 
-bool QtQmlAndroidRelativeLayoutParams::alignParentTop() const
+bool QQmlAndroidRelativeLayoutParams::alignParentTop() const
 {
     return m_alignParentTop;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setAlignParentTop(bool align)
+void QQmlAndroidRelativeLayoutParams::setAlignParentTop(bool align)
 {
     if (align != alignParentTop()) {
         m_alignParentTop = align;
@@ -228,12 +228,12 @@ void QtQmlAndroidRelativeLayoutParams::setAlignParentTop(bool align)
     }
 }
 
-bool QtQmlAndroidRelativeLayoutParams::alignParentLeft() const
+bool QQmlAndroidRelativeLayoutParams::alignParentLeft() const
 {
     return m_alignParentLeft;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setAlignParentLeft(bool align)
+void QQmlAndroidRelativeLayoutParams::setAlignParentLeft(bool align)
 {
     if (align != alignParentLeft()) {
         m_alignParentLeft = align;
@@ -242,12 +242,12 @@ void QtQmlAndroidRelativeLayoutParams::setAlignParentLeft(bool align)
     }
 }
 
-bool QtQmlAndroidRelativeLayoutParams::alignParentRight() const
+bool QQmlAndroidRelativeLayoutParams::alignParentRight() const
 {
     return m_alignParentRight;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setAlignParentRight(bool align)
+void QQmlAndroidRelativeLayoutParams::setAlignParentRight(bool align)
 {
     if (align != alignParentRight()) {
         m_alignParentRight = align;
@@ -256,12 +256,12 @@ void QtQmlAndroidRelativeLayoutParams::setAlignParentRight(bool align)
     }
 }
 
-bool QtQmlAndroidRelativeLayoutParams::alignParentBottom() const
+bool QQmlAndroidRelativeLayoutParams::alignParentBottom() const
 {
     return m_alignParentBottom;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setAlignParentBottom(bool align)
+void QQmlAndroidRelativeLayoutParams::setAlignParentBottom(bool align)
 {
     if (align != alignParentBottom()) {
         m_alignParentBottom = align;
@@ -270,12 +270,12 @@ void QtQmlAndroidRelativeLayoutParams::setAlignParentBottom(bool align)
     }
 }
 
-bool QtQmlAndroidRelativeLayoutParams::alignParentStart() const
+bool QQmlAndroidRelativeLayoutParams::alignParentStart() const
 {
     return m_alignParentStart;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setAlignParentStart(bool align)
+void QQmlAndroidRelativeLayoutParams::setAlignParentStart(bool align)
 {
     if (align != alignParentStart()) {
         m_alignParentStart = align;
@@ -284,12 +284,12 @@ void QtQmlAndroidRelativeLayoutParams::setAlignParentStart(bool align)
     }
 }
 
-bool QtQmlAndroidRelativeLayoutParams::alignParentEnd() const
+bool QQmlAndroidRelativeLayoutParams::alignParentEnd() const
 {
     return m_alignParentEnd;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setAlignParentEnd(bool align)
+void QQmlAndroidRelativeLayoutParams::setAlignParentEnd(bool align)
 {
     if (align != alignParentEnd()) {
         m_alignParentEnd = align;
@@ -298,12 +298,12 @@ void QtQmlAndroidRelativeLayoutParams::setAlignParentEnd(bool align)
     }
 }
 
-bool QtQmlAndroidRelativeLayoutParams::alignWithParent() const
+bool QQmlAndroidRelativeLayoutParams::alignWithParent() const
 {
     return m_alignWithParent;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setAlignWithParent(bool align)
+void QQmlAndroidRelativeLayoutParams::setAlignWithParent(bool align)
 {
     if (align != alignWithParent()) {
         m_alignWithParent = align;
@@ -312,12 +312,12 @@ void QtQmlAndroidRelativeLayoutParams::setAlignWithParent(bool align)
     }
 }
 
-bool QtQmlAndroidRelativeLayoutParams::centerHorizontal() const
+bool QQmlAndroidRelativeLayoutParams::centerHorizontal() const
 {
     return m_centerHorizontal;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setCenterHorizontal(bool center)
+void QQmlAndroidRelativeLayoutParams::setCenterHorizontal(bool center)
 {
     if (center != centerHorizontal()) {
         m_centerHorizontal = center;
@@ -326,12 +326,12 @@ void QtQmlAndroidRelativeLayoutParams::setCenterHorizontal(bool center)
     }
 }
 
-bool QtQmlAndroidRelativeLayoutParams::centerVertical() const
+bool QQmlAndroidRelativeLayoutParams::centerVertical() const
 {
     return m_centerVertical;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setCenterVertical(bool center)
+void QQmlAndroidRelativeLayoutParams::setCenterVertical(bool center)
 {
     if (center != centerVertical()) {
         m_centerVertical = center;
@@ -340,12 +340,12 @@ void QtQmlAndroidRelativeLayoutParams::setCenterVertical(bool center)
     }
 }
 
-bool QtQmlAndroidRelativeLayoutParams::centerInParent() const
+bool QQmlAndroidRelativeLayoutParams::centerInParent() const
 {
     return m_centerInParent;
 }
 
-void QtQmlAndroidRelativeLayoutParams::setCenterInParent(bool center)
+void QQmlAndroidRelativeLayoutParams::setCenterInParent(bool center)
 {
     if (center != centerInParent()) {
         m_centerInParent = center;
@@ -354,14 +354,14 @@ void QtQmlAndroidRelativeLayoutParams::setCenterInParent(bool center)
     }
 }
 
-QAndroidJniObject QtQmlAndroidRelativeLayoutParams::onCreate()
+QAndroidJniObject QQmlAndroidRelativeLayoutParams::onCreate()
 {
     return QAndroidJniObject("android/widget/RelativeLayout$LayoutParams",
                              "(II)V",
                              WRAP_CONTENT, WRAP_CONTENT);
 }
 
-static void addRule(QAndroidJniObject& instance, QtQmlAndroidView *view, QtQmlAndroidRelativeLayout::Verb verb)
+static void addRule(QAndroidJniObject& instance, QQmlAndroidView *view, QQmlAndroidRelativeLayout::Verb verb)
 {
     if (view) {
         int anchor = view->instance().callMethod<jint>("getId");
@@ -369,41 +369,41 @@ static void addRule(QAndroidJniObject& instance, QtQmlAndroidView *view, QtQmlAn
     }
 }
 
-static void addRule(QAndroidJniObject &instance, bool value, QtQmlAndroidRelativeLayout::Verb verb)
+static void addRule(QAndroidJniObject &instance, bool value, QQmlAndroidRelativeLayout::Verb verb)
 {
     if (value)
         instance.callMethod<void>("addRule", "(I)V", verb);
 }
 
-void QtQmlAndroidRelativeLayoutParams::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidRelativeLayoutParams::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidMarginLayoutParams::onInflate(instance);
+    QQmlAndroidMarginLayoutParams::onInflate(instance);
 
     instance.setField<jboolean>("alignWithParent", m_alignWithParent);
 
-    addRule(instance, m_above, QtQmlAndroidRelativeLayout::ABOVE);
-    addRule(instance, m_below, QtQmlAndroidRelativeLayout::BELOW);
-    addRule(instance, m_alignTop, QtQmlAndroidRelativeLayout::ALIGN_TOP);
-    addRule(instance, m_alignLeft, QtQmlAndroidRelativeLayout::ALIGN_LEFT);
-    addRule(instance, m_alignRight, QtQmlAndroidRelativeLayout::ALIGN_RIGHT);
-    addRule(instance, m_alignBottom, QtQmlAndroidRelativeLayout::ALIGN_BOTTOM);
-    addRule(instance, m_alignStart, QtQmlAndroidRelativeLayout::ALIGN_START);
-    addRule(instance, m_alignEnd, QtQmlAndroidRelativeLayout::ALIGN_END);
-    addRule(instance, m_alignBaseline, QtQmlAndroidRelativeLayout::ALIGN_BASELINE);
-    addRule(instance, m_toLeftOf, QtQmlAndroidRelativeLayout::LEFT_OF);
-    addRule(instance, m_toRightOf, QtQmlAndroidRelativeLayout::RIGHT_OF);
-    addRule(instance, m_toStartOf, QtQmlAndroidRelativeLayout::START_OF);
-    addRule(instance, m_toEndOf, QtQmlAndroidRelativeLayout::END_OF);
-
-    addRule(instance, m_alignParentTop, QtQmlAndroidRelativeLayout::ALIGN_PARENT_TOP);
-    addRule(instance, m_alignParentLeft, QtQmlAndroidRelativeLayout::ALIGN_PARENT_LEFT);
-    addRule(instance, m_alignParentRight, QtQmlAndroidRelativeLayout::ALIGN_PARENT_RIGHT);
-    addRule(instance, m_alignParentBottom, QtQmlAndroidRelativeLayout::ALIGN_PARENT_BOTTOM);
-    addRule(instance, m_alignParentStart, QtQmlAndroidRelativeLayout::ALIGN_PARENT_START);
-    addRule(instance, m_alignParentEnd, QtQmlAndroidRelativeLayout::ALIGN_PARENT_END);
-    addRule(instance, m_centerHorizontal, QtQmlAndroidRelativeLayout::CENTER_HORIZONTAL);
-    addRule(instance, m_centerVertical, QtQmlAndroidRelativeLayout::CENTER_VERTICAL);
-    addRule(instance, m_centerInParent, QtQmlAndroidRelativeLayout::CENTER_IN_PARENT);
+    addRule(instance, m_above, QQmlAndroidRelativeLayout::ABOVE);
+    addRule(instance, m_below, QQmlAndroidRelativeLayout::BELOW);
+    addRule(instance, m_alignTop, QQmlAndroidRelativeLayout::ALIGN_TOP);
+    addRule(instance, m_alignLeft, QQmlAndroidRelativeLayout::ALIGN_LEFT);
+    addRule(instance, m_alignRight, QQmlAndroidRelativeLayout::ALIGN_RIGHT);
+    addRule(instance, m_alignBottom, QQmlAndroidRelativeLayout::ALIGN_BOTTOM);
+    addRule(instance, m_alignStart, QQmlAndroidRelativeLayout::ALIGN_START);
+    addRule(instance, m_alignEnd, QQmlAndroidRelativeLayout::ALIGN_END);
+    addRule(instance, m_alignBaseline, QQmlAndroidRelativeLayout::ALIGN_BASELINE);
+    addRule(instance, m_toLeftOf, QQmlAndroidRelativeLayout::LEFT_OF);
+    addRule(instance, m_toRightOf, QQmlAndroidRelativeLayout::RIGHT_OF);
+    addRule(instance, m_toStartOf, QQmlAndroidRelativeLayout::START_OF);
+    addRule(instance, m_toEndOf, QQmlAndroidRelativeLayout::END_OF);
+
+    addRule(instance, m_alignParentTop, QQmlAndroidRelativeLayout::ALIGN_PARENT_TOP);
+    addRule(instance, m_alignParentLeft, QQmlAndroidRelativeLayout::ALIGN_PARENT_LEFT);
+    addRule(instance, m_alignParentRight, QQmlAndroidRelativeLayout::ALIGN_PARENT_RIGHT);
+    addRule(instance, m_alignParentBottom, QQmlAndroidRelativeLayout::ALIGN_PARENT_BOTTOM);
+    addRule(instance, m_alignParentStart, QQmlAndroidRelativeLayout::ALIGN_PARENT_START);
+    addRule(instance, m_alignParentEnd, QQmlAndroidRelativeLayout::ALIGN_PARENT_END);
+    addRule(instance, m_centerHorizontal, QQmlAndroidRelativeLayout::CENTER_HORIZONTAL);
+    addRule(instance, m_centerVertical, QQmlAndroidRelativeLayout::CENTER_VERTICAL);
+    addRule(instance, m_centerInParent, QQmlAndroidRelativeLayout::CENTER_IN_PARENT);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidrelativelayoutparams_p.h b/src/qmlandroid/widget/qtqmlandroidrelativelayoutparams_p.h
index 8e0496d..3387212 100644
--- a/src/qmlandroid/widget/qtqmlandroidrelativelayoutparams_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidrelativelayoutparams_p.h
@@ -5,22 +5,22 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidRelativeLayoutParams : public QtQmlAndroidMarginLayoutParams
+class QQmlAndroidRelativeLayoutParams : public QQmlAndroidMarginLayoutParams
 {
     Q_OBJECT
-    Q_PROPERTY(QtQmlAndroidView *above READ above WRITE setAbove NOTIFY aboveChanged)
-    Q_PROPERTY(QtQmlAndroidView *below READ below WRITE setBelow NOTIFY belowChanged)
-    Q_PROPERTY(QtQmlAndroidView *alignTop READ alignTop WRITE setAlignTop NOTIFY alignTopChanged)
-    Q_PROPERTY(QtQmlAndroidView *alignLeft READ alignLeft WRITE setAlignLeft NOTIFY alignLeftChanged)
-    Q_PROPERTY(QtQmlAndroidView *alignRight READ alignRight WRITE setAlignRight NOTIFY alignRightChanged)
-    Q_PROPERTY(QtQmlAndroidView *alignBottom READ alignBottom WRITE setAlignBottom NOTIFY alignBottomChanged)
-    Q_PROPERTY(QtQmlAndroidView *alignStart READ alignStart WRITE setAlignStart NOTIFY alignStartChanged)
-    Q_PROPERTY(QtQmlAndroidView *alignEnd READ alignEnd WRITE setAlignEnd NOTIFY alignEndChanged)
-    Q_PROPERTY(QtQmlAndroidView *alignBaseline READ alignBaseline WRITE setAlignBaseline NOTIFY alignBaselineChanged)
-    Q_PROPERTY(QtQmlAndroidView *toLeftOf READ toLeftOf WRITE setToLeftOf NOTIFY toLeftOfChanged)
-    Q_PROPERTY(QtQmlAndroidView *toRightOf READ toRightOf WRITE setToRightOf NOTIFY toRightOfChanged)
-    Q_PROPERTY(QtQmlAndroidView *toStartOf READ toStartOf WRITE setToStartOf NOTIFY toStartOfChanged)
-    Q_PROPERTY(QtQmlAndroidView *toEndOf READ toEndOf WRITE setToEndOf NOTIFY toEndOfChanged)
+    Q_PROPERTY(QQmlAndroidView *above READ above WRITE setAbove NOTIFY aboveChanged)
+    Q_PROPERTY(QQmlAndroidView *below READ below WRITE setBelow NOTIFY belowChanged)
+    Q_PROPERTY(QQmlAndroidView *alignTop READ alignTop WRITE setAlignTop NOTIFY alignTopChanged)
+    Q_PROPERTY(QQmlAndroidView *alignLeft READ alignLeft WRITE setAlignLeft NOTIFY alignLeftChanged)
+    Q_PROPERTY(QQmlAndroidView *alignRight READ alignRight WRITE setAlignRight NOTIFY alignRightChanged)
+    Q_PROPERTY(QQmlAndroidView *alignBottom READ alignBottom WRITE setAlignBottom NOTIFY alignBottomChanged)
+    Q_PROPERTY(QQmlAndroidView *alignStart READ alignStart WRITE setAlignStart NOTIFY alignStartChanged)
+    Q_PROPERTY(QQmlAndroidView *alignEnd READ alignEnd WRITE setAlignEnd NOTIFY alignEndChanged)
+    Q_PROPERTY(QQmlAndroidView *alignBaseline READ alignBaseline WRITE setAlignBaseline NOTIFY alignBaselineChanged)
+    Q_PROPERTY(QQmlAndroidView *toLeftOf READ toLeftOf WRITE setToLeftOf NOTIFY toLeftOfChanged)
+    Q_PROPERTY(QQmlAndroidView *toRightOf READ toRightOf WRITE setToRightOf NOTIFY toRightOfChanged)
+    Q_PROPERTY(QQmlAndroidView *toStartOf READ toStartOf WRITE setToStartOf NOTIFY toStartOfChanged)
+    Q_PROPERTY(QQmlAndroidView *toEndOf READ toEndOf WRITE setToEndOf NOTIFY toEndOfChanged)
     Q_PROPERTY(bool alignParentTop READ alignParentTop WRITE setAlignParentTop NOTIFY alignParentTopChanged)
     Q_PROPERTY(bool alignParentLeft READ alignParentLeft WRITE setAlignParentLeft NOTIFY alignParentLeftChanged)
     Q_PROPERTY(bool alignParentRight READ alignParentRight WRITE setAlignParentRight NOTIFY alignParentRightChanged)
@@ -33,46 +33,46 @@ class QtQmlAndroidRelativeLayoutParams : public QtQmlAndroidMarginLayoutParams
     Q_PROPERTY(bool centerInParent READ centerInParent WRITE setCenterInParent NOTIFY centerInParentChanged)
 
 public:
-    explicit QtQmlAndroidRelativeLayoutParams(QtQmlAndroidView *view);
+    explicit QQmlAndroidRelativeLayoutParams(QQmlAndroidView *view);
 
-    QtQmlAndroidView *above() const;
-    void setAbove(QtQmlAndroidView *view);
+    QQmlAndroidView *above() const;
+    void setAbove(QQmlAndroidView *view);
 
-    QtQmlAndroidView *below() const;
-    void setBelow(QtQmlAndroidView *view);
+    QQmlAndroidView *below() const;
+    void setBelow(QQmlAndroidView *view);
 
-    QtQmlAndroidView *alignTop() const;
-    void setAlignTop(QtQmlAndroidView *view);
+    QQmlAndroidView *alignTop() const;
+    void setAlignTop(QQmlAndroidView *view);
 
-    QtQmlAndroidView *alignLeft() const;
-    void setAlignLeft(QtQmlAndroidView *view);
+    QQmlAndroidView *alignLeft() const;
+    void setAlignLeft(QQmlAndroidView *view);
 
-    QtQmlAndroidView *alignRight() const;
-    void setAlignRight(QtQmlAndroidView *view);
+    QQmlAndroidView *alignRight() const;
+    void setAlignRight(QQmlAndroidView *view);
 
-    QtQmlAndroidView *alignBottom() const;
-    void setAlignBottom(QtQmlAndroidView *view);
+    QQmlAndroidView *alignBottom() const;
+    void setAlignBottom(QQmlAndroidView *view);
 
-    QtQmlAndroidView *alignStart() const;
-    void setAlignStart(QtQmlAndroidView *view);
+    QQmlAndroidView *alignStart() const;
+    void setAlignStart(QQmlAndroidView *view);
 
-    QtQmlAndroidView *alignEnd() const;
-    void setAlignEnd(QtQmlAndroidView *view);
+    QQmlAndroidView *alignEnd() const;
+    void setAlignEnd(QQmlAndroidView *view);
 
-    QtQmlAndroidView *alignBaseline() const;
-    void setAlignBaseline(QtQmlAndroidView *view);
+    QQmlAndroidView *alignBaseline() const;
+    void setAlignBaseline(QQmlAndroidView *view);
 
-    QtQmlAndroidView *toLeftOf() const;
-    void setToLeftOf(QtQmlAndroidView *view);
+    QQmlAndroidView *toLeftOf() const;
+    void setToLeftOf(QQmlAndroidView *view);
 
-    QtQmlAndroidView *toRightOf() const;
-    void setToRightOf(QtQmlAndroidView *view);
+    QQmlAndroidView *toRightOf() const;
+    void setToRightOf(QQmlAndroidView *view);
 
-    QtQmlAndroidView *toStartOf() const;
-    void setToStartOf(QtQmlAndroidView *view);
+    QQmlAndroidView *toStartOf() const;
+    void setToStartOf(QQmlAndroidView *view);
 
-    QtQmlAndroidView *toEndOf() const;
-    void setToEndOf(QtQmlAndroidView *view);
+    QQmlAndroidView *toEndOf() const;
+    void setToEndOf(QQmlAndroidView *view);
 
     bool alignParentTop() const;
     void setAlignParentTop(bool align);
@@ -135,19 +135,19 @@ protected:
     void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
 
 private:
-    QtQmlAndroidView *m_above;
-    QtQmlAndroidView *m_below;
-    QtQmlAndroidView *m_alignTop;
-    QtQmlAndroidView *m_alignLeft;
-    QtQmlAndroidView *m_alignRight;
-    QtQmlAndroidView *m_alignBottom;
-    QtQmlAndroidView *m_alignStart;
-    QtQmlAndroidView *m_alignEnd;
-    QtQmlAndroidView *m_alignBaseline;
-    QtQmlAndroidView *m_toLeftOf;
-    QtQmlAndroidView *m_toRightOf;
-    QtQmlAndroidView *m_toStartOf;
-    QtQmlAndroidView *m_toEndOf;
+    QQmlAndroidView *m_above;
+    QQmlAndroidView *m_below;
+    QQmlAndroidView *m_alignTop;
+    QQmlAndroidView *m_alignLeft;
+    QQmlAndroidView *m_alignRight;
+    QQmlAndroidView *m_alignBottom;
+    QQmlAndroidView *m_alignStart;
+    QQmlAndroidView *m_alignEnd;
+    QQmlAndroidView *m_alignBaseline;
+    QQmlAndroidView *m_toLeftOf;
+    QQmlAndroidView *m_toRightOf;
+    QQmlAndroidView *m_toStartOf;
+    QQmlAndroidView *m_toEndOf;
 
     bool m_alignParentTop;
     bool m_alignParentLeft;
diff --git a/src/qmlandroid/widget/qtqmlandroidscrollview.cpp b/src/qmlandroid/widget/qtqmlandroidscrollview.cpp
index 72ed915..d39e908 100644
--- a/src/qmlandroid/widget/qtqmlandroidscrollview.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidscrollview.cpp
@@ -3,25 +3,25 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidScrollView::QtQmlAndroidScrollView(QtQmlAndroidView *parent) :
-    QtQmlAndroidFrameLayout(parent)
+QQmlAndroidScrollView::QQmlAndroidScrollView(QQmlAndroidView *parent) :
+    QQmlAndroidFrameLayout(parent)
 {
 }
 
-int QtQmlAndroidScrollView::scrollX() const
+int QQmlAndroidScrollView::scrollX() const
 {
     if (m_scrollX.isNull())
         return 0;
     return m_scrollX.value();
 }
 
-void QtQmlAndroidScrollView::setScrollX(int x)
+void QQmlAndroidScrollView::setScrollX(int x)
 {
     if (updateScrollX(x))
         QtQmlAndroid::callIntMethod(instance(), "setScrollX", x);
 }
 
-bool QtQmlAndroidScrollView::updateScrollX(int x)
+bool QQmlAndroidScrollView::updateScrollX(int x)
 {
     if (m_scrollX.isNull() || m_scrollX.value() != x) {
         m_scrollX = x;
@@ -30,20 +30,20 @@ bool QtQmlAndroidScrollView::updateScrollX(int x)
     return false;
 }
 
-int QtQmlAndroidScrollView::scrollY() const
+int QQmlAndroidScrollView::scrollY() const
 {
     if (m_scrollY.isNull())
         return 0;
     return m_scrollY.value();
 }
 
-void QtQmlAndroidScrollView::setScrollY(int y)
+void QQmlAndroidScrollView::setScrollY(int y)
 {
     if (updateScrollY(y))
         QtQmlAndroid::callIntMethod(instance(), "setScrollY", y);
 }
 
-bool QtQmlAndroidScrollView::updateScrollY(int y)
+bool QQmlAndroidScrollView::updateScrollY(int y)
 {
     if (m_scrollY.isNull() || m_scrollY.value() != y) {
         m_scrollY = y;
@@ -52,7 +52,7 @@ bool QtQmlAndroidScrollView::updateScrollY(int y)
     return false;
 }
 
-QAndroidJniObject QtQmlAndroidScrollView::onCreate()
+QAndroidJniObject QQmlAndroidScrollView::onCreate()
 {
     return QAndroidJniObject("qt/android/widget/QtScrollView",
                              "(Landroid/content/Context;J)V",
@@ -60,9 +60,9 @@ QAndroidJniObject QtQmlAndroidScrollView::onCreate()
                              reinterpret_cast<jlong>(this));
 }
 
-void QtQmlAndroidScrollView::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidScrollView::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidFrameLayout::onInflate(instance);
+    QQmlAndroidFrameLayout::onInflate(instance);
 
     static bool nativeMethodsRegistered = false;
     if (!nativeMethodsRegistered) {
@@ -71,7 +71,7 @@ void QtQmlAndroidScrollView::onInflate(QAndroidJniObject &instance)
     }
 }
 
-void QtQmlAndroidScrollView::onRegisterNativeMethods(jobject listener)
+void QQmlAndroidScrollView::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onScrollChanged", "(JII)V", reinterpret_cast<void *>(onScrollChanged)}};
 
@@ -81,11 +81,11 @@ void QtQmlAndroidScrollView::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QtQmlAndroidScrollView::onScrollChanged(JNIEnv *env, jobject object, jlong instance, jint left, jint top)
+void QQmlAndroidScrollView::onScrollChanged(JNIEnv *env, jobject object, jlong instance, jint left, jint top)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidScrollView *view = reinterpret_cast<QtQmlAndroidScrollView *>(instance);
+    QQmlAndroidScrollView *view = reinterpret_cast<QQmlAndroidScrollView *>(instance);
     if (view) {
         QMetaObject::invokeMethod(view, "updateScrollX", Qt::QueuedConnection, Q_ARG(int, left));
         QMetaObject::invokeMethod(view, "updateScrollY", Qt::QueuedConnection, Q_ARG(int, top));
diff --git a/src/qmlandroid/widget/qtqmlandroidscrollview_p.h b/src/qmlandroid/widget/qtqmlandroidscrollview_p.h
index e223dcb..c08bfc2 100644
--- a/src/qmlandroid/widget/qtqmlandroidscrollview_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidscrollview_p.h
@@ -5,14 +5,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidScrollView : public QtQmlAndroidFrameLayout
+class QQmlAndroidScrollView : public QQmlAndroidFrameLayout
 {
     Q_OBJECT
     Q_PROPERTY(int scrollX READ scrollX WRITE setScrollX NOTIFY scrollXChanged)
     Q_PROPERTY(int scrollY READ scrollY WRITE setScrollY NOTIFY scrollYChanged)
 
 public:
-    explicit QtQmlAndroidScrollView(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidScrollView(QQmlAndroidView *parent = 0);
 
     int scrollX() const;
     void setScrollX(int x);
@@ -36,8 +36,8 @@ private Q_SLOTS:
     bool updateScrollY(int y);
 
 private:
-    QtQmlAndroidOptional<int> m_scrollX;
-    QtQmlAndroidOptional<int> m_scrollY;
+    QQmlAndroidOptional<int> m_scrollX;
+    QQmlAndroidOptional<int> m_scrollY;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidsearchview.cpp b/src/qmlandroid/widget/qtqmlandroidsearchview.cpp
index b75ae28..09e60e7 100644
--- a/src/qmlandroid/widget/qtqmlandroidsearchview.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidsearchview.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidSearchView::QtQmlAndroidSearchView(QtQmlAndroidView *parent) :
-    QtQmlAndroidLinearLayout(parent)
+QQmlAndroidSearchView::QQmlAndroidSearchView(QQmlAndroidView *parent) :
+    QQmlAndroidLinearLayout(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidSearchView::onCreate()
+QAndroidJniObject QQmlAndroidSearchView::onCreate()
 {
     return QAndroidJniObject("android/widget/SearchView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidSearchView::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidSearchView::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidLinearLayout::onInflate(instance);
+    QQmlAndroidLinearLayout::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidsearchview_p.h b/src/qmlandroid/widget/qtqmlandroidsearchview_p.h
index 2fab418..8c6e83b 100644
--- a/src/qmlandroid/widget/qtqmlandroidsearchview_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidsearchview_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidSearchView : public QtQmlAndroidLinearLayout
+class QQmlAndroidSearchView : public QQmlAndroidLinearLayout
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidSearchView(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidSearchView(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidseekbar.cpp b/src/qmlandroid/widget/qtqmlandroidseekbar.cpp
index 9d0fbb1..fff1c7a 100644
--- a/src/qmlandroid/widget/qtqmlandroidseekbar.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidseekbar.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidSeekBar::QtQmlAndroidSeekBar(QtQmlAndroidView *parent) :
-    QtQmlAndroidAbsSeekBar(parent)
+QQmlAndroidSeekBar::QQmlAndroidSeekBar(QQmlAndroidView *parent) :
+    QQmlAndroidAbsSeekBar(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidSeekBar::onCreate()
+QAndroidJniObject QQmlAndroidSeekBar::onCreate()
 {
     return QAndroidJniObject("android/widget/SeekBar",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidSeekBar::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidSeekBar::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidAbsSeekBar::onInflate(instance);
+    QQmlAndroidAbsSeekBar::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/widget/QtSeekBarListener",
                                    "(Landroid/widget/SeekBar;J)V",
@@ -30,7 +30,7 @@ void QtQmlAndroidSeekBar::onInflate(QAndroidJniObject &instance)
     }
 }
 
-void QtQmlAndroidSeekBar::onRegisterNativeMethods(jobject listener)
+void QQmlAndroidSeekBar::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onProgressChanged", "(JIZ)V", reinterpret_cast<void *>(onProgressChanged)}};
 
@@ -40,11 +40,11 @@ void QtQmlAndroidSeekBar::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QtQmlAndroidSeekBar::onProgressChanged(JNIEnv *env, jobject object, jlong instance, jint progress, jboolean fromUser)
+void QQmlAndroidSeekBar::onProgressChanged(JNIEnv *env, jobject object, jlong instance, jint progress, jboolean fromUser)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidSeekBar *bar = reinterpret_cast<QtQmlAndroidSeekBar *>(instance);
+    QQmlAndroidSeekBar *bar = reinterpret_cast<QQmlAndroidSeekBar *>(instance);
     if (bar && fromUser)
         QMetaObject::invokeMethod(bar, "updateProgress", Qt::QueuedConnection, Q_ARG(int, progress));
 }
diff --git a/src/qmlandroid/widget/qtqmlandroidseekbar_p.h b/src/qmlandroid/widget/qtqmlandroidseekbar_p.h
index 0c26938..df284cb 100644
--- a/src/qmlandroid/widget/qtqmlandroidseekbar_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidseekbar_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidSeekBar : public QtQmlAndroidAbsSeekBar
+class QQmlAndroidSeekBar : public QQmlAndroidAbsSeekBar
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidSeekBar(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidSeekBar(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidspace.cpp b/src/qmlandroid/widget/qtqmlandroidspace.cpp
index 9ba188a..2afb242 100644
--- a/src/qmlandroid/widget/qtqmlandroidspace.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidspace.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidSpace::QtQmlAndroidSpace(QtQmlAndroidView *parent) :
-    QtQmlAndroidView(parent)
+QQmlAndroidSpace::QQmlAndroidSpace(QQmlAndroidView *parent) :
+    QQmlAndroidView(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidSpace::onCreate()
+QAndroidJniObject QQmlAndroidSpace::onCreate()
 {
     return QAndroidJniObject("android/widget/Space",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidSpace::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidSpace::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidView::onInflate(instance);
+    QQmlAndroidView::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidspace_p.h b/src/qmlandroid/widget/qtqmlandroidspace_p.h
index 90b597c..1ec169d 100644
--- a/src/qmlandroid/widget/qtqmlandroidspace_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidspace_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidSpace : public QtQmlAndroidView
+class QQmlAndroidSpace : public QQmlAndroidView
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidSpace(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidSpace(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidspinner.cpp b/src/qmlandroid/widget/qtqmlandroidspinner.cpp
index ff9a743..bdd6e8c 100644
--- a/src/qmlandroid/widget/qtqmlandroidspinner.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidspinner.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidSpinner::QtQmlAndroidSpinner(QtQmlAndroidView *parent) :
-    QtQmlAndroidAdapterView(parent)
+QQmlAndroidSpinner::QQmlAndroidSpinner(QQmlAndroidView *parent) :
+    QQmlAndroidAdapterView(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidSpinner::onCreate()
+QAndroidJniObject QQmlAndroidSpinner::onCreate()
 {
     return QAndroidJniObject("android/widget/Spinner",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidSpinner::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidSpinner::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidAdapterView::onInflate(instance);
+    QQmlAndroidAdapterView::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidspinner_p.h b/src/qmlandroid/widget/qtqmlandroidspinner_p.h
index 6f49550..71513a5 100644
--- a/src/qmlandroid/widget/qtqmlandroidspinner_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidspinner_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidSpinner : public QtQmlAndroidAdapterView // TODO: AbsSpinner
+class QQmlAndroidSpinner : public QQmlAndroidAdapterView // TODO: AbsSpinner
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidSpinner(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidSpinner(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidswitch.cpp b/src/qmlandroid/widget/qtqmlandroidswitch.cpp
index 9c0fa3e..09e8cc4 100644
--- a/src/qmlandroid/widget/qtqmlandroidswitch.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidswitch.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidSwitch::QtQmlAndroidSwitch(QtQmlAndroidView *parent) :
-    QtQmlAndroidCompoundButton(parent)
+QQmlAndroidSwitch::QQmlAndroidSwitch(QQmlAndroidView *parent) :
+    QQmlAndroidCompoundButton(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidSwitch::onCreate()
+QAndroidJniObject QQmlAndroidSwitch::onCreate()
 {
     return QAndroidJniObject("android/widget/Switch",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidSwitch::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidSwitch::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidCompoundButton::onInflate(instance);
+    QQmlAndroidCompoundButton::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidswitch_p.h b/src/qmlandroid/widget/qtqmlandroidswitch_p.h
index 6fbbda7..9999bab 100644
--- a/src/qmlandroid/widget/qtqmlandroidswitch_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidswitch_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidSwitch : public QtQmlAndroidCompoundButton
+class QQmlAndroidSwitch : public QQmlAndroidCompoundButton
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidSwitch(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidSwitch(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidtabhost.cpp b/src/qmlandroid/widget/qtqmlandroidtabhost.cpp
index 6029c4f..ee5ee4b 100644
--- a/src/qmlandroid/widget/qtqmlandroidtabhost.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidtabhost.cpp
@@ -3,21 +3,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidTabHost::QtQmlAndroidTabHost(QtQmlAndroidView *parent) :
-    QtQmlAndroidFrameLayout(parent)
+QQmlAndroidTabHost::QQmlAndroidTabHost(QQmlAndroidView *parent) :
+    QQmlAndroidFrameLayout(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidTabHost::onCreate()
+QAndroidJniObject QQmlAndroidTabHost::onCreate()
 {
     return QAndroidJniObject("android/widget/TabHost",
                              "(Landroid/content/Context;Landroid/util/AttributeSet;)V",
                              ctx().object(), 0);
 }
 
-void QtQmlAndroidTabHost::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidTabHost::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidFrameLayout::onInflate(instance);
+    QQmlAndroidFrameLayout::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/widget/QtTabHostListener",
                                    "(Landroid/widget/TabHost;J)V",
@@ -33,12 +33,12 @@ void QtQmlAndroidTabHost::onInflate(QAndroidJniObject &instance)
     instance.callMethod<void>("setup");
 
     int index = 0;
-    QList<QtQmlAndroidTabSpec *> tabs = findChildren<QtQmlAndroidTabSpec *>();
-    foreach (QtQmlAndroidTabSpec *tab, tabs)
+    QList<QQmlAndroidTabSpec *> tabs = findChildren<QQmlAndroidTabSpec *>();
+    foreach (QQmlAndroidTabSpec *tab, tabs)
         tab->setup(instance, index++);
 }
 
-void QtQmlAndroidTabHost::onRegisterNativeMethods(jobject listener)
+void QQmlAndroidTabHost::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onTabChanged", "(JLjava/lang/String;)V", reinterpret_cast<void *>(onTabChanged)}};
 
@@ -48,11 +48,11 @@ void QtQmlAndroidTabHost::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QtQmlAndroidTabHost::onTabChanged(JNIEnv *env, jobject object, jlong instance, jstring tabId)
+void QQmlAndroidTabHost::onTabChanged(JNIEnv *env, jobject object, jlong instance, jstring tabId)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QtQmlAndroidTabHost *host = reinterpret_cast<QtQmlAndroidTabHost *>(instance);
+    QQmlAndroidTabHost *host = reinterpret_cast<QQmlAndroidTabHost *>(instance);
     if (host)
         QMetaObject::invokeMethod(host, "tabChanged", Qt::QueuedConnection, Q_ARG(QString, QAndroidJniObject(tabId).toString()));
 }
diff --git a/src/qmlandroid/widget/qtqmlandroidtabhost_p.h b/src/qmlandroid/widget/qtqmlandroidtabhost_p.h
index a06a63a..636f863 100644
--- a/src/qmlandroid/widget/qtqmlandroidtabhost_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidtabhost_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidTabHost : public QtQmlAndroidFrameLayout
+class QQmlAndroidTabHost : public QQmlAndroidFrameLayout
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidTabHost(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidTabHost(QQmlAndroidView *parent = 0);
 
 Q_SIGNALS:
     void tabChanged(const QString &tabId);
diff --git a/src/qmlandroid/widget/qtqmlandroidtabspec.cpp b/src/qmlandroid/widget/qtqmlandroidtabspec.cpp
index 7efe719..a15a809 100644
--- a/src/qmlandroid/widget/qtqmlandroidtabspec.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidtabspec.cpp
@@ -6,28 +6,28 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidTabSpec::QtQmlAndroidTabSpec(QtQmlAndroidView *view) :
+QQmlAndroidTabSpec::QQmlAndroidTabSpec(QQmlAndroidView *view) :
     QObject(view)
 {
-    QtQmlAndroidView *parent = qobject_cast<QtQmlAndroidView *>(view->parent());
+    QQmlAndroidView *parent = qobject_cast<QQmlAndroidView *>(view->parent());
     if (parent)
         parent->setIdentifier(16908305); // TODO: android.R.id.tabcontent
 }
 
-QtQmlAndroidTabSpec *QtQmlAndroidTabSpec::qmlAttachedProperties(QObject *object)
+QQmlAndroidTabSpec *QQmlAndroidTabSpec::qmlAttachedProperties(QObject *object)
 {
-    QtQmlAndroidView *view = qobject_cast<QtQmlAndroidView*>(object);
+    QQmlAndroidView *view = qobject_cast<QQmlAndroidView*>(object);
     if (view)
-        return new QtQmlAndroidTabSpec(view);
+        return new QQmlAndroidTabSpec(view);
     return 0;
 }
 
-QString QtQmlAndroidTabSpec::label() const
+QString QQmlAndroidTabSpec::label() const
 {
     return m_label;
 }
 
-void QtQmlAndroidTabSpec::setLabel(const QString &label)
+void QQmlAndroidTabSpec::setLabel(const QString &label)
 {
     if (m_label != label) {
         m_label = label;
@@ -36,10 +36,10 @@ void QtQmlAndroidTabSpec::setLabel(const QString &label)
     }
 }
 
-void QtQmlAndroidTabSpec::setup(QAndroidJniObject &host, int index)
+void QQmlAndroidTabSpec::setup(QAndroidJniObject &host, int index)
 {
     int id = -1;
-    QtQmlAndroidView *content = qobject_cast<QtQmlAndroidView *>(parent());
+    QQmlAndroidView *content = qobject_cast<QQmlAndroidView *>(parent());
     if (content)
         id = content->identifier();
 
diff --git a/src/qmlandroid/widget/qtqmlandroidtabspec_p.h b/src/qmlandroid/widget/qtqmlandroidtabspec_p.h
index 9d303d6..1558f34 100644
--- a/src/qmlandroid/widget/qtqmlandroidtabspec_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidtabspec_p.h
@@ -7,18 +7,18 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidView;
-class QtQmlAndroidTabHost;
+class QQmlAndroidView;
+class QQmlAndroidTabHost;
 
-class QtQmlAndroidTabSpec : public QObject
+class QQmlAndroidTabSpec : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
 
 public:
-    explicit QtQmlAndroidTabSpec(QtQmlAndroidView *view);
+    explicit QQmlAndroidTabSpec(QQmlAndroidView *view);
 
-    static QtQmlAndroidTabSpec *qmlAttachedProperties(QObject *object);
+    static QQmlAndroidTabSpec *qmlAttachedProperties(QObject *object);
 
     QString label() const;
     void setLabel(const QString &label);
@@ -34,6 +34,6 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QtQmlAndroidTabSpec, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QQmlAndroidTabSpec, QML_HAS_ATTACHED_PROPERTIES)
 
 #endif // QTQMLANDROIDTABSPEC_P_H
diff --git a/src/qmlandroid/widget/qtqmlandroidtabwidget.cpp b/src/qmlandroid/widget/qtqmlandroidtabwidget.cpp
index 5600172..645869e 100644
--- a/src/qmlandroid/widget/qtqmlandroidtabwidget.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidtabwidget.cpp
@@ -2,22 +2,22 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidTabWidget::QtQmlAndroidTabWidget(QtQmlAndroidView *parent) :
-    QtQmlAndroidLinearLayout(parent)
+QQmlAndroidTabWidget::QQmlAndroidTabWidget(QQmlAndroidView *parent) :
+    QQmlAndroidLinearLayout(parent)
 {
     setIdentifier(16908307); // TODO: android.R.id.tabs
 }
 
-QAndroidJniObject QtQmlAndroidTabWidget::onCreate()
+QAndroidJniObject QQmlAndroidTabWidget::onCreate()
 {
     return QAndroidJniObject("android/widget/TabWidget",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidTabWidget::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidTabWidget::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidLinearLayout::onInflate(instance);
+    QQmlAndroidLinearLayout::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidtabwidget_p.h b/src/qmlandroid/widget/qtqmlandroidtabwidget_p.h
index ea602cb..d2a8518 100644
--- a/src/qmlandroid/widget/qtqmlandroidtabwidget_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidtabwidget_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidTabWidget : public QtQmlAndroidLinearLayout
+class QQmlAndroidTabWidget : public QQmlAndroidLinearLayout
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidTabWidget(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidTabWidget(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidtextview.cpp b/src/qmlandroid/widget/qtqmlandroidtextview.cpp
index 2822938..298b5c8 100644
--- a/src/qmlandroid/widget/qtqmlandroidtextview.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidtextview.cpp
@@ -4,17 +4,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidTextView::QtQmlAndroidTextView(QtQmlAndroidView *parent) :
-    QtQmlAndroidView(parent), m_singleLine(false)
+QQmlAndroidTextView::QQmlAndroidTextView(QQmlAndroidView *parent) :
+    QQmlAndroidView(parent), m_singleLine(false)
 {
 }
 
-QString QtQmlAndroidTextView::text() const
+QString QQmlAndroidTextView::text() const
 {
     return m_text;
 }
 
-void QtQmlAndroidTextView::setText(const QString &text)
+void QQmlAndroidTextView::setText(const QString &text)
 {
     if (m_text != text) {
         m_text = text;
@@ -23,14 +23,14 @@ void QtQmlAndroidTextView::setText(const QString &text)
     }
 }
 
-int QtQmlAndroidTextView::textColor() const
+int QQmlAndroidTextView::textColor() const
 {
     if (m_textColor.isNull())
-        return QtQmlAndroidColor::BLACK; // TODO
+        return QQmlAndroidColor::BLACK; // TODO
     return m_textColor.value();
 }
 
-void QtQmlAndroidTextView::setTextColor(int color)
+void QQmlAndroidTextView::setTextColor(int color)
 {
     if (color != textColor()) {
         m_textColor = color;
@@ -39,14 +39,14 @@ void QtQmlAndroidTextView::setTextColor(int color)
     }
 }
 
-qreal QtQmlAndroidTextView::textSize() const
+qreal QQmlAndroidTextView::textSize() const
 {
     if (m_textSize.isNull())
         return -1;
     return m_textSize.value();
 }
 
-void QtQmlAndroidTextView::setTextSize(qreal size)
+void QQmlAndroidTextView::setTextSize(qreal size)
 {
     if (size != textSize()) {
         m_textSize = size;
@@ -55,12 +55,12 @@ void QtQmlAndroidTextView::setTextSize(qreal size)
     }
 }
 
-QString QtQmlAndroidTextView::hint() const
+QString QQmlAndroidTextView::hint() const
 {
     return m_hint;
 }
 
-void QtQmlAndroidTextView::setHint(const QString &hint)
+void QQmlAndroidTextView::setHint(const QString &hint)
 {
     if (m_hint != hint) {
         m_hint = hint;
@@ -69,12 +69,12 @@ void QtQmlAndroidTextView::setHint(const QString &hint)
     }
 }
 
-bool QtQmlAndroidTextView::isSingleLine() const
+bool QQmlAndroidTextView::isSingleLine() const
 {
     return m_singleLine;
 }
 
-void QtQmlAndroidTextView::setSingleLine(bool singleLine)
+void QQmlAndroidTextView::setSingleLine(bool singleLine)
 {
     if (m_singleLine != singleLine) {
         m_singleLine = singleLine;
@@ -83,14 +83,14 @@ void QtQmlAndroidTextView::setSingleLine(bool singleLine)
     }
 }
 
-int QtQmlAndroidTextView::inputType() const
+int QQmlAndroidTextView::inputType() const
 {
     if (m_inputType.isNull())
         return 0; // TODO
     return m_inputType.value();
 }
 
-void QtQmlAndroidTextView::setInputType(int type)
+void QQmlAndroidTextView::setInputType(int type)
 {
     if (m_inputType.isNull() || m_inputType.value() != type) {
         m_inputType = type;
@@ -99,16 +99,16 @@ void QtQmlAndroidTextView::setInputType(int type)
     }
 }
 
-QAndroidJniObject QtQmlAndroidTextView::onCreate()
+QAndroidJniObject QQmlAndroidTextView::onCreate()
 {
     return QAndroidJniObject("android/widget/TextView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidTextView::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidTextView::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidView::onInflate(instance);
+    QQmlAndroidView::onInflate(instance);
 
     if (!m_text.isNull())
         instance.callMethod<void>("setText", "(Ljava/lang/CharSequence;)V", QAndroidJniObject::fromString(m_text).object());
diff --git a/src/qmlandroid/widget/qtqmlandroidtextview_p.h b/src/qmlandroid/widget/qtqmlandroidtextview_p.h
index 9f36b6d..373d412 100644
--- a/src/qmlandroid/widget/qtqmlandroidtextview_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidtextview_p.h
@@ -7,7 +7,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidTextView : public QtQmlAndroidView
+class QQmlAndroidTextView : public QQmlAndroidView
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
@@ -18,7 +18,7 @@ class QtQmlAndroidTextView : public QtQmlAndroidView
     Q_PROPERTY(int inputType READ inputType WRITE setInputType NOTIFY inputTypeChanged)
 
 public:
-    explicit QtQmlAndroidTextView(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidTextView(QQmlAndroidView *parent = 0);
 
     QString text() const;
     void setText(const QString &text);
@@ -53,10 +53,10 @@ protected:
 private:
     QString m_text;
     QString m_hint;
-    QtQmlAndroidOptional<int> m_textColor;
-    QtQmlAndroidOptional<qreal> m_textSize;
+    QQmlAndroidOptional<int> m_textColor;
+    QQmlAndroidOptional<qreal> m_textSize;
     bool m_singleLine;
-    QtQmlAndroidOptional<int> m_inputType;
+    QQmlAndroidOptional<int> m_inputType;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidtimepicker.cpp b/src/qmlandroid/widget/qtqmlandroidtimepicker.cpp
index 32c6f07..179fea3 100644
--- a/src/qmlandroid/widget/qtqmlandroidtimepicker.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidtimepicker.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidTimePicker::QtQmlAndroidTimePicker(QtQmlAndroidView *parent) :
-    QtQmlAndroidFrameLayout(parent)
+QQmlAndroidTimePicker::QQmlAndroidTimePicker(QQmlAndroidView *parent) :
+    QQmlAndroidFrameLayout(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidTimePicker::onCreate()
+QAndroidJniObject QQmlAndroidTimePicker::onCreate()
 {
     return QAndroidJniObject("android/widget/TimePicker",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidTimePicker::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidTimePicker::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidFrameLayout::onInflate(instance);
+    QQmlAndroidFrameLayout::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidtimepicker_p.h b/src/qmlandroid/widget/qtqmlandroidtimepicker_p.h
index fb3385f..ce29097 100644
--- a/src/qmlandroid/widget/qtqmlandroidtimepicker_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidtimepicker_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidTimePicker : public QtQmlAndroidFrameLayout
+class QQmlAndroidTimePicker : public QQmlAndroidFrameLayout
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidTimePicker(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidTimePicker(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidtoast.cpp b/src/qmlandroid/widget/qtqmlandroidtoast.cpp
index df18380..7582dbf 100644
--- a/src/qmlandroid/widget/qtqmlandroidtoast.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidtoast.cpp
@@ -5,17 +5,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidToast::QtQmlAndroidToast(QObject *parent) :
-    QtQmlAndroidObject(parent)
+QQmlAndroidToast::QQmlAndroidToast(QObject *parent) :
+    QQmlAndroidObject(parent)
 {
 }
 
-QString QtQmlAndroidToast::text() const
+QString QQmlAndroidToast::text() const
 {
     return m_text;
 }
 
-void QtQmlAndroidToast::setText(const QString &text)
+void QQmlAndroidToast::setText(const QString &text)
 {
     if (m_text != text) {
         m_text = text;
@@ -23,14 +23,14 @@ void QtQmlAndroidToast::setText(const QString &text)
     }
 }
 
-int QtQmlAndroidToast::gravity() const
+int QQmlAndroidToast::gravity() const
 {
     if (m_gravity.isNull())
         return 0; // TODO
     return m_gravity.value();
 }
 
-void QtQmlAndroidToast::setGravity(int value)
+void QQmlAndroidToast::setGravity(int value)
 {
     if (value != gravity()) {
         m_gravity = value;
@@ -38,9 +38,9 @@ void QtQmlAndroidToast::setGravity(int value)
     }
 }
 
-void QtQmlAndroidToast::show()
+void QQmlAndroidToast::show()
 {
-    QtQmlAndroidView *view = qobject_cast<QtQmlAndroidView *>(parent());
+    QQmlAndroidView *view = qobject_cast<QQmlAndroidView *>(parent());
     if (!view) {
         qWarning() << "Toast must be in a view.";
         return;
@@ -75,7 +75,7 @@ void QtQmlAndroidToast::show()
     });
 }
 
-void QtQmlAndroidToast::cancel()
+void QQmlAndroidToast::cancel()
 {
     QtQmlAndroid::callVoidMethod(instance(), "cancel");
 }
diff --git a/src/qmlandroid/widget/qtqmlandroidtoast_p.h b/src/qmlandroid/widget/qtqmlandroidtoast_p.h
index 36216fc..786b9fa 100644
--- a/src/qmlandroid/widget/qtqmlandroidtoast_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidtoast_p.h
@@ -6,16 +6,16 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidView;
+class QQmlAndroidView;
 
-class QtQmlAndroidToast : public QtQmlAndroidObject
+class QQmlAndroidToast : public QQmlAndroidObject
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
     Q_PROPERTY(int gravity READ gravity WRITE setGravity NOTIFY gravityChanged)
 
 public:
-    explicit QtQmlAndroidToast(QObject *parent = 0);
+    explicit QQmlAndroidToast(QObject *parent = 0);
 
     QString text() const;
     void setText(const QString &text);
@@ -33,7 +33,7 @@ Q_SIGNALS:
 
 private:
     QString m_text;
-    QtQmlAndroidOptional<int> m_gravity;
+    QQmlAndroidOptional<int> m_gravity;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidtogglebutton.cpp b/src/qmlandroid/widget/qtqmlandroidtogglebutton.cpp
index d81a83f..5cf6bfd 100644
--- a/src/qmlandroid/widget/qtqmlandroidtogglebutton.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidtogglebutton.cpp
@@ -3,17 +3,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidToggleButton::QtQmlAndroidToggleButton(QtQmlAndroidView *parent) :
-    QtQmlAndroidCompoundButton(parent)
+QQmlAndroidToggleButton::QQmlAndroidToggleButton(QQmlAndroidView *parent) :
+    QQmlAndroidCompoundButton(parent)
 {
 }
 
-QString QtQmlAndroidToggleButton::textOn() const
+QString QQmlAndroidToggleButton::textOn() const
 {
     return m_textOn;
 }
 
-void QtQmlAndroidToggleButton::setTextOn(const QString &text)
+void QQmlAndroidToggleButton::setTextOn(const QString &text)
 {
     if (m_textOn != text) {
         m_textOn = text;
@@ -22,12 +22,12 @@ void QtQmlAndroidToggleButton::setTextOn(const QString &text)
     }
 }
 
-QString QtQmlAndroidToggleButton::textOff() const
+QString QQmlAndroidToggleButton::textOff() const
 {
     return m_textOff;
 }
 
-void QtQmlAndroidToggleButton::setTextOff(const QString &text)
+void QQmlAndroidToggleButton::setTextOff(const QString &text)
 {
     if (m_textOff != text) {
         m_textOff = text;
@@ -36,16 +36,16 @@ void QtQmlAndroidToggleButton::setTextOff(const QString &text)
     }
 }
 
-QAndroidJniObject QtQmlAndroidToggleButton::onCreate()
+QAndroidJniObject QQmlAndroidToggleButton::onCreate()
 {
     return QAndroidJniObject("android/widget/ToggleButton",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidToggleButton::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidToggleButton::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidCompoundButton::onInflate(instance);
+    QQmlAndroidCompoundButton::onInflate(instance);
 
     if (!m_textOn.isNull())
         instance.callMethod<void>("setTextOn", "(Ljava/lang/CharSequence;)V", QAndroidJniObject::fromString(m_textOn).object());
diff --git a/src/qmlandroid/widget/qtqmlandroidtogglebutton_p.h b/src/qmlandroid/widget/qtqmlandroidtogglebutton_p.h
index b3e1564..c53834a 100644
--- a/src/qmlandroid/widget/qtqmlandroidtogglebutton_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidtogglebutton_p.h
@@ -5,14 +5,14 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidToggleButton : public QtQmlAndroidCompoundButton
+class QQmlAndroidToggleButton : public QQmlAndroidCompoundButton
 {
     Q_OBJECT
     Q_PROPERTY(QString textOn READ textOn WRITE setTextOn NOTIFY textOnChanged)
     Q_PROPERTY(QString textOff READ textOff WRITE setTextOff NOTIFY textOffChanged)
 
 public:
-    explicit QtQmlAndroidToggleButton(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidToggleButton(QQmlAndroidView *parent = 0);
 
     QString textOn() const;
     void setTextOn(const QString &text);
diff --git a/src/qmlandroid/widget/qtqmlandroidviewanimator.cpp b/src/qmlandroid/widget/qtqmlandroidviewanimator.cpp
index 3cfdf4e..37c94b4 100644
--- a/src/qmlandroid/widget/qtqmlandroidviewanimator.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidviewanimator.cpp
@@ -3,19 +3,19 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidViewAnimator::QtQmlAndroidViewAnimator(QtQmlAndroidView *parent) :
-    QtQmlAndroidFrameLayout(parent)
+QQmlAndroidViewAnimator::QQmlAndroidViewAnimator(QQmlAndroidView *parent) :
+    QQmlAndroidFrameLayout(parent)
 {
 }
 
-int QtQmlAndroidViewAnimator::displayedChild() const
+int QQmlAndroidViewAnimator::displayedChild() const
 {
     if (m_displayedChild.isNull())
         return 0;
     return m_displayedChild.value();
 }
 
-void QtQmlAndroidViewAnimator::setDisplayedChild(int child)
+void QQmlAndroidViewAnimator::setDisplayedChild(int child)
 {
     if (child != displayedChild()) {
         m_displayedChild = child;
@@ -24,14 +24,14 @@ void QtQmlAndroidViewAnimator::setDisplayedChild(int child)
     }
 }
 
-int QtQmlAndroidViewAnimator::inAnimation() const
+int QQmlAndroidViewAnimator::inAnimation() const
 {
     if (m_inAnimation.isNull())
         return -1;
     return m_inAnimation.value();
 }
 
-void QtQmlAndroidViewAnimator::setInAnimation(int animation)
+void QQmlAndroidViewAnimator::setInAnimation(int animation)
 {
     if (animation != inAnimation()) {
         m_inAnimation = animation;
@@ -45,14 +45,14 @@ void QtQmlAndroidViewAnimator::setInAnimation(int animation)
     }
 }
 
-int QtQmlAndroidViewAnimator::outAnimation() const
+int QQmlAndroidViewAnimator::outAnimation() const
 {
     if (m_outAnimation.isNull())
         return -1;
     return m_outAnimation.value();
 }
 
-void QtQmlAndroidViewAnimator::setOutAnimation(int animation)
+void QQmlAndroidViewAnimator::setOutAnimation(int animation)
 {
     if (animation != outAnimation()) {
         m_outAnimation = animation;
@@ -66,26 +66,26 @@ void QtQmlAndroidViewAnimator::setOutAnimation(int animation)
     }
 }
 
-void QtQmlAndroidViewAnimator::showNext()
+void QQmlAndroidViewAnimator::showNext()
 {
     QtQmlAndroid::callVoidMethod(instance(), "showNext");
 }
 
-void QtQmlAndroidViewAnimator::showPrevious()
+void QQmlAndroidViewAnimator::showPrevious()
 {
     QtQmlAndroid::callVoidMethod(instance(), "showPrevious");
 }
 
-QAndroidJniObject QtQmlAndroidViewAnimator::onCreate()
+QAndroidJniObject QQmlAndroidViewAnimator::onCreate()
 {
     return QAndroidJniObject("android/widget/ViewAnimator",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidViewAnimator::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidViewAnimator::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidFrameLayout::onInflate(instance);
+    QQmlAndroidFrameLayout::onInflate(instance);
 
     if (!m_displayedChild.isNull())
         instance.callMethod<void>("setDisplayedChild", "(I)V", m_displayedChild.value());
diff --git a/src/qmlandroid/widget/qtqmlandroidviewanimator_p.h b/src/qmlandroid/widget/qtqmlandroidviewanimator_p.h
index a57951a..dba42cf 100644
--- a/src/qmlandroid/widget/qtqmlandroidviewanimator_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidviewanimator_p.h
@@ -5,7 +5,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidViewAnimator : public QtQmlAndroidFrameLayout
+class QQmlAndroidViewAnimator : public QQmlAndroidFrameLayout
 {
     Q_OBJECT
     Q_PROPERTY(int displayedChild READ displayedChild WRITE setDisplayedChild NOTIFY displayedChildChanged)
@@ -13,7 +13,7 @@ class QtQmlAndroidViewAnimator : public QtQmlAndroidFrameLayout
     Q_PROPERTY(int outAnimation READ outAnimation WRITE setOutAnimation NOTIFY outAnimationChanged)
 
 public:
-    explicit QtQmlAndroidViewAnimator(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidViewAnimator(QQmlAndroidView *parent = 0);
 
     int displayedChild() const;
     void setDisplayedChild(int child);
@@ -38,9 +38,9 @@ protected:
     void onInflate(QAndroidJniObject &instance) Q_DECL_OVERRIDE;
 
 private:
-    QtQmlAndroidOptional<int> m_displayedChild;
-    QtQmlAndroidOptional<int> m_inAnimation;
-    QtQmlAndroidOptional<int> m_outAnimation;
+    QQmlAndroidOptional<int> m_displayedChild;
+    QQmlAndroidOptional<int> m_inAnimation;
+    QQmlAndroidOptional<int> m_outAnimation;
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidviewflipper.cpp b/src/qmlandroid/widget/qtqmlandroidviewflipper.cpp
index 632d51b..f84c3c6 100644
--- a/src/qmlandroid/widget/qtqmlandroidviewflipper.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidviewflipper.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidViewFlipper::QtQmlAndroidViewFlipper(QtQmlAndroidView *parent) :
-    QtQmlAndroidViewAnimator(parent)
+QQmlAndroidViewFlipper::QQmlAndroidViewFlipper(QQmlAndroidView *parent) :
+    QQmlAndroidViewAnimator(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidViewFlipper::onCreate()
+QAndroidJniObject QQmlAndroidViewFlipper::onCreate()
 {
     return QAndroidJniObject("android/widget/ViewFlipper",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidViewFlipper::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidViewFlipper::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidViewAnimator::onInflate(instance);
+    QQmlAndroidViewAnimator::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidviewflipper_p.h b/src/qmlandroid/widget/qtqmlandroidviewflipper_p.h
index f0950f9..f3a7b22 100644
--- a/src/qmlandroid/widget/qtqmlandroidviewflipper_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidviewflipper_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidViewFlipper : public QtQmlAndroidViewAnimator
+class QQmlAndroidViewFlipper : public QQmlAndroidViewAnimator
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidViewFlipper(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidViewFlipper(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidviewswitcher.cpp b/src/qmlandroid/widget/qtqmlandroidviewswitcher.cpp
index 6406e93..fe2698f 100644
--- a/src/qmlandroid/widget/qtqmlandroidviewswitcher.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidviewswitcher.cpp
@@ -2,21 +2,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QtQmlAndroidViewSwitcher::QtQmlAndroidViewSwitcher(QtQmlAndroidView *parent) :
-    QtQmlAndroidViewAnimator(parent)
+QQmlAndroidViewSwitcher::QQmlAndroidViewSwitcher(QQmlAndroidView *parent) :
+    QQmlAndroidViewAnimator(parent)
 {
 }
 
-QAndroidJniObject QtQmlAndroidViewSwitcher::onCreate()
+QAndroidJniObject QQmlAndroidViewSwitcher::onCreate()
 {
     return QAndroidJniObject("android/widget/ViewSwitcher",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QtQmlAndroidViewSwitcher::onInflate(QAndroidJniObject &instance)
+void QQmlAndroidViewSwitcher::onInflate(QAndroidJniObject &instance)
 {
-    QtQmlAndroidViewAnimator::onInflate(instance);
+    QQmlAndroidViewAnimator::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmlandroid/widget/qtqmlandroidviewswitcher_p.h b/src/qmlandroid/widget/qtqmlandroidviewswitcher_p.h
index 83fe253..afb71e8 100644
--- a/src/qmlandroid/widget/qtqmlandroidviewswitcher_p.h
+++ b/src/qmlandroid/widget/qtqmlandroidviewswitcher_p.h
@@ -5,12 +5,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QtQmlAndroidViewSwitcher : public QtQmlAndroidViewAnimator
+class QQmlAndroidViewSwitcher : public QQmlAndroidViewAnimator
 {
     Q_OBJECT
 
 public:
-    explicit QtQmlAndroidViewSwitcher(QtQmlAndroidView *parent = 0);
+    explicit QQmlAndroidViewSwitcher(QQmlAndroidView *parent = 0);
 
 protected:
     QAndroidJniObject onCreate() Q_DECL_OVERRIDE;
diff --git a/src/qmlandroid/widget/qtqmlandroidwidgetmodule.cpp b/src/qmlandroid/widget/qtqmlandroidwidgetmodule.cpp
index 04053d8..432ef81 100644
--- a/src/qmlandroid/widget/qtqmlandroidwidgetmodule.cpp
+++ b/src/qmlandroid/widget/qtqmlandroidwidgetmodule.cpp
@@ -45,43 +45,43 @@ namespace QtQmlAndroid {
 
 void registerWidgetModule(const char *uri)
 {
-    qmlRegisterType<QtQmlAndroidArrayAdapter>(uri, 0, 21, "ArrayAdapter");
-    qmlRegisterType<QtQmlAndroidBaseAdapter>();
-    qmlRegisterType<QtQmlAndroidButton>(uri, 0, 21, "Button");
-    qmlRegisterType<QtQmlAndroidCalendarView>(uri, 0, 21, "CalendarView");
-    qmlRegisterType<QtQmlAndroidCheckBox>(uri, 0, 21, "CheckBox");
-    qmlRegisterType<QtQmlAndroidDatePicker>(uri, 0, 21, "DatePicker");
-    qmlRegisterType<QtQmlAndroidEditText>(uri, 0, 21, "EditText");
-    qmlRegisterType<QtQmlAndroidFrameLayout>(uri, 0, 21, "FrameLayout");
-    qmlRegisterType<QtQmlAndroidFrameLayoutParams>();
-    qmlRegisterType<QtQmlAndroidImageView>(uri, 0, 21, "ImageView");
-    qmlRegisterType<QtQmlAndroidLinearLayout>(uri, 0, 21, "LinearLayout");
-    qmlRegisterType<QtQmlAndroidLinearLayoutParams>();
-    qmlRegisterType<QtQmlAndroidListView>(uri, 0, 21, "ListView");
-    qmlRegisterType<QtQmlAndroidNumberPicker>(uri, 0, 21, "NumberPicker");
-    qmlRegisterType<QtQmlAndroidPopupMenu>(uri, 0, 21, "PopupMenu");
-    qmlRegisterType<QtQmlAndroidProgressBar>(uri, 0, 21, "ProgressBar");
-    qmlRegisterType<QtQmlAndroidRadioButton>(uri, 0, 21, "RadioButton");
-    qmlRegisterType<QtQmlAndroidRadioGroup>(uri, 0, 21, "RadioGroup");
-    qmlRegisterType<QtQmlAndroidRatingBar>(uri, 0, 21, "RatingBar");
-    qmlRegisterType<QtQmlAndroidRelativeLayout>(uri, 0, 21, "RelativeLayout");
-    qmlRegisterType<QtQmlAndroidRelativeLayoutParams>();
-    qmlRegisterType<QtQmlAndroidScrollView>(uri, 0, 21, "ScrollView");
-    qmlRegisterType<QtQmlAndroidSearchView>(uri, 0, 21, "SearchView");
-    qmlRegisterType<QtQmlAndroidSeekBar>(uri, 0, 21, "SeekBar");
-    qmlRegisterType<QtQmlAndroidSpace>(uri, 0, 21, "Space");
-    qmlRegisterType<QtQmlAndroidSpinner>(uri, 0, 21, "Spinner");
-    qmlRegisterType<QtQmlAndroidSwitch>(uri, 0, 21, "Switch");
-    qmlRegisterType<QtQmlAndroidTabHost>(uri, 0, 21, "TabHost");
-    qmlRegisterUncreatableType<QtQmlAndroidTabSpec>(uri, 0, 21, "TabSpec", "TabSpec is an attached property");
-    qmlRegisterType<QtQmlAndroidTabWidget>(uri, 0, 21, "TabWidget");
-    qmlRegisterType<QtQmlAndroidTextView>(uri, 0, 21, "TextView");
-    qmlRegisterType<QtQmlAndroidTimePicker>(uri, 0, 21, "TimePicker");
-    qmlRegisterType<QtQmlAndroidToast>(uri, 0, 21, "Toast");
-    qmlRegisterType<QtQmlAndroidToggleButton>(uri, 0, 21, "ToggleButton");
-    qmlRegisterType<QtQmlAndroidViewAnimator>(uri, 0, 21, "ViewAnimator");
-    qmlRegisterType<QtQmlAndroidViewFlipper>(uri, 0, 21, "ViewFlipper");
-    qmlRegisterType<QtQmlAndroidViewSwitcher>(uri, 0, 21, "ViewSwitcher");
+    qmlRegisterType<QQmlAndroidArrayAdapter>(uri, 0, 21, "ArrayAdapter");
+    qmlRegisterType<QQmlAndroidBaseAdapter>();
+    qmlRegisterType<QQmlAndroidButton>(uri, 0, 21, "Button");
+    qmlRegisterType<QQmlAndroidCalendarView>(uri, 0, 21, "CalendarView");
+    qmlRegisterType<QQmlAndroidCheckBox>(uri, 0, 21, "CheckBox");
+    qmlRegisterType<QQmlAndroidDatePicker>(uri, 0, 21, "DatePicker");
+    qmlRegisterType<QQmlAndroidEditText>(uri, 0, 21, "EditText");
+    qmlRegisterType<QQmlAndroidFrameLayout>(uri, 0, 21, "FrameLayout");
+    qmlRegisterType<QQmlAndroidFrameLayoutParams>();
+    qmlRegisterType<QQmlAndroidImageView>(uri, 0, 21, "ImageView");
+    qmlRegisterType<QQmlAndroidLinearLayout>(uri, 0, 21, "LinearLayout");
+    qmlRegisterType<QQmlAndroidLinearLayoutParams>();
+    qmlRegisterType<QQmlAndroidListView>(uri, 0, 21, "ListView");
+    qmlRegisterType<QQmlAndroidNumberPicker>(uri, 0, 21, "NumberPicker");
+    qmlRegisterType<QQmlAndroidPopupMenu>(uri, 0, 21, "PopupMenu");
+    qmlRegisterType<QQmlAndroidProgressBar>(uri, 0, 21, "ProgressBar");
+    qmlRegisterType<QQmlAndroidRadioButton>(uri, 0, 21, "RadioButton");
+    qmlRegisterType<QQmlAndroidRadioGroup>(uri, 0, 21, "RadioGroup");
+    qmlRegisterType<QQmlAndroidRatingBar>(uri, 0, 21, "RatingBar");
+    qmlRegisterType<QQmlAndroidRelativeLayout>(uri, 0, 21, "RelativeLayout");
+    qmlRegisterType<QQmlAndroidRelativeLayoutParams>();
+    qmlRegisterType<QQmlAndroidScrollView>(uri, 0, 21, "ScrollView");
+    qmlRegisterType<QQmlAndroidSearchView>(uri, 0, 21, "SearchView");
+    qmlRegisterType<QQmlAndroidSeekBar>(uri, 0, 21, "SeekBar");
+    qmlRegisterType<QQmlAndroidSpace>(uri, 0, 21, "Space");
+    qmlRegisterType<QQmlAndroidSpinner>(uri, 0, 21, "Spinner");
+    qmlRegisterType<QQmlAndroidSwitch>(uri, 0, 21, "Switch");
+    qmlRegisterType<QQmlAndroidTabHost>(uri, 0, 21, "TabHost");
+    qmlRegisterUncreatableType<QQmlAndroidTabSpec>(uri, 0, 21, "TabSpec", "TabSpec is an attached property");
+    qmlRegisterType<QQmlAndroidTabWidget>(uri, 0, 21, "TabWidget");
+    qmlRegisterType<QQmlAndroidTextView>(uri, 0, 21, "TextView");
+    qmlRegisterType<QQmlAndroidTimePicker>(uri, 0, 21, "TimePicker");
+    qmlRegisterType<QQmlAndroidToast>(uri, 0, 21, "Toast");
+    qmlRegisterType<QQmlAndroidToggleButton>(uri, 0, 21, "ToggleButton");
+    qmlRegisterType<QQmlAndroidViewAnimator>(uri, 0, 21, "ViewAnimator");
+    qmlRegisterType<QQmlAndroidViewFlipper>(uri, 0, 21, "ViewFlipper");
+    qmlRegisterType<QQmlAndroidViewSwitcher>(uri, 0, 21, "ViewSwitcher");
 }
 
 }