Rename QQmlAndroidFoo to QNativeAndroidFoo

Change-Id: Ia4fcc35a984ec2587bfea4e212afd30ff388c240
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

206 files changed, 3016 insertions, 3016 deletions

diff --git a/src/android/android.pri b/src/android/android.pri
index d7ecc31..a5127d2 100644
--- a/src/android/android.pri
+++ b/src/android/android.pri
@@ -1,10 +1,10 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qqmlandroidr_p.h
+    $$PWD/qnativeandroidr_p.h
 
 SOURCES += \
-    $$PWD/qqmlandroidr.cpp
+    $$PWD/qnativeandroidr.cpp
 
 include(app/app.pri)
 include(core/core.pri)
diff --git a/src/android/android.pro b/src/android/android.pro
index bfc111f..e362b65 100644
--- a/src/android/android.pro
+++ b/src/android/android.pro
@@ -11,6 +11,6 @@ features.path = $$[QT_HOST_DATA]/mkspecs/features
 !prefix_build: COPIES += features
 INSTALLS += features
 
-include(qmlandroid.pri)
+include(android.pri)
 
 load(qt_module)
diff --git a/src/android/app/app.pri b/src/android/app/app.pri
index f7951c0..2e3a46f 100644
--- a/src/android/app/app.pri
+++ b/src/android/app/app.pri
@@ -1,15 +1,15 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qqmlandroidactionbar_p.h \
-    $$PWD/qqmlandroidactivity_p.h \
-    $$PWD/qqmlandroidalertdialog_p.h \
-    $$PWD/qqmlandroiddialog_p.h \
-    $$PWD/qqmlandroidservice_p.h
+    $$PWD/qnativeandroidactionbar_p.h \
+    $$PWD/qnativeandroidactivity_p.h \
+    $$PWD/qnativeandroidalertdialog_p.h \
+    $$PWD/qnativeandroiddialog_p.h \
+    $$PWD/qnativeandroidservice_p.h
 
 SOURCES += \
-    $$PWD/qqmlandroidactionbar.cpp \
-    $$PWD/qqmlandroidactivity.cpp \
-    $$PWD/qqmlandroidalertdialog.cpp \
-    $$PWD/qqmlandroiddialog.cpp \
-    $$PWD/qqmlandroidservice.cpp
+    $$PWD/qnativeandroidactionbar.cpp \
+    $$PWD/qnativeandroidactivity.cpp \
+    $$PWD/qnativeandroidalertdialog.cpp \
+    $$PWD/qnativeandroiddialog.cpp \
+    $$PWD/qnativeandroidservice.cpp
diff --git a/src/android/app/qqmlandroidactionbar.cpp b/src/android/app/qnativeandroidactionbar.cpp
index 6b6893b..eefc43c 100644
--- a/src/android/app/qqmlandroidactionbar.cpp
+++ b/src/android/app/qnativeandroidactionbar.cpp
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidactionbar_p.h"
-#include "qqmlandroiddrawable_p.h"
+#include "qnativeandroidactionbar_p.h"
+#include "qnativeandroiddrawable_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidActionBar::QQmlAndroidActionBar(QObject *parent) :
-    QQmlAndroidObject(parent), m_visible(true), m_elevation(0.0), m_background(0)
+QNativeAndroidActionBar::QNativeAndroidActionBar(QObject *parent) :
+    QNativeAndroidObject(parent), m_visible(true), m_elevation(0.0), m_background(0)
 {
 }
 
-bool QQmlAndroidActionBar::isVisible() const
+bool QNativeAndroidActionBar::isVisible() const
 {
     return m_visible;
 }
 
-void QQmlAndroidActionBar::setVisible(bool arg)
+void QNativeAndroidActionBar::setVisible(bool arg)
 {
     if (arg != isVisible()) {
         m_visible = arg;
@@ -62,12 +62,12 @@ void QQmlAndroidActionBar::setVisible(bool arg)
     }
 }
 
-qreal QQmlAndroidActionBar::elevation() const
+qreal QNativeAndroidActionBar::elevation() const
 {
     return m_elevation;
 }
 
-void QQmlAndroidActionBar::setElevation(qreal elevation)
+void QNativeAndroidActionBar::setElevation(qreal elevation)
 {
     if (m_elevation != elevation) {
         m_elevation = elevation;
@@ -76,12 +76,12 @@ void QQmlAndroidActionBar::setElevation(qreal elevation)
     }
 }
 
-QString QQmlAndroidActionBar::title() const
+QString QNativeAndroidActionBar::title() const
 {
     return m_title;
 }
 
-void QQmlAndroidActionBar::setTitle(const QString &title)
+void QNativeAndroidActionBar::setTitle(const QString &title)
 {
     if (m_title != title) {
         m_title = title;
@@ -90,12 +90,12 @@ void QQmlAndroidActionBar::setTitle(const QString &title)
     }
 }
 
-QString QQmlAndroidActionBar::subtitle() const
+QString QNativeAndroidActionBar::subtitle() const
 {
     return m_subtitle;
 }
 
-void QQmlAndroidActionBar::setSubtitle(const QString &subtitle)
+void QNativeAndroidActionBar::setSubtitle(const QString &subtitle)
 {
     if (m_subtitle != subtitle) {
         m_subtitle = subtitle;
@@ -104,28 +104,28 @@ void QQmlAndroidActionBar::setSubtitle(const QString &subtitle)
     }
 }
 
-QQmlAndroidDrawable *QQmlAndroidActionBar::background() const
+QNativeAndroidDrawable *QNativeAndroidActionBar::background() const
 {
     return m_background;
 }
 
-void QQmlAndroidActionBar::setBackground(QQmlAndroidDrawable *background)
+void QNativeAndroidActionBar::setBackground(QNativeAndroidDrawable *background)
 {
     if (m_background != background) {
         if (m_background) {
-            disconnect(m_background, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidActionBar::updateBackground);
+            disconnect(m_background, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidActionBar::updateBackground);
             m_background->destruct();
         }
         m_background = background;
         if (m_background) {
-            connect(m_background, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidActionBar::updateBackground);
+            connect(m_background, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidActionBar::updateBackground);
             m_background->construct();
         }
         emit backgroundChanged();
     }
 }
 
-void QQmlAndroidActionBar::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidActionBar::onInflate(QAndroidJniObject &instance)
 {
     instance.callMethod<void>(m_visible ? "show" : "hide");
 
@@ -140,14 +140,14 @@ void QQmlAndroidActionBar::onInflate(QAndroidJniObject &instance)
     instance.callMethod<void>("setHomeButtonEnabled", "(Z)V", true);
 }
 
-void QQmlAndroidActionBar::objectChange(ObjectChange change)
+void QNativeAndroidActionBar::objectChange(ObjectChange change)
 {
-    QQmlAndroidObject::objectChange(change);
+    QNativeAndroidObject::objectChange(change);
     if (change == InstanceChange)
         updateBackground();
 }
 
-void QQmlAndroidActionBar::updateBackground()
+void QNativeAndroidActionBar::updateBackground()
 {
     if (!isValid() || !m_background)
         return;
diff --git a/src/android/app/qqmlandroidactionbar_p.h b/src/android/app/qnativeandroidactionbar_p.h
index 2bc70a2..974a8d5 100644
--- a/src/android/app/qqmlandroidactionbar_p.h
+++ b/src/android/app/qnativeandroidactionbar_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDACTIONBAR_P_H
-#define QQMLANDROIDACTIONBAR_P_H
+#ifndef QNATIVEANDROIDACTIONBAR_P_H
+#define QNATIVEANDROIDACTIONBAR_P_H
 
 //
 //  W A R N I N G
@@ -48,24 +48,24 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidobject_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidobject_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQmlAndroidDrawable;
+class QNativeAndroidDrawable;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidActionBar : public QQmlAndroidObject
+class Q_QMLANDROID_EXPORT QNativeAndroidActionBar : public QNativeAndroidObject
 {
     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(QQmlAndroidDrawable *background READ background WRITE setBackground NOTIFY backgroundChanged)
+    Q_PROPERTY(QNativeAndroidDrawable *background READ background WRITE setBackground NOTIFY backgroundChanged)
 
 public:
-    explicit QQmlAndroidActionBar(QObject *parent = nullptr);
+    explicit QNativeAndroidActionBar(QObject *parent = nullptr);
 
     bool isVisible() const;
     void setVisible(bool visible);
@@ -79,8 +79,8 @@ public:
     QString subtitle() const;
     void setSubtitle(const QString &subtitle);
 
-    QQmlAndroidDrawable *background() const;
-    void setBackground(QQmlAndroidDrawable *background);
+    QNativeAndroidDrawable *background() const;
+    void setBackground(QNativeAndroidDrawable *background);
 
 Q_SIGNALS:
     void visibleChanged();
@@ -102,9 +102,9 @@ private:
     qreal m_elevation;
     QString m_title;
     QString m_subtitle;
-    QQmlAndroidDrawable *m_background;
+    QNativeAndroidDrawable *m_background;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDACTIONBAR_P_H
+#endif // QNATIVEANDROIDACTIONBAR_P_H
diff --git a/src/android/app/qqmlandroidactivity.cpp b/src/android/app/qnativeandroidactivity.cpp
index b740efb..4208b2a 100644
--- a/src/android/app/qqmlandroidactivity.cpp
+++ b/src/android/app/qnativeandroidactivity.cpp
@@ -34,12 +34,12 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidactivity_p.h"
-#include "qqmlandroidactionbar_p.h"
-#include "qqmlandroidmenuitem_p.h"
-#include "qqmlandroidmenu_p.h"
-#include "qqmlandroidview_p.h"
-#include "qqmlandroidwindow_p.h"
+#include "qnativeandroidactivity_p.h"
+#include "qnativeandroidactionbar_p.h"
+#include "qnativeandroidmenuitem_p.h"
+#include "qnativeandroidmenu_p.h"
+#include "qnativeandroidview_p.h"
+#include "qnativeandroidwindow_p.h"
 #include "qtqmlandroidfunctions_p.h"
 #include <QtCore/private/qjnihelpers_p.h>
 #include <QtAndroidExtras/qandroidfunctions.h>
@@ -47,25 +47,25 @@
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidActivity::QQmlAndroidActivity(QObject *parent) :
-    QQmlAndroidContextWrapper(parent), m_window(new QQmlAndroidWindow(this)),
+QNativeAndroidActivity::QNativeAndroidActivity(QObject *parent) :
+    QNativeAndroidContextWrapper(parent), m_window(new QNativeAndroidWindow(this)),
     m_contentView(0), m_optionsMenu(0), m_actionBar(0)
 {
     // TODO: multiple activities?
     setInstance(QtAndroid::androidActivity());
 }
 
-QQmlAndroidWindow *QQmlAndroidActivity::window() const
+QNativeAndroidWindow *QNativeAndroidActivity::window() const
 {
     return m_window;
 }
 
-QQmlAndroidActionBar *QQmlAndroidActivity::actionBar() const
+QNativeAndroidActionBar *QNativeAndroidActivity::actionBar() const
 {
     return m_actionBar;
 }
 
-void QQmlAndroidActivity::setActionBar(QQmlAndroidActionBar *bar)
+void QNativeAndroidActivity::setActionBar(QNativeAndroidActionBar *bar)
 {
     if (m_actionBar != bar) {
         if (m_actionBar)
@@ -76,59 +76,59 @@ void QQmlAndroidActivity::setActionBar(QQmlAndroidActionBar *bar)
     }
 }
 
-QQmlAndroidMenu *QQmlAndroidActivity::optionsMenu() const
+QNativeAndroidMenu *QNativeAndroidActivity::optionsMenu() const
 {
     return m_optionsMenu;
 }
 
-void QQmlAndroidActivity::setOptionsMenu(QQmlAndroidMenu *menu)
+void QNativeAndroidActivity::setOptionsMenu(QNativeAndroidMenu *menu)
 {
     if (m_optionsMenu != menu) {
         if (m_optionsMenu) {
-            disconnect(m_optionsMenu, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidActivity::updateOptionsMenu);
+            disconnect(m_optionsMenu, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidActivity::updateOptionsMenu);
             m_optionsMenu->destruct();
         }
         m_optionsMenu = menu;
         if (m_optionsMenu) {
-            connect(m_optionsMenu, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidActivity::updateOptionsMenu);
+            connect(m_optionsMenu, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidActivity::updateOptionsMenu);
             if (isComponentComplete())
                 m_optionsMenu->construct();
         }
     }
 }
 
-QQmlAndroidView *QQmlAndroidActivity::contentView() const
+QNativeAndroidView *QNativeAndroidActivity::contentView() const
 {
     return m_contentView;
 }
 
-void QQmlAndroidActivity::setContentView(QQmlAndroidView *view)
+void QNativeAndroidActivity::setContentView(QNativeAndroidView *view)
 {
     if (m_contentView != view) {
         if (m_contentView) {
-            disconnect(m_contentView, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidActivity::updateContentView);
+            disconnect(m_contentView, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidActivity::updateContentView);
             m_contentView->destruct();
         }
         m_contentView = view;
         if (m_contentView) {
-            connect(m_contentView, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidActivity::updateContentView);
+            connect(m_contentView, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidActivity::updateContentView);
             if (isComponentComplete())
                 m_contentView->construct();
         }
     }
 }
 
-void QQmlAndroidActivity::classBegin()
+void QNativeAndroidActivity::classBegin()
 {
-    QQmlAndroidContextWrapper::classBegin();
+    QNativeAndroidContextWrapper::classBegin();
 }
 
-void QQmlAndroidActivity::componentComplete()
+void QNativeAndroidActivity::componentComplete()
 {
-    QQmlAndroidContextWrapper::componentComplete();
+    QNativeAndroidContextWrapper::componentComplete();
 
     foreach (QObject *child, children()) {
-        QQmlAndroidObject *object = qobject_cast<QQmlAndroidObject *>(child);
+        QNativeAndroidObject *object = qobject_cast<QNativeAndroidObject *>(child);
         if (object)
             object->construct();
     }
@@ -140,7 +140,7 @@ void QQmlAndroidActivity::componentComplete()
         setupWindow();
 }
 
-void QQmlAndroidActivity::setupWindow()
+void QNativeAndroidActivity::setupWindow()
 {
     if (!isValid())
         return;
@@ -152,7 +152,7 @@ void QQmlAndroidActivity::setupWindow()
     });
 }
 
-void QQmlAndroidActivity::setupActionBar()
+void QNativeAndroidActivity::setupActionBar()
 {
     if (!isValid())
         return;
@@ -164,7 +164,7 @@ void QQmlAndroidActivity::setupActionBar()
     });
 }
 
-void QQmlAndroidActivity::updateOptionsMenu()
+void QNativeAndroidActivity::updateOptionsMenu()
 {
     if (!isValid())
         return;
@@ -179,12 +179,12 @@ void QQmlAndroidActivity::updateOptionsMenu()
     });
 }
 
-void QQmlAndroidActivity::invalidateOptionsMenu()
+void QNativeAndroidActivity::invalidateOptionsMenu()
 {
     QtQmlAndroid::callVoidMethod(instance(), "invalidateOptionsMenu");
 }
 
-void QQmlAndroidActivity::updateContentView()
+void QNativeAndroidActivity::updateContentView()
 {
     if (!isValid())
         return;
diff --git a/src/android/app/qqmlandroidactivity_p.h b/src/android/app/qnativeandroidactivity_p.h
index 58d119f..c87de51 100644
--- a/src/android/app/qqmlandroidactivity_p.h
+++ b/src/android/app/qnativeandroidactivity_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDACTIVITY_P_H
-#define QQMLANDROIDACTIVITY_P_H
+#ifndef QNATIVEANDROIDACTIVITY_P_H
+#define QNATIVEANDROIDACTIVITY_P_H
 
 //
 //  W A R N I N G
@@ -48,36 +48,36 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidcontextwrapper_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcontextwrapper_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQmlAndroidView;
-class QQmlAndroidMenu;
-class QQmlAndroidWindow;
-class QQmlAndroidActionBar;
+class QNativeAndroidView;
+class QNativeAndroidMenu;
+class QNativeAndroidWindow;
+class QNativeAndroidActionBar;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidActivity : public QQmlAndroidContextWrapper
+class Q_QMLANDROID_EXPORT QNativeAndroidActivity : public QNativeAndroidContextWrapper
 {
     Q_OBJECT
-    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)
+    Q_PROPERTY(QNativeAndroidWindow *window READ window CONSTANT)
+    Q_PROPERTY(QNativeAndroidActionBar *actionBar READ actionBar WRITE setActionBar)
+    Q_PROPERTY(QNativeAndroidMenu *optionsMenu READ optionsMenu WRITE setOptionsMenu)
+    Q_PROPERTY(QNativeAndroidView *contentView READ contentView WRITE setContentView)
 
 public:
-    explicit QQmlAndroidActivity(QObject *parent = nullptr);
+    explicit QNativeAndroidActivity(QObject *parent = nullptr);
 
-    QQmlAndroidWindow *window() const;
+    QNativeAndroidWindow *window() const;
 
-    QQmlAndroidActionBar *actionBar() const;
-    void setActionBar(QQmlAndroidActionBar *bar);
+    QNativeAndroidActionBar *actionBar() const;
+    void setActionBar(QNativeAndroidActionBar *bar);
 
-    QQmlAndroidMenu *optionsMenu() const;
-    void setOptionsMenu(QQmlAndroidMenu *menu);
+    QNativeAndroidMenu *optionsMenu() const;
+    void setOptionsMenu(QNativeAndroidMenu *menu);
 
-    QQmlAndroidView *contentView() const;
-    void setContentView(QQmlAndroidView *view);
+    QNativeAndroidView *contentView() const;
+    void setContentView(QNativeAndroidView *view);
 
 protected:
     void classBegin() override;
@@ -91,12 +91,12 @@ private Q_SLOTS:
     void updateContentView();
 
 private:
-    QQmlAndroidWindow *m_window;
-    QQmlAndroidView *m_contentView;
-    QQmlAndroidMenu *m_optionsMenu;
-    QQmlAndroidActionBar *m_actionBar;
+    QNativeAndroidWindow *m_window;
+    QNativeAndroidView *m_contentView;
+    QNativeAndroidMenu *m_optionsMenu;
+    QNativeAndroidActionBar *m_actionBar;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDACTIVITY_P_H
+#endif // QNATIVEANDROIDACTIVITY_P_H
diff --git a/src/android/app/qqmlandroidalertdialog.cpp b/src/android/app/qnativeandroidalertdialog.cpp
index 84dff83..1b8d329 100644
--- a/src/android/app/qqmlandroidalertdialog.cpp
+++ b/src/android/app/qnativeandroidalertdialog.cpp
@@ -34,22 +34,22 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidalertdialog_p.h"
+#include "qnativeandroidalertdialog_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidAlertDialog::QQmlAndroidAlertDialog(QObject *parent) :
-    QQmlAndroidDialog(parent)
+QNativeAndroidAlertDialog::QNativeAndroidAlertDialog(QObject *parent) :
+    QNativeAndroidDialog(parent)
 {
 }
 
-QString QQmlAndroidAlertDialog::title() const
+QString QNativeAndroidAlertDialog::title() const
 {
     return m_title;
 }
 
-void QQmlAndroidAlertDialog::setTitle(const QString &title)
+void QNativeAndroidAlertDialog::setTitle(const QString &title)
 {
     if (m_title != title) {
         m_title = title;
@@ -58,12 +58,12 @@ void QQmlAndroidAlertDialog::setTitle(const QString &title)
     }
 }
 
-QString QQmlAndroidAlertDialog::message() const
+QString QNativeAndroidAlertDialog::message() const
 {
     return m_message;
 }
 
-void QQmlAndroidAlertDialog::setMessage(const QString &message)
+void QNativeAndroidAlertDialog::setMessage(const QString &message)
 {
     if (m_message != message) {
         m_message = message;
@@ -72,16 +72,16 @@ void QQmlAndroidAlertDialog::setMessage(const QString &message)
     }
 }
 
-QAndroidJniObject QQmlAndroidAlertDialog::onCreate()
+QAndroidJniObject QNativeAndroidAlertDialog::onCreate()
 {
     return QAndroidJniObject("android/app/AlertDialog",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidAlertDialog::onInflate(QAndroidJniObject& instance)
+void QNativeAndroidAlertDialog::onInflate(QAndroidJniObject& instance)
 {
-    QQmlAndroidDialog::onInflate(instance);
+    QNativeAndroidDialog::onInflate(instance);
 
     if (!m_title.isNull())
         instance.callMethod<void>("setTitle", "(Ljava/lang/CharSequence;)V", QAndroidJniObject::fromString(m_title).object());
diff --git a/src/android/app/qqmlandroidalertdialog_p.h b/src/android/app/qnativeandroidalertdialog_p.h
index 129a1c1..0ccce96 100644
--- a/src/android/app/qqmlandroidalertdialog_p.h
+++ b/src/android/app/qnativeandroidalertdialog_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDALERTDIALOG_P_H
-#define QQMLANDROIDALERTDIALOG_P_H
+#ifndef QNATIVEANDROIDALERTDIALOG_P_H
+#define QNATIVEANDROIDALERTDIALOG_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroiddialog_p.h>
+#include <QtQmlAndroid/private/qnativeandroiddialog_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidAlertDialog : public QQmlAndroidDialog
+class Q_QMLANDROID_EXPORT QNativeAndroidAlertDialog : public QNativeAndroidDialog
 {
     Q_OBJECT
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
     Q_PROPERTY(QString message READ message WRITE setMessage NOTIFY messageChanged)
 
 public:
-    explicit QQmlAndroidAlertDialog(QObject *parent = nullptr);
+    explicit QNativeAndroidAlertDialog(QObject *parent = nullptr);
 
     QString title() const;
     void setTitle(const QString &title);
@@ -82,4 +82,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDALERTDIALOG_P_H
+#endif // QNATIVEANDROIDALERTDIALOG_P_H
diff --git a/src/android/app/qqmlandroiddialog.cpp b/src/android/app/qnativeandroiddialog.cpp
index 397ee60..b73fdc6 100644
--- a/src/android/app/qqmlandroiddialog.cpp
+++ b/src/android/app/qnativeandroiddialog.cpp
@@ -34,46 +34,46 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroiddialog_p.h"
+#include "qnativeandroiddialog_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidDialog::QQmlAndroidDialog(QObject *parent) :
-    QQmlAndroidContextual(parent)
+QNativeAndroidDialog::QNativeAndroidDialog(QObject *parent) :
+    QNativeAndroidContextual(parent)
 {
 }
 
-void QQmlAndroidDialog::cancel()
+void QNativeAndroidDialog::cancel()
 {
     QtQmlAndroid::callVoidMethod(instance(), "cancel");
 }
 
-void QQmlAndroidDialog::dismiss()
+void QNativeAndroidDialog::dismiss()
 {
     QtQmlAndroid::callVoidMethod(instance(), "dismiss");
 }
 
-void QQmlAndroidDialog::hide()
+void QNativeAndroidDialog::hide()
 {
     QtQmlAndroid::callVoidMethod(instance(), "hide");
 }
 
-void QQmlAndroidDialog::show()
+void QNativeAndroidDialog::show()
 {
     QtQmlAndroid::callVoidMethod(instance(), "show");
 }
 
-QAndroidJniObject QQmlAndroidDialog::onCreate()
+QAndroidJniObject QNativeAndroidDialog::onCreate()
 {
     return QAndroidJniObject("android/app/Dialog",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidDialog::onInflate(QAndroidJniObject& instance)
+void QNativeAndroidDialog::onInflate(QAndroidJniObject& instance)
 {
-    QQmlAndroidContextual::onInflate(instance);
+    QNativeAndroidContextual::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/app/qqmlandroiddialog_p.h b/src/android/app/qnativeandroiddialog_p.h
index fdacdfe..21b9ed8 100644
--- a/src/android/app/qqmlandroiddialog_p.h
+++ b/src/android/app/qnativeandroiddialog_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDDIALOG_P_H
-#define QQMLANDROIDDIALOG_P_H
+#ifndef QNATIVEANDROIDDIALOG_P_H
+#define QNATIVEANDROIDDIALOG_P_H
 
 //
 //  W A R N I N G
@@ -48,16 +48,16 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidcontextual_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidDialog : public QQmlAndroidContextual
+class Q_QMLANDROID_EXPORT QNativeAndroidDialog : public QNativeAndroidContextual
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidDialog(QObject *parent = nullptr);
+    explicit QNativeAndroidDialog(QObject *parent = nullptr);
 
 public Q_SLOTS:
     void cancel();
@@ -72,4 +72,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDDIALOG_P_H
+#endif // QNATIVEANDROIDDIALOG_P_H
diff --git a/src/android/app/qqmlandroidservice.cpp b/src/android/app/qnativeandroidservice.cpp
index 6db3d51..ccb0d49 100644
--- a/src/android/app/qqmlandroidservice.cpp
+++ b/src/android/app/qnativeandroidservice.cpp
@@ -34,22 +34,22 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidservice_p.h"
+#include "qnativeandroidservice_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidService::QQmlAndroidService(QObject *parent) :
-    QQmlAndroidContextWrapper(0, parent), m_sticky(true)
+QNativeAndroidService::QNativeAndroidService(QObject *parent) :
+    QNativeAndroidContextWrapper(0, parent), m_sticky(true)
 {
 }
 
-bool QQmlAndroidService::isSticky() const
+bool QNativeAndroidService::isSticky() const
 {
     return m_sticky;
 }
 
-void QQmlAndroidService::setSticky(bool sticky)
+void QNativeAndroidService::setSticky(bool sticky)
 {
     if (m_sticky != sticky) {
         m_sticky = sticky;
@@ -57,7 +57,7 @@ void QQmlAndroidService::setSticky(bool sticky)
     }
 }
 
-void QQmlAndroidService::start()
+void QNativeAndroidService::start()
 {
     QAndroidJniObject context = ctx();
     QAndroidJniObject service = instance();
@@ -82,7 +82,7 @@ void QQmlAndroidService::start()
     });
 }
 
-void QQmlAndroidService::stop()
+void QNativeAndroidService::stop()
 {
     QAndroidJniObject context = ctx();
     QAndroidJniObject service = instance();
@@ -106,14 +106,14 @@ void QQmlAndroidService::stop()
     });
 }
 
-QAndroidJniObject QQmlAndroidService::onCreate()
+QAndroidJniObject QNativeAndroidService::onCreate()
 {
     return QAndroidJniObject("qt/android/app/QmlService");
 }
 
-void QQmlAndroidService::onInflate(QAndroidJniObject& instance)
+void QNativeAndroidService::onInflate(QAndroidJniObject& instance)
 {
-    QQmlAndroidContextWrapper::onInflate(instance);
+    QNativeAndroidContextWrapper::onInflate(instance);
 
     static bool nativeMethodsRegistered = false;
     if (!nativeMethodsRegistered) {
@@ -122,7 +122,7 @@ void QQmlAndroidService::onInflate(QAndroidJniObject& instance)
     }
 }
 
-void QQmlAndroidService::onRegisterNativeMethods(jobject service)
+void QNativeAndroidService::onRegisterNativeMethods(jobject service)
 {
     JNINativeMethod methods[] {{"onCreated", "(J)V", reinterpret_cast<void *>(onCreated)},
                                {"onDestroyed", "(J)V", reinterpret_cast<void *>(onDestroyed)},
@@ -134,29 +134,29 @@ void QQmlAndroidService::onRegisterNativeMethods(jobject service)
     env->DeleteLocalRef(cls);
 }
 
-void QQmlAndroidService::onCreated(JNIEnv *env, jobject object, jlong instance)
+void QNativeAndroidService::onCreated(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-//    QQmlAndroidService *service = reinterpret_cast<QQmlAndroidService *>(instance);
+//    QNativeAndroidService *service = reinterpret_cast<QNativeAndroidService *>(instance);
 //    if (service)
 //        QMetaObject::invokeMethod(service, "created", Qt::QueuedConnection);
 }
 
-void QQmlAndroidService::onDestroyed(JNIEnv *env, jobject object, jlong instance)
+void QNativeAndroidService::onDestroyed(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidService *service = reinterpret_cast<QQmlAndroidService *>(instance);
+    QNativeAndroidService *service = reinterpret_cast<QNativeAndroidService *>(instance);
     if (service)
         QMetaObject::invokeMethod(service, "stopped", Qt::QueuedConnection);
 }
 
-jboolean QQmlAndroidService::onStartCommand(JNIEnv *env, jobject object, jlong instance, jint flags, jint startId)
+jboolean QNativeAndroidService::onStartCommand(JNIEnv *env, jobject object, jlong instance, jint flags, jint startId)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidService *service = reinterpret_cast<QQmlAndroidService *>(instance);
+    QNativeAndroidService *service = reinterpret_cast<QNativeAndroidService *>(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));
@@ -165,7 +165,7 @@ jboolean QQmlAndroidService::onStartCommand(JNIEnv *env, jobject object, jlong i
     return ret;
 }
 
-bool QQmlAndroidService::startCommand(int flags, int startId)
+bool QNativeAndroidService::startCommand(int flags, int startId)
 {
     Q_UNUSED(flags);
     Q_UNUSED(startId);
diff --git a/src/android/app/qqmlandroidservice_p.h b/src/android/app/qnativeandroidservice_p.h
index 8c5c01e..161e770 100644
--- a/src/android/app/qqmlandroidservice_p.h
+++ b/src/android/app/qnativeandroidservice_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDSERVICE_P_H
-#define QQMLANDROIDSERVICE_P_H
+#ifndef QNATIVEANDROIDSERVICE_P_H
+#define QNATIVEANDROIDSERVICE_P_H
 
 //
 //  W A R N I N G
@@ -48,17 +48,17 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidcontextwrapper_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcontextwrapper_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidService : public QQmlAndroidContextWrapper
+class Q_QMLANDROID_EXPORT QNativeAndroidService : public QNativeAndroidContextWrapper
 {
     Q_OBJECT
     Q_PROPERTY(bool sticky READ isSticky WRITE setSticky NOTIFY stickyChanged)
 
 public:
-    explicit QQmlAndroidService(QObject *parent = nullptr);
+    explicit QNativeAndroidService(QObject *parent = nullptr);
 
     bool isSticky() const;
     void setSticky(bool sticky);
@@ -90,4 +90,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDSERVICE_P_H
+#endif // QNATIVEANDROIDSERVICE_P_H
diff --git a/src/android/content/content.pri b/src/android/content/content.pri
index 6a48b09..2ef4ef7 100644
--- a/src/android/content/content.pri
+++ b/src/android/content/content.pri
@@ -1,11 +1,11 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qqmlandroidcontext_p.h \
-    $$PWD/qqmlandroidcontextual_p.h \
-    $$PWD/qqmlandroidcontextwrapper_p.h
+    $$PWD/qnativeandroidcontext_p.h \
+    $$PWD/qnativeandroidcontextual_p.h \
+    $$PWD/qnativeandroidcontextwrapper_p.h
 
 SOURCES += \
-    $$PWD/qqmlandroidcontext.cpp \
-    $$PWD/qqmlandroidcontextual.cpp \
-    $$PWD/qqmlandroidcontextwrapper.cpp
+    $$PWD/qnativeandroidcontext.cpp \
+    $$PWD/qnativeandroidcontextual.cpp \
+    $$PWD/qnativeandroidcontextwrapper.cpp
diff --git a/src/android/content/qqmlandroidcontext.cpp b/src/android/content/qnativeandroidcontext.cpp
index 5156e08..7179f66 100644
--- a/src/android/content/qqmlandroidcontext.cpp
+++ b/src/android/content/qnativeandroidcontext.cpp
@@ -34,17 +34,17 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidcontext_p.h"
+#include "qnativeandroidcontext_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidContext::QQmlAndroidContext(QObject *parent) :
-    QQmlAndroidContextual(this, parent)
+QNativeAndroidContext::QNativeAndroidContext(QObject *parent) :
+    QNativeAndroidContextual(this, parent)
 {
 }
 
-QQmlAndroidContext::QQmlAndroidContext(QQmlAndroidContext *context, QObject *parent) :
-    QQmlAndroidContextual(context, parent)
+QNativeAndroidContext::QNativeAndroidContext(QNativeAndroidContext *context, QObject *parent) :
+    QNativeAndroidContextual(context, parent)
 {
 }
 
diff --git a/src/android/content/qqmlandroidcontext_p.h b/src/android/content/qnativeandroidcontext_p.h
index 6bb6736..b0e409f 100644
--- a/src/android/content/qqmlandroidcontext_p.h
+++ b/src/android/content/qnativeandroidcontext_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDCONTEXT_P_H
-#define QQMLANDROIDCONTEXT_P_H
+#ifndef QNATIVEANDROIDCONTEXT_P_H
+#define QNATIVEANDROIDCONTEXT_P_H
 
 //
 //  W A R N I N G
@@ -48,19 +48,19 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidcontextual_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidContext : public QQmlAndroidContextual
+class Q_QMLANDROID_EXPORT QNativeAndroidContext : public QNativeAndroidContextual
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidContext(QObject *parent = nullptr);
-    explicit QQmlAndroidContext(QQmlAndroidContext *context, QObject *parent = nullptr);
+    explicit QNativeAndroidContext(QObject *parent = nullptr);
+    explicit QNativeAndroidContext(QNativeAndroidContext *context, QObject *parent = nullptr);
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDCONTEXT_P_H
+#endif // QNATIVEANDROIDCONTEXT_P_H
diff --git a/src/android/content/qqmlandroidcontextual.cpp b/src/android/content/qnativeandroidcontextual.cpp
index 60af40c..e8478f8 100644
--- a/src/android/content/qqmlandroidcontextual.cpp
+++ b/src/android/content/qnativeandroidcontextual.cpp
@@ -34,39 +34,39 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidcontextual_p.h"
-#include "qqmlandroidcontext_p.h"
+#include "qnativeandroidcontextual_p.h"
+#include "qnativeandroidcontext_p.h"
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidContextual::QQmlAndroidContextual(QObject *parent) :
-    QQmlAndroidObject(parent), m_context(0)
+QNativeAndroidContextual::QNativeAndroidContextual(QObject *parent) :
+    QNativeAndroidObject(parent), m_context(0)
 {
     if (!initContext())
         QMetaObject::invokeMethod(this, "resolveContext", Qt::QueuedConnection);
 }
 
-QQmlAndroidContextual::QQmlAndroidContextual(QQmlAndroidContext* context, QObject *parent) :
-    QQmlAndroidObject(parent), m_context(0)
+QNativeAndroidContextual::QNativeAndroidContextual(QNativeAndroidContext* context, QObject *parent) :
+    QNativeAndroidObject(parent), m_context(0)
 {
     if (!initContext(context))
         QMetaObject::invokeMethod(this, "resolveContext", Qt::QueuedConnection);
 }
 
-QAndroidJniObject QQmlAndroidContextual::ctx() const
+QAndroidJniObject QNativeAndroidContextual::ctx() const
 {
     if (!m_context)
         return QAndroidJniObject();
     return m_context->instance();
 }
 
-QQmlAndroidContext *QQmlAndroidContextual::context() const
+QNativeAndroidContext *QNativeAndroidContextual::context() const
 {
     return m_context;
 }
 
-void QQmlAndroidContextual::setContext(QQmlAndroidContext *context)
+void QNativeAndroidContextual::setContext(QNativeAndroidContext *context)
 {
     if (m_context != context) {
         m_context = context;
@@ -75,18 +75,18 @@ void QQmlAndroidContextual::setContext(QQmlAndroidContext *context)
     }
 }
 
-void QQmlAndroidContextual::componentComplete()
+void QNativeAndroidContextual::componentComplete()
 {
-    QQmlAndroidObject::componentComplete();
+    QNativeAndroidObject::componentComplete();
     propagateContext();
 }
 
-static QQmlAndroidContext *findContext(QQmlAndroidObject *object)
+static QNativeAndroidContext *findContext(QNativeAndroidObject *object)
 {
-    QQmlAndroidContext *context = qobject_cast<QQmlAndroidContext *>(object);
+    QNativeAndroidContext *context = qobject_cast<QNativeAndroidContext *>(object);
     QObject *p = object->parent();
     while (p && !context) {
-        QQmlAndroidContextual *contextual = qobject_cast<QQmlAndroidContextual *>(p);
+        QNativeAndroidContextual *contextual = qobject_cast<QNativeAndroidContextual *>(p);
         if (contextual)
             context = contextual->context();
         p = p->parent();
@@ -94,7 +94,7 @@ static QQmlAndroidContext *findContext(QQmlAndroidObject *object)
     return context;
 }
 
-bool QQmlAndroidContextual::initContext(QQmlAndroidContext *context)
+bool QNativeAndroidContextual::initContext(QNativeAndroidContext *context)
 {
     if (!context)
         context = findContext(this);
@@ -102,19 +102,19 @@ bool QQmlAndroidContextual::initContext(QQmlAndroidContext *context)
     return context;
 }
 
-void QQmlAndroidContextual::resolveContext()
+void QNativeAndroidContextual::resolveContext()
 {
     if (!m_context) {
         setContext(findContext(this));
         if (!m_context)
-            qWarning() << "QQmlAndroidContextual: could not resolve context for" << this;
+            qWarning() << "QNativeAndroidContextual: could not resolve context for" << this;
     }
 }
 
-void QQmlAndroidContextual::propagateContext()
+void QNativeAndroidContextual::propagateContext()
 {
     foreach (QObject *child, children()) {
-        QQmlAndroidContextual *contextual = qobject_cast<QQmlAndroidContextual *>(child);
+        QNativeAndroidContextual *contextual = qobject_cast<QNativeAndroidContextual *>(child);
         if (contextual)
             contextual->setContext(m_context);
     }
diff --git a/src/android/content/qqmlandroidcontextual_p.h b/src/android/content/qnativeandroidcontextual_p.h
index de9691b..432dd39 100644
--- a/src/android/content/qqmlandroidcontextual_p.h
+++ b/src/android/content/qnativeandroidcontextual_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDCONTEXTUAL_P_H
-#define QQMLANDROIDCONTEXTUAL_P_H
+#ifndef QNATIVEANDROIDCONTEXTUAL_P_H
+#define QNATIVEANDROIDCONTEXTUAL_P_H
 
 //
 //  W A R N I N G
@@ -48,24 +48,24 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidobject_p.h>
+#include <QtQmlAndroid/private/qnativeandroidobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQmlAndroidContext;
+class QNativeAndroidContext;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidContextual : public QQmlAndroidObject
+class Q_QMLANDROID_EXPORT QNativeAndroidContextual : public QNativeAndroidObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlAndroidContext *context READ context NOTIFY contextChanged)
+    Q_PROPERTY(QNativeAndroidContext *context READ context NOTIFY contextChanged)
 
 public:
-    explicit QQmlAndroidContextual(QObject *parent = nullptr);
-    explicit QQmlAndroidContextual(QQmlAndroidContext *context, QObject *parent = nullptr);
+    explicit QNativeAndroidContextual(QObject *parent = nullptr);
+    explicit QNativeAndroidContextual(QNativeAndroidContext *context, QObject *parent = nullptr);
 
     QAndroidJniObject ctx() const;
-    QQmlAndroidContext *context() const;
-    void setContext(QQmlAndroidContext *context);
+    QNativeAndroidContext *context() const;
+    void setContext(QNativeAndroidContext *context);
 
 Q_SIGNALS:
     void contextChanged();
@@ -74,14 +74,14 @@ protected:
     void componentComplete() override;
 
 private Q_SLOTS:
-    bool initContext(QQmlAndroidContext *context = nullptr);
+    bool initContext(QNativeAndroidContext *context = nullptr);
     void resolveContext();
     void propagateContext();
 
 private:
-    QQmlAndroidContext *m_context;
+    QNativeAndroidContext *m_context;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDCONTEXTUAL_P_H
+#endif // QNATIVEANDROIDCONTEXTUAL_P_H
diff --git a/src/android/content/qqmlandroidcontextwrapper.cpp b/src/android/content/qnativeandroidcontextwrapper.cpp
index 576ee28..dd0b3ca 100644
--- a/src/android/content/qqmlandroidcontextwrapper.cpp
+++ b/src/android/content/qnativeandroidcontextwrapper.cpp
@@ -34,17 +34,17 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidcontextwrapper_p.h"
+#include "qnativeandroidcontextwrapper_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidContextWrapper::QQmlAndroidContextWrapper(QObject *parent) :
-    QQmlAndroidContext(parent)
+QNativeAndroidContextWrapper::QNativeAndroidContextWrapper(QObject *parent) :
+    QNativeAndroidContext(parent)
 {
 }
 
-QQmlAndroidContextWrapper::QQmlAndroidContextWrapper(QQmlAndroidContext *context, QObject *parent) :
-    QQmlAndroidContext(context, parent)
+QNativeAndroidContextWrapper::QNativeAndroidContextWrapper(QNativeAndroidContext *context, QObject *parent) :
+    QNativeAndroidContext(context, parent)
 {
 }
 
diff --git a/src/android/widget/qqmlandroidtabwidget_p.h b/src/android/content/qnativeandroidcontextwrapper_p.h
index f072db2..75e5f39 100644
--- a/src/android/widget/qqmlandroidtabwidget_p.h
+++ b/src/android/content/qnativeandroidcontextwrapper_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDTABWIDGET_P_H
-#define QQMLANDROIDTABWIDGET_P_H
+#ifndef QNATIVEANDROIDCONTEXTWRAPPER_P_H
+#define QNATIVEANDROIDCONTEXTWRAPPER_P_H
 
 //
 //  W A R N I N G
@@ -48,22 +48,19 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidlinearlayout_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcontext_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidTabWidget : public QQmlAndroidLinearLayout
+class Q_QMLANDROID_EXPORT QNativeAndroidContextWrapper : public QNativeAndroidContext
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidTabWidget(QQmlAndroidView *parent = nullptr);
-
-protected:
-    QAndroidJniObject onCreate() override;
-    void onInflate(QAndroidJniObject &instance) override;
+    explicit QNativeAndroidContextWrapper(QObject *parent = nullptr);
+    explicit QNativeAndroidContextWrapper(QNativeAndroidContext *context, QObject *parent = nullptr);
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDTABWIDGET_P_H
+#endif // QNATIVEANDROIDCONTEXTWRAPPER_P_H
diff --git a/src/android/content/qqmlandroidcontextwrapper_p.h b/src/android/content/qqmlandroidcontextwrapper_p.h
deleted file mode 100644
index 59e73a5..0000000
--- a/src/android/content/qqmlandroidcontextwrapper_p.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLANDROIDCONTEXTWRAPPER_P_H
-#define QQMLANDROIDCONTEXTWRAPPER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qqmlandroidcontext_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_QMLANDROID_EXPORT QQmlAndroidContextWrapper : public QQmlAndroidContext
-{
-    Q_OBJECT
-
-public:
-    explicit QQmlAndroidContextWrapper(QObject *parent = nullptr);
-    explicit QQmlAndroidContextWrapper(QQmlAndroidContext *context, QObject *parent = nullptr);
-};
-
-QT_END_NAMESPACE
-
-#endif // QQMLANDROIDCONTEXTWRAPPER_P_H
diff --git a/src/android/core/core.pri b/src/android/core/core.pri
index f3eb64f..c63af8d 100644
--- a/src/android/core/core.pri
+++ b/src/android/core/core.pri
@@ -1,11 +1,11 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qqmlandroidobject_p.h \
-    $$PWD/qqmlandroidoptional_p.h \
+    $$PWD/qnativeandroidobject_p.h \
+    $$PWD/qnativeandroidoptional_p.h \
     $$PWD/qtqmlandroidfunctions_p.h \
     $$PWD/qtqmlandroidglobal_p.h
 
 SOURCES += \
-    $$PWD/qqmlandroidobject.cpp \
+    $$PWD/qnativeandroidobject.cpp \
     $$PWD/qtqmlandroidfunctions.cpp
diff --git a/src/android/core/qqmlandroidobject.cpp b/src/android/core/qnativeandroidobject.cpp
index c760260..19d0932 100644
--- a/src/android/core/qqmlandroidobject.cpp
+++ b/src/android/core/qnativeandroidobject.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidobject_p.h"
+#include "qnativeandroidobject_p.h"
 #include "qtqmlandroidfunctions_p.h"
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qcoreevent.h>
@@ -43,24 +43,24 @@ QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QReadWriteLock, instanceLock)
 
-QQmlAndroidObject::QQmlAndroidObject(QObject *parent) :
+QNativeAndroidObject::QNativeAndroidObject(QObject *parent) :
     QObject(parent), m_complete(false)
 {
 }
 
-bool QQmlAndroidObject::isValid() const
+bool QNativeAndroidObject::isValid() const
 {
     QReadLocker locker(instanceLock());
     return m_instance.isValid();
 }
 
-QAndroidJniObject QQmlAndroidObject::instance() const
+QAndroidJniObject QNativeAndroidObject::instance() const
 {
     QReadLocker locker(instanceLock());
     return m_instance;
 }
 
-void QQmlAndroidObject::setInstance(const QAndroidJniObject &instance)
+void QNativeAndroidObject::setInstance(const QAndroidJniObject &instance)
 {
     QWriteLocker locker(instanceLock());
     if (m_instance != instance) {
@@ -70,17 +70,17 @@ void QQmlAndroidObject::setInstance(const QAndroidJniObject &instance)
     }
 }
 
-void QQmlAndroidObject::changeInstance()
+void QNativeAndroidObject::changeInstance()
 {
     Q_ASSERT(QtQmlAndroid::isMainQtThread());
     objectChange(InstanceChange);
     emit instanceChanged();
 }
 
-void QQmlAndroidObject::construct()
+void QNativeAndroidObject::construct()
 {
     foreach (QObject *obj, children()) {
-        QQmlAndroidObject *child = qobject_cast<QQmlAndroidObject *>(obj);
+        QNativeAndroidObject *child = qobject_cast<QNativeAndroidObject *>(obj);
         if (child)
             child->construct();
     }
@@ -95,7 +95,7 @@ void QQmlAndroidObject::construct()
         method();
 }
 
-void QQmlAndroidObject::inflate(const QAndroidJniObject &instance)
+void QNativeAndroidObject::inflate(const QAndroidJniObject &instance)
 {
     std::function<void()> method = [=]() {
         QAndroidJniObject object(instance);
@@ -110,10 +110,10 @@ void QQmlAndroidObject::inflate(const QAndroidJniObject &instance)
         method();
 }
 
-void QQmlAndroidObject::destruct()
+void QNativeAndroidObject::destruct()
 {
     foreach (QObject *obj, children()) {
-        QQmlAndroidObject *child = qobject_cast<QQmlAndroidObject *>(obj);
+        QNativeAndroidObject *child = qobject_cast<QNativeAndroidObject *>(obj);
         if (child)
             child->destruct();
     }
@@ -121,64 +121,64 @@ void QQmlAndroidObject::destruct()
     setInstance(QAndroidJniObject());
 }
 
-QAndroidJniObject QQmlAndroidObject::onCreate()
+QAndroidJniObject QNativeAndroidObject::onCreate()
 {
     return QAndroidJniObject();
 }
 
-void QQmlAndroidObject::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidObject::onInflate(QAndroidJniObject &instance)
 {
     Q_UNUSED(instance);
     Q_ASSERT(!QtQmlAndroid::isMainQtThread());
 }
 
-bool QQmlAndroidObject::isComponentComplete() const
+bool QNativeAndroidObject::isComponentComplete() const
 {
     return m_complete;
 }
 
-void QQmlAndroidObject::classBegin()
+void QNativeAndroidObject::classBegin()
 {
 }
 
-void QQmlAndroidObject::componentComplete()
+void QNativeAndroidObject::componentComplete()
 {
     m_complete = true;
 }
 
-void QQmlAndroidObject::objectChange(ObjectChange change)
+void QNativeAndroidObject::objectChange(ObjectChange change)
 {
     Q_ASSERT(QtQmlAndroid::isMainQtThread());
     Q_UNUSED(change);
 }
 
-QQmlListProperty<QObject> QQmlAndroidObject::data()
+QQmlListProperty<QObject> QNativeAndroidObject::data()
 {
-    return QQmlListProperty<QObject>(this, 0, &QQmlAndroidObject::data_append,
-                                     &QQmlAndroidObject::data_count, &QQmlAndroidObject::data_at, 0);
+    return QQmlListProperty<QObject>(this, 0, &QNativeAndroidObject::data_append,
+                                     &QNativeAndroidObject::data_count, &QNativeAndroidObject::data_at, 0);
 }
 
-void QQmlAndroidObject::data_append(QQmlListProperty<QObject> *list, QObject *object)
+void QNativeAndroidObject::data_append(QQmlListProperty<QObject> *list, QObject *object)
 {
-    if (QQmlAndroidObject *that = qobject_cast<QQmlAndroidObject *>(list->object))
+    if (QNativeAndroidObject *that = qobject_cast<QNativeAndroidObject *>(list->object))
         object->setParent(that);
 }
 
-int QQmlAndroidObject::data_count(QQmlListProperty<QObject> *list)
+int QNativeAndroidObject::data_count(QQmlListProperty<QObject> *list)
 {
-    if (QQmlAndroidObject *that = qobject_cast<QQmlAndroidObject *>(list->object))
+    if (QNativeAndroidObject *that = qobject_cast<QNativeAndroidObject *>(list->object))
         return that->children().count();
     return 0;
 }
 
-QObject *QQmlAndroidObject::data_at(QQmlListProperty<QObject> *list, int index)
+QObject *QNativeAndroidObject::data_at(QQmlListProperty<QObject> *list, int index)
 {
-    if (QQmlAndroidObject *that = qobject_cast<QQmlAndroidObject *>(list->object))
+    if (QNativeAndroidObject *that = qobject_cast<QNativeAndroidObject *>(list->object))
         return that->children().value(index);
     return 0;
 }
 
-void QQmlAndroidObject::childEvent(QChildEvent *event)
+void QNativeAndroidObject::childEvent(QChildEvent *event)
 {
     if (event->added())
         emit dataChanged();
diff --git a/src/android/core/qqmlandroidobject_p.h b/src/android/core/qnativeandroidobject_p.h
index 17056c9..d8b5d52 100644
--- a/src/android/core/qqmlandroidobject_p.h
+++ b/src/android/core/qnativeandroidobject_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDOBJECT_P_H
-#define QQMLANDROIDOBJECT_P_H
+#ifndef QNATIVEANDROIDOBJECT_P_H
+#define QNATIVEANDROIDOBJECT_P_H
 
 //
 //  W A R N I N G
@@ -59,7 +59,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidObject : public QObject, public QQmlParserStatus
+class Q_QMLANDROID_EXPORT QNativeAndroidObject : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     Q_PROPERTY(QQmlListProperty<QObject> data READ data NOTIFY dataChanged)
@@ -67,7 +67,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidObject : public QObject, public QQmlParserS
     Q_INTERFACES(QQmlParserStatus)
 
 public:
-    explicit QQmlAndroidObject(QObject *parent = nullptr);
+    explicit QNativeAndroidObject(QObject *parent = nullptr);
 
     bool isValid() const;
     QAndroidJniObject instance() const;
@@ -110,9 +110,9 @@ private:
 
     bool m_complete;
     QAndroidJniObject m_instance;
-    friend class QQmlAndroidActivity;
+    friend class QNativeAndroidActivity;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDOBJECT_P_H
+#endif // QNATIVEANDROIDOBJECT_P_H
diff --git a/src/android/core/qqmlandroidoptional_p.h b/src/android/core/qnativeandroidoptional_p.h
index aea3316..0d2d930 100644
--- a/src/android/core/qqmlandroidoptional_p.h
+++ b/src/android/core/qnativeandroidoptional_p.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDOPTIONAL_P_H
-#define QQMLANDROIDOPTIONAL_P_H
+#ifndef QNATIVEANDROIDOPTIONAL_P_H
+#define QNATIVEANDROIDOPTIONAL_P_H
 
 //
 //  W A R N I N G
@@ -54,13 +54,13 @@
 QT_BEGIN_NAMESPACE
 
 template <typename T>
-class QQmlAndroidOptional
+class QNativeAndroidOptional
 {
 public:
-    QQmlAndroidOptional() : t(), exists(false) {}
-    explicit QQmlAndroidOptional(const T &t) : t(t), exists(true) {}
-    explicit QQmlAndroidOptional(T &&t) : t(std::move(t)), exists(true) {}
-    QQmlAndroidOptional &operator=(const T &o) { t = o; exists = true; return *this; }
+    QNativeAndroidOptional() : t(), exists(false) {}
+    explicit QNativeAndroidOptional(const T &t) : t(t), exists(true) {}
+    explicit QNativeAndroidOptional(T &&t) : t(std::move(t)), exists(true) {}
+    QNativeAndroidOptional &operator=(const T &o) { t = o; exists = true; return *this; }
 
     operator T&() Q_DECL_NOTHROW { return t; }
     operator const T&() const Q_DECL_NOTHROW { return t; }
@@ -73,35 +73,35 @@ private:
 };
 
 template <typename T>
-inline bool operator==(const QQmlAndroidOptional<T> &lhs, const QQmlAndroidOptional<T> &rhs)
+inline bool operator==(const QNativeAndroidOptional<T> &lhs, const QNativeAndroidOptional<T> &rhs)
     Q_DECL_NOEXCEPT_EXPR(noexcept(static_cast<const T&>(lhs) == static_cast<const T&>(rhs)))
 { return lhs.isNull() == rhs.isNull() && !lhs.isNull() && static_cast<const T&>(lhs) == static_cast<const T&>(rhs); }
 
 template <typename T>
-inline bool operator==(const QQmlAndroidOptional<T> &lhs, const T &rhs)
+inline bool operator==(const QNativeAndroidOptional<T> &lhs, const T &rhs)
     Q_DECL_NOEXCEPT_EXPR(noexcept(static_cast<const T&>(lhs) == rhs))
 { return !lhs.isNull() && static_cast<const T&>(lhs) == rhs; }
 
 template <typename T>
-inline bool operator==(const T &lhs, const QQmlAndroidOptional<T> &rhs)
+inline bool operator==(const T &lhs, const QNativeAndroidOptional<T> &rhs)
     Q_DECL_NOEXCEPT_EXPR(noexcept(lhs == static_cast<const T&>(rhs)))
 { return !rhs.isNull() && lhs == static_cast<const T&>(rhs); }
 
 template <typename T>
-inline bool operator!=(const QQmlAndroidOptional<T> &lhs, const QQmlAndroidOptional<T> &rhs)
+inline bool operator!=(const QNativeAndroidOptional<T> &lhs, const QNativeAndroidOptional<T> &rhs)
     Q_DECL_NOEXCEPT_EXPR(noexcept(lhs == rhs))
 { return !operator==(lhs, rhs); }
 
 template <typename T>
-inline bool operator!=(const QQmlAndroidOptional<T> &lhs, const T &rhs)
+inline bool operator!=(const QNativeAndroidOptional<T> &lhs, const T &rhs)
     Q_DECL_NOEXCEPT_EXPR(noexcept(lhs == rhs))
 { return !operator==(lhs, rhs); }
 
 template <typename T>
-inline bool operator!=(const T &lhs, const QQmlAndroidOptional<T> &rhs)
+inline bool operator!=(const T &lhs, const QNativeAndroidOptional<T> &rhs)
     Q_DECL_NOEXCEPT_EXPR(noexcept(lhs == rhs))
 { return !operator==(lhs, rhs); }
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDOPTIONAL_P_H
+#endif // QNATIVEANDROIDOPTIONAL_P_H
diff --git a/src/android/graphics/drawable/drawable.pri b/src/android/graphics/drawable/drawable.pri
index 6c04e80..51e4845 100644
--- a/src/android/graphics/drawable/drawable.pri
+++ b/src/android/graphics/drawable/drawable.pri
@@ -1,9 +1,9 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qqmlandroidcolordrawable_p.h \
-    $$PWD/qqmlandroiddrawable_p.h
+    $$PWD/qnativeandroidcolordrawable_p.h \
+    $$PWD/qnativeandroiddrawable_p.h
 
 SOURCES += \
-    $$PWD/qqmlandroidcolordrawable.cpp \
-    $$PWD/qqmlandroiddrawable.cpp
+    $$PWD/qnativeandroidcolordrawable.cpp \
+    $$PWD/qnativeandroiddrawable.cpp
diff --git a/src/android/graphics/drawable/qqmlandroidcolordrawable.cpp b/src/android/graphics/drawable/qnativeandroidcolordrawable.cpp
index 6dcf2b8..9c840f0 100644
--- a/src/android/graphics/drawable/qqmlandroidcolordrawable.cpp
+++ b/src/android/graphics/drawable/qnativeandroidcolordrawable.cpp
@@ -34,27 +34,27 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidcolordrawable_p.h"
+#include "qnativeandroidcolordrawable_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidColorDrawable::QQmlAndroidColorDrawable(QObject *parent) :
-    QQmlAndroidDrawable(parent), m_color(0)
+QNativeAndroidColorDrawable::QNativeAndroidColorDrawable(QObject *parent) :
+    QNativeAndroidDrawable(parent), m_color(0)
 {
 }
 
-QQmlAndroidColorDrawable::QQmlAndroidColorDrawable(int color, QObject *parent) :
-    QQmlAndroidDrawable(parent), m_color(color)
+QNativeAndroidColorDrawable::QNativeAndroidColorDrawable(int color, QObject *parent) :
+    QNativeAndroidDrawable(parent), m_color(color)
 {
 }
 
-int QQmlAndroidColorDrawable::color() const
+int QNativeAndroidColorDrawable::color() const
 {
     return m_color;
 }
 
-void QQmlAndroidColorDrawable::setColor(int color)
+void QNativeAndroidColorDrawable::setColor(int color)
 {
     if (m_color != color) {
         m_color = color;
@@ -63,14 +63,14 @@ void QQmlAndroidColorDrawable::setColor(int color)
     }
 }
 
-QAndroidJniObject QQmlAndroidColorDrawable::onCreate()
+QAndroidJniObject QNativeAndroidColorDrawable::onCreate()
 {
     return QAndroidJniObject("android/graphics/drawable/ColorDrawable");
 }
 
-void QQmlAndroidColorDrawable::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidColorDrawable::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidDrawable::onInflate(instance);
+    QNativeAndroidDrawable::onInflate(instance);
 
     instance.callMethod<void>("setColor", "(I)V", m_color);
 }
diff --git a/src/android/graphics/drawable/qqmlandroidcolordrawable_p.h b/src/android/graphics/drawable/qnativeandroidcolordrawable_p.h
index b0bf19f..e49b866 100644
--- a/src/android/graphics/drawable/qqmlandroidcolordrawable_p.h
+++ b/src/android/graphics/drawable/qnativeandroidcolordrawable_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDCOLORDRAWABLE_P_H
-#define QQMLANDROIDCOLORDRAWABLE_P_H
+#ifndef QNATIVEANDROIDCOLORDRAWABLE_P_H
+#define QNATIVEANDROIDCOLORDRAWABLE_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroiddrawable_p.h>
+#include <QtQmlAndroid/private/qnativeandroiddrawable_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidColorDrawable : public QQmlAndroidDrawable
+class Q_QMLANDROID_EXPORT QNativeAndroidColorDrawable : public QNativeAndroidDrawable
 {
     Q_OBJECT
     Q_PROPERTY(int color READ color WRITE setColor NOTIFY colorChanged)
 
 public:
-    explicit QQmlAndroidColorDrawable(QObject *parent = nullptr);
-    explicit QQmlAndroidColorDrawable(int color, QObject *parent = nullptr);
+    explicit QNativeAndroidColorDrawable(QObject *parent = nullptr);
+    explicit QNativeAndroidColorDrawable(int color, QObject *parent = nullptr);
 
     int color() const;
     void setColor(int color);
@@ -77,4 +77,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDCOLORDRAWABLE_P_H
+#endif // QNATIVEANDROIDCOLORDRAWABLE_P_H
diff --git a/src/android/graphics/drawable/qqmlandroiddrawable.cpp b/src/android/graphics/drawable/qnativeandroiddrawable.cpp
index 68414b7..42740b9 100644
--- a/src/android/graphics/drawable/qqmlandroiddrawable.cpp
+++ b/src/android/graphics/drawable/qnativeandroiddrawable.cpp
@@ -34,21 +34,21 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroiddrawable_p.h"
+#include "qnativeandroiddrawable_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidDrawable::QQmlAndroidDrawable(QObject *parent) :
-    QQmlAndroidObject(parent)
+QNativeAndroidDrawable::QNativeAndroidDrawable(QObject *parent) :
+    QNativeAndroidObject(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidDrawable::onCreate()
+QAndroidJniObject QNativeAndroidDrawable::onCreate()
 {
     return QAndroidJniObject("android/graphics/drawable/Drawable");
 }
 
-void QQmlAndroidDrawable::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidDrawable::onInflate(QAndroidJniObject &instance)
 {
     Q_UNUSED(instance);
 }
diff --git a/src/android/widget/qqmlandroidedittext_p.h b/src/android/graphics/drawable/qnativeandroiddrawable_p.h
index 5263a90..31e1065 100644
--- a/src/android/widget/qqmlandroidedittext_p.h
+++ b/src/android/graphics/drawable/qnativeandroiddrawable_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDEDITTEXT_P_H
-#define QQMLANDROIDEDITTEXT_P_H
+#ifndef QNATIVEANDROIDDRAWABLE_P_H
+#define QNATIVEANDROIDDRAWABLE_P_H
 
 //
 //  W A R N I N G
@@ -48,16 +48,16 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidtextview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidEditText : public QQmlAndroidTextView
+class Q_QMLANDROID_EXPORT QNativeAndroidDrawable : public QNativeAndroidObject
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidEditText(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidDrawable(QObject *parent = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
@@ -66,4 +66,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDEDITTEXT_P_H
+#endif // QNATIVEANDROIDDRAWABLE_P_H
diff --git a/src/android/graphics/graphics.pri b/src/android/graphics/graphics.pri
index 7061563..2a8a428 100644
--- a/src/android/graphics/graphics.pri
+++ b/src/android/graphics/graphics.pri
@@ -1,9 +1,9 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qqmlandroidcolor_p.h
+    $$PWD/qnativeandroidcolor_p.h
 
 SOURCES += \
-    $$PWD/qqmlandroidcolor.cpp
+    $$PWD/qnativeandroidcolor.cpp
 
 include(drawable/drawable.pri)
diff --git a/src/android/graphics/qqmlandroidcolor.cpp b/src/android/graphics/qnativeandroidcolor.cpp
index 0327c58..af76ba1 100644
--- a/src/android/graphics/qqmlandroidcolor.cpp
+++ b/src/android/graphics/qnativeandroidcolor.cpp
@@ -34,51 +34,51 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidcolor_p.h"
+#include "qnativeandroidcolor_p.h"
 #include <QtGui/qcolor.h>
 
 QT_BEGIN_NAMESPACE
 
-int QQmlAndroidColor::alpha(int color)
+int QNativeAndroidColor::alpha(int color)
 {
     return static_cast<uint>(color) >> 24;
 }
 
-int QQmlAndroidColor::argb(int alpha, int red, int green, int blue)
+int QNativeAndroidColor::argb(int alpha, int red, int green, int blue)
 {
     return (alpha << 24) | (red << 16) | (green << 8) | blue;
 }
 
-int QQmlAndroidColor::blue(int color)
+int QNativeAndroidColor::blue(int color)
 {
     return color & 0xFF;
 }
 
-int QQmlAndroidColor::green(int color)
+int QNativeAndroidColor::green(int color)
 {
     return (color >> 8) & 0xFF;
 }
 
-int QQmlAndroidColor::red(int color)
+int QNativeAndroidColor::red(int color)
 {
     return (color >> 16) & 0xFF;
 }
 
-int QQmlAndroidColor::rgb(int red, int green, int blue)
+int QNativeAndroidColor::rgb(int red, int green, int blue)
 {
     return (0xFF << 24) | (red << 16) | (green << 8) | blue;
 }
 
-int QQmlAndroidColor::name(const QString &name)
+int QNativeAndroidColor::name(const QString &name)
 {
     return QColor(name).rgba();
 }
 
-QObject *QQmlAndroidColor::provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+QObject *QNativeAndroidColor::provider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(engine);
     Q_UNUSED(scriptEngine);
-    return new QQmlAndroidColor;
+    return new QNativeAndroidColor;
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/graphics/qqmlandroidcolor_p.h b/src/android/graphics/qnativeandroidcolor_p.h
index 74f9961..8d37fdb 100644
--- a/src/android/graphics/qqmlandroidcolor_p.h
+++ b/src/android/graphics/qnativeandroidcolor_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDCOLOR_P_H
-#define QQMLANDROIDCOLOR_P_H
+#ifndef QNATIVEANDROIDCOLOR_P_H
+#define QNATIVEANDROIDCOLOR_P_H
 
 //
 //  W A R N I N G
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidColor : public QObject
+class Q_QMLANDROID_EXPORT QNativeAndroidColor : public QObject
 {
     Q_OBJECT
     Q_ENUMS(Constants)
@@ -89,4 +89,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDCOLOR_P_H
+#endif // QNATIVEANDROIDCOLOR_P_H
diff --git a/src/android/qqmlandroidr.cpp b/src/android/qnativeandroidr.cpp
index d50a142..ad60024 100644
--- a/src/android/qqmlandroidr.cpp
+++ b/src/android/qnativeandroidr.cpp
@@ -34,13 +34,13 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidr_p.h"
+#include "qnativeandroidr_p.h"
 #include <QtAndroidExtras/qandroidjniobject.h>
 #include <QtAndroidExtras/qandroidjnienvironment.h>
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidR::QQmlAndroidR() :
+QNativeAndroidR::QNativeAndroidR() :
     m_anim(0),
     m_animator(0),
     m_array(0),
@@ -86,165 +86,165 @@ static QQmlPropertyMap *getFields(const char *className, QObject *parent)
     return map;
 }
 
-QQmlPropertyMap *QQmlAndroidR::anim()
+QQmlPropertyMap *QNativeAndroidR::anim()
 {
     if (!m_anim)
         m_anim = getFields("android/R$anim", this);
     return m_anim;
 }
 
-QQmlPropertyMap *QQmlAndroidR::animator()
+QQmlPropertyMap *QNativeAndroidR::animator()
 {
     if (!m_animator)
         m_animator = getFields("android/R$animator", this);
     return m_animator;
 }
 
-QQmlPropertyMap *QQmlAndroidR::array()
+QQmlPropertyMap *QNativeAndroidR::array()
 {
     if (!m_array)
         m_array = getFields("android/R$array", this);
     return m_array;
 }
 
-QQmlPropertyMap *QQmlAndroidR::attr()
+QQmlPropertyMap *QNativeAndroidR::attr()
 {
     if (!m_attr)
         m_attr = getFields("android/R$attr", this);
     return m_attr;
 }
 
-QQmlPropertyMap *QQmlAndroidR::boolean()
+QQmlPropertyMap *QNativeAndroidR::boolean()
 {
     if (!m_boolean)
         m_boolean = getFields("android/R$boolean", this);
     return m_boolean;
 }
 
-QQmlPropertyMap *QQmlAndroidR::color()
+QQmlPropertyMap *QNativeAndroidR::color()
 {
     if (!m_color)
         m_color = getFields("android/R$color", this);
     return m_color;
 }
 
-QQmlPropertyMap *QQmlAndroidR::dimen()
+QQmlPropertyMap *QNativeAndroidR::dimen()
 {
     if (!m_dimen)
         m_dimen = getFields("android/R$dimen", this);
     return m_dimen;
 }
 
-QQmlPropertyMap *QQmlAndroidR::drawable()
+QQmlPropertyMap *QNativeAndroidR::drawable()
 {
     if (!m_drawable)
         m_drawable = getFields("android/R$drawable", this);
     return m_drawable;
 }
 
-QQmlPropertyMap *QQmlAndroidR::fraction()
+QQmlPropertyMap *QNativeAndroidR::fraction()
 {
     if (!m_fraction)
         m_fraction = getFields("android/R$fraction", this);
     return m_fraction;
 }
 
-QQmlPropertyMap *QQmlAndroidR::id()
+QQmlPropertyMap *QNativeAndroidR::id()
 {
     if (!m_id)
         m_id = getFields("android/R$id", this);
     return m_id;
 }
 
-QQmlPropertyMap *QQmlAndroidR::integer()
+QQmlPropertyMap *QNativeAndroidR::integer()
 {
     if (!m_integer)
         m_integer = getFields("android/R$integer", this);
     return m_integer;
 }
 
-QQmlPropertyMap *QQmlAndroidR::interpolator()
+QQmlPropertyMap *QNativeAndroidR::interpolator()
 {
     if (!m_interpolator)
         m_interpolator = getFields("android/R$interpolator", this);
     return m_interpolator;
 }
 
-QQmlPropertyMap *QQmlAndroidR::layout()
+QQmlPropertyMap *QNativeAndroidR::layout()
 {
     if (!m_layout)
         m_layout = getFields("android/R$layout", this);
     return m_layout;
 }
 
-QQmlPropertyMap *QQmlAndroidR::menu()
+QQmlPropertyMap *QNativeAndroidR::menu()
 {
     if (!m_menu)
         m_menu = getFields("android/R$menu", this);
     return m_menu;
 }
 
-QQmlPropertyMap *QQmlAndroidR::mipmap()
+QQmlPropertyMap *QNativeAndroidR::mipmap()
 {
     if (!m_mipmap)
         m_mipmap = getFields("android/R$mipmap", this);
     return m_mipmap;
 }
 
-QQmlPropertyMap *QQmlAndroidR::plurals()
+QQmlPropertyMap *QNativeAndroidR::plurals()
 {
     if (!m_plurals)
         m_plurals = getFields("android/R$plurals", this);
     return m_plurals;
 }
 
-QQmlPropertyMap *QQmlAndroidR::raw()
+QQmlPropertyMap *QNativeAndroidR::raw()
 {
     if (!m_raw)
         m_raw = getFields("android/R$raw", this);
     return m_raw;
 }
 
-QQmlPropertyMap *QQmlAndroidR::string()
+QQmlPropertyMap *QNativeAndroidR::string()
 {
     if (!m_string)
         m_string = getFields("android/R$string", this);
     return m_string;
 }
 
-QQmlPropertyMap *QQmlAndroidR::style()
+QQmlPropertyMap *QNativeAndroidR::style()
 {
     if (!m_style)
         m_style = getFields("android/R$style", this);
     return m_style;
 }
 
-QQmlPropertyMap *QQmlAndroidR::styleable()
+QQmlPropertyMap *QNativeAndroidR::styleable()
 {
     if (!m_styleable)
         m_styleable = getFields("android/R$styleable", this);
     return m_styleable;
 }
 
-QQmlPropertyMap *QQmlAndroidR::transition()
+QQmlPropertyMap *QNativeAndroidR::transition()
 {
     if (!m_transition)
         m_transition = getFields("android/R$transition", this);
     return m_transition;
 }
 
-QQmlPropertyMap *QQmlAndroidR::xml()
+QQmlPropertyMap *QNativeAndroidR::xml()
 {
     if (!m_xml)
         m_xml = getFields("android/R$xml", this);
     return m_xml;
 }
 
-QObject *QQmlAndroidR::provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+QObject *QNativeAndroidR::provider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(engine);
     Q_UNUSED(scriptEngine);
-    return new QQmlAndroidR;
+    return new QNativeAndroidR;
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/qqmlandroidr_p.h b/src/android/qnativeandroidr_p.h
index 07c4f36..a2d9eff 100644
--- a/src/android/qqmlandroidr_p.h
+++ b/src/android/qnativeandroidr_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDR_P_H
-#define QQMLANDROIDR_P_H
+#ifndef QNATIVEANDROIDR_P_H
+#define QNATIVEANDROIDR_P_H
 
 //
 //  W A R N I N G
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 class QJSEngine;
 class QQmlEngine;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidR : public QObject
+class Q_QMLANDROID_EXPORT QNativeAndroidR : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQmlPropertyMap *anim READ anim CONSTANT)
@@ -85,7 +85,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidR : public QObject
     Q_PROPERTY(QQmlPropertyMap *xml READ xml CONSTANT)
 
 public:
-    QQmlAndroidR();
+    QNativeAndroidR();
 
     QQmlPropertyMap *anim();
     QQmlPropertyMap *animator();
@@ -139,4 +139,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDR_P_H
+#endif // QNATIVEANDROIDR_P_H
diff --git a/src/android/support/v4/widget/qqmlandroiddrawerlayout.cpp b/src/android/support/v4/widget/qnativeandroiddrawerlayout.cpp
index 4f7a50e..d0529ef 100644
--- a/src/android/support/v4/widget/qqmlandroiddrawerlayout.cpp
+++ b/src/android/support/v4/widget/qnativeandroiddrawerlayout.cpp
@@ -34,48 +34,48 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroiddrawerlayout_p.h"
-#include "qqmlandroidactionbardrawertoggle_p.h"
+#include "qnativeandroiddrawerlayout_p.h"
+#include "qnativeandroidactionbardrawertoggle_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidDrawerLayout::QQmlAndroidDrawerLayout(QQmlAndroidView *parent) :
-    QQmlAndroidViewGroup(parent)
+QNativeAndroidDrawerLayout::QNativeAndroidDrawerLayout(QNativeAndroidView *parent) :
+    QNativeAndroidViewGroup(parent)
 {
 }
 
-QQmlAndroidDrawerLayoutParams *QQmlAndroidDrawerLayout::qmlAttachedProperties(QObject *object)
+QNativeAndroidDrawerLayoutParams *QNativeAndroidDrawerLayout::qmlAttachedProperties(QObject *object)
 {
-    QQmlAndroidView *view = qobject_cast<QQmlAndroidView*>(object);
+    QNativeAndroidView *view = qobject_cast<QNativeAndroidView*>(object);
     if (view)
-        return new QQmlAndroidDrawerLayoutParams(view);
+        return new QNativeAndroidDrawerLayoutParams(view);
     return 0;
 }
 
-void QQmlAndroidDrawerLayout::closeDrawers()
+void QNativeAndroidDrawerLayout::closeDrawers()
 {
     QtQmlAndroid::callVoidMethod(instance(), "closeDrawers");
 }
 
-void QQmlAndroidDrawerLayout::closeDrawer(int gravity)
+void QNativeAndroidDrawerLayout::closeDrawer(int gravity)
 {
     QtQmlAndroid::callIntMethod(instance(), "closeDrawer", gravity);
 }
 
-QAndroidJniObject QQmlAndroidDrawerLayout::onCreate()
+QAndroidJniObject QNativeAndroidDrawerLayout::onCreate()
 {
     return QAndroidJniObject("android/support/v4/widget/DrawerLayout",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidDrawerLayout::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidDrawerLayout::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidViewGroup::onInflate(instance);
+    QNativeAndroidViewGroup::onInflate(instance);
 
     foreach (QObject *child, QObject::children()) {
-        QQmlAndroidActionBarDrawerToggle *toggle = qobject_cast<QQmlAndroidActionBarDrawerToggle *>(child);
+        QNativeAndroidActionBarDrawerToggle *toggle = qobject_cast<QNativeAndroidActionBarDrawerToggle *>(child);
         if (toggle)
             toggle->onCreate(ctx(), instance);
     }
diff --git a/src/android/support/v4/widget/qqmlandroiddrawerlayout_p.h b/src/android/support/v4/widget/qnativeandroiddrawerlayout_p.h
index cb9dd84..91e61cd 100644
--- a/src/android/support/v4/widget/qqmlandroiddrawerlayout_p.h
+++ b/src/android/support/v4/widget/qnativeandroiddrawerlayout_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDDRAWERLAYOUT_P_H
-#define QQMLANDROIDDRAWERLAYOUT_P_H
+#ifndef QNATIVEANDROIDDRAWERLAYOUT_P_H
+#define QNATIVEANDROIDDRAWERLAYOUT_P_H
 
 //
 //  W A R N I N G
@@ -48,19 +48,19 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidviewgroup_p.h>
-#include <QtQmlAndroid/private/qqmlandroiddrawerlayoutparams_p.h>
+#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h>
+#include <QtQmlAndroid/private/qnativeandroiddrawerlayoutparams_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidDrawerLayout : public QQmlAndroidViewGroup
+class Q_QMLANDROID_EXPORT QNativeAndroidDrawerLayout : public QNativeAndroidViewGroup
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidDrawerLayout(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidDrawerLayout(QNativeAndroidView *parent = nullptr);
 
-    static QQmlAndroidDrawerLayoutParams *qmlAttachedProperties(QObject *object);
+    static QNativeAndroidDrawerLayoutParams *qmlAttachedProperties(QObject *object);
 
 public Q_SLOTS:
     void closeDrawers();
@@ -73,6 +73,6 @@ protected:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QQmlAndroidDrawerLayout, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QNativeAndroidDrawerLayout, QML_HAS_ATTACHED_PROPERTIES)
 
-#endif // QQMLANDROIDDRAWERLAYOUT_P_H
+#endif // QNATIVEANDROIDDRAWERLAYOUT_P_H
diff --git a/src/android/support/v4/widget/qqmlandroiddrawerlayoutparams.cpp b/src/android/support/v4/widget/qnativeandroiddrawerlayoutparams.cpp
index 908d42b..9f79f1e 100644
--- a/src/android/support/v4/widget/qqmlandroiddrawerlayoutparams.cpp
+++ b/src/android/support/v4/widget/qnativeandroiddrawerlayoutparams.cpp
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroiddrawerlayoutparams_p.h"
-#include "qqmlandroiddrawerlayout_p.h"
-#include "qqmlandroidview_p.h"
+#include "qnativeandroiddrawerlayoutparams_p.h"
+#include "qnativeandroiddrawerlayout_p.h"
+#include "qnativeandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidDrawerLayoutParams::QQmlAndroidDrawerLayoutParams(QQmlAndroidView *view) :
-    QQmlAndroidMarginLayoutParams(view), m_gravity(0)
+QNativeAndroidDrawerLayoutParams::QNativeAndroidDrawerLayoutParams(QNativeAndroidView *view) :
+    QNativeAndroidMarginLayoutParams(view), m_gravity(0)
 {
 }
 
-int QQmlAndroidDrawerLayoutParams::gravity() const
+int QNativeAndroidDrawerLayoutParams::gravity() const
 {
     return m_gravity;
 }
 
-void QQmlAndroidDrawerLayoutParams::setGravity(int value)
+void QNativeAndroidDrawerLayoutParams::setGravity(int value)
 {
     if (m_gravity != value) {
         m_gravity = value;
@@ -59,16 +59,16 @@ void QQmlAndroidDrawerLayoutParams::setGravity(int value)
     }
 }
 
-QAndroidJniObject QQmlAndroidDrawerLayoutParams::onCreate()
+QAndroidJniObject QNativeAndroidDrawerLayoutParams::onCreate()
 {
     return QAndroidJniObject("android/support/v4/widget/DrawerLayout$LayoutParams",
                              "(III)V",
                              MATCH_PARENT, MATCH_PARENT, m_gravity);
 }
 
-void QQmlAndroidDrawerLayoutParams::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidDrawerLayoutParams::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidMarginLayoutParams::onInflate(instance);
+    QNativeAndroidMarginLayoutParams::onInflate(instance);
 
     instance.setField<int>("gravity", m_gravity);
 }
diff --git a/src/android/support/v4/widget/qqmlandroiddrawerlayoutparams_p.h b/src/android/support/v4/widget/qnativeandroiddrawerlayoutparams_p.h
index 54816f4..5c1c650 100644
--- a/src/android/support/v4/widget/qqmlandroiddrawerlayoutparams_p.h
+++ b/src/android/support/v4/widget/qnativeandroiddrawerlayoutparams_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDDRAWERLAYOUTPARAMS_P_H
-#define QQMLANDROIDDRAWERLAYOUTPARAMS_P_H
+#ifndef QNATIVEANDROIDDRAWERLAYOUTPARAMS_P_H
+#define QNATIVEANDROIDDRAWERLAYOUTPARAMS_P_H
 
 //
 //  W A R N I N G
@@ -48,17 +48,17 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidmarginlayoutparams_p.h>
+#include <QtQmlAndroid/private/qnativeandroidmarginlayoutparams_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidDrawerLayoutParams : public QQmlAndroidMarginLayoutParams
+class Q_QMLANDROID_EXPORT QNativeAndroidDrawerLayoutParams : public QNativeAndroidMarginLayoutParams
 {
     Q_OBJECT
     Q_PROPERTY(int gravity READ gravity WRITE setGravity NOTIFY gravityChanged) // TODO Gravity
 
 public:
-    explicit QQmlAndroidDrawerLayoutParams(QQmlAndroidView *view);
+    explicit QNativeAndroidDrawerLayoutParams(QNativeAndroidView *view);
 
     int gravity() const;
     void setGravity(int gravity);
@@ -76,4 +76,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDDRAWERLAYOUTPARAMS_P_H
+#endif // QNATIVEANDROIDDRAWERLAYOUTPARAMS_P_H
diff --git a/src/android/support/v4/widget/qqmlandroidswiperefreshlayout.cpp b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
index 80b631c..0211e14 100644
--- a/src/android/support/v4/widget/qqmlandroidswiperefreshlayout.cpp
+++ b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
@@ -34,28 +34,28 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidswiperefreshlayout_p.h"
+#include "qnativeandroidswiperefreshlayout_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidSwipeRefreshLayout::QQmlAndroidSwipeRefreshLayout(QQmlAndroidView *parent) :
-    QQmlAndroidViewGroup(parent), m_refreshing(false)
+QNativeAndroidSwipeRefreshLayout::QNativeAndroidSwipeRefreshLayout(QNativeAndroidView *parent) :
+    QNativeAndroidViewGroup(parent), m_refreshing(false)
 {
 }
 
-bool QQmlAndroidSwipeRefreshLayout::isRefreshing() const
+bool QNativeAndroidSwipeRefreshLayout::isRefreshing() const
 {
     return m_refreshing;
 }
 
-void QQmlAndroidSwipeRefreshLayout::setRefreshing(bool refreshing)
+void QNativeAndroidSwipeRefreshLayout::setRefreshing(bool refreshing)
 {
     if (updateRefreshing(refreshing))
         QtQmlAndroid::callBoolMethod(instance(), "setRefreshing", refreshing);
 }
 
-bool QQmlAndroidSwipeRefreshLayout::updateRefreshing(bool refreshing)
+bool QNativeAndroidSwipeRefreshLayout::updateRefreshing(bool refreshing)
 {
     if (m_refreshing != refreshing) {
         m_refreshing = refreshing;
@@ -65,16 +65,16 @@ bool QQmlAndroidSwipeRefreshLayout::updateRefreshing(bool refreshing)
     return false;
 }
 
-QAndroidJniObject QQmlAndroidSwipeRefreshLayout::onCreate()
+QAndroidJniObject QNativeAndroidSwipeRefreshLayout::onCreate()
 {
     return QAndroidJniObject("android/support/v4/widget/SwipeRefreshLayout",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidSwipeRefreshLayout::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidSwipeRefreshLayout::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidViewGroup::onInflate(instance);
+    QNativeAndroidViewGroup::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener",
                                    "(Landroid/support/v4/widget/SwipeRefreshLayout;J)V",
@@ -88,7 +88,7 @@ void QQmlAndroidSwipeRefreshLayout::onInflate(QAndroidJniObject &instance)
     }
 }
 
-void QQmlAndroidSwipeRefreshLayout::onRegisterNativeMethods(jobject listener)
+void QNativeAndroidSwipeRefreshLayout::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onRefresh", "(J)V", reinterpret_cast<void *>(onRefresh)}};
 
@@ -98,11 +98,11 @@ void QQmlAndroidSwipeRefreshLayout::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QQmlAndroidSwipeRefreshLayout::onRefresh(JNIEnv *env, jobject object, jlong instance)
+void QNativeAndroidSwipeRefreshLayout::onRefresh(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidSwipeRefreshLayout *layout = reinterpret_cast<QQmlAndroidSwipeRefreshLayout *>(instance);
+    QNativeAndroidSwipeRefreshLayout *layout = reinterpret_cast<QNativeAndroidSwipeRefreshLayout *>(instance);
     if (layout)
         QMetaObject::invokeMethod(layout, "updateRefreshing", Qt::QueuedConnection, Q_ARG(bool, true));
 }
diff --git a/src/android/support/v4/widget/qqmlandroidswiperefreshlayout_p.h b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout_p.h
index 79b9f51..ff14592 100644
--- a/src/android/support/v4/widget/qqmlandroidswiperefreshlayout_p.h
+++ b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDSWIPEREFRESHLAYOUT_P_H
-#define QQMLANDROIDSWIPEREFRESHLAYOUT_P_H
+#ifndef QNATIVEANDROIDSWIPEREFRESHLAYOUT_P_H
+#define QNATIVEANDROIDSWIPEREFRESHLAYOUT_P_H
 
 //
 //  W A R N I N G
@@ -48,17 +48,17 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidviewgroup_p.h>
+#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidSwipeRefreshLayout : public QQmlAndroidViewGroup
+class Q_QMLANDROID_EXPORT QNativeAndroidSwipeRefreshLayout : public QNativeAndroidViewGroup
 {
     Q_OBJECT
     Q_PROPERTY(bool refreshing READ isRefreshing WRITE setRefreshing NOTIFY refreshingChanged)
 
 public:
-    explicit QQmlAndroidSwipeRefreshLayout(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidSwipeRefreshLayout(QNativeAndroidView *parent = nullptr);
 
     bool isRefreshing() const;
     void setRefreshing(bool refreshing);
@@ -83,4 +83,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDSWIPEREFRESHLAYOUT_P_H
+#endif // QNATIVEANDROIDSWIPEREFRESHLAYOUT_P_H
diff --git a/src/android/support/v4/widget/widget.pri b/src/android/support/v4/widget/widget.pri
index cbf1b84..03300c1 100644
--- a/src/android/support/v4/widget/widget.pri
+++ b/src/android/support/v4/widget/widget.pri
@@ -1,11 +1,11 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qqmlandroiddrawerlayout_p.h \
-    $$PWD/qqmlandroiddrawerlayoutparams_p.h \
-    $$PWD/qqmlandroidswiperefreshlayout_p.h
+    $$PWD/qnativeandroiddrawerlayout_p.h \
+    $$PWD/qnativeandroiddrawerlayoutparams_p.h \
+    $$PWD/qnativeandroidswiperefreshlayout_p.h
 
 SOURCES += \
-    $$PWD/qqmlandroiddrawerlayout.cpp \
-    $$PWD/qqmlandroiddrawerlayoutparams.cpp \
-    $$PWD/qqmlandroidswiperefreshlayout.cpp
+    $$PWD/qnativeandroiddrawerlayout.cpp \
+    $$PWD/qnativeandroiddrawerlayoutparams.cpp \
+    $$PWD/qnativeandroidswiperefreshlayout.cpp
diff --git a/src/android/support/v7/app/app.pri b/src/android/support/v7/app/app.pri
index a203273..b7ba094 100644
--- a/src/android/support/v7/app/app.pri
+++ b/src/android/support/v7/app/app.pri
@@ -1,7 +1,7 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qqmlandroidactionbardrawertoggle_p.h
+    $$PWD/qnativeandroidactionbardrawertoggle_p.h
 
 SOURCES += \
-    $$PWD/qqmlandroidactionbardrawertoggle.cpp
+    $$PWD/qnativeandroidactionbardrawertoggle.cpp
diff --git a/src/android/support/v7/app/qqmlandroidactionbardrawertoggle.cpp b/src/android/support/v7/app/qnativeandroidactionbardrawertoggle.cpp
index 16bb0bb..52446c2 100644
--- a/src/android/support/v7/app/qqmlandroidactionbardrawertoggle.cpp
+++ b/src/android/support/v7/app/qnativeandroidactionbardrawertoggle.cpp
@@ -34,16 +34,16 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidactionbardrawertoggle_p.h"
+#include "qnativeandroidactionbardrawertoggle_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidActionBarDrawerToggle::QQmlAndroidActionBarDrawerToggle(QObject *parent) :
-    QQmlAndroidObject(parent)
+QNativeAndroidActionBarDrawerToggle::QNativeAndroidActionBarDrawerToggle(QObject *parent) :
+    QNativeAndroidObject(parent)
 {
 }
 
-void QQmlAndroidActionBarDrawerToggle::onCreate(const QAndroidJniObject &activity, const QAndroidJniObject &drawer)
+void QNativeAndroidActionBarDrawerToggle::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/android/support/v7/app/qqmlandroidactionbardrawertoggle_p.h b/src/android/support/v7/app/qnativeandroidactionbardrawertoggle_p.h
index b649219..f693575 100644
--- a/src/android/support/v7/app/qqmlandroidactionbardrawertoggle_p.h
+++ b/src/android/support/v7/app/qnativeandroidactionbardrawertoggle_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDACTIONBARDRAWERTOGGLE_P_H
-#define QQMLANDROIDACTIONBARDRAWERTOGGLE_P_H
+#ifndef QNATIVEANDROIDACTIONBARDRAWERTOGGLE_P_H
+#define QNATIVEANDROIDACTIONBARDRAWERTOGGLE_P_H
 
 //
 //  W A R N I N G
@@ -48,20 +48,20 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidobject_p.h>
+#include <QtQmlAndroid/private/qnativeandroidobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidActionBarDrawerToggle : public QQmlAndroidObject
+class Q_QMLANDROID_EXPORT QNativeAndroidActionBarDrawerToggle : public QNativeAndroidObject
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidActionBarDrawerToggle(QObject *parent = nullptr);
+    explicit QNativeAndroidActionBarDrawerToggle(QObject *parent = nullptr);
 
     void onCreate(const QAndroidJniObject &activity, const QAndroidJniObject &drawer);
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDACTIONBARDRAWERTOGGLE_P_H
+#endif // QNATIVEANDROIDACTIONBARDRAWERTOGGLE_P_H
diff --git a/src/android/support/v7/widget/qqmlandroidcardview.cpp b/src/android/support/v7/widget/qnativeandroidcardview.cpp
index 1a49bbb..75b5355 100644
--- a/src/android/support/v7/widget/qqmlandroidcardview.cpp
+++ b/src/android/support/v7/widget/qnativeandroidcardview.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidcardview_p.h"
+#include "qnativeandroidcardview_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidCardView::QQmlAndroidCardView(QQmlAndroidView *parent) :
-    QQmlAndroidFrameLayout(parent)
+QNativeAndroidCardView::QNativeAndroidCardView(QNativeAndroidView *parent) :
+    QNativeAndroidFrameLayout(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidCardView::onCreate()
+QAndroidJniObject QNativeAndroidCardView::onCreate()
 {
     return QAndroidJniObject("android/support/v7/widget/CardView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidCardView::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidCardView::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidFrameLayout::onInflate(instance);
+    QNativeAndroidFrameLayout::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qqmlandroidabsseekbar_p.h b/src/android/support/v7/widget/qnativeandroidcardview_p.h
index f7bb356..7d5674f 100644
--- a/src/android/widget/qqmlandroidabsseekbar_p.h
+++ b/src/android/support/v7/widget/qnativeandroidcardview_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDABSSEEKBAR_P_H
-#define QQMLANDROIDABSSEEKBAR_P_H
+#ifndef QNATIVEANDROIDCARDVIEW_P_H
+#define QNATIVEANDROIDCARDVIEW_P_H
 
 //
 //  W A R N I N G
@@ -48,16 +48,16 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidprogressbar_p.h>
+#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidAbsSeekBar : public QQmlAndroidProgressBar
+class Q_QMLANDROID_EXPORT QNativeAndroidCardView : public QNativeAndroidFrameLayout
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidAbsSeekBar(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidCardView(QNativeAndroidView *parent = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
@@ -66,4 +66,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDABSSEEKBAR_P_H
+#endif // QNATIVEANDROIDCARDVIEW_P_H
diff --git a/src/android/support/v7/widget/qqmlandroidrecycleradapter.cpp b/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp
index 54056ca..25ced36 100644
--- a/src/android/support/v7/widget/qqmlandroidrecycleradapter.cpp
+++ b/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidrecycleradapter_p.h"
+#include "qnativeandroidrecycleradapter_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qqmlandroidview_p.h"
+#include "qnativeandroidview_p.h"
 #include <QtQml/qqmlcomponent.h>
 #include <QtQml/qqmlcontext.h>
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidRecyclerAdapter::QQmlAndroidRecyclerAdapter(QObject *parent) :
-    QQmlAndroidContextual(parent), m_count(0), m_delegate(0)
+QNativeAndroidRecyclerAdapter::QNativeAndroidRecyclerAdapter(QObject *parent) :
+    QNativeAndroidContextual(parent), m_count(0), m_delegate(0)
 {
 }
 
-int QQmlAndroidRecyclerAdapter::count() const
+int QNativeAndroidRecyclerAdapter::count() const
 {
     return m_count;
 }
 
-void QQmlAndroidRecyclerAdapter::setCount(int count)
+void QNativeAndroidRecyclerAdapter::setCount(int count)
 {
     if (m_count != count) {
         m_count = count;
@@ -61,12 +61,12 @@ void QQmlAndroidRecyclerAdapter::setCount(int count)
     }
 }
 
-QQmlComponent *QQmlAndroidRecyclerAdapter::delegate() const
+QQmlComponent *QNativeAndroidRecyclerAdapter::delegate() const
 {
     return m_delegate;
 }
 
-void QQmlAndroidRecyclerAdapter::setDelegate(QQmlComponent *delegate)
+void QNativeAndroidRecyclerAdapter::setDelegate(QQmlComponent *delegate)
 {
     if (m_delegate != delegate) {
         m_delegate = delegate;
@@ -75,7 +75,7 @@ void QQmlAndroidRecyclerAdapter::setDelegate(QQmlComponent *delegate)
     }
 }
 
-QAndroidJniObject QQmlAndroidRecyclerAdapter::onCreate()
+QAndroidJniObject QNativeAndroidRecyclerAdapter::onCreate()
 {
     return QAndroidJniObject("qt/android/support/v7/widget/QmlRecyclerAdapter",
                              "(IJ)V",
@@ -83,9 +83,9 @@ QAndroidJniObject QQmlAndroidRecyclerAdapter::onCreate()
                              reinterpret_cast<jlong>(this));
 }
 
-void QQmlAndroidRecyclerAdapter::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidRecyclerAdapter::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidContextual::onInflate(instance);
+    QNativeAndroidContextual::onInflate(instance);
 
     static bool nativeMethodsRegistered = false;
     if (!nativeMethodsRegistered) {
@@ -97,7 +97,7 @@ void QQmlAndroidRecyclerAdapter::onInflate(QAndroidJniObject &instance)
         instance.callMethod<void>("setItemCount", "(I)V", m_count);
 }
 
-void QQmlAndroidRecyclerAdapter::onRegisterNativeMethods(jobject adapter)
+void QNativeAndroidRecyclerAdapter::onRegisterNativeMethods(jobject adapter)
 {
     JNINativeMethod methods[] {{"onCreateViewHolder", "(JLandroid/view/ViewGroup;I)Lqt/android/support/v7/widget/QmlRecyclerAdapter$ViewHolder;", reinterpret_cast<void *>(onCreateViewHolder)},
                                {"onBindViewHolder", "(JLqt/android/support/v7/widget/QmlRecyclerAdapter$ViewHolder;I)V", reinterpret_cast<void *>(onBindViewHolder)}};
@@ -108,16 +108,16 @@ void QQmlAndroidRecyclerAdapter::onRegisterNativeMethods(jobject adapter)
     env->DeleteLocalRef(cls);
 }
 
-jobject QQmlAndroidRecyclerAdapter::onCreateViewHolder(JNIEnv *env, jobject object, jlong instance, jobject parent, jint viewType)
+jobject QNativeAndroidRecyclerAdapter::onCreateViewHolder(JNIEnv *env, jobject object, jlong instance, jobject parent, jint viewType)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
     Q_UNUSED(parent);
     Q_UNUSED(viewType);
-    QQmlAndroidRecyclerAdapter *adapter = reinterpret_cast<QQmlAndroidRecyclerAdapter *>(instance);
+    QNativeAndroidRecyclerAdapter *adapter = reinterpret_cast<QNativeAndroidRecyclerAdapter *>(instance);
     if (adapter) {
-        QQmlAndroidView *item = nullptr;
-        QMetaObject::invokeMethod(adapter, "createItem", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QQmlAndroidView *, item));
+        QNativeAndroidView *item = nullptr;
+        QMetaObject::invokeMethod(adapter, "createItem", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QNativeAndroidView *, item));
         item->construct();
         adapter->m_holders += QAndroidJniObject("qt/android/support/v7/widget/QmlRecyclerAdapter$ViewHolder",
                                                 "(Landroid/view/View;J)V",
@@ -128,40 +128,40 @@ jobject QQmlAndroidRecyclerAdapter::onCreateViewHolder(JNIEnv *env, jobject obje
     return 0;
 }
 
-void QQmlAndroidRecyclerAdapter::onBindViewHolder(JNIEnv *env, jobject object, jlong instance, jobject holder, jint position)
+void QNativeAndroidRecyclerAdapter::onBindViewHolder(JNIEnv *env, jobject object, jlong instance, jobject holder, jint position)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidRecyclerAdapter *adapter = reinterpret_cast<QQmlAndroidRecyclerAdapter *>(instance);
+    QNativeAndroidRecyclerAdapter *adapter = reinterpret_cast<QNativeAndroidRecyclerAdapter *>(instance);
     if (adapter) {
         jlong vi = QAndroidJniObject(holder).callMethod<jlong>("getInstance");
-        QQmlAndroidView *item = reinterpret_cast<QQmlAndroidView *>(vi);
+        QNativeAndroidView *item = reinterpret_cast<QNativeAndroidView *>(vi);
         if (item)
-            QMetaObject::invokeMethod(adapter, "setItemPosition", Qt::BlockingQueuedConnection, Q_ARG(QQmlAndroidView *, item), Q_ARG(int, position));
+            QMetaObject::invokeMethod(adapter, "setItemPosition", Qt::BlockingQueuedConnection, Q_ARG(QNativeAndroidView *, item), Q_ARG(int, position));
     }
 }
 
-QQmlAndroidView *QQmlAndroidRecyclerAdapter::createItem()
+QNativeAndroidView *QNativeAndroidRecyclerAdapter::createItem()
 {
-    QQmlAndroidView *item = nullptr;
+    QNativeAndroidView *item = nullptr;
     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<QQmlAndroidView *>(object);
+            item = qobject_cast<QNativeAndroidView *>(object);
             if (!item)
                 delete object;
         } else {
             delete context;
         }
     } else {
-        item = new QQmlAndroidView;
+        item = new QNativeAndroidView;
     }
     if (item) {
         item->setContext(context());
-        item->setParentView(qobject_cast<QQmlAndroidView *>(parent())); // TODO
+        item->setParentView(qobject_cast<QNativeAndroidView *>(parent())); // TODO
         setItemPosition(item, -1);
     }
     if (m_delegate)
@@ -169,7 +169,7 @@ QQmlAndroidView *QQmlAndroidRecyclerAdapter::createItem()
     return item;
 }
 
-void QQmlAndroidRecyclerAdapter::setItemPosition(QQmlAndroidView *item, int position)
+void QNativeAndroidRecyclerAdapter::setItemPosition(QNativeAndroidView *item, int position)
 {
     QQmlContext *context = qmlContext(item);
     if (context)
diff --git a/src/android/support/v7/widget/qqmlandroidrecycleradapter_p.h b/src/android/support/v7/widget/qnativeandroidrecycleradapter_p.h
index 1e2b9ea..5b72a57 100644
--- a/src/android/support/v7/widget/qqmlandroidrecycleradapter_p.h
+++ b/src/android/support/v7/widget/qnativeandroidrecycleradapter_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDRECYCLERADAPTER_P_H
-#define QQMLANDROIDRECYCLERADAPTER_P_H
+#ifndef QNATIVEANDROIDRECYCLERADAPTER_P_H
+#define QNATIVEANDROIDRECYCLERADAPTER_P_H
 
 //
 //  W A R N I N G
@@ -48,21 +48,21 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidcontextual_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQmlComponent;
-class QQmlAndroidView;
+class QNativeAndroidView;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidRecyclerAdapter : public QQmlAndroidContextual
+class Q_QMLANDROID_EXPORT QNativeAndroidRecyclerAdapter : public QNativeAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged)
     Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged)
 
 public:
-    explicit QQmlAndroidRecyclerAdapter(QObject *parent = nullptr);
+    explicit QNativeAndroidRecyclerAdapter(QObject *parent = nullptr);
 
     int count() const;
     void setCount(int count);
@@ -83,8 +83,8 @@ protected:
     static void onBindViewHolder(JNIEnv *env, jobject object, jlong instance, jobject holder, jint position);
 
 private Q_SLOTS:
-    QQmlAndroidView *createItem();
-    void setItemPosition(QQmlAndroidView *item, int position);
+    QNativeAndroidView *createItem();
+    void setItemPosition(QNativeAndroidView *item, int position);
 
 private:
     int m_count;
@@ -94,4 +94,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDRECYCLERADAPTER_P_H
+#endif // QNATIVEANDROIDRECYCLERADAPTER_P_H
diff --git a/src/android/support/v7/widget/qqmlandroidrecyclerview.cpp b/src/android/support/v7/widget/qnativeandroidrecyclerview.cpp
index 684ccda..fdb190d 100644
--- a/src/android/support/v7/widget/qqmlandroidrecyclerview.cpp
+++ b/src/android/support/v7/widget/qnativeandroidrecyclerview.cpp
@@ -34,48 +34,48 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidrecyclerview_p.h"
-#include "qqmlandroidrecycleradapter_p.h"
+#include "qnativeandroidrecyclerview_p.h"
+#include "qnativeandroidrecycleradapter_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidRecyclerView::QQmlAndroidRecyclerView(QQmlAndroidView *parent) :
-    QQmlAndroidViewGroup(parent), m_adapter(0)
+QNativeAndroidRecyclerView::QNativeAndroidRecyclerView(QNativeAndroidView *parent) :
+    QNativeAndroidViewGroup(parent), m_adapter(0)
 {
 }
 
-QQmlAndroidRecyclerAdapter *QQmlAndroidRecyclerView::adapter() const
+QNativeAndroidRecyclerAdapter *QNativeAndroidRecyclerView::adapter() const
 {
     return m_adapter;
 }
 
-void QQmlAndroidRecyclerView::setAdapter(QQmlAndroidRecyclerAdapter *adapter)
+void QNativeAndroidRecyclerView::setAdapter(QNativeAndroidRecyclerAdapter *adapter)
 {
     if (m_adapter != adapter) {
         if (m_adapter) {
             m_adapter->setContext(0);
-            disconnect(m_adapter, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidRecyclerView::updateAdapter);
+            disconnect(m_adapter, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidRecyclerView::updateAdapter);
             m_adapter->destruct();
         }
         m_adapter = adapter;
         if (m_adapter) {
             m_adapter->setContext(context());
-            connect(m_adapter, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidRecyclerView::updateAdapter);
+            connect(m_adapter, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidRecyclerView::updateAdapter);
             if (isValid())
                 m_adapter->construct();
         }
         emit adapterChanged();
     }}
 
-QAndroidJniObject QQmlAndroidRecyclerView::onCreate()
+QAndroidJniObject QNativeAndroidRecyclerView::onCreate()
 {
     return QAndroidJniObject("android/support/v7/widget/RecyclerView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidRecyclerView::onInflate(QAndroidJniObject& instance)
+void QNativeAndroidRecyclerView::onInflate(QAndroidJniObject& instance)
 {
     m_layoutManager = QAndroidJniObject("android/support/v7/widget/LinearLayoutManager",
                                         "(Landroid/content/Context;)V",
@@ -85,17 +85,17 @@ void QQmlAndroidRecyclerView::onInflate(QAndroidJniObject& instance)
                               "(Landroid/support/v7/widget/RecyclerView$LayoutManager;)V",
                               m_layoutManager.object());
 
-    QQmlAndroidViewGroup::onInflate(instance);
+    QNativeAndroidViewGroup::onInflate(instance);
 }
 
-void QQmlAndroidRecyclerView::objectChange(ObjectChange change)
+void QNativeAndroidRecyclerView::objectChange(ObjectChange change)
 {
-    QQmlAndroidViewGroup::objectChange(change);
+    QNativeAndroidViewGroup::objectChange(change);
     if (change == InstanceChange)
         updateAdapter();
 }
 
-void QQmlAndroidRecyclerView::updateAdapter()
+void QNativeAndroidRecyclerView::updateAdapter()
 {
     if (!isValid() || !m_adapter)
         return;
diff --git a/src/android/support/v7/widget/qqmlandroidrecyclerview_p.h b/src/android/support/v7/widget/qnativeandroidrecyclerview_p.h
index a56a5cd..e1f1d51 100644
--- a/src/android/support/v7/widget/qqmlandroidrecyclerview_p.h
+++ b/src/android/support/v7/widget/qnativeandroidrecyclerview_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDRECYCLERVIEW_P_H
-#define QQMLANDROIDRECYCLERVIEW_P_H
+#ifndef QNATIVEANDROIDRECYCLERVIEW_P_H
+#define QNATIVEANDROIDRECYCLERVIEW_P_H
 
 //
 //  W A R N I N G
@@ -48,22 +48,22 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidviewgroup_p.h>
+#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQmlAndroidRecyclerAdapter;
+class QNativeAndroidRecyclerAdapter;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidRecyclerView : public QQmlAndroidViewGroup
+class Q_QMLANDROID_EXPORT QNativeAndroidRecyclerView : public QNativeAndroidViewGroup
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlAndroidRecyclerAdapter *adapter READ adapter WRITE setAdapter NOTIFY adapterChanged)
+    Q_PROPERTY(QNativeAndroidRecyclerAdapter *adapter READ adapter WRITE setAdapter NOTIFY adapterChanged)
 
 public:
-    explicit QQmlAndroidRecyclerView(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidRecyclerView(QNativeAndroidView *parent = nullptr);
 
-    QQmlAndroidRecyclerAdapter *adapter() const;
-    void setAdapter(QQmlAndroidRecyclerAdapter *adapter);
+    QNativeAndroidRecyclerAdapter *adapter() const;
+    void setAdapter(QNativeAndroidRecyclerAdapter *adapter);
 
 Q_SIGNALS:
     void adapterChanged();
@@ -78,10 +78,10 @@ private Q_SLOTS:
     void updateAdapter();
 
 private:
-    QQmlAndroidRecyclerAdapter *m_adapter;
+    QNativeAndroidRecyclerAdapter *m_adapter;
     QAndroidJniObject m_layoutManager;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDRECYCLERVIEW_P_H
+#endif // QNATIVEANDROIDRECYCLERVIEW_P_H
diff --git a/src/android/support/v7/widget/widget.pri b/src/android/support/v7/widget/widget.pri
index 3f67ebc..978d59b 100644
--- a/src/android/support/v7/widget/widget.pri
+++ b/src/android/support/v7/widget/widget.pri
@@ -1,11 +1,11 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qqmlandroidcardview_p.h \
-    $$PWD/qqmlandroidrecycleradapter_p.h \
-    $$PWD/qqmlandroidrecyclerview_p.h
+    $$PWD/qnativeandroidcardview_p.h \
+    $$PWD/qnativeandroidrecycleradapter_p.h \
+    $$PWD/qnativeandroidrecyclerview_p.h
 
 SOURCES += \
-    $$PWD/qqmlandroidcardview.cpp \
-    $$PWD/qqmlandroidrecycleradapter.cpp \
-    $$PWD/qqmlandroidrecyclerview.cpp
+    $$PWD/qnativeandroidcardview.cpp \
+    $$PWD/qnativeandroidrecycleradapter.cpp \
+    $$PWD/qnativeandroidrecyclerview.cpp
diff --git a/src/android/view/animation/animation.pri b/src/android/view/animation/animation.pri
index 0a90fd9..b4cf55c 100644
--- a/src/android/view/animation/animation.pri
+++ b/src/android/view/animation/animation.pri
@@ -1,39 +1,39 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qqmlandroidacceleratedecelerateinterpolator_p.h \
-    $$PWD/qqmlandroidaccelerateinterpolator_p.h \
-    $$PWD/qqmlandroidalphaanimation_p.h \
-    $$PWD/qqmlandroidanimation_p.h \
-    $$PWD/qqmlandroidanimationset_p.h \
-    $$PWD/qqmlandroidanticipateinterpolator_p.h \
-    $$PWD/qqmlandroidanticipateovershootinterpolator_p.h \
-    $$PWD/qqmlandroidbounceinterpolator_p.h \
-    $$PWD/qqmlandroidcycleinterpolator_p.h \
-    $$PWD/qqmlandroiddecelerateinterpolator_p.h \
-    $$PWD/qqmlandroidinterpolator_p.h \
-    $$PWD/qqmlandroidlinearinterpolator_p.h \
-    $$PWD/qqmlandroidovershootinterpolator_p.h \
-    $$PWD/qqmlandroidpathinterpolator_p.h \
-    $$PWD/qqmlandroidrotateanimation_p.h \
-    $$PWD/qqmlandroidscaleanimation_p.h \
-    $$PWD/qqmlandroidtranslateanimation_p.h
+    $$PWD/qnativeandroidacceleratedecelerateinterpolator_p.h \
+    $$PWD/qnativeandroidaccelerateinterpolator_p.h \
+    $$PWD/qnativeandroidalphaanimation_p.h \
+    $$PWD/qnativeandroidanimation_p.h \
+    $$PWD/qnativeandroidanimationset_p.h \
+    $$PWD/qnativeandroidanticipateinterpolator_p.h \
+    $$PWD/qnativeandroidanticipateovershootinterpolator_p.h \
+    $$PWD/qnativeandroidbounceinterpolator_p.h \
+    $$PWD/qnativeandroidcycleinterpolator_p.h \
+    $$PWD/qnativeandroiddecelerateinterpolator_p.h \
+    $$PWD/qnativeandroidinterpolator_p.h \
+    $$PWD/qnativeandroidlinearinterpolator_p.h \
+    $$PWD/qnativeandroidovershootinterpolator_p.h \
+    $$PWD/qnativeandroidpathinterpolator_p.h \
+    $$PWD/qnativeandroidrotateanimation_p.h \
+    $$PWD/qnativeandroidscaleanimation_p.h \
+    $$PWD/qnativeandroidtranslateanimation_p.h
 
 SOURCES += \
-    $$PWD/qqmlandroidacceleratedecelerateinterpolator.cpp \
-    $$PWD/qqmlandroidaccelerateinterpolator.cpp \
-    $$PWD/qqmlandroidalphaanimation.cpp \
-    $$PWD/qqmlandroidanimation.cpp \
-    $$PWD/qqmlandroidanimationset.cpp \
-    $$PWD/qqmlandroidanticipateinterpolator.cpp \
-    $$PWD/qqmlandroidanticipateovershootinterpolator.cpp \
-    $$PWD/qqmlandroidbounceinterpolator.cpp \
-    $$PWD/qqmlandroidcycleinterpolator.cpp \
-    $$PWD/qqmlandroiddecelerateinterpolator.cpp \
-    $$PWD/qqmlandroidinterpolator.cpp \
-    $$PWD/qqmlandroidlinearinterpolator.cpp \
-    $$PWD/qqmlandroidovershootinterpolator.cpp \
-    $$PWD/qqmlandroidpathinterpolator.cpp \
-    $$PWD/qqmlandroidrotateanimation.cpp \
-    $$PWD/qqmlandroidscaleanimation.cpp \
-    $$PWD/qqmlandroidtranslateanimation.cpp
+    $$PWD/qnativeandroidacceleratedecelerateinterpolator.cpp \
+    $$PWD/qnativeandroidaccelerateinterpolator.cpp \
+    $$PWD/qnativeandroidalphaanimation.cpp \
+    $$PWD/qnativeandroidanimation.cpp \
+    $$PWD/qnativeandroidanimationset.cpp \
+    $$PWD/qnativeandroidanticipateinterpolator.cpp \
+    $$PWD/qnativeandroidanticipateovershootinterpolator.cpp \
+    $$PWD/qnativeandroidbounceinterpolator.cpp \
+    $$PWD/qnativeandroidcycleinterpolator.cpp \
+    $$PWD/qnativeandroiddecelerateinterpolator.cpp \
+    $$PWD/qnativeandroidinterpolator.cpp \
+    $$PWD/qnativeandroidlinearinterpolator.cpp \
+    $$PWD/qnativeandroidovershootinterpolator.cpp \
+    $$PWD/qnativeandroidpathinterpolator.cpp \
+    $$PWD/qnativeandroidrotateanimation.cpp \
+    $$PWD/qnativeandroidscaleanimation.cpp \
+    $$PWD/qnativeandroidtranslateanimation.cpp
diff --git a/src/android/view/animation/qqmlandroidacceleratedecelerateinterpolator.cpp b/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator.cpp
index 43088da..82b4179 100644
--- a/src/android/view/animation/qqmlandroidacceleratedecelerateinterpolator.cpp
+++ b/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator.cpp
@@ -34,16 +34,16 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidacceleratedecelerateinterpolator_p.h"
+#include "qnativeandroidacceleratedecelerateinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidAccelerateDecelerateInterpolator::QQmlAndroidAccelerateDecelerateInterpolator(QObject *parent) :
-    QQmlAndroidInterpolator(parent)
+QNativeAndroidAccelerateDecelerateInterpolator::QNativeAndroidAccelerateDecelerateInterpolator(QObject *parent) :
+    QNativeAndroidInterpolator(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidAccelerateDecelerateInterpolator::onCreate()
+QAndroidJniObject QNativeAndroidAccelerateDecelerateInterpolator::onCreate()
 {
     return QAndroidJniObject("android/view/animation/AccelerateDecelerateInterpolator");
 }
diff --git a/src/android/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h b/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator_p.h
index 91a9055..46d1520 100644
--- a/src/android/view/animation/qqmlandroidacceleratedecelerateinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidacceleratedecelerateinterpolator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDACCELERATEDECELERATEINTERPOLATOR_P_H
-#define QQMLANDROIDACCELERATEDECELERATEINTERPOLATOR_P_H
+#ifndef QNATIVEANDROIDACCELERATEDECELERATEINTERPOLATOR_P_H
+#define QNATIVEANDROIDACCELERATEDECELERATEINTERPOLATOR_P_H
 
 //
 //  W A R N I N G
@@ -49,18 +49,18 @@
 //
 
 #include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
-#include <QtQmlAndroid/private/qqmlandroidinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h>
 #include <QtAndroidExtras/qandroidjniobject.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidAccelerateDecelerateInterpolator : public QQmlAndroidInterpolator
+class Q_QMLANDROID_EXPORT QNativeAndroidAccelerateDecelerateInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidAccelerateDecelerateInterpolator(QObject *parent = nullptr);
+    explicit QNativeAndroidAccelerateDecelerateInterpolator(QObject *parent = nullptr);
 
 Q_SIGNALS:
 
@@ -72,4 +72,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDACCELERATEDECELERATEINTERPOLATOR_P_H
+#endif // QNATIVEANDROIDACCELERATEDECELERATEINTERPOLATOR_P_H
diff --git a/src/android/view/animation/qqmlandroidaccelerateinterpolator.cpp b/src/android/view/animation/qnativeandroidaccelerateinterpolator.cpp
index cc983fb..e0718a0 100644
--- a/src/android/view/animation/qqmlandroidaccelerateinterpolator.cpp
+++ b/src/android/view/animation/qnativeandroidaccelerateinterpolator.cpp
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidaccelerateinterpolator_p.h"
+#include "qnativeandroidaccelerateinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidAccelerateInterpolator::QQmlAndroidAccelerateInterpolator(QObject *parent) :
-    QQmlAndroidInterpolator(parent)
+QNativeAndroidAccelerateInterpolator::QNativeAndroidAccelerateInterpolator(QObject *parent) :
+    QNativeAndroidInterpolator(parent)
 {
 }
 
-qreal QQmlAndroidAccelerateInterpolator::factor() const
+qreal QNativeAndroidAccelerateInterpolator::factor() const
 {
     if (m_factor.isNull())
         return 1.0;
     return m_factor;
 }
 
-void QQmlAndroidAccelerateInterpolator::setFactor(qreal factor)
+void QNativeAndroidAccelerateInterpolator::setFactor(qreal factor)
 {
     if (m_factor.isNull() || m_factor != factor) {
         m_factor = factor;
@@ -58,7 +58,7 @@ void QQmlAndroidAccelerateInterpolator::setFactor(qreal factor)
     }
 }
 
-QAndroidJniObject QQmlAndroidAccelerateInterpolator::onCreate()
+QAndroidJniObject QNativeAndroidAccelerateInterpolator::onCreate()
 {
     if (m_factor.isNull())
         return QAndroidJniObject("android/view/animation/AccelerateInterpolator");
diff --git a/src/android/view/animation/qqmlandroidaccelerateinterpolator_p.h b/src/android/view/animation/qnativeandroidaccelerateinterpolator_p.h
index ab2ab14..9522d4f 100644
--- a/src/android/view/animation/qqmlandroidaccelerateinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidaccelerateinterpolator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDACCELERATEINTERPOLATOR_P_H
-#define QQMLANDROIDACCELERATEINTERPOLATOR_P_H
+#ifndef QNATIVEANDROIDACCELERATEINTERPOLATOR_P_H
+#define QNATIVEANDROIDACCELERATEINTERPOLATOR_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidAccelerateInterpolator : public QQmlAndroidInterpolator
+class Q_QMLANDROID_EXPORT QNativeAndroidAccelerateInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal factor READ factor WRITE setFactor NOTIFY factorChanged)
 
 public:
-    explicit QQmlAndroidAccelerateInterpolator(QObject *parent = nullptr);
+    explicit QNativeAndroidAccelerateInterpolator(QObject *parent = nullptr);
 
     qreal factor() const;
     void setFactor(qreal factor);
@@ -71,9 +71,9 @@ protected:
     QAndroidJniObject onCreate() override;
 
 private:
-    QQmlAndroidOptional<qreal> m_factor;
+    QNativeAndroidOptional<qreal> m_factor;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDACCELERATEINTERPOLATOR_P_H
+#endif // QNATIVEANDROIDACCELERATEINTERPOLATOR_P_H
diff --git a/src/android/view/animation/qqmlandroidalphaanimation.cpp b/src/android/view/animation/qnativeandroidalphaanimation.cpp
index 833b7fe..ae52dc6 100644
--- a/src/android/view/animation/qqmlandroidalphaanimation.cpp
+++ b/src/android/view/animation/qnativeandroidalphaanimation.cpp
@@ -34,21 +34,21 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidalphaanimation_p.h"
+#include "qnativeandroidalphaanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidAlphaAnimation::QQmlAndroidAlphaAnimation(QObject *parent) :
-    QQmlAndroidAnimation(parent), m_fromAlpha(0), m_toAlpha(0)
+QNativeAndroidAlphaAnimation::QNativeAndroidAlphaAnimation(QObject *parent) :
+    QNativeAndroidAnimation(parent), m_fromAlpha(0), m_toAlpha(0)
 {
 }
 
-qreal QQmlAndroidAlphaAnimation::fromAlpha() const
+qreal QNativeAndroidAlphaAnimation::fromAlpha() const
 {
     return m_fromAlpha;
 }
 
-void QQmlAndroidAlphaAnimation::setFromAlpha(qreal alpha)
+void QNativeAndroidAlphaAnimation::setFromAlpha(qreal alpha)
 {
     if (m_fromAlpha != alpha) {
         m_fromAlpha = alpha;
@@ -56,12 +56,12 @@ void QQmlAndroidAlphaAnimation::setFromAlpha(qreal alpha)
     }
 }
 
-qreal QQmlAndroidAlphaAnimation::toAlpha() const
+qreal QNativeAndroidAlphaAnimation::toAlpha() const
 {
     return m_toAlpha;
 }
 
-void QQmlAndroidAlphaAnimation::setToAlpha(qreal alpha)
+void QNativeAndroidAlphaAnimation::setToAlpha(qreal alpha)
 {
     if (m_toAlpha != alpha) {
         m_toAlpha = alpha;
@@ -69,7 +69,7 @@ void QQmlAndroidAlphaAnimation::setToAlpha(qreal alpha)
     }
 }
 
-QAndroidJniObject QQmlAndroidAlphaAnimation::onCreate()
+QAndroidJniObject QNativeAndroidAlphaAnimation::onCreate()
 {
     return QAndroidJniObject("android/view/animation/AlphaAnimation",
                              "(FF)V",
diff --git a/src/android/view/animation/qqmlandroidalphaanimation_p.h b/src/android/view/animation/qnativeandroidalphaanimation_p.h
index 0bddd50..2c1d97f 100644
--- a/src/android/view/animation/qqmlandroidalphaanimation_p.h
+++ b/src/android/view/animation/qnativeandroidalphaanimation_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDALPHAANIMATION_P_H
-#define QQMLANDROIDALPHAANIMATION_P_H
+#ifndef QNATIVEANDROIDALPHAANIMATION_P_H
+#define QNATIVEANDROIDALPHAANIMATION_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidanimation_p.h>
+#include <QtQmlAndroid/private/qnativeandroidanimation_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidAlphaAnimation : public QQmlAndroidAnimation
+class Q_QMLANDROID_EXPORT QNativeAndroidAlphaAnimation : public QNativeAndroidAnimation
 {
     Q_OBJECT
     Q_PROPERTY(qreal fromAlpha READ fromAlpha WRITE setFromAlpha NOTIFY fromAlphaChanged)
     Q_PROPERTY(qreal toAlpha READ toAlpha WRITE setToAlpha NOTIFY toAlphaChanged)
 
 public:
-    explicit QQmlAndroidAlphaAnimation(QObject *parent = nullptr);
+    explicit QNativeAndroidAlphaAnimation(QObject *parent = nullptr);
 
     qreal fromAlpha() const;
     void setFromAlpha(qreal alpha);
@@ -81,4 +81,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDALPHAANIMATION_P_H
+#endif // QNATIVEANDROIDALPHAANIMATION_P_H
diff --git a/src/android/view/animation/qqmlandroidanimation.cpp b/src/android/view/animation/qnativeandroidanimation.cpp
index 6dd43c3..433563e 100644
--- a/src/android/view/animation/qqmlandroidanimation.cpp
+++ b/src/android/view/animation/qnativeandroidanimation.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidanimation_p.h"
+#include "qnativeandroidanimation_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qqmlandroidinterpolator_p.h"
+#include "qnativeandroidinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidAnimation::QQmlAndroidAnimation(QObject *parent) :
-    QQmlAndroidContextual(parent), m_interpolator(0)
+QNativeAndroidAnimation::QNativeAndroidAnimation(QObject *parent) :
+    QNativeAndroidContextual(parent), m_interpolator(0)
 {
 }
 
-int QQmlAndroidAnimation::resource() const
+int QNativeAndroidAnimation::resource() const
 {
     if (m_resource.isNull())
         return 0;
     return m_resource;
 }
 
-void QQmlAndroidAnimation::setResource(int resource)
+void QNativeAndroidAnimation::setResource(int resource)
 {
     if (m_resource.isNull() || m_resource != resource) {
         m_resource = resource;
@@ -60,14 +60,14 @@ void QQmlAndroidAnimation::setResource(int resource)
     }
 }
 
-int QQmlAndroidAnimation::duration() const
+int QNativeAndroidAnimation::duration() const
 {
     if (m_duration.isNull())
         return 0;
     return m_duration;
 }
 
-void QQmlAndroidAnimation::setDuration(int duration)
+void QNativeAndroidAnimation::setDuration(int duration)
 {
     if (m_duration.isNull() || m_duration != duration) {
         m_duration = duration;
@@ -76,14 +76,14 @@ void QQmlAndroidAnimation::setDuration(int duration)
     }
 }
 
-bool QQmlAndroidAnimation::fillAfter() const
+bool QNativeAndroidAnimation::fillAfter() const
 {
     if (m_fillAfter.isNull())
         return false;
     return m_fillAfter;
 }
 
-void QQmlAndroidAnimation::setFillAfter(bool fill)
+void QNativeAndroidAnimation::setFillAfter(bool fill)
 {
     if (m_fillAfter.isNull() || m_fillAfter != fill) {
         m_fillAfter = fill;
@@ -92,14 +92,14 @@ void QQmlAndroidAnimation::setFillAfter(bool fill)
     }
 }
 
-bool QQmlAndroidAnimation::fillBefore() const
+bool QNativeAndroidAnimation::fillBefore() const
 {
     if (m_fillBefore.isNull())
         return true;
     return m_fillBefore;
 }
 
-void QQmlAndroidAnimation::setFillBefore(bool fill)
+void QNativeAndroidAnimation::setFillBefore(bool fill)
 {
     if (m_fillBefore.isNull() || m_fillBefore != fill) {
         m_fillBefore = fill;
@@ -108,14 +108,14 @@ void QQmlAndroidAnimation::setFillBefore(bool fill)
     }
 }
 
-bool QQmlAndroidAnimation::fillEnabled() const
+bool QNativeAndroidAnimation::fillEnabled() const
 {
     if (!m_fillEnabled.isNull())
         return false;
     return m_fillEnabled;
 }
 
-void QQmlAndroidAnimation::setFillEnabled(bool fill)
+void QNativeAndroidAnimation::setFillEnabled(bool fill)
 {
     if (m_fillEnabled.isNull() || m_fillEnabled != fill) {
         m_fillEnabled = fill;
@@ -124,35 +124,35 @@ void QQmlAndroidAnimation::setFillEnabled(bool fill)
     }
 }
 
-QQmlAndroidInterpolator *QQmlAndroidAnimation::interpolator() const
+QNativeAndroidInterpolator *QNativeAndroidAnimation::interpolator() const
 {
     return m_interpolator;
 }
 
-void QQmlAndroidAnimation::setInterpolator(QQmlAndroidInterpolator *interpolator)
+void QNativeAndroidAnimation::setInterpolator(QNativeAndroidInterpolator *interpolator)
 {
     if (m_interpolator != interpolator) {
         if (m_interpolator) {
-            disconnect(m_interpolator, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidAnimation::updateInterpolator);
+            disconnect(m_interpolator, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidAnimation::updateInterpolator);
             m_interpolator->destruct();
         }
         m_interpolator = interpolator;
         if (m_interpolator) {
-            connect(m_interpolator, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidAnimation::updateInterpolator);
+            connect(m_interpolator, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidAnimation::updateInterpolator);
             if (isValid())
                 m_interpolator->construct();
         }
     }
 }
 
-int QQmlAndroidAnimation::repeatCount() const
+int QNativeAndroidAnimation::repeatCount() const
 {
     if (m_repeatCount.isNull())
         return 0;
     return m_repeatCount;
 }
 
-void QQmlAndroidAnimation::setRepeatCount(int count)
+void QNativeAndroidAnimation::setRepeatCount(int count)
 {
     if (m_repeatCount.isNull() || m_repeatCount != count) {
         m_repeatCount = count;
@@ -161,14 +161,14 @@ void QQmlAndroidAnimation::setRepeatCount(int count)
     }
 }
 
-QQmlAndroidAnimation::RepeatMode QQmlAndroidAnimation::repeatMode() const
+QNativeAndroidAnimation::RepeatMode QNativeAndroidAnimation::repeatMode() const
 {
     if (m_repeatMode.isNull())
         return RESTART;
     return m_repeatMode;
 }
 
-void QQmlAndroidAnimation::setRepeatMode(RepeatMode mode)
+void QNativeAndroidAnimation::setRepeatMode(RepeatMode mode)
 {
     if (m_repeatMode.isNull() || m_repeatMode != mode) {
         m_repeatMode = mode;
@@ -177,14 +177,14 @@ void QQmlAndroidAnimation::setRepeatMode(RepeatMode mode)
     }
 }
 
-int QQmlAndroidAnimation::startOffset() const
+int QNativeAndroidAnimation::startOffset() const
 {
     if (m_startOffset.isNull())
         return 0;
     return m_startOffset;
 }
 
-void QQmlAndroidAnimation::setStartOffset(int offset)
+void QNativeAndroidAnimation::setStartOffset(int offset)
 {
     if (m_startOffset.isNull() || m_startOffset != offset) {
         m_startOffset = offset;
@@ -193,14 +193,14 @@ void QQmlAndroidAnimation::setStartOffset(int offset)
     }
 }
 
-QQmlAndroidAnimation::ZAdjustment QQmlAndroidAnimation::zAdjustment() const
+QNativeAndroidAnimation::ZAdjustment QNativeAndroidAnimation::zAdjustment() const
 {
     if (m_zAdjustment.isNull())
         return ZORDER_NORMAL;
     return m_zAdjustment;
 }
 
-void QQmlAndroidAnimation::setZAdjustment(ZAdjustment adjustment)
+void QNativeAndroidAnimation::setZAdjustment(ZAdjustment adjustment)
 {
     if (m_zAdjustment.isNull() || m_zAdjustment != adjustment) {
         m_zAdjustment = adjustment;
@@ -209,22 +209,22 @@ void QQmlAndroidAnimation::setZAdjustment(ZAdjustment adjustment)
     }
 }
 
-void QQmlAndroidAnimation::cancel()
+void QNativeAndroidAnimation::cancel()
 {
     QtQmlAndroid::callVoidMethod(instance(), "cancel");
 }
 
-void QQmlAndroidAnimation::start()
+void QNativeAndroidAnimation::start()
 {
     QtQmlAndroid::callVoidMethod(instance(), "start");
 }
 
-void QQmlAndroidAnimation::startNow()
+void QNativeAndroidAnimation::startNow()
 {
     QtQmlAndroid::callVoidMethod(instance(), "startNow");
 }
 
-QAndroidJniObject QQmlAndroidAnimation::onCreate()
+QAndroidJniObject QNativeAndroidAnimation::onCreate()
 {
     if (m_resource.isNull())
         return QAndroidJniObject("android/view/animation/Animation");
@@ -236,9 +236,9 @@ QAndroidJniObject QQmlAndroidAnimation::onCreate()
                                                      m_resource);
 }
 
-void QQmlAndroidAnimation::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidAnimation::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidContextual::onInflate(instance);
+    QNativeAndroidContextual::onInflate(instance);
 
     if (m_resource.isNull()) {
         if (!m_duration.isNull())
@@ -260,13 +260,13 @@ void QQmlAndroidAnimation::onInflate(QAndroidJniObject &instance)
     }
 }
 
-void QQmlAndroidAnimation::objectChange(ObjectChange change)
+void QNativeAndroidAnimation::objectChange(ObjectChange change)
 {
     if (change == InstanceChange)
         updateInterpolator();
 }
 
-void QQmlAndroidAnimation::updateInterpolator()
+void QNativeAndroidAnimation::updateInterpolator()
 {
     if (!isValid() || !m_interpolator || !m_interpolator->isValid())
         return;
diff --git a/src/android/view/animation/qqmlandroidanimation_p.h b/src/android/view/animation/qnativeandroidanimation_p.h
index 47717e6..8b3029e 100644
--- a/src/android/view/animation/qqmlandroidanimation_p.h
+++ b/src/android/view/animation/qnativeandroidanimation_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDANIMATION_P_H
-#define QQMLANDROIDANIMATION_P_H
+#ifndef QNATIVEANDROIDANIMATION_P_H
+#define QNATIVEANDROIDANIMATION_P_H
 
 //
 //  W A R N I N G
@@ -48,14 +48,14 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidcontextual_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQmlAndroidInterpolator;
+class QNativeAndroidInterpolator;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidAnimation : public QQmlAndroidContextual
+class Q_QMLANDROID_EXPORT QNativeAndroidAnimation : public QNativeAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(int resource READ resource WRITE setResource NOTIFY resourceChanged)
@@ -63,7 +63,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidAnimation : public QQmlAndroidContextual
     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(QQmlAndroidInterpolator *interpolator READ interpolator WRITE setInterpolator NOTIFY interpolatorChanged)
+    Q_PROPERTY(QNativeAndroidInterpolator *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)
@@ -71,7 +71,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidAnimation : public QQmlAndroidContextual
     Q_ENUMS(RepeatMode ZAdjustment Infinity Relation)
 
 public:
-    explicit QQmlAndroidAnimation(QObject *parent = nullptr);
+    explicit QNativeAndroidAnimation(QObject *parent = nullptr);
 
     int resource() const;
     void setResource(int resource);
@@ -98,8 +98,8 @@ public:
     bool fillEnabled() const;
     void setFillEnabled(bool enabled);
 
-    QQmlAndroidInterpolator *interpolator() const;
-    void setInterpolator(QQmlAndroidInterpolator *interpolator);
+    QNativeAndroidInterpolator *interpolator() const;
+    void setInterpolator(QNativeAndroidInterpolator *interpolator);
 
     int repeatCount() const;
     void setRepeatCount(int count);
@@ -151,18 +151,18 @@ private Q_SLOTS:
     void updateInterpolator();
 
 private:
-    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;
+    QNativeAndroidOptional<int> m_resource;
+    QNativeAndroidOptional<int> m_duration;
+    QNativeAndroidOptional<bool> m_fillAfter;
+    QNativeAndroidOptional<bool> m_fillBefore;
+    QNativeAndroidOptional<bool> m_fillEnabled;
+    QNativeAndroidInterpolator *m_interpolator;
+    QNativeAndroidOptional<int> m_repeatCount;
+    QNativeAndroidOptional<RepeatMode> m_repeatMode;
+    QNativeAndroidOptional<int> m_startOffset;
+    QNativeAndroidOptional<ZAdjustment> m_zAdjustment;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDANIMATION_P_H
+#endif // QNATIVEANDROIDANIMATION_P_H
diff --git a/src/android/view/animation/qqmlandroidanimationset.cpp b/src/android/view/animation/qnativeandroidanimationset.cpp
index f5c85b5..a11d37a 100644
--- a/src/android/view/animation/qqmlandroidanimationset.cpp
+++ b/src/android/view/animation/qnativeandroidanimationset.cpp
@@ -34,21 +34,21 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidanimationset_p.h"
+#include "qnativeandroidanimationset_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidAnimationSet::QQmlAndroidAnimationSet(QObject *parent) :
-    QQmlAndroidAnimation(parent), m_shareInterpolator(false)
+QNativeAndroidAnimationSet::QNativeAndroidAnimationSet(QObject *parent) :
+    QNativeAndroidAnimation(parent), m_shareInterpolator(false)
 {
 }
 
-bool QQmlAndroidAnimationSet::shareInterpolator() const
+bool QNativeAndroidAnimationSet::shareInterpolator() const
 {
     return m_shareInterpolator;
 }
 
-void QQmlAndroidAnimationSet::setShareInterpolator(bool share)
+void QNativeAndroidAnimationSet::setShareInterpolator(bool share)
 {
     if (m_shareInterpolator != share) {
         m_shareInterpolator = share;
@@ -56,19 +56,19 @@ void QQmlAndroidAnimationSet::setShareInterpolator(bool share)
     }
 }
 
-QAndroidJniObject QQmlAndroidAnimationSet::onCreate()
+QAndroidJniObject QNativeAndroidAnimationSet::onCreate()
 {
     return QAndroidJniObject("android/view/animation/AnimationSet",
                              "(Z)V",
                              m_shareInterpolator);
 }
 
-void QQmlAndroidAnimationSet::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidAnimationSet::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidAnimation::onInflate(instance);
+    QNativeAndroidAnimation::onInflate(instance);
 
     foreach (QObject *object, children()) {
-        QQmlAndroidAnimation *child = qobject_cast<QQmlAndroidAnimation *>(object);
+        QNativeAndroidAnimation *child = qobject_cast<QNativeAndroidAnimation *>(object);
         if (child) {
             QAndroidJniObject animation = child->instance();
             if (animation.isValid())
diff --git a/src/android/view/animation/qqmlandroidanimationset_p.h b/src/android/view/animation/qnativeandroidanimationset_p.h
index 2891e86..2f3603c 100644
--- a/src/android/view/animation/qqmlandroidanimationset_p.h
+++ b/src/android/view/animation/qnativeandroidanimationset_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDANIMATIONSET_P_H
-#define QQMLANDROIDANIMATIONSET_P_H
+#ifndef QNATIVEANDROIDANIMATIONSET_P_H
+#define QNATIVEANDROIDANIMATIONSET_P_H
 
 //
 //  W A R N I N G
@@ -48,17 +48,17 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidanimation_p.h>
+#include <QtQmlAndroid/private/qnativeandroidanimation_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidAnimationSet : public QQmlAndroidAnimation
+class Q_QMLANDROID_EXPORT QNativeAndroidAnimationSet : public QNativeAndroidAnimation
 {
     Q_OBJECT
     Q_PROPERTY(bool shareInterpolator READ shareInterpolator WRITE setShareInterpolator NOTIFY shareInterpolatorChanged)
 
 public:
-    explicit QQmlAndroidAnimationSet(QObject *parent = nullptr);
+    explicit QNativeAndroidAnimationSet(QObject *parent = nullptr);
 
     bool shareInterpolator() const;
     void setShareInterpolator(bool share);
@@ -76,4 +76,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDANIMATIONSET_P_H
+#endif // QNATIVEANDROIDANIMATIONSET_P_H
diff --git a/src/android/view/animation/qqmlandroidanticipateinterpolator.cpp b/src/android/view/animation/qnativeandroidanticipateinterpolator.cpp
index 5588dec..4a908a4 100644
--- a/src/android/view/animation/qqmlandroidanticipateinterpolator.cpp
+++ b/src/android/view/animation/qnativeandroidanticipateinterpolator.cpp
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidanticipateinterpolator_p.h"
+#include "qnativeandroidanticipateinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidAnticipateInterpolator::QQmlAndroidAnticipateInterpolator(QObject *parent) :
-    QQmlAndroidInterpolator(parent)
+QNativeAndroidAnticipateInterpolator::QNativeAndroidAnticipateInterpolator(QObject *parent) :
+    QNativeAndroidInterpolator(parent)
 {
 }
 
-qreal QQmlAndroidAnticipateInterpolator::tension() const
+qreal QNativeAndroidAnticipateInterpolator::tension() const
 {
     if (m_tension.isNull())
         return 1.0;
     return m_tension;
 }
 
-void QQmlAndroidAnticipateInterpolator::setTension(qreal tension)
+void QNativeAndroidAnticipateInterpolator::setTension(qreal tension)
 {
     if (m_tension.isNull() || m_tension != tension) {
         m_tension = tension;
@@ -58,7 +58,7 @@ void QQmlAndroidAnticipateInterpolator::setTension(qreal tension)
     }
 }
 
-QAndroidJniObject QQmlAndroidAnticipateInterpolator::onCreate()
+QAndroidJniObject QNativeAndroidAnticipateInterpolator::onCreate()
 {
     if (m_tension.isNull())
         return QAndroidJniObject("android/view/animation/AnticipateInterpolator");
diff --git a/src/android/view/animation/qqmlandroidovershootinterpolator_p.h b/src/android/view/animation/qnativeandroidanticipateinterpolator_p.h
index b7eebb0..eda2348 100644
--- a/src/android/view/animation/qqmlandroidovershootinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidanticipateinterpolator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDOVERSHOOTINTERPOLATOR_P_H
-#define QQMLANDROIDOVERSHOOTINTERPOLATOR_P_H
+#ifndef QNATIVEANDROIDANTICIPATEINTERPOLATOR_P_H
+#define QNATIVEANDROIDANTICIPATEINTERPOLATOR_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidOvershootInterpolator : public QQmlAndroidInterpolator
+class Q_QMLANDROID_EXPORT QNativeAndroidAnticipateInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal tension READ tension WRITE setTension NOTIFY tensionChanged)
 
 public:
-    explicit QQmlAndroidOvershootInterpolator(QObject *parent = nullptr);
+    explicit QNativeAndroidAnticipateInterpolator(QObject *parent = nullptr);
 
     qreal tension() const;
     void setTension(qreal tension);
@@ -71,9 +71,9 @@ protected:
     QAndroidJniObject onCreate() override;
 
 private:
-    QQmlAndroidOptional<qreal> m_tension;
+    QNativeAndroidOptional<qreal> m_tension;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDOVERSHOOTINTERPOLATOR_P_H
+#endif // QNATIVEANDROIDANTICIPATEINTERPOLATOR_P_H
diff --git a/src/android/view/animation/qqmlandroidanticipateovershootinterpolator.cpp b/src/android/view/animation/qnativeandroidanticipateovershootinterpolator.cpp
index 6e2b21b..d666b09 100644
--- a/src/android/view/animation/qqmlandroidanticipateovershootinterpolator.cpp
+++ b/src/android/view/animation/qnativeandroidanticipateovershootinterpolator.cpp
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidanticipateovershootinterpolator_p.h"
+#include "qnativeandroidanticipateovershootinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidAnticipateOvershootInterpolator::QQmlAndroidAnticipateOvershootInterpolator(QObject *parent) :
-    QQmlAndroidInterpolator(parent)
+QNativeAndroidAnticipateOvershootInterpolator::QNativeAndroidAnticipateOvershootInterpolator(QObject *parent) :
+    QNativeAndroidInterpolator(parent)
 {
 }
 
-qreal QQmlAndroidAnticipateOvershootInterpolator::tension() const
+qreal QNativeAndroidAnticipateOvershootInterpolator::tension() const
 {
     if (m_tension.isNull())
         return 1.0;
     return m_tension;
 }
 
-void QQmlAndroidAnticipateOvershootInterpolator::setTension(qreal tension)
+void QNativeAndroidAnticipateOvershootInterpolator::setTension(qreal tension)
 {
     if (m_tension.isNull() || m_tension != tension) {
         m_tension = tension;
@@ -58,14 +58,14 @@ void QQmlAndroidAnticipateOvershootInterpolator::setTension(qreal tension)
     }
 }
 
-qreal QQmlAndroidAnticipateOvershootInterpolator::extraTension() const
+qreal QNativeAndroidAnticipateOvershootInterpolator::extraTension() const
 {
     if (m_extraTension.isNull())
         return 1.0;
     return m_extraTension;
 }
 
-void QQmlAndroidAnticipateOvershootInterpolator::setExtraTension(qreal tension)
+void QNativeAndroidAnticipateOvershootInterpolator::setExtraTension(qreal tension)
 {
     if (m_extraTension.isNull() || m_extraTension != tension) {
         m_extraTension = tension;
@@ -73,7 +73,7 @@ void QQmlAndroidAnticipateOvershootInterpolator::setExtraTension(qreal tension)
     }
 }
 
-QAndroidJniObject QQmlAndroidAnticipateOvershootInterpolator::onCreate()
+QAndroidJniObject QNativeAndroidAnticipateOvershootInterpolator::onCreate()
 {
     if (m_tension.isNull() && m_extraTension.isNull())
         return QAndroidJniObject("android/view/animation/AnticipateOvershootInterpolator");
diff --git a/src/android/view/animation/qqmlandroidanticipateovershootinterpolator_p.h b/src/android/view/animation/qnativeandroidanticipateovershootinterpolator_p.h
index 05a4092..a25bb24 100644
--- a/src/android/view/animation/qqmlandroidanticipateovershootinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidanticipateovershootinterpolator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDANTICIPATEOVERSHOOTINTERPOLATOR_P_H
-#define QQMLANDROIDANTICIPATEOVERSHOOTINTERPOLATOR_P_H
+#ifndef QNATIVEANDROIDANTICIPATEOVERSHOOTINTERPOLATOR_P_H
+#define QNATIVEANDROIDANTICIPATEOVERSHOOTINTERPOLATOR_P_H
 
 //
 //  W A R N I N G
@@ -48,19 +48,19 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidAnticipateOvershootInterpolator : public QQmlAndroidInterpolator
+class Q_QMLANDROID_EXPORT QNativeAndroidAnticipateOvershootInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal tension READ tension WRITE setTension NOTIFY tensionChanged)
     Q_PROPERTY(qreal extraTension READ extraTension WRITE setExtraTension NOTIFY extraTensionChanged)
 
 public:
-    explicit QQmlAndroidAnticipateOvershootInterpolator(QObject *parent = nullptr);
+    explicit QNativeAndroidAnticipateOvershootInterpolator(QObject *parent = nullptr);
 
     qreal tension() const;
     void setTension(qreal tension);
@@ -76,10 +76,10 @@ protected:
     QAndroidJniObject onCreate() override;
 
 private:
-    QQmlAndroidOptional<qreal> m_tension;
-    QQmlAndroidOptional<qreal> m_extraTension;
+    QNativeAndroidOptional<qreal> m_tension;
+    QNativeAndroidOptional<qreal> m_extraTension;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDANTICIPATEOVERSHOOTINTERPOLATOR_P_H
+#endif // QNATIVEANDROIDANTICIPATEOVERSHOOTINTERPOLATOR_P_H
diff --git a/src/android/view/animation/qqmlandroidbounceinterpolator.cpp b/src/android/view/animation/qnativeandroidbounceinterpolator.cpp
index c615d2d..ccf68d7 100644
--- a/src/android/view/animation/qqmlandroidbounceinterpolator.cpp
+++ b/src/android/view/animation/qnativeandroidbounceinterpolator.cpp
@@ -34,16 +34,16 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidbounceinterpolator_p.h"
+#include "qnativeandroidbounceinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidBounceInterpolator::QQmlAndroidBounceInterpolator(QObject *parent) :
-    QQmlAndroidInterpolator(parent)
+QNativeAndroidBounceInterpolator::QNativeAndroidBounceInterpolator(QObject *parent) :
+    QNativeAndroidInterpolator(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidBounceInterpolator::onCreate()
+QAndroidJniObject QNativeAndroidBounceInterpolator::onCreate()
 {
     return QAndroidJniObject("android/view/animation/BounceInterpolator");
 }
diff --git a/src/android/view/animation/qqmlandroidlinearinterpolator_p.h b/src/android/view/animation/qnativeandroidbounceinterpolator_p.h
index 4ccc2d3..d1da8b3 100644
--- a/src/android/view/animation/qqmlandroidlinearinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidbounceinterpolator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDLINEARINTERPOLATOR_P_H
-#define QQMLANDROIDLINEARINTERPOLATOR_P_H
+#ifndef QNATIVEANDROIDBOUNCEINTERPOLATOR_P_H
+#define QNATIVEANDROIDBOUNCEINTERPOLATOR_P_H
 
 //
 //  W A R N I N G
@@ -49,18 +49,18 @@
 //
 
 #include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
-#include <QtQmlAndroid/private/qqmlandroidinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h>
 #include <QtAndroidExtras/qandroidjniobject.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidLinearInterpolator : public QQmlAndroidInterpolator
+class Q_QMLANDROID_EXPORT QNativeAndroidBounceInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidLinearInterpolator(QObject *parent = nullptr);
+    explicit QNativeAndroidBounceInterpolator(QObject *parent = nullptr);
 
 Q_SIGNALS:
 
@@ -72,4 +72,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDLINEARINTERPOLATOR_P_H
+#endif // QNATIVEANDROIDBOUNCEINTERPOLATOR_P_H
diff --git a/src/android/view/animation/qqmlandroidcycleinterpolator.cpp b/src/android/view/animation/qnativeandroidcycleinterpolator.cpp
index 6c88540..d6d0b4c 100644
--- a/src/android/view/animation/qqmlandroidcycleinterpolator.cpp
+++ b/src/android/view/animation/qnativeandroidcycleinterpolator.cpp
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidcycleinterpolator_p.h"
+#include "qnativeandroidcycleinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidCycleInterpolator::QQmlAndroidCycleInterpolator(QObject *parent) :
-    QQmlAndroidInterpolator(parent)
+QNativeAndroidCycleInterpolator::QNativeAndroidCycleInterpolator(QObject *parent) :
+    QNativeAndroidInterpolator(parent)
 {
 }
 
-qreal QQmlAndroidCycleInterpolator::cycles() const
+qreal QNativeAndroidCycleInterpolator::cycles() const
 {
     if (m_cycles.isNull())
         return 1.0;
     return m_cycles;
 }
 
-void QQmlAndroidCycleInterpolator::setCycles(qreal cycles)
+void QNativeAndroidCycleInterpolator::setCycles(qreal cycles)
 {
     if (m_cycles.isNull() || m_cycles != cycles) {
         m_cycles = cycles;
@@ -58,7 +58,7 @@ void QQmlAndroidCycleInterpolator::setCycles(qreal cycles)
     }
 }
 
-QAndroidJniObject QQmlAndroidCycleInterpolator::onCreate()
+QAndroidJniObject QNativeAndroidCycleInterpolator::onCreate()
 {
     if (m_cycles.isNull())
         return QAndroidJniObject("android/view/animation/CycleInterpolator");
diff --git a/src/android/view/animation/qqmlandroidcycleinterpolator_p.h b/src/android/view/animation/qnativeandroidcycleinterpolator_p.h
index 6fbeeeb..6bea402 100644
--- a/src/android/view/animation/qqmlandroidcycleinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidcycleinterpolator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDCYCLEINTERPOLATOR_P_H
-#define QQMLANDROIDCYCLEINTERPOLATOR_P_H
+#ifndef QNATIVEANDROIDCYCLEINTERPOLATOR_P_H
+#define QNATIVEANDROIDCYCLEINTERPOLATOR_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidCycleInterpolator : public QQmlAndroidInterpolator
+class Q_QMLANDROID_EXPORT QNativeAndroidCycleInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal cycles READ cycles WRITE setCycles NOTIFY cyclesChanged)
 
 public:
-    explicit QQmlAndroidCycleInterpolator(QObject *parent = nullptr);
+    explicit QNativeAndroidCycleInterpolator(QObject *parent = nullptr);
 
     qreal cycles() const;
     void setCycles(qreal cycles);
@@ -71,9 +71,9 @@ protected:
     QAndroidJniObject onCreate() override;
 
 private:
-    QQmlAndroidOptional<qreal> m_cycles;
+    QNativeAndroidOptional<qreal> m_cycles;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDCYCLEINTERPOLATOR_P_H
+#endif // QNATIVEANDROIDCYCLEINTERPOLATOR_P_H
diff --git a/src/android/view/animation/qqmlandroiddecelerateinterpolator.cpp b/src/android/view/animation/qnativeandroiddecelerateinterpolator.cpp
index e634367..d498d76 100644
--- a/src/android/view/animation/qqmlandroiddecelerateinterpolator.cpp
+++ b/src/android/view/animation/qnativeandroiddecelerateinterpolator.cpp
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroiddecelerateinterpolator_p.h"
+#include "qnativeandroiddecelerateinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidDecelerateInterpolator::QQmlAndroidDecelerateInterpolator(QObject *parent) :
-    QQmlAndroidInterpolator(parent)
+QNativeAndroidDecelerateInterpolator::QNativeAndroidDecelerateInterpolator(QObject *parent) :
+    QNativeAndroidInterpolator(parent)
 {
 }
 
-qreal QQmlAndroidDecelerateInterpolator::factor() const
+qreal QNativeAndroidDecelerateInterpolator::factor() const
 {
     if (m_factor.isNull())
         return 1.0;
     return m_factor;
 }
 
-void QQmlAndroidDecelerateInterpolator::setFactor(qreal factor)
+void QNativeAndroidDecelerateInterpolator::setFactor(qreal factor)
 {
     if (m_factor.isNull() || m_factor != factor) {
         m_factor = factor;
@@ -58,7 +58,7 @@ void QQmlAndroidDecelerateInterpolator::setFactor(qreal factor)
     }
 }
 
-QAndroidJniObject QQmlAndroidDecelerateInterpolator::onCreate()
+QAndroidJniObject QNativeAndroidDecelerateInterpolator::onCreate()
 {
     if (m_factor.isNull())
         return QAndroidJniObject("android/view/animation/DecelerateInterpolator");
diff --git a/src/android/view/animation/qqmlandroiddecelerateinterpolator_p.h b/src/android/view/animation/qnativeandroiddecelerateinterpolator_p.h
index 3fa2800..153baa8 100644
--- a/src/android/view/animation/qqmlandroiddecelerateinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroiddecelerateinterpolator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDDECELERATEINTERPOLATOR_P_H
-#define QQMLANDROIDDECELERATEINTERPOLATOR_P_H
+#ifndef QNATIVEANDROIDDECELERATEINTERPOLATOR_P_H
+#define QNATIVEANDROIDDECELERATEINTERPOLATOR_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidDecelerateInterpolator : public QQmlAndroidInterpolator
+class Q_QMLANDROID_EXPORT QNativeAndroidDecelerateInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal factor READ factor WRITE setFactor NOTIFY factorChanged)
 
 public:
-    explicit QQmlAndroidDecelerateInterpolator(QObject *parent = nullptr);
+    explicit QNativeAndroidDecelerateInterpolator(QObject *parent = nullptr);
 
     qreal factor() const;
     void setFactor(qreal factor);
@@ -71,9 +71,9 @@ protected:
     QAndroidJniObject onCreate() override;
 
 private:
-    QQmlAndroidOptional<qreal> m_factor;
+    QNativeAndroidOptional<qreal> m_factor;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDDECELERATEINTERPOLATOR_P_H
+#endif // QNATIVEANDROIDDECELERATEINTERPOLATOR_P_H
diff --git a/src/android/view/animation/qqmlandroidinterpolator.cpp b/src/android/view/animation/qnativeandroidinterpolator.cpp
index 9764bda..cd7affc 100644
--- a/src/android/view/animation/qqmlandroidinterpolator.cpp
+++ b/src/android/view/animation/qnativeandroidinterpolator.cpp
@@ -34,16 +34,16 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidinterpolator_p.h"
+#include "qnativeandroidinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidInterpolator::QQmlAndroidInterpolator(QObject *parent) :
-    QQmlAndroidObject(parent)
+QNativeAndroidInterpolator::QNativeAndroidInterpolator(QObject *parent) :
+    QNativeAndroidObject(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidInterpolator::onCreate()
+QAndroidJniObject QNativeAndroidInterpolator::onCreate()
 {
     return QAndroidJniObject();
 }
diff --git a/src/android/view/animation/qqmlandroidinterpolator_p.h b/src/android/view/animation/qnativeandroidinterpolator_p.h
index cd27e0b..5c9446a 100644
--- a/src/android/view/animation/qqmlandroidinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidinterpolator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDINTERPOLATOR_P_H
-#define QQMLANDROIDINTERPOLATOR_P_H
+#ifndef QNATIVEANDROIDINTERPOLATOR_P_H
+#define QNATIVEANDROIDINTERPOLATOR_P_H
 
 //
 //  W A R N I N G
@@ -48,16 +48,16 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidobject_p.h>
+#include <QtQmlAndroid/private/qnativeandroidobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidInterpolator : public QQmlAndroidObject
+class Q_QMLANDROID_EXPORT QNativeAndroidInterpolator : public QNativeAndroidObject
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidInterpolator(QObject *parent = nullptr);
+    explicit QNativeAndroidInterpolator(QObject *parent = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
@@ -65,4 +65,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDINTERPOLATOR_P_H
+#endif // QNATIVEANDROIDINTERPOLATOR_P_H
diff --git a/src/android/view/animation/qqmlandroidlinearinterpolator.cpp b/src/android/view/animation/qnativeandroidlinearinterpolator.cpp
index 57dcfa6..2dff06c 100644
--- a/src/android/view/animation/qqmlandroidlinearinterpolator.cpp
+++ b/src/android/view/animation/qnativeandroidlinearinterpolator.cpp
@@ -34,16 +34,16 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidlinearinterpolator_p.h"
+#include "qnativeandroidlinearinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidLinearInterpolator::QQmlAndroidLinearInterpolator(QObject *parent) :
-    QQmlAndroidInterpolator(parent)
+QNativeAndroidLinearInterpolator::QNativeAndroidLinearInterpolator(QObject *parent) :
+    QNativeAndroidInterpolator(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidLinearInterpolator::onCreate()
+QAndroidJniObject QNativeAndroidLinearInterpolator::onCreate()
 {
     return QAndroidJniObject("android/view/animation/LinearInterpolator");
 }
diff --git a/src/android/view/animation/qqmlandroidbounceinterpolator_p.h b/src/android/view/animation/qnativeandroidlinearinterpolator_p.h
index 4a9da71..c847303 100644
--- a/src/android/view/animation/qqmlandroidbounceinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidlinearinterpolator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDBOUNCEINTERPOLATOR_P_H
-#define QQMLANDROIDBOUNCEINTERPOLATOR_P_H
+#ifndef QNATIVEANDROIDLINEARINTERPOLATOR_P_H
+#define QNATIVEANDROIDLINEARINTERPOLATOR_P_H
 
 //
 //  W A R N I N G
@@ -49,18 +49,18 @@
 //
 
 #include <QtQmlAndroid/private/qtqmlandroidglobal_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
-#include <QtQmlAndroid/private/qqmlandroidinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h>
 #include <QtAndroidExtras/qandroidjniobject.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidBounceInterpolator : public QQmlAndroidInterpolator
+class Q_QMLANDROID_EXPORT QNativeAndroidLinearInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidBounceInterpolator(QObject *parent = nullptr);
+    explicit QNativeAndroidLinearInterpolator(QObject *parent = nullptr);
 
 Q_SIGNALS:
 
@@ -72,4 +72,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDBOUNCEINTERPOLATOR_P_H
+#endif // QNATIVEANDROIDLINEARINTERPOLATOR_P_H
diff --git a/src/android/view/animation/qqmlandroidovershootinterpolator.cpp b/src/android/view/animation/qnativeandroidovershootinterpolator.cpp
index 595a209..88a2568 100644
--- a/src/android/view/animation/qqmlandroidovershootinterpolator.cpp
+++ b/src/android/view/animation/qnativeandroidovershootinterpolator.cpp
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidovershootinterpolator_p.h"
+#include "qnativeandroidovershootinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidOvershootInterpolator::QQmlAndroidOvershootInterpolator(QObject *parent) :
-    QQmlAndroidInterpolator(parent)
+QNativeAndroidOvershootInterpolator::QNativeAndroidOvershootInterpolator(QObject *parent) :
+    QNativeAndroidInterpolator(parent)
 {
 }
 
-qreal QQmlAndroidOvershootInterpolator::tension() const
+qreal QNativeAndroidOvershootInterpolator::tension() const
 {
     if (m_tension.isNull())
         return 2.0;
     return m_tension;
 }
 
-void QQmlAndroidOvershootInterpolator::setTension(qreal tension)
+void QNativeAndroidOvershootInterpolator::setTension(qreal tension)
 {
     if (m_tension.isNull() || m_tension != tension) {
         m_tension = tension;
@@ -58,7 +58,7 @@ void QQmlAndroidOvershootInterpolator::setTension(qreal tension)
     }
 }
 
-QAndroidJniObject QQmlAndroidOvershootInterpolator::onCreate()
+QAndroidJniObject QNativeAndroidOvershootInterpolator::onCreate()
 {
     if (m_tension.isNull())
         return QAndroidJniObject("android/view/animation/OvershootInterpolator");
diff --git a/src/android/view/animation/qqmlandroidanticipateinterpolator_p.h b/src/android/view/animation/qnativeandroidovershootinterpolator_p.h
index 2a524b8..e3d4300 100644
--- a/src/android/view/animation/qqmlandroidanticipateinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidovershootinterpolator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDANTICIPATEINTERPOLATOR_P_H
-#define QQMLANDROIDANTICIPATEINTERPOLATOR_P_H
+#ifndef QNATIVEANDROIDOVERSHOOTINTERPOLATOR_P_H
+#define QNATIVEANDROIDOVERSHOOTINTERPOLATOR_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidAnticipateInterpolator : public QQmlAndroidInterpolator
+class Q_QMLANDROID_EXPORT QNativeAndroidOvershootInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal tension READ tension WRITE setTension NOTIFY tensionChanged)
 
 public:
-    explicit QQmlAndroidAnticipateInterpolator(QObject *parent = nullptr);
+    explicit QNativeAndroidOvershootInterpolator(QObject *parent = nullptr);
 
     qreal tension() const;
     void setTension(qreal tension);
@@ -71,9 +71,9 @@ protected:
     QAndroidJniObject onCreate() override;
 
 private:
-    QQmlAndroidOptional<qreal> m_tension;
+    QNativeAndroidOptional<qreal> m_tension;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDANTICIPATEINTERPOLATOR_P_H
+#endif // QNATIVEANDROIDOVERSHOOTINTERPOLATOR_P_H
diff --git a/src/android/view/animation/qqmlandroidpathinterpolator.cpp b/src/android/view/animation/qnativeandroidpathinterpolator.cpp
index ae6a56c..e1e7fd9 100644
--- a/src/android/view/animation/qqmlandroidpathinterpolator.cpp
+++ b/src/android/view/animation/qnativeandroidpathinterpolator.cpp
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidpathinterpolator_p.h"
+#include "qnativeandroidpathinterpolator_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidPathInterpolator::QQmlAndroidPathInterpolator(QObject *parent) :
-    QQmlAndroidInterpolator(parent)
+QNativeAndroidPathInterpolator::QNativeAndroidPathInterpolator(QObject *parent) :
+    QNativeAndroidInterpolator(parent)
 {
 }
 
-qreal QQmlAndroidPathInterpolator::controlX() const
+qreal QNativeAndroidPathInterpolator::controlX() const
 {
     if (m_controlX.isNull())
         return 0.0;
     return m_controlX;
 }
 
-void QQmlAndroidPathInterpolator::setControlX(qreal x)
+void QNativeAndroidPathInterpolator::setControlX(qreal x)
 {
     if (m_controlX.isNull() || m_controlX != x) {
         m_controlX = x;
@@ -58,14 +58,14 @@ void QQmlAndroidPathInterpolator::setControlX(qreal x)
     }
 }
 
-qreal QQmlAndroidPathInterpolator::controlY() const
+qreal QNativeAndroidPathInterpolator::controlY() const
 {
     if (m_controlY.isNull())
         return 0.0;
     return m_controlY;
 }
 
-void QQmlAndroidPathInterpolator::setControlY(qreal y)
+void QNativeAndroidPathInterpolator::setControlY(qreal y)
 {
     if (m_controlY.isNull() || m_controlY != y) {
         m_controlY = y;
@@ -73,14 +73,14 @@ void QQmlAndroidPathInterpolator::setControlY(qreal y)
     }
 }
 
-qreal QQmlAndroidPathInterpolator::controlX2() const
+qreal QNativeAndroidPathInterpolator::controlX2() const
 {
     if (m_controlX2.isNull())
         return 0.0;
     return m_controlX2;
 }
 
-void QQmlAndroidPathInterpolator::setControlX2(qreal x)
+void QNativeAndroidPathInterpolator::setControlX2(qreal x)
 {
     if (m_controlX2.isNull() || m_controlX2 != x) {
         m_controlX2 = x;
@@ -88,14 +88,14 @@ void QQmlAndroidPathInterpolator::setControlX2(qreal x)
     }
 }
 
-qreal QQmlAndroidPathInterpolator::controlY2() const
+qreal QNativeAndroidPathInterpolator::controlY2() const
 {
     if (m_controlY2.isNull())
         return 0.0;
     return m_controlY2;
 }
 
-void QQmlAndroidPathInterpolator::setControlY2(qreal y)
+void QNativeAndroidPathInterpolator::setControlY2(qreal y)
 {
     if (m_controlY2.isNull() || m_controlY2 != y) {
         m_controlY2 = y;
@@ -103,7 +103,7 @@ void QQmlAndroidPathInterpolator::setControlY2(qreal y)
     }
 }
 
-QAndroidJniObject QQmlAndroidPathInterpolator::onCreate()
+QAndroidJniObject QNativeAndroidPathInterpolator::onCreate()
 {
     if (!m_controlX.isNull() && !m_controlY.isNull() && !m_controlX2.isNull() && !m_controlY2.isNull())
         return QAndroidJniObject("android/view/animation/PathInterpolator",
diff --git a/src/android/view/animation/qqmlandroidpathinterpolator_p.h b/src/android/view/animation/qnativeandroidpathinterpolator_p.h
index 7e80fcf..07f2d6d 100644
--- a/src/android/view/animation/qqmlandroidpathinterpolator_p.h
+++ b/src/android/view/animation/qnativeandroidpathinterpolator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDAPATHINTERPOLATOR_P_H
-#define QQMLANDROIDAPATHINTERPOLATOR_P_H
+#ifndef QNATIVEANDROIDAPATHINTERPOLATOR_P_H
+#define QNATIVEANDROIDAPATHINTERPOLATOR_P_H
 
 //
 //  W A R N I N G
@@ -48,12 +48,12 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidPathInterpolator : public QQmlAndroidInterpolator
+class Q_QMLANDROID_EXPORT QNativeAndroidPathInterpolator : public QNativeAndroidInterpolator
 {
     Q_OBJECT
     Q_PROPERTY(qreal controlX READ controlX WRITE setControlX NOTIFY controlXChanged)
@@ -62,7 +62,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidPathInterpolator : public QQmlAndroidInterp
     Q_PROPERTY(qreal controlY2 READ controlY2 WRITE setControlY2 NOTIFY controlY2Changed)
 
 public:
-    explicit QQmlAndroidPathInterpolator(QObject *parent = nullptr);
+    explicit QNativeAndroidPathInterpolator(QObject *parent = nullptr);
 
     qreal controlX() const;
     void setControlX(qreal x);
@@ -86,12 +86,12 @@ protected:
     QAndroidJniObject onCreate() override;
 
 private:
-    QQmlAndroidOptional<qreal> m_controlX;
-    QQmlAndroidOptional<qreal> m_controlY;
-    QQmlAndroidOptional<qreal> m_controlX2;
-    QQmlAndroidOptional<qreal> m_controlY2;
+    QNativeAndroidOptional<qreal> m_controlX;
+    QNativeAndroidOptional<qreal> m_controlY;
+    QNativeAndroidOptional<qreal> m_controlX2;
+    QNativeAndroidOptional<qreal> m_controlY2;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDAPATHINTERPOLATOR_P_H
+#endif // QNATIVEANDROIDAPATHINTERPOLATOR_P_H
diff --git a/src/android/view/animation/qqmlandroidrotateanimation.cpp b/src/android/view/animation/qnativeandroidrotateanimation.cpp
index 03c921f..1304a1b 100644
--- a/src/android/view/animation/qqmlandroidrotateanimation.cpp
+++ b/src/android/view/animation/qnativeandroidrotateanimation.cpp
@@ -34,22 +34,22 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidrotateanimation_p.h"
+#include "qnativeandroidrotateanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidRotateAnimation::QQmlAndroidRotateAnimation(QObject *parent) :
-    QQmlAndroidAnimation(parent), m_from(0), m_to(0),
+QNativeAndroidRotateAnimation::QNativeAndroidRotateAnimation(QObject *parent) :
+    QNativeAndroidAnimation(parent), m_from(0), m_to(0),
     m_pivotX(0), m_pivotY(0), m_pivotXType(ABSOLUTE), m_pivotYType(ABSOLUTE)
 {
 }
 
-qreal QQmlAndroidRotateAnimation::fromDegrees() const
+qreal QNativeAndroidRotateAnimation::fromDegrees() const
 {
     return m_from;
 }
 
-void QQmlAndroidRotateAnimation::setFromDegrees(qreal degrees)
+void QNativeAndroidRotateAnimation::setFromDegrees(qreal degrees)
 {
     if (m_from != degrees) {
         m_from = degrees;
@@ -57,12 +57,12 @@ void QQmlAndroidRotateAnimation::setFromDegrees(qreal degrees)
     }
 }
 
-qreal QQmlAndroidRotateAnimation::toDegrees() const
+qreal QNativeAndroidRotateAnimation::toDegrees() const
 {
     return m_to;
 }
 
-void QQmlAndroidRotateAnimation::setToDegrees(qreal degrees)
+void QNativeAndroidRotateAnimation::setToDegrees(qreal degrees)
 {
     if (m_to != degrees) {
         m_to = degrees;
@@ -70,12 +70,12 @@ void QQmlAndroidRotateAnimation::setToDegrees(qreal degrees)
     }
 }
 
-qreal QQmlAndroidRotateAnimation::pivotX() const
+qreal QNativeAndroidRotateAnimation::pivotX() const
 {
     return m_pivotX;
 }
 
-void QQmlAndroidRotateAnimation::setPivotX(qreal pivotX)
+void QNativeAndroidRotateAnimation::setPivotX(qreal pivotX)
 {
     if (m_pivotX != pivotX) {
         m_pivotX = pivotX;
@@ -83,12 +83,12 @@ void QQmlAndroidRotateAnimation::setPivotX(qreal pivotX)
     }
 }
 
-qreal QQmlAndroidRotateAnimation::pivotY() const
+qreal QNativeAndroidRotateAnimation::pivotY() const
 {
     return m_pivotY;
 }
 
-void QQmlAndroidRotateAnimation::setPivotY(qreal pivotY)
+void QNativeAndroidRotateAnimation::setPivotY(qreal pivotY)
 {
     if (m_pivotY != pivotY) {
         m_pivotY = pivotY;
@@ -96,12 +96,12 @@ void QQmlAndroidRotateAnimation::setPivotY(qreal pivotY)
     }
 }
 
-QQmlAndroidRotateAnimation::Relation QQmlAndroidRotateAnimation::pivotXType() const
+QNativeAndroidRotateAnimation::Relation QNativeAndroidRotateAnimation::pivotXType() const
 {
     return m_pivotXType;
 }
 
-void QQmlAndroidRotateAnimation::setPivotXType(Relation type)
+void QNativeAndroidRotateAnimation::setPivotXType(Relation type)
 {
     if (m_pivotXType != type) {
         m_pivotXType = type;
@@ -109,12 +109,12 @@ void QQmlAndroidRotateAnimation::setPivotXType(Relation type)
     }
 }
 
-QQmlAndroidRotateAnimation::Relation QQmlAndroidRotateAnimation::pivotYType() const
+QNativeAndroidRotateAnimation::Relation QNativeAndroidRotateAnimation::pivotYType() const
 {
     return m_pivotYType;
 }
 
-void QQmlAndroidRotateAnimation::setPivotYType(Relation type)
+void QNativeAndroidRotateAnimation::setPivotYType(Relation type)
 {
     if (m_pivotYType != type) {
         m_pivotYType = type;
@@ -122,7 +122,7 @@ void QQmlAndroidRotateAnimation::setPivotYType(Relation type)
     }
 }
 
-QAndroidJniObject QQmlAndroidRotateAnimation::onCreate()
+QAndroidJniObject QNativeAndroidRotateAnimation::onCreate()
 {
     return QAndroidJniObject("android/view/animation/RotateAnimation",
                              "(FFIFIF)V",
diff --git a/src/android/view/animation/qqmlandroidrotateanimation_p.h b/src/android/view/animation/qnativeandroidrotateanimation_p.h
index 7615a42..b9d194b 100644
--- a/src/android/view/animation/qqmlandroidrotateanimation_p.h
+++ b/src/android/view/animation/qnativeandroidrotateanimation_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDROTATEANIMATION_P_H
-#define QQMLANDROIDROTATEANIMATION_P_H
+#ifndef QNATIVEANDROIDROTATEANIMATION_P_H
+#define QNATIVEANDROIDROTATEANIMATION_P_H
 
 //
 //  W A R N I N G
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidanimation_p.h>
+#include <QtQmlAndroid/private/qnativeandroidanimation_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidRotateAnimation : public QQmlAndroidAnimation
+class Q_QMLANDROID_EXPORT QNativeAndroidRotateAnimation : public QNativeAndroidAnimation
 {
     Q_OBJECT
     Q_PROPERTY(qreal fromDegrees READ fromDegrees WRITE setFromDegrees NOTIFY fromDegreesChanged)
@@ -64,7 +64,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidRotateAnimation : public QQmlAndroidAnimati
     Q_ENUMS(Relation)
 
 public:
-    explicit QQmlAndroidRotateAnimation(QObject *parent = nullptr);
+    explicit QNativeAndroidRotateAnimation(QObject *parent = nullptr);
 
     qreal fromDegrees() const;
     void setFromDegrees(qreal degrees);
@@ -106,4 +106,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDROTATEANIMATION_P_H
+#endif // QNATIVEANDROIDROTATEANIMATION_P_H
diff --git a/src/android/view/animation/qqmlandroidscaleanimation.cpp b/src/android/view/animation/qnativeandroidscaleanimation.cpp
index 4c21bdc..369a783 100644
--- a/src/android/view/animation/qqmlandroidscaleanimation.cpp
+++ b/src/android/view/animation/qnativeandroidscaleanimation.cpp
@@ -34,22 +34,22 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidscaleanimation_p.h"
+#include "qnativeandroidscaleanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidScaleAnimation::QQmlAndroidScaleAnimation(QObject *parent) :
-    QQmlAndroidAnimation(parent), m_fromX(0), m_fromY(0), m_toX(0), m_toY(0),
+QNativeAndroidScaleAnimation::QNativeAndroidScaleAnimation(QObject *parent) :
+    QNativeAndroidAnimation(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 QQmlAndroidScaleAnimation::fromXScale() const
+qreal QNativeAndroidScaleAnimation::fromXScale() const
 {
     return m_fromX;
 }
 
-void QQmlAndroidScaleAnimation::setFromXScale(qreal x)
+void QNativeAndroidScaleAnimation::setFromXScale(qreal x)
 {
     if (m_fromX != x) {
         m_fromX = x;
@@ -57,12 +57,12 @@ void QQmlAndroidScaleAnimation::setFromXScale(qreal x)
     }
 }
 
-qreal QQmlAndroidScaleAnimation::fromYScale() const
+qreal QNativeAndroidScaleAnimation::fromYScale() const
 {
     return m_fromY;
 }
 
-void QQmlAndroidScaleAnimation::setFromYScale(qreal y)
+void QNativeAndroidScaleAnimation::setFromYScale(qreal y)
 {
     if (m_fromY != y) {
         m_fromY = y;
@@ -70,12 +70,12 @@ void QQmlAndroidScaleAnimation::setFromYScale(qreal y)
     }
 }
 
-qreal QQmlAndroidScaleAnimation::toXScale() const
+qreal QNativeAndroidScaleAnimation::toXScale() const
 {
     return m_toX;
 }
 
-void QQmlAndroidScaleAnimation::setToXScale(qreal x)
+void QNativeAndroidScaleAnimation::setToXScale(qreal x)
 {
     if (m_toX != x) {
         m_toX = x;
@@ -83,12 +83,12 @@ void QQmlAndroidScaleAnimation::setToXScale(qreal x)
     }
 }
 
-qreal QQmlAndroidScaleAnimation::toYScale() const
+qreal QNativeAndroidScaleAnimation::toYScale() const
 {
     return m_toY;
 }
 
-void QQmlAndroidScaleAnimation::setToYScale(qreal y)
+void QNativeAndroidScaleAnimation::setToYScale(qreal y)
 {
     if (m_toY != y) {
         m_toY = y;
@@ -96,12 +96,12 @@ void QQmlAndroidScaleAnimation::setToYScale(qreal y)
     }
 }
 
-qreal QQmlAndroidScaleAnimation::pivotX() const
+qreal QNativeAndroidScaleAnimation::pivotX() const
 {
     return m_pivotX;
 }
 
-void QQmlAndroidScaleAnimation::setPivotX(qreal pivotX)
+void QNativeAndroidScaleAnimation::setPivotX(qreal pivotX)
 {
     if (m_pivotX != pivotX) {
         m_pivotX = pivotX;
@@ -109,12 +109,12 @@ void QQmlAndroidScaleAnimation::setPivotX(qreal pivotX)
     }
 }
 
-qreal QQmlAndroidScaleAnimation::pivotY() const
+qreal QNativeAndroidScaleAnimation::pivotY() const
 {
     return m_pivotY;
 }
 
-void QQmlAndroidScaleAnimation::setPivotY(qreal pivotY)
+void QNativeAndroidScaleAnimation::setPivotY(qreal pivotY)
 {
     if (m_pivotY != pivotY) {
         m_pivotY = pivotY;
@@ -122,12 +122,12 @@ void QQmlAndroidScaleAnimation::setPivotY(qreal pivotY)
     }
 }
 
-QQmlAndroidAnimation::Relation QQmlAndroidScaleAnimation::pivotXType() const
+QNativeAndroidAnimation::Relation QNativeAndroidScaleAnimation::pivotXType() const
 {
     return m_pivotXType;
 }
 
-void QQmlAndroidScaleAnimation::setPivotXType(Relation type)
+void QNativeAndroidScaleAnimation::setPivotXType(Relation type)
 {
     if (m_pivotXType != type) {
         m_pivotXType = type;
@@ -135,12 +135,12 @@ void QQmlAndroidScaleAnimation::setPivotXType(Relation type)
     }
 }
 
-QQmlAndroidAnimation::Relation QQmlAndroidScaleAnimation::pivotYType() const
+QNativeAndroidAnimation::Relation QNativeAndroidScaleAnimation::pivotYType() const
 {
     return m_pivotYType;
 }
 
-void QQmlAndroidScaleAnimation::setPivotYType(Relation type)
+void QNativeAndroidScaleAnimation::setPivotYType(Relation type)
 {
     if (m_pivotYType != type) {
         m_pivotYType = type;
@@ -148,7 +148,7 @@ void QQmlAndroidScaleAnimation::setPivotYType(Relation type)
     }
 }
 
-QAndroidJniObject QQmlAndroidScaleAnimation::onCreate()
+QAndroidJniObject QNativeAndroidScaleAnimation::onCreate()
 {
     return QAndroidJniObject("android/view/animation/ScaleAnimation",
                              "(FFFFIFIF)V",
diff --git a/src/android/view/animation/qqmlandroidscaleanimation_p.h b/src/android/view/animation/qnativeandroidscaleanimation_p.h
index 7dd118d..f8bf4e5 100644
--- a/src/android/view/animation/qqmlandroidscaleanimation_p.h
+++ b/src/android/view/animation/qnativeandroidscaleanimation_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDSCALEANIMATION_P_H
-#define QQMLANDROIDSCALEANIMATION_P_H
+#ifndef QNATIVEANDROIDSCALEANIMATION_P_H
+#define QNATIVEANDROIDSCALEANIMATION_P_H
 
 //
 //  W A R N I N G
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidanimation_p.h>
+#include <QtQmlAndroid/private/qnativeandroidanimation_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidScaleAnimation : public QQmlAndroidAnimation
+class Q_QMLANDROID_EXPORT QNativeAndroidScaleAnimation : public QNativeAndroidAnimation
 {
     Q_OBJECT
     Q_PROPERTY(qreal fromXScale READ fromXScale WRITE setFromXScale NOTIFY fromXScaleChanged)
@@ -65,7 +65,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidScaleAnimation : public QQmlAndroidAnimatio
     Q_PROPERTY(Relation pivotYType READ pivotYType WRITE setPivotYType NOTIFY pivotYTypeChanged)
 
 public:
-    explicit QQmlAndroidScaleAnimation(QObject *parent = nullptr);
+    explicit QNativeAndroidScaleAnimation(QObject *parent = nullptr);
 
     qreal fromXScale() const;
     void setFromXScale(qreal scale);
@@ -117,4 +117,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDSCALEANIMATION_P_H
+#endif // QNATIVEANDROIDSCALEANIMATION_P_H
diff --git a/src/android/view/animation/qqmlandroidtranslateanimation.cpp b/src/android/view/animation/qnativeandroidtranslateanimation.cpp
index f432c22..a4f57c3 100644
--- a/src/android/view/animation/qqmlandroidtranslateanimation.cpp
+++ b/src/android/view/animation/qnativeandroidtranslateanimation.cpp
@@ -34,22 +34,22 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidtranslateanimation_p.h"
+#include "qnativeandroidtranslateanimation_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidTranslateAnimation::QQmlAndroidTranslateAnimation(QObject *parent) :
-    QQmlAndroidAnimation(parent), m_fromX(0), m_fromY(0), m_toX(0), m_toY(0),
+QNativeAndroidTranslateAnimation::QNativeAndroidTranslateAnimation(QObject *parent) :
+    QNativeAndroidAnimation(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 QQmlAndroidTranslateAnimation::fromX() const
+qreal QNativeAndroidTranslateAnimation::fromX() const
 {
     return m_fromX;
 }
 
-void QQmlAndroidTranslateAnimation::setFromX(qreal x)
+void QNativeAndroidTranslateAnimation::setFromX(qreal x)
 {
     if (m_fromX != x) {
         m_fromX = x;
@@ -57,12 +57,12 @@ void QQmlAndroidTranslateAnimation::setFromX(qreal x)
     }
 }
 
-qreal QQmlAndroidTranslateAnimation::fromY() const
+qreal QNativeAndroidTranslateAnimation::fromY() const
 {
     return m_fromY;
 }
 
-void QQmlAndroidTranslateAnimation::setFromY(qreal y)
+void QNativeAndroidTranslateAnimation::setFromY(qreal y)
 {
     if (m_fromY != y) {
         m_fromY = y;
@@ -70,12 +70,12 @@ void QQmlAndroidTranslateAnimation::setFromY(qreal y)
     }
 }
 
-qreal QQmlAndroidTranslateAnimation::toX() const
+qreal QNativeAndroidTranslateAnimation::toX() const
 {
     return m_toX;
 }
 
-void QQmlAndroidTranslateAnimation::setToX(qreal x)
+void QNativeAndroidTranslateAnimation::setToX(qreal x)
 {
     if (m_toX != x) {
         m_toX = x;
@@ -83,12 +83,12 @@ void QQmlAndroidTranslateAnimation::setToX(qreal x)
     }
 }
 
-qreal QQmlAndroidTranslateAnimation::toY() const
+qreal QNativeAndroidTranslateAnimation::toY() const
 {
     return m_toY;
 }
 
-void QQmlAndroidTranslateAnimation::setToY(qreal y)
+void QNativeAndroidTranslateAnimation::setToY(qreal y)
 {
     if (m_toY != y) {
         m_toY = y;
@@ -96,12 +96,12 @@ void QQmlAndroidTranslateAnimation::setToY(qreal y)
     }
 }
 
-QQmlAndroidAnimation::Relation QQmlAndroidTranslateAnimation::fromXType() const
+QNativeAndroidAnimation::Relation QNativeAndroidTranslateAnimation::fromXType() const
 {
     return m_fromXType;
 }
 
-void QQmlAndroidTranslateAnimation::setFromXType(Relation type)
+void QNativeAndroidTranslateAnimation::setFromXType(Relation type)
 {
     if (m_fromXType != type) {
         m_fromXType = type;
@@ -109,12 +109,12 @@ void QQmlAndroidTranslateAnimation::setFromXType(Relation type)
     }
 }
 
-QQmlAndroidAnimation::Relation QQmlAndroidTranslateAnimation::fromYType() const
+QNativeAndroidAnimation::Relation QNativeAndroidTranslateAnimation::fromYType() const
 {
     return m_fromYType;
 }
 
-void QQmlAndroidTranslateAnimation::setFromYType(Relation type)
+void QNativeAndroidTranslateAnimation::setFromYType(Relation type)
 {
     if (m_fromYType != type) {
         m_fromYType = type;
@@ -122,12 +122,12 @@ void QQmlAndroidTranslateAnimation::setFromYType(Relation type)
     }
 }
 
-QQmlAndroidAnimation::Relation QQmlAndroidTranslateAnimation::toXType() const
+QNativeAndroidAnimation::Relation QNativeAndroidTranslateAnimation::toXType() const
 {
     return m_toXType;
 }
 
-void QQmlAndroidTranslateAnimation::setToXType(Relation type)
+void QNativeAndroidTranslateAnimation::setToXType(Relation type)
 {
     if (m_toXType != type) {
         m_toXType = type;
@@ -135,12 +135,12 @@ void QQmlAndroidTranslateAnimation::setToXType(Relation type)
     }
 }
 
-QQmlAndroidAnimation::Relation QQmlAndroidTranslateAnimation::toYType() const
+QNativeAndroidAnimation::Relation QNativeAndroidTranslateAnimation::toYType() const
 {
     return m_toYType;
 }
 
-void QQmlAndroidTranslateAnimation::setToYType(Relation type)
+void QNativeAndroidTranslateAnimation::setToYType(Relation type)
 {
     if (m_toYType != type) {
         m_toYType = type;
@@ -148,7 +148,7 @@ void QQmlAndroidTranslateAnimation::setToYType(Relation type)
     }
 }
 
-QAndroidJniObject QQmlAndroidTranslateAnimation::onCreate()
+QAndroidJniObject QNativeAndroidTranslateAnimation::onCreate()
 {
     return QAndroidJniObject("android/view/animation/TranslateAnimation",
                              "(IFIFIFIF)V",
diff --git a/src/android/view/animation/qqmlandroidtranslateanimation_p.h b/src/android/view/animation/qnativeandroidtranslateanimation_p.h
index 6c3859b..fc2f4c8 100644
--- a/src/android/view/animation/qqmlandroidtranslateanimation_p.h
+++ b/src/android/view/animation/qnativeandroidtranslateanimation_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDTRANSLATEANIMATION_P_H
-#define QQMLANDROIDTRANSLATEANIMATION_P_H
+#ifndef QNATIVEANDROIDTRANSLATEANIMATION_P_H
+#define QNATIVEANDROIDTRANSLATEANIMATION_P_H
 
 //
 //  W A R N I N G
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidanimation_p.h>
+#include <QtQmlAndroid/private/qnativeandroidanimation_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidTranslateAnimation : public QQmlAndroidAnimation
+class Q_QMLANDROID_EXPORT QNativeAndroidTranslateAnimation : public QNativeAndroidAnimation
 {
     Q_OBJECT
     Q_PROPERTY(qreal fromX READ fromX WRITE setFromX NOTIFY fromXChanged)
@@ -65,7 +65,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidTranslateAnimation : public QQmlAndroidAnim
     Q_PROPERTY(Relation toYType READ toYType WRITE setToYType NOTIFY toYTypeChanged)
 
 public:
-    explicit QQmlAndroidTranslateAnimation(QObject *parent = nullptr);
+    explicit QNativeAndroidTranslateAnimation(QObject *parent = nullptr);
 
     qreal fromX() const;
     void setFromX(qreal x);
@@ -117,4 +117,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDTRANSLATEANIMATION_P_H
+#endif // QNATIVEANDROIDTRANSLATEANIMATION_P_H
diff --git a/src/android/view/qqmlandroidgravity_p.h b/src/android/view/qnativeandroidgravity_p.h
index 331e7e4..82ac038 100644
--- a/src/android/view/qqmlandroidgravity_p.h
+++ b/src/android/view/qnativeandroidgravity_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDGRAVITY_P_H
-#define QQMLANDROIDGRAVITY_P_H
+#ifndef QNATIVEANDROIDGRAVITY_P_H
+#define QNATIVEANDROIDGRAVITY_P_H
 
 //
 //  W A R N I N G
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidGravity : public QObject
+class Q_QMLANDROID_EXPORT QNativeAndroidGravity : public QObject
 {
     Q_OBJECT
     Q_FLAGS(Flags)
@@ -94,8 +94,8 @@ public:
     Q_DECLARE_FLAGS(Flags, Flag)
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QQmlAndroidGravity::Flags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QNativeAndroidGravity::Flags)
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDGRAVITY_P_H
+#endif // QNATIVEANDROIDGRAVITY_P_H
diff --git a/src/android/view/qqmlandroidlayoutparams.cpp b/src/android/view/qnativeandroidlayoutparams.cpp
index d5ef865..0a1e8aa 100644
--- a/src/android/view/qqmlandroidlayoutparams.cpp
+++ b/src/android/view/qnativeandroidlayoutparams.cpp
@@ -34,34 +34,34 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidlayoutparams_p.h"
+#include "qnativeandroidlayoutparams_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qqmlandroidview_p.h"
+#include "qnativeandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidLayoutParams::QQmlAndroidLayoutParams(QQmlAndroidView *view) :
-    QQmlAndroidObject(view), m_dirty(false), m_view(view)
+QNativeAndroidLayoutParams::QNativeAndroidLayoutParams(QNativeAndroidView *view) :
+    QNativeAndroidObject(view), m_dirty(false), m_view(view)
 {
     m_view->setLayoutParams(this);
 }
 
-QQmlAndroidLayoutParams *QQmlAndroidLayoutParams::qmlAttachedProperties(QObject *object)
+QNativeAndroidLayoutParams *QNativeAndroidLayoutParams::qmlAttachedProperties(QObject *object)
 {
-    QQmlAndroidView *view = qobject_cast<QQmlAndroidView*>(object);
+    QNativeAndroidView *view = qobject_cast<QNativeAndroidView*>(object);
     if (view)
-        return new QQmlAndroidLayoutParams(view);
+        return new QNativeAndroidLayoutParams(view);
     return 0;
 }
 
-int QQmlAndroidLayoutParams::width() const
+int QNativeAndroidLayoutParams::width() const
 {
     if (m_width.isNull())
         return MATCH_PARENT;
     return m_width;
 }
 
-void QQmlAndroidLayoutParams::setWidth(int value)
+void QNativeAndroidLayoutParams::setWidth(int value)
 {
     if (value != width()) {
         m_width = value;
@@ -70,14 +70,14 @@ void QQmlAndroidLayoutParams::setWidth(int value)
     }
 }
 
-int QQmlAndroidLayoutParams::height() const
+int QNativeAndroidLayoutParams::height() const
 {
     if (m_height.isNull())
         return MATCH_PARENT;
     return m_height;
 }
 
-void QQmlAndroidLayoutParams::setHeight(int value)
+void QNativeAndroidLayoutParams::setHeight(int value)
 {
     if (value != height()) {
         m_height = value;
@@ -86,7 +86,7 @@ void QQmlAndroidLayoutParams::setHeight(int value)
     }
 }
 
-void QQmlAndroidLayoutParams::invalidate()
+void QNativeAndroidLayoutParams::invalidate()
 {
     if (!m_dirty && isValid()) {
         m_dirty = true;
@@ -94,14 +94,14 @@ void QQmlAndroidLayoutParams::invalidate()
     }
 }
 
-QAndroidJniObject QQmlAndroidLayoutParams::onCreate()
+QAndroidJniObject QNativeAndroidLayoutParams::onCreate()
 {
     return QAndroidJniObject("android/view/ViewGroup$LayoutParams",
                              "(II)V",
                              MATCH_PARENT, MATCH_PARENT);
 }
 
-void QQmlAndroidLayoutParams::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidLayoutParams::onInflate(QAndroidJniObject &instance)
 {
     if (!m_width.isNull())
         instance.setField<int>("width", m_width);
@@ -109,7 +109,7 @@ void QQmlAndroidLayoutParams::onInflate(QAndroidJniObject &instance)
         instance.setField<int>("height", m_height);
 }
 
-bool QQmlAndroidLayoutParams::event(QEvent *event)
+bool QNativeAndroidLayoutParams::event(QEvent *event)
 {
     if (event->type() == QEvent::LayoutRequest) {
         if (m_dirty && isValid()) {
@@ -117,7 +117,7 @@ bool QQmlAndroidLayoutParams::event(QEvent *event)
             m_dirty = false;
         }
     }
-    return QQmlAndroidObject::event(event);
+    return QNativeAndroidObject::event(event);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/view/qqmlandroidlayoutparams_p.h b/src/android/view/qnativeandroidlayoutparams_p.h
index 3c87699..a9c9bc4 100644
--- a/src/android/view/qqmlandroidlayoutparams_p.h
+++ b/src/android/view/qnativeandroidlayoutparams_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDLAYOUTPARAMS_P_H
-#define QQMLANDROIDLAYOUTPARAMS_P_H
+#ifndef QNATIVEANDROIDLAYOUTPARAMS_P_H
+#define QNATIVEANDROIDLAYOUTPARAMS_P_H
 
 //
 //  W A R N I N G
@@ -48,15 +48,15 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidobject_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidobject_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 #include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQmlAndroidView;
+class QNativeAndroidView;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidLayoutParams : public QQmlAndroidObject
+class Q_QMLANDROID_EXPORT QNativeAndroidLayoutParams : public QNativeAndroidObject
 {
     Q_OBJECT
     Q_PROPERTY(int width READ width WRITE setWidth NOTIFY widthChanged)
@@ -64,9 +64,9 @@ class Q_QMLANDROID_EXPORT QQmlAndroidLayoutParams : public QQmlAndroidObject
     Q_ENUMS(Size)
 
 public:
-    explicit QQmlAndroidLayoutParams(QQmlAndroidView *view);
+    explicit QNativeAndroidLayoutParams(QNativeAndroidView *view);
 
-    static QQmlAndroidLayoutParams *qmlAttachedProperties(QObject *object);
+    static QNativeAndroidLayoutParams *qmlAttachedProperties(QObject *object);
 
     enum Size {
         FILL_PARENT = -1,
@@ -95,13 +95,13 @@ protected:
 
 private:
     bool m_dirty;
-    QQmlAndroidView *m_view;
-    QQmlAndroidOptional<int> m_width;
-    QQmlAndroidOptional<int> m_height;
+    QNativeAndroidView *m_view;
+    QNativeAndroidOptional<int> m_width;
+    QNativeAndroidOptional<int> m_height;
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QQmlAndroidLayoutParams, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QNativeAndroidLayoutParams, QML_HAS_ATTACHED_PROPERTIES)
 
-#endif // QQMLANDROIDLAYOUTPARAMS_P_H
+#endif // QNATIVEANDROIDLAYOUTPARAMS_P_H
diff --git a/src/android/view/qqmlandroidmenu.cpp b/src/android/view/qnativeandroidmenu.cpp
index a571cde..5636890 100644
--- a/src/android/view/qqmlandroidmenu.cpp
+++ b/src/android/view/qnativeandroidmenu.cpp
@@ -34,35 +34,35 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidmenu_p.h"
-#include "qqmlandroidmenuitem_p.h"
+#include "qnativeandroidmenu_p.h"
+#include "qnativeandroidmenuitem_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidMenu::QQmlAndroidMenu(QObject *parent) :
-    QQmlAndroidContextual(parent)
+QNativeAndroidMenu::QNativeAndroidMenu(QObject *parent) :
+    QNativeAndroidContextual(parent)
 {
 }
 
-QList<QQmlAndroidMenuItem *> QQmlAndroidMenu::items() const
+QList<QNativeAndroidMenuItem *> QNativeAndroidMenu::items() const
 {
-    QList<QQmlAndroidMenuItem *> lst;
+    QList<QNativeAndroidMenuItem *> lst;
     foreach (QObject *child, children()) {
-        QQmlAndroidMenuItem *item = qobject_cast<QQmlAndroidMenuItem *>(child);
+        QNativeAndroidMenuItem *item = qobject_cast<QNativeAndroidMenuItem *>(child);
         if (item)
             lst += item;
     }
     return lst;
 }
 
-QAndroidJniObject QQmlAndroidMenu::onCreate()
+QAndroidJniObject QNativeAndroidMenu::onCreate()
 {
     return QAndroidJniObject("qt/android/view/QmlMenu");
 }
 
-void QQmlAndroidMenu::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidMenu::onInflate(QAndroidJniObject &instance)
 {
-    foreach (QQmlAndroidMenuItem *item, items()) {
+    foreach (QNativeAndroidMenuItem *item, items()) {
         item->construct();
         if (item->isValid())
             instance.callMethod<void>("add", "(Lqt/android/view/QmlMenuItem;)V", item->instance().object());
diff --git a/src/android/view/qqmlandroidmenu_p.h b/src/android/view/qnativeandroidmenu_p.h
index 5e4a087..0c33c83 100644
--- a/src/android/view/qqmlandroidmenu_p.h
+++ b/src/android/view/qnativeandroidmenu_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDMENU_P_H
-#define QQMLANDROIDMENU_P_H
+#ifndef QNATIVEANDROIDMENU_P_H
+#define QNATIVEANDROIDMENU_P_H
 
 //
 //  W A R N I N G
@@ -48,20 +48,20 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidcontextual_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQmlAndroidMenuItem;
+class QNativeAndroidMenuItem;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidMenu : public QQmlAndroidContextual
+class Q_QMLANDROID_EXPORT QNativeAndroidMenu : public QNativeAndroidContextual
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidMenu(QObject *parent = nullptr);
+    explicit QNativeAndroidMenu(QObject *parent = nullptr);
 
-    QList<QQmlAndroidMenuItem *> items() const;
+    QList<QNativeAndroidMenuItem *> items() const;
 
 protected:
     QAndroidJniObject onCreate() override;
@@ -70,4 +70,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDMENU_P_H
+#endif // QNATIVEANDROIDMENU_P_H
diff --git a/src/android/view/qqmlandroidmenuitem.cpp b/src/android/view/qnativeandroidmenuitem.cpp
index 5982073..8867a21 100644
--- a/src/android/view/qqmlandroidmenuitem.cpp
+++ b/src/android/view/qnativeandroidmenuitem.cpp
@@ -34,27 +34,27 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidmenuitem_p.h"
+#include "qnativeandroidmenuitem_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qqmlandroidcontext_p.h"
-#include "qqmlandroidview_p.h"
+#include "qnativeandroidcontext_p.h"
+#include "qnativeandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidMenuItem::QQmlAndroidMenuItem(QObject *parent) :
-    QQmlAndroidContextual(parent), m_enabled(true), m_visible(true),
+QNativeAndroidMenuItem::QNativeAndroidMenuItem(QObject *parent) :
+    QNativeAndroidContextual(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 QQmlAndroidMenuItem::title() const
+QString QNativeAndroidMenuItem::title() const
 {
     return m_title;
 }
 
-void QQmlAndroidMenuItem::setTitle(const QString &title)
+void QNativeAndroidMenuItem::setTitle(const QString &title)
 {
     if (m_title != title) {
         m_title = title;
@@ -63,12 +63,12 @@ void QQmlAndroidMenuItem::setTitle(const QString &title)
     }
 }
 
-bool QQmlAndroidMenuItem::isEnabled() const
+bool QNativeAndroidMenuItem::isEnabled() const
 {
     return m_enabled;
 }
 
-void QQmlAndroidMenuItem::setEnabled(bool enabled)
+void QNativeAndroidMenuItem::setEnabled(bool enabled)
 {
     if (m_enabled != enabled) {
         m_enabled = enabled;
@@ -77,12 +77,12 @@ void QQmlAndroidMenuItem::setEnabled(bool enabled)
     }
 }
 
-bool QQmlAndroidMenuItem::isVisible() const
+bool QNativeAndroidMenuItem::isVisible() const
 {
     return m_visible;
 }
 
-void QQmlAndroidMenuItem::setVisible(bool visible)
+void QNativeAndroidMenuItem::setVisible(bool visible)
 {
     if (m_visible != visible) {
         m_visible = visible;
@@ -93,12 +93,12 @@ void QQmlAndroidMenuItem::setVisible(bool visible)
     }
 }
 
-bool QQmlAndroidMenuItem::isCheckable() const
+bool QNativeAndroidMenuItem::isCheckable() const
 {
     return m_checkable;
 }
 
-void QQmlAndroidMenuItem::setCheckable(bool checkable)
+void QNativeAndroidMenuItem::setCheckable(bool checkable)
 {
     if (m_checkable != checkable) {
         m_checkable = checkable;
@@ -107,12 +107,12 @@ void QQmlAndroidMenuItem::setCheckable(bool checkable)
     }
 }
 
-bool QQmlAndroidMenuItem::isChecked() const
+bool QNativeAndroidMenuItem::isChecked() const
 {
     return m_checked;
 }
 
-void QQmlAndroidMenuItem::setChecked(bool checked)
+void QNativeAndroidMenuItem::setChecked(bool checked)
 {
     if (m_checked != checked) {
         m_checked = checked;
@@ -121,12 +121,12 @@ void QQmlAndroidMenuItem::setChecked(bool checked)
     }
 }
 
-int QQmlAndroidMenuItem::showAs() const
+int QNativeAndroidMenuItem::showAs() const
 {
     return m_showAs;
 }
 
-void QQmlAndroidMenuItem::setShowAs(int showAs)
+void QNativeAndroidMenuItem::setShowAs(int showAs)
 {
     if (m_showAs != showAs) {
         m_showAs = showAs;
@@ -135,21 +135,21 @@ void QQmlAndroidMenuItem::setShowAs(int showAs)
     }
 }
 
-QQmlAndroidView *QQmlAndroidMenuItem::actionView() const
+QNativeAndroidView *QNativeAndroidMenuItem::actionView() const
 {
     return m_actionView;
 }
 
-void QQmlAndroidMenuItem::setActionView(QQmlAndroidView *view)
+void QNativeAndroidMenuItem::setActionView(QNativeAndroidView *view)
 {
     if (m_actionView != view) {
         if (m_actionView) {
-            disconnect(m_actionView, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidMenuItem::updateActionView);
+            disconnect(m_actionView, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidMenuItem::updateActionView);
             m_actionView->destruct();
         }
         m_actionView = view;
         if (m_actionView) {
-            connect(m_actionView, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidMenuItem::updateActionView);
+            connect(m_actionView, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidMenuItem::updateActionView);
             if (isValid())
                 m_actionView->construct();
         }
@@ -157,14 +157,14 @@ void QQmlAndroidMenuItem::setActionView(QQmlAndroidView *view)
     }
 }
 
-QAndroidJniObject QQmlAndroidMenuItem::onCreate()
+QAndroidJniObject QNativeAndroidMenuItem::onCreate()
 {
     return QAndroidJniObject("qt/android/view/QmlMenuItem",
                              "(J)V",
                              reinterpret_cast<jlong>(this));
 }
 
-void QQmlAndroidMenuItem::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidMenuItem::onInflate(QAndroidJniObject &instance)
 {
     instance.callMethod<void>("setTitle", "(Ljava/lang/CharSequence;)V", QAndroidJniObject::fromString(m_title).object());
     instance.callMethod<void>("setEnabled", "(Z)V", m_enabled);
@@ -180,7 +180,7 @@ void QQmlAndroidMenuItem::onInflate(QAndroidJniObject &instance)
     }
 }
 
-void QQmlAndroidMenuItem::onRegisterNativeMethods(jobject item)
+void QNativeAndroidMenuItem::onRegisterNativeMethods(jobject item)
 {
     JNINativeMethod methods[] {{"onClick", "(J)Z", reinterpret_cast<void *>(onClick)},
                                {"onMenuItemActionCollapse", "(J)Z", reinterpret_cast<void *>(onMenuItemActionCollapse)},
@@ -192,11 +192,11 @@ void QQmlAndroidMenuItem::onRegisterNativeMethods(jobject item)
     env->DeleteLocalRef(cls);
 }
 
-bool QQmlAndroidMenuItem::onClick(JNIEnv *env, jobject object, jlong instance)
+bool QNativeAndroidMenuItem::onClick(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidMenuItem *item = reinterpret_cast<QQmlAndroidMenuItem *>(instance);
+    QNativeAndroidMenuItem *item = reinterpret_cast<QNativeAndroidMenuItem *>(instance);
     if (item) {
         QMetaObject::invokeMethod(item, "click", Qt::QueuedConnection);
         return true;
@@ -204,11 +204,11 @@ bool QQmlAndroidMenuItem::onClick(JNIEnv *env, jobject object, jlong instance)
     return false;
 }
 
-bool QQmlAndroidMenuItem::onMenuItemActionCollapse(JNIEnv *env, jobject object, jlong instance)
+bool QNativeAndroidMenuItem::onMenuItemActionCollapse(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidMenuItem *item = reinterpret_cast<QQmlAndroidMenuItem *>(instance);
+    QNativeAndroidMenuItem *item = reinterpret_cast<QNativeAndroidMenuItem *>(instance);
     if (item) {
         // TODO
         return true;
@@ -216,11 +216,11 @@ bool QQmlAndroidMenuItem::onMenuItemActionCollapse(JNIEnv *env, jobject object,
     return false;
 }
 
-bool QQmlAndroidMenuItem::onMenuItemActionExpand(JNIEnv *env, jobject object, jlong instance)
+bool QNativeAndroidMenuItem::onMenuItemActionExpand(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidMenuItem *item = reinterpret_cast<QQmlAndroidMenuItem *>(instance);
+    QNativeAndroidMenuItem *item = reinterpret_cast<QNativeAndroidMenuItem *>(instance);
     if (item) {
         // TODO
         return true;
@@ -229,14 +229,14 @@ bool QQmlAndroidMenuItem::onMenuItemActionExpand(JNIEnv *env, jobject object, jl
 
 }
 
-void QQmlAndroidMenuItem::objectChange(ObjectChange change)
+void QNativeAndroidMenuItem::objectChange(ObjectChange change)
 {
-    QQmlAndroidContextual::objectChange(change);
+    QNativeAndroidContextual::objectChange(change);
     if (change == InstanceChange)
         updateActionView();
 }
 
-void QQmlAndroidMenuItem::updateActionView()
+void QNativeAndroidMenuItem::updateActionView()
 {
     if (!isValid() || !m_actionView)
         return;
diff --git a/src/android/view/qqmlandroidmenuitem_p.h b/src/android/view/qnativeandroidmenuitem_p.h
index b3c9be2..58d4d8b 100644
--- a/src/android/view/qqmlandroidmenuitem_p.h
+++ b/src/android/view/qnativeandroidmenuitem_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDMENUITEM_P_H
-#define QQMLANDROIDMENUITEM_P_H
+#ifndef QNATIVEANDROIDMENUITEM_P_H
+#define QNATIVEANDROIDMENUITEM_P_H
 
 //
 //  W A R N I N G
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidcontextual_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQmlAndroidView;
+class QNativeAndroidView;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidMenuItem : public QQmlAndroidContextual
+class Q_QMLANDROID_EXPORT QNativeAndroidMenuItem : public QNativeAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
@@ -63,11 +63,11 @@ class Q_QMLANDROID_EXPORT QQmlAndroidMenuItem : public QQmlAndroidContextual
     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(QQmlAndroidView *actionView READ actionView WRITE setActionView NOTIFY actionViewChanged)
+    Q_PROPERTY(QNativeAndroidView *actionView READ actionView WRITE setActionView NOTIFY actionViewChanged)
     Q_ENUMS(ShowAs)
 
 public:
-    explicit QQmlAndroidMenuItem(QObject *parent = nullptr);
+    explicit QNativeAndroidMenuItem(QObject *parent = nullptr);
 
     QString title() const;
     void setTitle(const QString &title);
@@ -95,8 +95,8 @@ public:
     int showAs() const;
     void setShowAs(int showAs);
 
-    QQmlAndroidView *actionView() const;
-    void setActionView(QQmlAndroidView *view);
+    QNativeAndroidView *actionView() const;
+    void setActionView(QNativeAndroidView *view);
 
 Q_SIGNALS:
     void click();
@@ -129,9 +129,9 @@ private:
     bool m_checkable;
     bool m_checked;
     int m_showAs;
-    QQmlAndroidView *m_actionView;
+    QNativeAndroidView *m_actionView;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDMENUITEM_P_H
+#endif // QNATIVEANDROIDMENUITEM_P_H
diff --git a/src/android/view/qqmlandroidview.cpp b/src/android/view/qnativeandroidview.cpp
index 23e8e46..d12c338 100644
--- a/src/android/view/qqmlandroidview.cpp
+++ b/src/android/view/qnativeandroidview.cpp
@@ -34,11 +34,11 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidview_p.h"
-#include "qqmlandroiddrawable_p.h"
-#include "qqmlandroidcolordrawable_p.h"
-#include "qqmlandroidlayoutparams_p.h"
-#include "qqmlandroidanimation_p.h"
+#include "qnativeandroidview_p.h"
+#include "qnativeandroiddrawable_p.h"
+#include "qnativeandroidcolordrawable_p.h"
+#include "qnativeandroidlayoutparams_p.h"
+#include "qnativeandroidanimation_p.h"
 #include "qtqmlandroidfunctions_p.h"
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qcoreevent.h>
@@ -46,8 +46,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidView::QQmlAndroidView(QQmlAndroidView *parent) :
-    QQmlAndroidContextual(parent), m_parent(0), m_background(0), m_backgroundResource(0),
+QNativeAndroidView::QNativeAndroidView(QNativeAndroidView *parent) :
+    QNativeAndroidContextual(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)
 {
@@ -61,30 +61,30 @@ QQmlAndroidView::QQmlAndroidView(QQmlAndroidView *parent) :
     requestPolish();
 }
 
-QQmlAndroidView::~QQmlAndroidView()
+QNativeAndroidView::~QNativeAndroidView()
 {
-    foreach (QQmlAndroidView *child, m_children)
+    foreach (QNativeAndroidView *child, m_children)
         child->setParentView(0);
     if (m_parent)
         setParentView(0);
 }
 
-int QQmlAndroidView::identifier() const
+int QNativeAndroidView::identifier() const
 {
     return m_id;
 }
 
-void QQmlAndroidView::setIdentifier(int identifier)
+void QNativeAndroidView::setIdentifier(int identifier)
 {
     m_id = identifier;
 }
 
-QQmlAndroidView *QQmlAndroidView::parentView() const
+QNativeAndroidView *QNativeAndroidView::parentView() const
 {
     return m_parent;
 }
 
-void QQmlAndroidView::setParentView(QQmlAndroidView *parent)
+void QNativeAndroidView::setParentView(QNativeAndroidView *parent)
 {
     if (m_parent != parent) {
         if (m_parent)
@@ -97,54 +97,54 @@ void QQmlAndroidView::setParentView(QQmlAndroidView *parent)
     }
 }
 
-QList<QQmlAndroidView *> QQmlAndroidView::childViews() const
+QList<QNativeAndroidView *> QNativeAndroidView::childViews() const
 {
     return m_children;
 }
 
-QQmlListProperty<QQmlAndroidView> QQmlAndroidView::children()
+QQmlListProperty<QNativeAndroidView> QNativeAndroidView::children()
 {
-    return QQmlListProperty<QQmlAndroidView>(this, 0, &QQmlAndroidView::children_append, &QQmlAndroidView::children_count,
-                                                   &QQmlAndroidView::children_at, &QQmlAndroidView::children_clear);
+    return QQmlListProperty<QNativeAndroidView>(this, 0, &QNativeAndroidView::children_append, &QNativeAndroidView::children_count,
+                                                   &QNativeAndroidView::children_at, &QNativeAndroidView::children_clear);
 }
 
-QQmlAndroidLayoutParams *QQmlAndroidView::layoutParams() const
+QNativeAndroidLayoutParams *QNativeAndroidView::layoutParams() const
 {
     return m_layoutParams;
 }
 
-void QQmlAndroidView::setLayoutParams(QQmlAndroidLayoutParams *params)
+void QNativeAndroidView::setLayoutParams(QNativeAndroidLayoutParams *params)
 {
     if (m_layoutParams != params) {
         if (m_layoutParams) {
-            disconnect(m_layoutParams, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidView::updateLayoutParams);
+            disconnect(m_layoutParams, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidView::updateLayoutParams);
             m_layoutParams->destruct();
         }
         m_layoutParams = params;
         if (m_layoutParams) {
-            connect(m_layoutParams, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidView::updateLayoutParams);
+            connect(m_layoutParams, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidView::updateLayoutParams);
             if (isValid())
                 m_layoutParams->construct();
         }
     }
 }
 
-QQmlAndroidDrawable *QQmlAndroidView::background() const
+QNativeAndroidDrawable *QNativeAndroidView::background() const
 {
     return m_background;
 }
 
-void QQmlAndroidView::setBackground(QQmlAndroidDrawable *background, int resource)
+void QNativeAndroidView::setBackground(QNativeAndroidDrawable *background, int resource)
 {
     if (m_background != background) {
         if (m_background) {
-            disconnect(m_background, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidView::updateBackground);
+            disconnect(m_background, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidView::updateBackground);
             m_background->destruct();
         }
         m_background = background;
         m_backgroundResource = resource;
         if (m_background) {
-            connect(m_background, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidView::updateBackground);
+            connect(m_background, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidView::updateBackground);
             if (!resource)
                 m_background->construct();
         }
@@ -152,21 +152,21 @@ void QQmlAndroidView::setBackground(QQmlAndroidDrawable *background, int resourc
     }
 }
 
-QQmlAndroidAnimation *QQmlAndroidView::animation() const
+QNativeAndroidAnimation *QNativeAndroidView::animation() const
 {
     return m_animation;
 }
 
-void QQmlAndroidView::setAnimation(QQmlAndroidAnimation *animation)
+void QNativeAndroidView::setAnimation(QNativeAndroidAnimation *animation)
 {
     if (m_animation != animation) {
         if (m_animation) {
-            disconnect(m_animation, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidView::updateAnimation);
+            disconnect(m_animation, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidView::updateAnimation);
             m_animation->destruct();
         }
         m_animation = animation;
         if (m_animation) {
-            connect(m_animation, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidView::updateAnimation);
+            connect(m_animation, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidView::updateAnimation);
             if (isValid())
                 m_animation->construct();
         }
@@ -174,38 +174,38 @@ void QQmlAndroidView::setAnimation(QQmlAndroidAnimation *animation)
     }
 }
 
-int QQmlAndroidView::backgroundColor() const
+int QNativeAndroidView::backgroundColor() const
 {
-    QQmlAndroidColorDrawable *drawable = qobject_cast<QQmlAndroidColorDrawable *>(m_background);
+    QNativeAndroidColorDrawable *drawable = qobject_cast<QNativeAndroidColorDrawable *>(m_background);
     if (drawable)
         return drawable->color();
     return 0; // TODO
 }
 
-void QQmlAndroidView::setBackgroundColor(int color)
+void QNativeAndroidView::setBackgroundColor(int color)
 {
-    setBackground(new QQmlAndroidColorDrawable(color, this));
+    setBackground(new QNativeAndroidColorDrawable(color, this));
 }
 
-int QQmlAndroidView::backgroundResource() const
+int QNativeAndroidView::backgroundResource() const
 {
     return m_backgroundResource;
 }
 
-void QQmlAndroidView::setBackgroundResource(int resource)
+void QNativeAndroidView::setBackgroundResource(int resource)
 {
     if (m_backgroundResource != resource) {
-        setBackground(new QQmlAndroidDrawable(this), resource);
+        setBackground(new QNativeAndroidDrawable(this), resource);
         emit backgroundResourceChanged();
     }
 }
 
-bool QQmlAndroidView::isVisible() const
+bool QNativeAndroidView::isVisible() const
 {
     return m_visible;
 }
 
-void QQmlAndroidView::setVisible(bool visible)
+void QNativeAndroidView::setVisible(bool visible)
 {
     if (m_visible != visible) {
         m_visible = visible;
@@ -215,14 +215,14 @@ void QQmlAndroidView::setVisible(bool visible)
     }
 }
 
-bool QQmlAndroidView::hasFocus() const
+bool QNativeAndroidView::hasFocus() const
 {
     if (m_focus.isNull())
         return false;
     return m_focus;
 }
 
-bool QQmlAndroidView::updateFocus(bool arg)
+bool QNativeAndroidView::updateFocus(bool arg)
 {
     if (arg != hasFocus()) {
         m_focus = arg;
@@ -232,44 +232,44 @@ bool QQmlAndroidView::updateFocus(bool arg)
     return false;
 }
 
-qreal QQmlAndroidView::x() const
+qreal QNativeAndroidView::x() const
 {
     return left() + translationX();
 }
 
-void QQmlAndroidView::setX(qreal x)
+void QNativeAndroidView::setX(qreal x)
 {
     setTranslationX(x - left());
 }
 
-qreal QQmlAndroidView::y() const
+qreal QNativeAndroidView::y() const
 {
     return top() + translationY();
 }
 
-void QQmlAndroidView::setY(qreal y)
+void QNativeAndroidView::setY(qreal y)
 {
     setTranslationY(y - top());
 }
 
-qreal QQmlAndroidView::z() const
+qreal QNativeAndroidView::z() const
 {
     return elevation() + translationZ();
 }
 
-void QQmlAndroidView::setZ(qreal z)
+void QNativeAndroidView::setZ(qreal z)
 {
     setTranslationZ(z - elevation());
 }
 
-int QQmlAndroidView::top() const
+int QNativeAndroidView::top() const
 {
     if (m_top.isNull())
         return 0;
     return m_top;
 }
 
-void QQmlAndroidView::setTop(int top)
+void QNativeAndroidView::setTop(int top)
 {
     if (m_top.isNull() || m_top != top) {
         m_top = top;
@@ -279,14 +279,14 @@ void QQmlAndroidView::setTop(int top)
     }
 }
 
-int QQmlAndroidView::left() const
+int QNativeAndroidView::left() const
 {
     if (m_left.isNull())
         return 0;
     return m_left;
 }
 
-void QQmlAndroidView::setLeft(int left)
+void QNativeAndroidView::setLeft(int left)
 {
     if (m_left.isNull() || m_left != left) {
         m_left = left;
@@ -296,14 +296,14 @@ void QQmlAndroidView::setLeft(int left)
     }
 }
 
-int QQmlAndroidView::right() const
+int QNativeAndroidView::right() const
 {
     if (m_right.isNull())
         return 0;
     return m_right;
 }
 
-void QQmlAndroidView::setRight(int right)
+void QNativeAndroidView::setRight(int right)
 {
     if (m_right.isNull() || m_right != right) {
         m_right = right;
@@ -312,14 +312,14 @@ void QQmlAndroidView::setRight(int right)
     }
 }
 
-int QQmlAndroidView::bottom() const
+int QNativeAndroidView::bottom() const
 {
     if (m_bottom.isNull())
         return 0;
     return m_bottom;
 }
 
-void QQmlAndroidView::setBottom(int bottom)
+void QNativeAndroidView::setBottom(int bottom)
 {
     if (m_bottom.isNull() || m_bottom != bottom) {
         m_bottom = bottom;
@@ -328,27 +328,27 @@ void QQmlAndroidView::setBottom(int bottom)
     }
 }
 
-int QQmlAndroidView::width() const
+int QNativeAndroidView::width() const
 {
     return right() - left();
 }
 
-void QQmlAndroidView::setWidth(int width)
+void QNativeAndroidView::setWidth(int width)
 {
     setRight(left() + width);
 }
 
-int QQmlAndroidView::height() const
+int QNativeAndroidView::height() const
 {
     return bottom() - top();
 }
 
-void QQmlAndroidView::setHeight(int height)
+void QNativeAndroidView::setHeight(int height)
 {
     setBottom(top() + height);
 }
 
-void QQmlAndroidView::updateGeometry(int t, int l, int r, int b)
+void QNativeAndroidView::updateGeometry(int t, int l, int r, int b)
 {
     if (t != top()) {
         m_top = t;
@@ -372,14 +372,14 @@ void QQmlAndroidView::updateGeometry(int t, int l, int r, int b)
     }
 }
 
-int QQmlAndroidView::padding() const
+int QNativeAndroidView::padding() const
 {
     if (!m_padding.isNull())
         return m_padding;
     return 0;
 }
 
-void QQmlAndroidView::setPadding(int padding)
+void QNativeAndroidView::setPadding(int padding)
 {
     if (m_padding.isNull() || m_padding != padding) {
         m_padding = padding;
@@ -387,14 +387,14 @@ void QQmlAndroidView::setPadding(int padding)
     }
 }
 
-int QQmlAndroidView::paddingTop() const
+int QNativeAndroidView::paddingTop() const
 {
     if (m_paddingTop.isNull())
         return padding();
     return m_paddingTop;
 }
 
-void QQmlAndroidView::setPaddingTop(int padding)
+void QNativeAndroidView::setPaddingTop(int padding)
 {
     if (m_paddingTop.isNull() || m_paddingTop != padding) {
         m_paddingTop = padding;
@@ -402,14 +402,14 @@ void QQmlAndroidView::setPaddingTop(int padding)
     }
 }
 
-int QQmlAndroidView::paddingLeft() const
+int QNativeAndroidView::paddingLeft() const
 {
     if (m_paddingLeft.isNull())
         return padding();
     return m_paddingLeft;
 }
 
-void QQmlAndroidView::setPaddingLeft(int padding)
+void QNativeAndroidView::setPaddingLeft(int padding)
 {
     if (m_paddingLeft.isNull() || m_paddingLeft != padding) {
         m_paddingLeft = padding;
@@ -417,14 +417,14 @@ void QQmlAndroidView::setPaddingLeft(int padding)
     }
 }
 
-int QQmlAndroidView::paddingRight() const
+int QNativeAndroidView::paddingRight() const
 {
     if (m_paddingRight.isNull())
         return padding();
     return m_paddingRight;
 }
 
-void QQmlAndroidView::setPaddingRight(int padding)
+void QNativeAndroidView::setPaddingRight(int padding)
 {
     if (m_paddingRight.isNull() || m_paddingRight != padding) {
         m_paddingRight = padding;
@@ -432,14 +432,14 @@ void QQmlAndroidView::setPaddingRight(int padding)
     }
 }
 
-int QQmlAndroidView::paddingBottom() const
+int QNativeAndroidView::paddingBottom() const
 {
     if (m_paddingBottom.isNull())
         return padding();
     return m_paddingBottom;
 }
 
-void QQmlAndroidView::setPaddingBottom(int padding)
+void QNativeAndroidView::setPaddingBottom(int padding)
 {
     if (m_paddingBottom.isNull() || m_paddingBottom != padding) {
         m_paddingBottom = padding;
@@ -447,14 +447,14 @@ void QQmlAndroidView::setPaddingBottom(int padding)
     }
 }
 
-qreal QQmlAndroidView::alpha() const
+qreal QNativeAndroidView::alpha() const
 {
     if (!m_alpha.isNull())
         return m_alpha;
     return 0;
 }
 
-void QQmlAndroidView::setAlpha(qreal alpha)
+void QNativeAndroidView::setAlpha(qreal alpha)
 {
     if (m_alpha.isNull() || m_alpha != alpha) {
         m_alpha = alpha;
@@ -463,14 +463,14 @@ void QQmlAndroidView::setAlpha(qreal alpha)
     }
 }
 
-qreal QQmlAndroidView::scaleX() const
+qreal QNativeAndroidView::scaleX() const
 {
     if (!m_scaleX.isNull())
         return m_scaleX;
     return 0;
 }
 
-void QQmlAndroidView::setScaleX(qreal scaleX)
+void QNativeAndroidView::setScaleX(qreal scaleX)
 {
     if (m_scaleX.isNull() || m_scaleX != scaleX) {
         m_scaleX = scaleX;
@@ -479,14 +479,14 @@ void QQmlAndroidView::setScaleX(qreal scaleX)
     }
 }
 
-qreal QQmlAndroidView::scaleY() const
+qreal QNativeAndroidView::scaleY() const
 {
     if (!m_scaleY.isNull())
         return m_scaleY;
     return 0;
 }
 
-void QQmlAndroidView::setScaleY(qreal scaleY)
+void QNativeAndroidView::setScaleY(qreal scaleY)
 {
     if (m_scaleY.isNull() || m_scaleY != scaleY) {
         m_scaleY = scaleY;
@@ -495,14 +495,14 @@ void QQmlAndroidView::setScaleY(qreal scaleY)
     }
 }
 
-qreal QQmlAndroidView::pivotX() const
+qreal QNativeAndroidView::pivotX() const
 {
     if (!m_pivotX.isNull())
         return m_pivotX;
     return 0;
 }
 
-void QQmlAndroidView::setPivotX(qreal pivotX)
+void QNativeAndroidView::setPivotX(qreal pivotX)
 {
     if (m_pivotX.isNull() || m_pivotX != pivotX) {
         m_pivotX = pivotX;
@@ -511,14 +511,14 @@ void QQmlAndroidView::setPivotX(qreal pivotX)
     }
 }
 
-qreal QQmlAndroidView::pivotY() const
+qreal QNativeAndroidView::pivotY() const
 {
     if (!m_pivotY.isNull())
         return m_pivotY;
     return 0;
 }
 
-void QQmlAndroidView::setPivotY(qreal pivotY)
+void QNativeAndroidView::setPivotY(qreal pivotY)
 {
     if (m_pivotY.isNull() || m_pivotY != pivotY) {
         m_pivotY = pivotY;
@@ -527,14 +527,14 @@ void QQmlAndroidView::setPivotY(qreal pivotY)
     }
 }
 
-qreal QQmlAndroidView::rotation() const
+qreal QNativeAndroidView::rotation() const
 {
     if (!m_rotation.isNull())
         return m_rotation;
     return 0;
 }
 
-void QQmlAndroidView::setRotation(qreal rotation)
+void QNativeAndroidView::setRotation(qreal rotation)
 {
     if (m_rotation.isNull() || m_rotation != rotation) {
         m_rotation = rotation;
@@ -543,14 +543,14 @@ void QQmlAndroidView::setRotation(qreal rotation)
     }
 }
 
-qreal QQmlAndroidView::rotationX() const
+qreal QNativeAndroidView::rotationX() const
 {
     if (!m_rotationX.isNull())
         return m_rotationX;
     return 0;
 }
 
-void QQmlAndroidView::setRotationX(qreal rotationX)
+void QNativeAndroidView::setRotationX(qreal rotationX)
 {
     if (m_rotationX.isNull() || m_rotationX != rotationX) {
         m_rotationX = rotationX;
@@ -559,14 +559,14 @@ void QQmlAndroidView::setRotationX(qreal rotationX)
     }
 }
 
-qreal QQmlAndroidView::rotationY() const
+qreal QNativeAndroidView::rotationY() const
 {
     if (!m_rotationY.isNull())
         return m_rotationY;
     return 0;
 }
 
-void QQmlAndroidView::setRotationY(qreal rotationY)
+void QNativeAndroidView::setRotationY(qreal rotationY)
 {
     if (m_rotationY.isNull() || m_rotationY != rotationY) {
         m_rotationY = rotationY;
@@ -575,14 +575,14 @@ void QQmlAndroidView::setRotationY(qreal rotationY)
     }
 }
 
-qreal QQmlAndroidView::translationX() const
+qreal QNativeAndroidView::translationX() const
 {
     if (!m_translationX.isNull())
         return m_translationX;
     return 0;
 }
 
-void QQmlAndroidView::setTranslationX(qreal translationX)
+void QNativeAndroidView::setTranslationX(qreal translationX)
 {
     if (m_translationX.isNull() || m_translationX != translationX) {
         m_translationX = translationX;
@@ -592,14 +592,14 @@ void QQmlAndroidView::setTranslationX(qreal translationX)
     }
 }
 
-qreal QQmlAndroidView::translationY() const
+qreal QNativeAndroidView::translationY() const
 {
     if (!m_translationY.isNull())
         return m_translationY;
     return 0;
 }
 
-void QQmlAndroidView::setTranslationY(qreal translationY)
+void QNativeAndroidView::setTranslationY(qreal translationY)
 {
     if (m_translationY.isNull() || m_translationY != translationY) {
         m_translationY = translationY;
@@ -609,14 +609,14 @@ void QQmlAndroidView::setTranslationY(qreal translationY)
     }
 }
 
-qreal QQmlAndroidView::translationZ() const
+qreal QNativeAndroidView::translationZ() const
 {
     if (!m_translationZ.isNull())
         return m_translationZ;
     return 0;
 }
 
-void QQmlAndroidView::setTranslationZ(qreal translationZ)
+void QNativeAndroidView::setTranslationZ(qreal translationZ)
 {
     if (m_translationZ.isNull() || m_translationZ != translationZ) {
         m_translationZ = translationZ;
@@ -626,14 +626,14 @@ void QQmlAndroidView::setTranslationZ(qreal translationZ)
     }
 }
 
-qreal QQmlAndroidView::elevation() const
+qreal QNativeAndroidView::elevation() const
 {
     if (!m_elevation.isNull())
         return m_elevation;
     return 0;
 }
 
-void QQmlAndroidView::setElevation(qreal elevation)
+void QNativeAndroidView::setElevation(qreal elevation)
 {
     if (m_elevation.isNull() || m_elevation != elevation) {
         m_elevation = elevation;
@@ -643,7 +643,7 @@ void QQmlAndroidView::setElevation(qreal elevation)
     }
 }
 
-void QQmlAndroidView::viewChange(ViewChange change, const ViewChangeData &data)
+void QNativeAndroidView::viewChange(ViewChange change, const ViewChangeData &data)
 {
     switch (change) {
     case ViewParentChange:       // data.view
@@ -655,7 +655,7 @@ void QQmlAndroidView::viewChange(ViewChange change, const ViewChangeData &data)
     }
 }
 
-void QQmlAndroidView::addChild(QQmlAndroidView *child)
+void QNativeAndroidView::addChild(QNativeAndroidView *child)
 {
     if (!m_children.contains(child)) {
         m_children.append(child);
@@ -664,7 +664,7 @@ void QQmlAndroidView::addChild(QQmlAndroidView *child)
     }
 }
 
-void QQmlAndroidView::removeChild(QQmlAndroidView *child)
+void QNativeAndroidView::removeChild(QNativeAndroidView *child)
 {
     if (m_children.removeOne(child)) {
         viewChange(ViewChildRemovedChange, child);
@@ -672,35 +672,35 @@ void QQmlAndroidView::removeChild(QQmlAndroidView *child)
     }
 }
 
-void QQmlAndroidView::children_append(QQmlListProperty<QQmlAndroidView> *list, QQmlAndroidView *child)
+void QNativeAndroidView::children_append(QQmlListProperty<QNativeAndroidView> *list, QNativeAndroidView *child)
 {
-    if (QQmlAndroidView *that = qobject_cast<QQmlAndroidView *>(list->object))
+    if (QNativeAndroidView *that = qobject_cast<QNativeAndroidView *>(list->object))
         that->addChild(child);
 }
 
-int QQmlAndroidView::children_count(QQmlListProperty<QQmlAndroidView> *list)
+int QNativeAndroidView::children_count(QQmlListProperty<QNativeAndroidView> *list)
 {
-    if (QQmlAndroidView *that = qobject_cast<QQmlAndroidView *>(list->object))
+    if (QNativeAndroidView *that = qobject_cast<QNativeAndroidView *>(list->object))
         return that->m_children.count();
     return 0;
 }
 
-QQmlAndroidView *QQmlAndroidView::children_at(QQmlListProperty<QQmlAndroidView> *list, int index)
+QNativeAndroidView *QNativeAndroidView::children_at(QQmlListProperty<QNativeAndroidView> *list, int index)
 {
-    if (QQmlAndroidView *that = qobject_cast<QQmlAndroidView *>(list->object))
+    if (QNativeAndroidView *that = qobject_cast<QNativeAndroidView *>(list->object))
         return that->m_children.at(index);
     return 0;
 }
 
-void QQmlAndroidView::children_clear(QQmlListProperty<QQmlAndroidView> *list)
+void QNativeAndroidView::children_clear(QQmlListProperty<QNativeAndroidView> *list)
 {
-    if (QQmlAndroidView *that = qobject_cast<QQmlAndroidView *>(list->object)) {
+    if (QNativeAndroidView *that = qobject_cast<QNativeAndroidView *>(list->object)) {
         while (!that->m_children.isEmpty())
             that->m_children.first()->setParentView(0);
     }
 }
 
-QAndroidJniObject QQmlAndroidView::onCreate()
+QAndroidJniObject QNativeAndroidView::onCreate()
 {
     Q_ASSERT(!QtQmlAndroid::isMainQtThread());
 
@@ -709,11 +709,11 @@ QAndroidJniObject QQmlAndroidView::onCreate()
                              ctx().object());
 }
 
-void QQmlAndroidView::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidView::onInflate(QAndroidJniObject &instance)
 {
     Q_ASSERT(!QtQmlAndroid::isMainQtThread());
 
-    QQmlAndroidContextual::onInflate(instance);
+    QNativeAndroidContextual::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/view/QmlViewListener",
                                    "(Landroid/view/View;J)V",
@@ -771,7 +771,7 @@ void QQmlAndroidView::onInflate(QAndroidJniObject &instance)
     }
 }
 
-void QQmlAndroidView::onRegisterNativeMethods(jobject listener)
+void QNativeAndroidView::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onClick", "(J)V", reinterpret_cast<void *>(onClick)},
                                {"onFocusChange", "(JZ)V", reinterpret_cast<void *>(onFocusChange)},
@@ -784,38 +784,38 @@ void QQmlAndroidView::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QQmlAndroidView::onClick(JNIEnv *env, jobject object, jlong instance)
+void QNativeAndroidView::onClick(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidView *view = reinterpret_cast<QQmlAndroidView *>(instance);
+    QNativeAndroidView *view = reinterpret_cast<QNativeAndroidView *>(instance);
     if (view)
         QMetaObject::invokeMethod(view, "click", Qt::QueuedConnection);
 }
 
-void QQmlAndroidView::onFocusChange(JNIEnv *env, jobject object, jlong instance, jboolean hasFocus)
+void QNativeAndroidView::onFocusChange(JNIEnv *env, jobject object, jlong instance, jboolean hasFocus)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidView *view = reinterpret_cast<QQmlAndroidView *>(instance);
+    QNativeAndroidView *view = reinterpret_cast<QNativeAndroidView *>(instance);
     if (view)
         QMetaObject::invokeMethod(view, "updateFocus", Qt::QueuedConnection, Q_ARG(bool, hasFocus));
 }
 
-void QQmlAndroidView::onLayoutChange(JNIEnv *env, jobject object, jlong instance, jint left, jint top, jint right, jint bottom)
+void QNativeAndroidView::onLayoutChange(JNIEnv *env, jobject object, jlong instance, jint left, jint top, jint right, jint bottom)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidView *view = reinterpret_cast<QQmlAndroidView *>(instance);
+    QNativeAndroidView *view = reinterpret_cast<QNativeAndroidView *>(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 QQmlAndroidView::onLongClick(JNIEnv *env, jobject object, jlong instance)
+bool QNativeAndroidView::onLongClick(JNIEnv *env, jobject object, jlong instance)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidView *view = reinterpret_cast<QQmlAndroidView *>(instance);
+    QNativeAndroidView *view = reinterpret_cast<QNativeAndroidView *>(instance);
     if (view) {
         //qDebug() << "onLongClick:" << view;
         QMetaObject::invokeMethod(view, "longClick", Qt::QueuedConnection);
@@ -823,7 +823,7 @@ bool QQmlAndroidView::onLongClick(JNIEnv *env, jobject object, jlong instance)
     return true; // TODO: accept
 }
 
-void QQmlAndroidView::requestPolish()
+void QNativeAndroidView::requestPolish()
 {
     if (!m_polishing) {
         m_polishing = true;
@@ -831,25 +831,25 @@ void QQmlAndroidView::requestPolish()
     }
 }
 
-void QQmlAndroidView::polish()
+void QNativeAndroidView::polish()
 {
 }
 
-bool QQmlAndroidView::event(QEvent *event)
+bool QNativeAndroidView::event(QEvent *event)
 {
     if (event->type() == QEvent::PolishRequest) {
-        QQmlAndroidView *view = qobject_cast<QQmlAndroidView *>(parent());
+        QNativeAndroidView *view = qobject_cast<QNativeAndroidView *>(parent());
         if (view)
             setParentView(view);
         polish();
         m_polishing = false;
     }
-    return QQmlAndroidContextual::event(event);
+    return QNativeAndroidContextual::event(event);
 }
 
-void QQmlAndroidView::objectChange(ObjectChange change)
+void QNativeAndroidView::objectChange(ObjectChange change)
 {
-    QQmlAndroidContextual::objectChange(change);
+    QNativeAndroidContextual::objectChange(change);
     if (change == InstanceChange) {
         updateLayoutParams();
         updateBackground();
@@ -857,7 +857,7 @@ void QQmlAndroidView::objectChange(ObjectChange change)
     }
 }
 
-void QQmlAndroidView::updateBackground()
+void QNativeAndroidView::updateBackground()
 {
     if (!isValid() || !m_background)
         return;
@@ -869,7 +869,7 @@ void QQmlAndroidView::updateBackground()
     });
 }
 
-void QQmlAndroidView::updateAnimation()
+void QNativeAndroidView::updateAnimation()
 {
     if (!isValid() || !m_animation || !m_animation->isValid())
         return;
@@ -881,7 +881,7 @@ void QQmlAndroidView::updateAnimation()
     });
 }
 
-void QQmlAndroidView::updateLayoutParams()
+void QNativeAndroidView::updateLayoutParams()
 {
     if (!isValid() || !m_layoutParams)
         return;
diff --git a/src/android/view/qqmlandroidview_p.h b/src/android/view/qnativeandroidview_p.h
index 5f4a3cb..efb515e 100644
--- a/src/android/view/qqmlandroidview_p.h
+++ b/src/android/view/qnativeandroidview_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDVIEW_P_H
-#define QQMLANDROIDVIEW_P_H
+#ifndef QNATIVEANDROIDVIEW_P_H
+#define QNATIVEANDROIDVIEW_P_H
 
 //
 //  W A R N I N G
@@ -48,27 +48,27 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidcontextual_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 #include <QtQml/qqml.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQmlAndroidDrawable;
-class QQmlAndroidAnimation;
-class QQmlAndroidLayoutParams;
+class QNativeAndroidDrawable;
+class QNativeAndroidAnimation;
+class QNativeAndroidLayoutParams;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidView : public QQmlAndroidContextual
+class Q_QMLANDROID_EXPORT QNativeAndroidView : public QNativeAndroidContextual
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlAndroidView *parent READ parentView WRITE setParentView NOTIFY parentChanged)
-    Q_PROPERTY(QQmlListProperty<QQmlAndroidView> children READ children NOTIFY childrenChanged)
+    Q_PROPERTY(QNativeAndroidView *parent READ parentView WRITE setParentView NOTIFY parentChanged)
+    Q_PROPERTY(QQmlListProperty<QNativeAndroidView> children READ children NOTIFY childrenChanged)
 
-    Q_PROPERTY(QQmlAndroidDrawable *background READ background WRITE setBackground NOTIFY backgroundChanged)
+    Q_PROPERTY(QNativeAndroidDrawable *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(QQmlAndroidAnimation *animation READ animation WRITE setAnimation NOTIFY animationChanged)
+    Q_PROPERTY(QNativeAndroidAnimation *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)
@@ -104,23 +104,23 @@ class Q_QMLANDROID_EXPORT QQmlAndroidView : public QQmlAndroidContextual
     Q_PROPERTY(qreal translationZ READ translationZ WRITE setTranslationZ NOTIFY translationZChanged)
 
 public:
-    explicit QQmlAndroidView(QQmlAndroidView *parent = nullptr);
-    ~QQmlAndroidView();
+    explicit QNativeAndroidView(QNativeAndroidView *parent = nullptr);
+    ~QNativeAndroidView();
 
     int identifier() const;
     void setIdentifier(int id);
 
-    QQmlAndroidView *parentView() const;
-    void setParentView(QQmlAndroidView *parent);
+    QNativeAndroidView *parentView() const;
+    void setParentView(QNativeAndroidView *parent);
 
-    QList<QQmlAndroidView *> childViews() const;
-    QQmlListProperty<QQmlAndroidView> children();
+    QList<QNativeAndroidView *> childViews() const;
+    QQmlListProperty<QNativeAndroidView> children();
 
-    QQmlAndroidLayoutParams *layoutParams() const;
-    void setLayoutParams(QQmlAndroidLayoutParams *params);
+    QNativeAndroidLayoutParams *layoutParams() const;
+    void setLayoutParams(QNativeAndroidLayoutParams *params);
 
-    QQmlAndroidDrawable *background() const;
-    void setBackground(QQmlAndroidDrawable *background, int resource = 0);
+    QNativeAndroidDrawable *background() const;
+    void setBackground(QNativeAndroidDrawable *background, int resource = 0);
 
     int backgroundColor() const;
     void setBackgroundColor(int color);
@@ -128,8 +128,8 @@ public:
     int backgroundResource() const;
     void setBackgroundResource(int resource);
 
-    QQmlAndroidAnimation *animation() const;
-    void setAnimation(QQmlAndroidAnimation *animation);
+    QNativeAndroidAnimation *animation() const;
+    void setAnimation(QNativeAndroidAnimation *animation);
 
     bool isVisible() const;
     void setVisible(bool visible);
@@ -224,11 +224,11 @@ public:
     };
 
     union ViewChangeData {
-        ViewChangeData(QQmlAndroidView *v) : view(v) {}
+        ViewChangeData(QNativeAndroidView *v) : view(v) {}
         ViewChangeData(qreal n) : number(n) {}
         ViewChangeData(bool b) : boolean(b) {}
 
-        QQmlAndroidView *view;
+        QNativeAndroidView *view;
         qreal number;
         bool boolean;
     };
@@ -275,13 +275,13 @@ protected:
     virtual void polish();
     virtual void viewChange(ViewChange change, const ViewChangeData &data);
 
-    void addChild(QQmlAndroidView *child);
-    void removeChild(QQmlAndroidView *child);
+    void addChild(QNativeAndroidView *child);
+    void removeChild(QNativeAndroidView *child);
 
-    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);
+    static void children_append(QQmlListProperty<QNativeAndroidView> *list, QNativeAndroidView *child);
+    static int children_count(QQmlListProperty<QNativeAndroidView> *list);
+    static QNativeAndroidView *children_at(QQmlListProperty<QNativeAndroidView> *list, int index);
+    static void children_clear(QQmlListProperty<QNativeAndroidView> *list);
 
     QAndroidJniObject onCreate() override;
     void onInflate(QAndroidJniObject &instance) override;
@@ -305,42 +305,42 @@ private Q_SLOTS:
 
 private:
     int m_id;
-    QQmlAndroidView *m_parent;
-    QList<QQmlAndroidView *> m_children;
-    QQmlAndroidDrawable *m_background;
+    QNativeAndroidView *m_parent;
+    QList<QNativeAndroidView *> m_children;
+    QNativeAndroidDrawable *m_background;
     int m_backgroundResource;
-    QQmlAndroidAnimation *m_animation;
+    QNativeAndroidAnimation *m_animation;
     bool m_polishing;
     bool m_visible;
 
     QAndroidJniObject m_listener;
 
-    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;
-    QQmlAndroidOptional<qreal> m_alpha;
-    QQmlAndroidOptional<qreal> m_scaleX;
-    QQmlAndroidOptional<qreal> m_scaleY;
-    QQmlAndroidOptional<qreal> m_pivotX;
-    QQmlAndroidOptional<qreal> m_pivotY;
-    QQmlAndroidOptional<qreal> m_rotation;
-    QQmlAndroidOptional<qreal> m_rotationX;
-    QQmlAndroidOptional<qreal> m_rotationY;
-    QQmlAndroidOptional<qreal> m_translationX;
-    QQmlAndroidOptional<qreal> m_translationY;
-    QQmlAndroidOptional<qreal> m_translationZ;
-    QQmlAndroidOptional<qreal> m_elevation;
+    QNativeAndroidLayoutParams *m_layoutParams;
+
+    QNativeAndroidOptional<bool> m_focus;
+    QNativeAndroidOptional<int> m_top;
+    QNativeAndroidOptional<int> m_left;
+    QNativeAndroidOptional<int> m_right;
+    QNativeAndroidOptional<int> m_bottom;
+    QNativeAndroidOptional<int> m_padding;
+    QNativeAndroidOptional<int> m_paddingTop;
+    QNativeAndroidOptional<int> m_paddingLeft;
+    QNativeAndroidOptional<int> m_paddingRight;
+    QNativeAndroidOptional<int> m_paddingBottom;
+    QNativeAndroidOptional<qreal> m_alpha;
+    QNativeAndroidOptional<qreal> m_scaleX;
+    QNativeAndroidOptional<qreal> m_scaleY;
+    QNativeAndroidOptional<qreal> m_pivotX;
+    QNativeAndroidOptional<qreal> m_pivotY;
+    QNativeAndroidOptional<qreal> m_rotation;
+    QNativeAndroidOptional<qreal> m_rotationX;
+    QNativeAndroidOptional<qreal> m_rotationY;
+    QNativeAndroidOptional<qreal> m_translationX;
+    QNativeAndroidOptional<qreal> m_translationY;
+    QNativeAndroidOptional<qreal> m_translationZ;
+    QNativeAndroidOptional<qreal> m_elevation;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDVIEW_P_H
+#endif // QNATIVEANDROIDVIEW_P_H
diff --git a/src/android/view/qqmlandroidviewgroup.cpp b/src/android/view/qnativeandroidviewgroup.cpp
index 60defbe..0d08c3a 100644
--- a/src/android/view/qqmlandroidviewgroup.cpp
+++ b/src/android/view/qnativeandroidviewgroup.cpp
@@ -34,42 +34,42 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidviewgroup_p.h"
-#include "qqmlandroidlayoutparams_p.h"
+#include "qnativeandroidviewgroup_p.h"
+#include "qnativeandroidlayoutparams_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qqmlandroidcontext_p.h"
+#include "qnativeandroidcontext_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidViewGroup::QQmlAndroidViewGroup(QQmlAndroidView *parent) :
-    QQmlAndroidView(parent)
+QNativeAndroidViewGroup::QNativeAndroidViewGroup(QNativeAndroidView *parent) :
+    QNativeAndroidView(parent)
 {
 }
 
-QQmlAndroidLayoutParams *QQmlAndroidViewGroup::qmlAttachedProperties(QObject *object)
+QNativeAndroidLayoutParams *QNativeAndroidViewGroup::qmlAttachedProperties(QObject *object)
 {
-    QQmlAndroidView *view = qobject_cast<QQmlAndroidView*>(object);
+    QNativeAndroidView *view = qobject_cast<QNativeAndroidView*>(object);
     if (view)
-        return new QQmlAndroidLayoutParams(view);
+        return new QNativeAndroidLayoutParams(view);
     return 0;
 }
 
-QAndroidJniObject QQmlAndroidViewGroup::onCreate()
+QAndroidJniObject QNativeAndroidViewGroup::onCreate()
 {
     return QAndroidJniObject("android/view/ViewGroup",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidViewGroup::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidViewGroup::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidView::onInflate(instance);
+    QNativeAndroidView::onInflate(instance);
 
-    foreach (QQmlAndroidView *child, childViews())
+    foreach (QNativeAndroidView *child, childViews())
         instance.callMethod<void>("addView", "(Landroid/view/View;)V", child->instance().object());
 }
 
-void QQmlAndroidViewGroup::viewChange(ViewChange change, const ViewChangeData &data)
+void QNativeAndroidViewGroup::viewChange(ViewChange change, const ViewChangeData &data)
 {
     QAndroidJniObject group = instance();
     switch (change) {
diff --git a/src/android/view/qqmlandroidviewgroup_p.h b/src/android/view/qnativeandroidviewgroup_p.h
index 8d72ea3..b3565b0 100644
--- a/src/android/view/qqmlandroidviewgroup_p.h
+++ b/src/android/view/qnativeandroidviewgroup_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDVIEWGROUP_P_H
-#define QQMLANDROIDVIEWGROUP_P_H
+#ifndef QNATIVEANDROIDVIEWGROUP_P_H
+#define QNATIVEANDROIDVIEWGROUP_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidview_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidViewGroup : public QQmlAndroidView
+class Q_QMLANDROID_EXPORT QNativeAndroidViewGroup : public QNativeAndroidView
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidViewGroup(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidViewGroup(QNativeAndroidView *parent = nullptr);
 
-    static QQmlAndroidLayoutParams *qmlAttachedProperties(QObject *object);
+    static QNativeAndroidLayoutParams *qmlAttachedProperties(QObject *object);
 
 protected:
     QAndroidJniObject onCreate() override;
@@ -70,6 +70,6 @@ protected:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QQmlAndroidViewGroup, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QNativeAndroidViewGroup, QML_HAS_ATTACHED_PROPERTIES)
 
-#endif // QQMLANDROIDVIEWGROUP_P_H
+#endif // QNATIVEANDROIDVIEWGROUP_P_H
diff --git a/src/android/view/qqmlandroidwindow.cpp b/src/android/view/qnativeandroidwindow.cpp
index 14fc5ae..47bba19 100644
--- a/src/android/view/qqmlandroidwindow.cpp
+++ b/src/android/view/qnativeandroidwindow.cpp
@@ -34,26 +34,26 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidwindow_p.h"
-#include "qqmlandroidcontext_p.h"
+#include "qnativeandroidwindow_p.h"
+#include "qnativeandroidcontext_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidWindow::QQmlAndroidWindow(QQmlAndroidContext *context) :
-    QQmlAndroidContextual(context)
+QNativeAndroidWindow::QNativeAndroidWindow(QNativeAndroidContext *context) :
+    QNativeAndroidContextual(context)
 {
     setContext(context);
 }
 
-int QQmlAndroidWindow::statusBarColor() const
+int QNativeAndroidWindow::statusBarColor() const
 {
     if (m_statusBarColor.isNull())
         return 0; // TODO
     return m_statusBarColor;
 }
 
-void QQmlAndroidWindow::setStatusBarColor(int color)
+void QNativeAndroidWindow::setStatusBarColor(int color)
 {
     if (m_statusBarColor.isNull() || m_statusBarColor != color) {
         m_statusBarColor = color;
@@ -62,7 +62,7 @@ void QQmlAndroidWindow::setStatusBarColor(int color)
     }
 }
 
-void QQmlAndroidWindow::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidWindow::onInflate(QAndroidJniObject &instance)
 {
     if (!m_statusBarColor.isNull()) {
         // TODO: WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS
diff --git a/src/android/view/qqmlandroidwindow_p.h b/src/android/view/qnativeandroidwindow_p.h
index 41a0fca..b3640b0 100644
--- a/src/android/view/qqmlandroidwindow_p.h
+++ b/src/android/view/qnativeandroidwindow_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDWINDOW_P_H
-#define QQMLANDROIDWINDOW_P_H
+#ifndef QNATIVEANDROIDWINDOW_P_H
+#define QNATIVEANDROIDWINDOW_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidcontextual_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidWindow : public QQmlAndroidContextual
+class Q_QMLANDROID_EXPORT QNativeAndroidWindow : public QNativeAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(int statusBarColor READ statusBarColor WRITE setStatusBarColor NOTIFY statusBarColorChanged)
 
 public:
-    explicit QQmlAndroidWindow(QQmlAndroidContext *context);
+    explicit QNativeAndroidWindow(QNativeAndroidContext *context);
 
     int statusBarColor() const;
     void setStatusBarColor(int color);
@@ -71,9 +71,9 @@ protected:
     void onInflate(QAndroidJniObject &instance) override;
 
 private:
-    QQmlAndroidOptional<int> m_statusBarColor;
+    QNativeAndroidOptional<int> m_statusBarColor;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDWINDOW_P_H
+#endif // QNATIVEANDROIDWINDOW_P_H
diff --git a/src/android/view/view.pri b/src/android/view/view.pri
index 1647d73..018f9cd 100644
--- a/src/android/view/view.pri
+++ b/src/android/view/view.pri
@@ -1,20 +1,20 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qqmlandroidgravity_p.h \
-    $$PWD/qqmlandroidlayoutparams_p.h \
-    $$PWD/qqmlandroidmenu_p.h \
-    $$PWD/qqmlandroidmenuitem_p.h \
-    $$PWD/qqmlandroidview_p.h \
-    $$PWD/qqmlandroidviewgroup_p.h \
-    $$PWD/qqmlandroidwindow_p.h
+    $$PWD/qnativeandroidgravity_p.h \
+    $$PWD/qnativeandroidlayoutparams_p.h \
+    $$PWD/qnativeandroidmenu_p.h \
+    $$PWD/qnativeandroidmenuitem_p.h \
+    $$PWD/qnativeandroidview_p.h \
+    $$PWD/qnativeandroidviewgroup_p.h \
+    $$PWD/qnativeandroidwindow_p.h
 
 SOURCES += \
-    $$PWD/qqmlandroidlayoutparams.cpp \
-    $$PWD/qqmlandroidmenu.cpp \
-    $$PWD/qqmlandroidmenuitem.cpp \
-    $$PWD/qqmlandroidview.cpp \
-    $$PWD/qqmlandroidviewgroup.cpp \
-    $$PWD/qqmlandroidwindow.cpp
+    $$PWD/qnativeandroidlayoutparams.cpp \
+    $$PWD/qnativeandroidmenu.cpp \
+    $$PWD/qnativeandroidmenuitem.cpp \
+    $$PWD/qnativeandroidview.cpp \
+    $$PWD/qnativeandroidviewgroup.cpp \
+    $$PWD/qnativeandroidwindow.cpp
 
 include(animation/animation.pri)
diff --git a/src/android/widget/qqmlandroidabsseekbar.cpp b/src/android/widget/qnativeandroidabsseekbar.cpp
index c03457f..7adb19a 100644
--- a/src/android/widget/qqmlandroidabsseekbar.cpp
+++ b/src/android/widget/qnativeandroidabsseekbar.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidabsseekbar_p.h"
+#include "qnativeandroidabsseekbar_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidAbsSeekBar::QQmlAndroidAbsSeekBar(QQmlAndroidView *parent) :
-    QQmlAndroidProgressBar(parent)
+QNativeAndroidAbsSeekBar::QNativeAndroidAbsSeekBar(QNativeAndroidView *parent) :
+    QNativeAndroidProgressBar(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidAbsSeekBar::onCreate()
+QAndroidJniObject QNativeAndroidAbsSeekBar::onCreate()
 {
     return QAndroidJniObject("android/widget/AbsSeekBar",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidAbsSeekBar::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidAbsSeekBar::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidProgressBar::onInflate(instance);
+    QNativeAndroidProgressBar::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qnativeandroidabsseekbar_p.h b/src/android/widget/qnativeandroidabsseekbar_p.h
new file mode 100644
index 0000000..2f4c2ad
--- /dev/null
+++ b/src/android/widget/qnativeandroidabsseekbar_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt QML Android module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QNATIVEANDROIDABSSEEKBAR_P_H
+#define QNATIVEANDROIDABSSEEKBAR_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQmlAndroid/private/qnativeandroidprogressbar_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_QMLANDROID_EXPORT QNativeAndroidAbsSeekBar : public QNativeAndroidProgressBar
+{
+    Q_OBJECT
+
+public:
+    explicit QNativeAndroidAbsSeekBar(QNativeAndroidView *parent = nullptr);
+
+protected:
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QNATIVEANDROIDABSSEEKBAR_P_H
diff --git a/src/android/widget/qqmlandroidadapterview.cpp b/src/android/widget/qnativeandroidadapterview.cpp
index 09bffb2..d6382d4 100644
--- a/src/android/widget/qqmlandroidadapterview.cpp
+++ b/src/android/widget/qnativeandroidadapterview.cpp
@@ -34,34 +34,34 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidadapterview_p.h"
-#include "qqmlandroidbaseadapter_p.h"
+#include "qnativeandroidadapterview_p.h"
+#include "qnativeandroidbaseadapter_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidAdapterView::QQmlAndroidAdapterView(QQmlAndroidView *parent) :
-    QQmlAndroidViewGroup(parent), m_adapter(0)
+QNativeAndroidAdapterView::QNativeAndroidAdapterView(QNativeAndroidView *parent) :
+    QNativeAndroidViewGroup(parent), m_adapter(0)
 {
 }
 
-QQmlAndroidBaseAdapter *QQmlAndroidAdapterView::adapter() const
+QNativeAndroidBaseAdapter *QNativeAndroidAdapterView::adapter() const
 {
     return m_adapter;
 }
 
-void QQmlAndroidAdapterView::setAdapter(QQmlAndroidBaseAdapter *adapter)
+void QNativeAndroidAdapterView::setAdapter(QNativeAndroidBaseAdapter *adapter)
 {
     if (m_adapter != adapter) {
         if (m_adapter) {
             m_adapter->setContext(0);
-            disconnect(m_adapter, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidAdapterView::updateAdapter);
+            disconnect(m_adapter, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidAdapterView::updateAdapter);
             m_adapter->destruct();
         }
         m_adapter = adapter;
         if (m_adapter) {
             m_adapter->setContext(context());
-            connect(m_adapter, &QQmlAndroidObject::instanceChanged, this, &QQmlAndroidAdapterView::updateAdapter);
+            connect(m_adapter, &QNativeAndroidObject::instanceChanged, this, &QNativeAndroidAdapterView::updateAdapter);
             if (isValid())
                 m_adapter->construct();
         }
@@ -69,26 +69,26 @@ void QQmlAndroidAdapterView::setAdapter(QQmlAndroidBaseAdapter *adapter)
     }
 }
 
-void QQmlAndroidAdapterView::setSelection(int position)
+void QNativeAndroidAdapterView::setSelection(int position)
 {
     QtQmlAndroid::callIntMethod(instance(), "setSelection", position);
 }
 
-QAndroidJniObject QQmlAndroidAdapterView::onCreate()
+QAndroidJniObject QNativeAndroidAdapterView::onCreate()
 {
     return QAndroidJniObject("android/widget/AdapterView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidAdapterView::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidAdapterView::onInflate(QAndroidJniObject &instance)
 {
     m_listener = QAndroidJniObject("qt/android/widget/QmlAdapterViewListener",
                                    "(Landroid/widget/AdapterView;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
 
-    QQmlAndroidViewGroup::onInflate(instance);
+    QNativeAndroidViewGroup::onInflate(instance);
 
     static bool nativeMethodsRegistered = false;
     if (!nativeMethodsRegistered) {
@@ -97,7 +97,7 @@ void QQmlAndroidAdapterView::onInflate(QAndroidJniObject &instance)
     }
 }
 
-void QQmlAndroidAdapterView::onRegisterNativeMethods(jobject listener)
+void QNativeAndroidAdapterView::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onItemClick", "(JI)V", reinterpret_cast<void *>(onItemClick)}};
 
@@ -107,23 +107,23 @@ void QQmlAndroidAdapterView::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QQmlAndroidAdapterView::onItemClick(JNIEnv *env, jobject object, jlong instance, jint position)
+void QNativeAndroidAdapterView::onItemClick(JNIEnv *env, jobject object, jlong instance, jint position)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidAdapterView *view = reinterpret_cast<QQmlAndroidAdapterView *>(instance);
+    QNativeAndroidAdapterView *view = reinterpret_cast<QNativeAndroidAdapterView *>(instance);
     if (view)
         QMetaObject::invokeMethod(view, "click", Qt::QueuedConnection, Q_ARG(int, position));
 }
 
-void QQmlAndroidAdapterView::objectChange(ObjectChange change)
+void QNativeAndroidAdapterView::objectChange(ObjectChange change)
 {
-    QQmlAndroidViewGroup::objectChange(change);
+    QNativeAndroidViewGroup::objectChange(change);
     if (change == InstanceChange)
         updateAdapter();
 }
 
-void QQmlAndroidAdapterView::updateAdapter()
+void QNativeAndroidAdapterView::updateAdapter()
 {
     if (!isValid())
         return;
diff --git a/src/android/widget/qqmlandroidadapterview_p.h b/src/android/widget/qnativeandroidadapterview_p.h
index 8418e30..03dae78 100644
--- a/src/android/widget/qqmlandroidadapterview_p.h
+++ b/src/android/widget/qnativeandroidadapterview_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDADAPTERVIEW_P_H
-#define QQMLANDROIDADAPTERVIEW_P_H
+#ifndef QNATIVEANDROIDADAPTERVIEW_P_H
+#define QNATIVEANDROIDADAPTERVIEW_P_H
 
 //
 //  W A R N I N G
@@ -48,22 +48,22 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidviewgroup_p.h>
+#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQmlAndroidBaseAdapter;
+class QNativeAndroidBaseAdapter;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidAdapterView : public QQmlAndroidViewGroup
+class Q_QMLANDROID_EXPORT QNativeAndroidAdapterView : public QNativeAndroidViewGroup
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlAndroidBaseAdapter *adapter READ adapter WRITE setAdapter NOTIFY adapterChanged) // TODO: Adapter
+    Q_PROPERTY(QNativeAndroidBaseAdapter *adapter READ adapter WRITE setAdapter NOTIFY adapterChanged) // TODO: Adapter
 
 public:
-    explicit QQmlAndroidAdapterView(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidAdapterView(QNativeAndroidView *parent = nullptr);
 
-    QQmlAndroidBaseAdapter *adapter() const;
-    void setAdapter(QQmlAndroidBaseAdapter *adapter);
+    QNativeAndroidBaseAdapter *adapter() const;
+    void setAdapter(QNativeAndroidBaseAdapter *adapter);
 
 public Q_SLOTS:
     void setSelection(int position);
@@ -86,9 +86,9 @@ private Q_SLOTS:
 
 private:
     QAndroidJniObject m_listener;
-    QQmlAndroidBaseAdapter *m_adapter;
+    QNativeAndroidBaseAdapter *m_adapter;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDADAPTERVIEW_P_H
+#endif // QNATIVEANDROIDADAPTERVIEW_P_H
diff --git a/src/android/widget/qqmlandroidarrayadapter.cpp b/src/android/widget/qnativeandroidarrayadapter.cpp
index 066f44d..07d2870 100644
--- a/src/android/widget/qqmlandroidarrayadapter.cpp
+++ b/src/android/widget/qnativeandroidarrayadapter.cpp
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidarrayadapter_p.h"
-#include "qqmlandroidadapterview_p.h"
+#include "qnativeandroidarrayadapter_p.h"
+#include "qnativeandroidadapterview_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidArrayAdapter::QQmlAndroidArrayAdapter(QObject *parent) :
-    QQmlAndroidBaseAdapter(parent), m_style(17367043) // TODO: android.R.layout.simple_list_item_1
+QNativeAndroidArrayAdapter::QNativeAndroidArrayAdapter(QObject *parent) :
+    QNativeAndroidBaseAdapter(parent), m_style(17367043) // TODO: android.R.layout.simple_list_item_1
 {
 }
 
-int QQmlAndroidArrayAdapter::style() const
+int QNativeAndroidArrayAdapter::style() const
 {
     return m_style;
 }
 
-void QQmlAndroidArrayAdapter::setStyle(int style)
+void QNativeAndroidArrayAdapter::setStyle(int style)
 {
     if (m_style != style) {
         m_style = style;
@@ -58,12 +58,12 @@ void QQmlAndroidArrayAdapter::setStyle(int style)
     }
 }
 
-QStringList QQmlAndroidArrayAdapter::array() const
+QStringList QNativeAndroidArrayAdapter::array() const
 {
     return m_array;
 }
 
-void QQmlAndroidArrayAdapter::setArray(const QStringList &array)
+void QNativeAndroidArrayAdapter::setArray(const QStringList &array)
 {
     if (m_array != array) {
         m_array = array; // TODO: sync
@@ -72,17 +72,17 @@ void QQmlAndroidArrayAdapter::setArray(const QStringList &array)
     }
 }
 
-int QQmlAndroidArrayAdapter::count() const
+int QNativeAndroidArrayAdapter::count() const
 {
     return m_array.count();
 }
 
-QString QQmlAndroidArrayAdapter::getItem(int position) const
+QString QNativeAndroidArrayAdapter::getItem(int position) const
 {
     return m_array.value(position);
 }
 
-void QQmlAndroidArrayAdapter::clear()
+void QNativeAndroidArrayAdapter::clear()
 {
     if (!m_array.isEmpty()) {
         m_array.clear(); // TODO: sync
@@ -91,7 +91,7 @@ void QQmlAndroidArrayAdapter::clear()
     }
 }
 
-QAndroidJniObject QQmlAndroidArrayAdapter::onCreate()
+QAndroidJniObject QNativeAndroidArrayAdapter::onCreate()
 {
     return QAndroidJniObject("android/widget/ArrayAdapter",
                              "(Landroid/content/Context;I)V",
@@ -99,9 +99,9 @@ QAndroidJniObject QQmlAndroidArrayAdapter::onCreate()
                              m_style);
 }
 
-void QQmlAndroidArrayAdapter::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidArrayAdapter::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidBaseAdapter::onInflate(instance);
+    QNativeAndroidBaseAdapter::onInflate(instance);
 
     foreach (const QString &str, m_array)
         instance.callMethod<void>("add", "(Ljava/lang/Object;)V", QAndroidJniObject::fromString(str).object());
diff --git a/src/android/widget/qqmlandroidarrayadapter_p.h b/src/android/widget/qnativeandroidarrayadapter_p.h
index 06110c3..265a1d4 100644
--- a/src/android/widget/qqmlandroidarrayadapter_p.h
+++ b/src/android/widget/qnativeandroidarrayadapter_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDARRAYADAPTER_P_H
-#define QQMLANDROIDARRAYADAPTER_P_H
+#ifndef QNATIVEANDROIDARRAYADAPTER_P_H
+#define QNATIVEANDROIDARRAYADAPTER_P_H
 
 //
 //  W A R N I N G
@@ -48,19 +48,19 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidbaseadapter_p.h>
+#include <QtQmlAndroid/private/qnativeandroidbaseadapter_p.h>
 #include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidArrayAdapter : public QQmlAndroidBaseAdapter
+class Q_QMLANDROID_EXPORT QNativeAndroidArrayAdapter : public QNativeAndroidBaseAdapter
 {
     Q_OBJECT
     Q_PROPERTY(int style READ style WRITE setStyle NOTIFY styleChanged)
     Q_PROPERTY(QStringList array READ array WRITE setArray NOTIFY arrayChanged)
 
 public:
-    explicit QQmlAndroidArrayAdapter(QObject *parent = nullptr);
+    explicit QNativeAndroidArrayAdapter(QObject *parent = nullptr);
 
     int style() const;
     void setStyle(int style);
@@ -89,4 +89,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDARRAYADAPTER_P_H
+#endif // QNATIVEANDROIDARRAYADAPTER_P_H
diff --git a/src/android/widget/qqmlandroidbaseadapter.cpp b/src/android/widget/qnativeandroidbaseadapter.cpp
index 8282500..139f662 100644
--- a/src/android/widget/qqmlandroidbaseadapter.cpp
+++ b/src/android/widget/qnativeandroidbaseadapter.cpp
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidbaseadapter_p.h"
+#include "qnativeandroidbaseadapter_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidBaseAdapter::QQmlAndroidBaseAdapter(QObject *parent) :
-    QQmlAndroidContextual(parent)
+QNativeAndroidBaseAdapter::QNativeAndroidBaseAdapter(QObject *parent) :
+    QNativeAndroidContextual(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidBaseAdapter::onCreate()
+QAndroidJniObject QNativeAndroidBaseAdapter::onCreate()
 {
     return QAndroidJniObject("android/widget/BaseAdapter");
 }
 
-void QQmlAndroidBaseAdapter::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidBaseAdapter::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidContextual::onInflate(instance);
+    QNativeAndroidContextual::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qqmlandroidbaseadapter_p.h b/src/android/widget/qnativeandroidbaseadapter_p.h
index a32cd61..bf16ce2 100644
--- a/src/android/widget/qqmlandroidbaseadapter_p.h
+++ b/src/android/widget/qnativeandroidbaseadapter_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDBASEADAPTER_P_H
-#define QQMLANDROIDBASEADAPTER_P_H
+#ifndef QNATIVEANDROIDBASEADAPTER_P_H
+#define QNATIVEANDROIDBASEADAPTER_P_H
 
 //
 //  W A R N I N G
@@ -48,17 +48,17 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidcontextual_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcontextual_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidBaseAdapter : public QQmlAndroidContextual
+class Q_QMLANDROID_EXPORT QNativeAndroidBaseAdapter : public QNativeAndroidContextual
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 
 public:
-    explicit QQmlAndroidBaseAdapter(QObject *parent = nullptr);
+    explicit QNativeAndroidBaseAdapter(QObject *parent = nullptr);
 
     virtual int count() const = 0;
 
@@ -75,4 +75,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDBASEADAPTER_P_H
+#endif // QNATIVEANDROIDBASEADAPTER_P_H
diff --git a/src/android/widget/qqmlandroidbutton.cpp b/src/android/widget/qnativeandroidbutton.cpp
index 36e4937..97349ac 100644
--- a/src/android/widget/qqmlandroidbutton.cpp
+++ b/src/android/widget/qnativeandroidbutton.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidbutton_p.h"
+#include "qnativeandroidbutton_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidButton::QQmlAndroidButton(QQmlAndroidView *parent) :
-    QQmlAndroidTextView(parent)
+QNativeAndroidButton::QNativeAndroidButton(QNativeAndroidView *parent) :
+    QNativeAndroidTextView(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidButton::onCreate()
+QAndroidJniObject QNativeAndroidButton::onCreate()
 {
     return QAndroidJniObject("android/widget/Button",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidButton::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidButton::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidTextView::onInflate(instance);
+    QNativeAndroidTextView::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/support/v7/widget/qqmlandroidcardview_p.h b/src/android/widget/qnativeandroidbutton_p.h
index 6916eda..18ed287 100644
--- a/src/android/support/v7/widget/qqmlandroidcardview_p.h
+++ b/src/android/widget/qnativeandroidbutton_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDCARDVIEW_P_H
-#define QQMLANDROIDCARDVIEW_P_H
+#ifndef QNATIVEANDROIDBUTTON_P_H
+#define QNATIVEANDROIDBUTTON_P_H
 
 //
 //  W A R N I N G
@@ -48,16 +48,16 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidframelayout_p.h>
+#include <QtQmlAndroid/private/qnativeandroidtextview_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidCardView : public QQmlAndroidFrameLayout
+class Q_QMLANDROID_EXPORT QNativeAndroidButton : public QNativeAndroidTextView
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidCardView(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidButton(QNativeAndroidView *parent = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
@@ -66,4 +66,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDCARDVIEW_P_H
+#endif // QNATIVEANDROIDBUTTON_P_H
diff --git a/src/android/widget/qqmlandroidcalendarview.cpp b/src/android/widget/qnativeandroidcalendarview.cpp
index 7c1a627..dc2459c 100644
--- a/src/android/widget/qqmlandroidcalendarview.cpp
+++ b/src/android/widget/qnativeandroidcalendarview.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidcalendarview_p.h"
+#include "qnativeandroidcalendarview_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidCalendarView::QQmlAndroidCalendarView(QQmlAndroidView *parent) :
-    QQmlAndroidFrameLayout(parent)
+QNativeAndroidCalendarView::QNativeAndroidCalendarView(QNativeAndroidView *parent) :
+    QNativeAndroidFrameLayout(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidCalendarView::onCreate()
+QAndroidJniObject QNativeAndroidCalendarView::onCreate()
 {
     return QAndroidJniObject("android/widget/CalendarView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidCalendarView::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidCalendarView::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidViewGroup::onInflate(instance);
+    QNativeAndroidViewGroup::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qnativeandroidcalendarview_p.h b/src/android/widget/qnativeandroidcalendarview_p.h
new file mode 100644
index 0000000..d6026d3
--- /dev/null
+++ b/src/android/widget/qnativeandroidcalendarview_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt QML Android module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QNATIVEANDROIDCALENDARVIEW_P_H
+#define QNATIVEANDROIDCALENDARVIEW_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_QMLANDROID_EXPORT QNativeAndroidCalendarView : public QNativeAndroidFrameLayout
+{
+    Q_OBJECT
+
+public:
+    explicit QNativeAndroidCalendarView(QNativeAndroidView *parent = nullptr);
+
+protected:
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QNATIVEANDROIDCALENDARVIEW_P_H
diff --git a/src/android/widget/qqmlandroidcheckbox.cpp b/src/android/widget/qnativeandroidcheckbox.cpp
index 806da94..c6df337 100644
--- a/src/android/widget/qqmlandroidcheckbox.cpp
+++ b/src/android/widget/qnativeandroidcheckbox.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidcheckbox_p.h"
+#include "qnativeandroidcheckbox_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidCheckBox::QQmlAndroidCheckBox(QQmlAndroidView *parent) :
-    QQmlAndroidCompoundButton(parent)
+QNativeAndroidCheckBox::QNativeAndroidCheckBox(QNativeAndroidView *parent) :
+    QNativeAndroidCompoundButton(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidCheckBox::onCreate()
+QAndroidJniObject QNativeAndroidCheckBox::onCreate()
 {
     return QAndroidJniObject("android/widget/CheckBox",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidCheckBox::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidCheckBox::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidCompoundButton::onInflate(instance);
+    QNativeAndroidCompoundButton::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qnativeandroidcheckbox_p.h b/src/android/widget/qnativeandroidcheckbox_p.h
new file mode 100644
index 0000000..5c488e4
--- /dev/null
+++ b/src/android/widget/qnativeandroidcheckbox_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt QML Android module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QNATIVEANDROIDCHECKBOX_P_H
+#define QNATIVEANDROIDCHECKBOX_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQmlAndroid/private/qnativeandroidcompoundbutton_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_QMLANDROID_EXPORT QNativeAndroidCheckBox : public QNativeAndroidCompoundButton
+{
+    Q_OBJECT
+
+public:
+    explicit QNativeAndroidCheckBox(QNativeAndroidView *parent = nullptr);
+
+protected:
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QNATIVEANDROIDCHECKBOX_P_H
diff --git a/src/android/widget/qqmlandroidcompoundbutton.cpp b/src/android/widget/qnativeandroidcompoundbutton.cpp
index 617f61e..b49bb98 100644
--- a/src/android/widget/qqmlandroidcompoundbutton.cpp
+++ b/src/android/widget/qnativeandroidcompoundbutton.cpp
@@ -34,28 +34,28 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidcompoundbutton_p.h"
+#include "qnativeandroidcompoundbutton_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidCompoundButton::QQmlAndroidCompoundButton(QQmlAndroidView *parent) :
-    QQmlAndroidButton(parent), m_checked(false)
+QNativeAndroidCompoundButton::QNativeAndroidCompoundButton(QNativeAndroidView *parent) :
+    QNativeAndroidButton(parent), m_checked(false)
 {
 }
 
-bool QQmlAndroidCompoundButton::isChecked() const
+bool QNativeAndroidCompoundButton::isChecked() const
 {
     return m_checked;
 }
 
-void QQmlAndroidCompoundButton::setChecked(bool checked)
+void QNativeAndroidCompoundButton::setChecked(bool checked)
 {
     if (updateChecked(checked))
         QtQmlAndroid::callBoolMethod(instance(), "setChecked", checked);
 }
 
-bool QQmlAndroidCompoundButton::updateChecked(bool arg)
+bool QNativeAndroidCompoundButton::updateChecked(bool arg)
 {
     if (arg != isChecked()) {
         m_checked = arg;
@@ -65,21 +65,21 @@ bool QQmlAndroidCompoundButton::updateChecked(bool arg)
     return false;
 }
 
-void QQmlAndroidCompoundButton::toggle()
+void QNativeAndroidCompoundButton::toggle()
 {
     QtQmlAndroid::callVoidMethod(instance(), "toggle");
 }
 
-QAndroidJniObject QQmlAndroidCompoundButton::onCreate()
+QAndroidJniObject QNativeAndroidCompoundButton::onCreate()
 {
     return QAndroidJniObject("android/widget/CompoundButton",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidCompoundButton::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidCompoundButton::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidButton::onInflate(instance);
+    QNativeAndroidButton::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/widget/QmlCompoundButtonListener",
                                    "(Landroid/widget/CompoundButton;J)V",
@@ -95,7 +95,7 @@ void QQmlAndroidCompoundButton::onInflate(QAndroidJniObject &instance)
     instance.callMethod<void>("setChecked", "(Z)V", m_checked);
 }
 
-void QQmlAndroidCompoundButton::onRegisterNativeMethods(jobject listener)
+void QNativeAndroidCompoundButton::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onCheckedChanged", "(JZ)V", reinterpret_cast<void *>(onCheckedChanged)}};
 
@@ -105,11 +105,11 @@ void QQmlAndroidCompoundButton::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QQmlAndroidCompoundButton::onCheckedChanged(JNIEnv *env, jobject object, jlong instance, jboolean isChecked)
+void QNativeAndroidCompoundButton::onCheckedChanged(JNIEnv *env, jobject object, jlong instance, jboolean isChecked)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidCompoundButton *button = reinterpret_cast<QQmlAndroidCompoundButton *>(instance);
+    QNativeAndroidCompoundButton *button = reinterpret_cast<QNativeAndroidCompoundButton *>(instance);
     if (button)
         QMetaObject::invokeMethod(button, "updateChecked", Qt::QueuedConnection, Q_ARG(bool, isChecked));
 }
diff --git a/src/android/widget/qqmlandroidcompoundbutton_p.h b/src/android/widget/qnativeandroidcompoundbutton_p.h
index 81f7830..d5ba1fb 100644
--- a/src/android/widget/qqmlandroidcompoundbutton_p.h
+++ b/src/android/widget/qnativeandroidcompoundbutton_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDCOMPOUNDBUTTON_P_H
-#define QQMLANDROIDCOMPOUNDBUTTON_P_H
+#ifndef QNATIVEANDROIDCOMPOUNDBUTTON_P_H
+#define QNATIVEANDROIDCOMPOUNDBUTTON_P_H
 
 //
 //  W A R N I N G
@@ -48,17 +48,17 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidbutton_p.h>
+#include <QtQmlAndroid/private/qnativeandroidbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidCompoundButton : public QQmlAndroidButton
+class Q_QMLANDROID_EXPORT QNativeAndroidCompoundButton : public QNativeAndroidButton
 {
     Q_OBJECT
     Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged)
 
 public:
-    explicit QQmlAndroidCompoundButton(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidCompoundButton(QNativeAndroidView *parent = nullptr);
 
     bool isChecked() const;
     void setChecked(bool checked);
@@ -86,4 +86,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDCOMPOUNDBUTTON_P_H
+#endif // QNATIVEANDROIDCOMPOUNDBUTTON_P_H
diff --git a/src/android/widget/qqmlandroiddatepicker.cpp b/src/android/widget/qnativeandroiddatepicker.cpp
index 6487766..b028294 100644
--- a/src/android/widget/qqmlandroiddatepicker.cpp
+++ b/src/android/widget/qnativeandroiddatepicker.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroiddatepicker_p.h"
+#include "qnativeandroiddatepicker_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidDatePicker::QQmlAndroidDatePicker(QQmlAndroidView *parent) :
-    QQmlAndroidFrameLayout(parent)
+QNativeAndroidDatePicker::QNativeAndroidDatePicker(QNativeAndroidView *parent) :
+    QNativeAndroidFrameLayout(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidDatePicker::onCreate()
+QAndroidJniObject QNativeAndroidDatePicker::onCreate()
 {
     return QAndroidJniObject("android/widget/DatePicker",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidDatePicker::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidDatePicker::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidFrameLayout::onInflate(instance);
+    QNativeAndroidFrameLayout::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qnativeandroiddatepicker_p.h b/src/android/widget/qnativeandroiddatepicker_p.h
new file mode 100644
index 0000000..af6a86c
--- /dev/null
+++ b/src/android/widget/qnativeandroiddatepicker_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt QML Android module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QNATIVEANDROIDDATEPICKER_P_H
+#define QNATIVEANDROIDDATEPICKER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_QMLANDROID_EXPORT QNativeAndroidDatePicker : public QNativeAndroidFrameLayout
+{
+    Q_OBJECT
+
+public:
+    explicit QNativeAndroidDatePicker(QNativeAndroidView *parent = nullptr);
+
+protected:
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QNATIVEANDROIDDATEPICKER_P_H
diff --git a/src/android/widget/qqmlandroidedittext.cpp b/src/android/widget/qnativeandroidedittext.cpp
index 6697ac9..42b457a 100644
--- a/src/android/widget/qqmlandroidedittext.cpp
+++ b/src/android/widget/qnativeandroidedittext.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidedittext_p.h"
+#include "qnativeandroidedittext_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidEditText::QQmlAndroidEditText(QQmlAndroidView *parent) :
-    QQmlAndroidTextView(parent)
+QNativeAndroidEditText::QNativeAndroidEditText(QNativeAndroidView *parent) :
+    QNativeAndroidTextView(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidEditText::onCreate()
+QAndroidJniObject QNativeAndroidEditText::onCreate()
 {
     return QAndroidJniObject("android/widget/EditText",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidEditText::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidEditText::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidTextView::onInflate(instance);
+    QNativeAndroidTextView::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/graphics/drawable/qqmlandroiddrawable_p.h b/src/android/widget/qnativeandroidedittext_p.h
index 52f2386..733922b 100644
--- a/src/android/graphics/drawable/qqmlandroiddrawable_p.h
+++ b/src/android/widget/qnativeandroidedittext_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDDRAWABLE_P_H
-#define QQMLANDROIDDRAWABLE_P_H
+#ifndef QNATIVEANDROIDEDITTEXT_P_H
+#define QNATIVEANDROIDEDITTEXT_P_H
 
 //
 //  W A R N I N G
@@ -48,16 +48,16 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidobject_p.h>
+#include <QtQmlAndroid/private/qnativeandroidtextview_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidDrawable : public QQmlAndroidObject
+class Q_QMLANDROID_EXPORT QNativeAndroidEditText : public QNativeAndroidTextView
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidDrawable(QObject *parent = nullptr);
+    explicit QNativeAndroidEditText(QNativeAndroidView *parent = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
@@ -66,4 +66,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDDRAWABLE_P_H
+#endif // QNATIVEANDROIDEDITTEXT_P_H
diff --git a/src/android/widget/qqmlandroidframelayout.cpp b/src/android/widget/qnativeandroidframelayout.cpp
index b240433..fb31e35 100644
--- a/src/android/widget/qqmlandroidframelayout.cpp
+++ b/src/android/widget/qnativeandroidframelayout.cpp
@@ -34,33 +34,33 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidframelayout_p.h"
+#include "qnativeandroidframelayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidFrameLayout::QQmlAndroidFrameLayout(QQmlAndroidView *parent) :
-    QQmlAndroidViewGroup(parent)
+QNativeAndroidFrameLayout::QNativeAndroidFrameLayout(QNativeAndroidView *parent) :
+    QNativeAndroidViewGroup(parent)
 {
 }
 
-QQmlAndroidFrameLayoutParams *QQmlAndroidFrameLayout::qmlAttachedProperties(QObject *object)
+QNativeAndroidFrameLayoutParams *QNativeAndroidFrameLayout::qmlAttachedProperties(QObject *object)
 {
-    QQmlAndroidView *view = qobject_cast<QQmlAndroidView*>(object);
+    QNativeAndroidView *view = qobject_cast<QNativeAndroidView*>(object);
     if (view)
-        return new QQmlAndroidFrameLayoutParams(view);
+        return new QNativeAndroidFrameLayoutParams(view);
     return 0;
 }
 
-QAndroidJniObject QQmlAndroidFrameLayout::onCreate()
+QAndroidJniObject QNativeAndroidFrameLayout::onCreate()
 {
     return QAndroidJniObject("android/widget/FrameLayout",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidFrameLayout::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidFrameLayout::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidViewGroup::onInflate(instance);
+    QNativeAndroidViewGroup::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qqmlandroidframelayout_p.h b/src/android/widget/qnativeandroidframelayout_p.h
index f7debd5..b2f80ed 100644
--- a/src/android/widget/qqmlandroidframelayout_p.h
+++ b/src/android/widget/qnativeandroidframelayout_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDFRAMELAYOUT_P_H
-#define QQMLANDROIDFRAMELAYOUT_P_H
+#ifndef QNATIVEANDROIDFRAMELAYOUT_P_H
+#define QNATIVEANDROIDFRAMELAYOUT_P_H
 
 //
 //  W A R N I N G
@@ -48,19 +48,19 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidviewgroup_p.h>
-#include <QtQmlAndroid/private/qqmlandroidframelayoutparams_p.h>
+#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h>
+#include <QtQmlAndroid/private/qnativeandroidframelayoutparams_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidFrameLayout : public QQmlAndroidViewGroup
+class Q_QMLANDROID_EXPORT QNativeAndroidFrameLayout : public QNativeAndroidViewGroup
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidFrameLayout(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidFrameLayout(QNativeAndroidView *parent = nullptr);
 
-    static QQmlAndroidFrameLayoutParams *qmlAttachedProperties(QObject *object);
+    static QNativeAndroidFrameLayoutParams *qmlAttachedProperties(QObject *object);
 
 protected:
     QAndroidJniObject onCreate() override;
@@ -69,6 +69,6 @@ protected:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QQmlAndroidFrameLayout, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QNativeAndroidFrameLayout, QML_HAS_ATTACHED_PROPERTIES)
 
-#endif // QQMLANDROIDFRAMELAYOUT_P_H
+#endif // QNATIVEANDROIDFRAMELAYOUT_P_H
diff --git a/src/android/widget/qqmlandroidframelayoutparams.cpp b/src/android/widget/qnativeandroidframelayoutparams.cpp
index 2c8f5aa..c1240fb 100644
--- a/src/android/widget/qqmlandroidframelayoutparams.cpp
+++ b/src/android/widget/qnativeandroidframelayoutparams.cpp
@@ -34,24 +34,24 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidframelayoutparams_p.h"
-#include "qqmlandroidview_p.h"
+#include "qnativeandroidframelayoutparams_p.h"
+#include "qnativeandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidFrameLayoutParams::QQmlAndroidFrameLayoutParams(QQmlAndroidView *view) :
-    QQmlAndroidMarginLayoutParams(view)
+QNativeAndroidFrameLayoutParams::QNativeAndroidFrameLayoutParams(QNativeAndroidView *view) :
+    QNativeAndroidMarginLayoutParams(view)
 {
 }
 
-int QQmlAndroidFrameLayoutParams::gravity() const
+int QNativeAndroidFrameLayoutParams::gravity() const
 {
     if (m_gravity.isNull())
         return 0; // TODO
     return m_gravity;
 }
 
-void QQmlAndroidFrameLayoutParams::setGravity(int value)
+void QNativeAndroidFrameLayoutParams::setGravity(int value)
 {
     if (value != gravity()) {
         m_gravity = value;
@@ -60,16 +60,16 @@ void QQmlAndroidFrameLayoutParams::setGravity(int value)
     }
 }
 
-QAndroidJniObject QQmlAndroidFrameLayoutParams::onCreate()
+QAndroidJniObject QNativeAndroidFrameLayoutParams::onCreate()
 {
     return QAndroidJniObject("android/widget/FrameLayout$LayoutParams",
                              "(II)V",
                              MATCH_PARENT, MATCH_PARENT);
 }
 
-void QQmlAndroidFrameLayoutParams::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidFrameLayoutParams::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidMarginLayoutParams::onInflate(instance);
+    QNativeAndroidMarginLayoutParams::onInflate(instance);
 
     if (!m_gravity.isNull())
         instance.callMethod<void>("setGravity", "(I)V", m_gravity);
diff --git a/src/android/widget/qqmlandroidframelayoutparams_p.h b/src/android/widget/qnativeandroidframelayoutparams_p.h
index db3709a..679a89c 100644
--- a/src/android/widget/qqmlandroidframelayoutparams_p.h
+++ b/src/android/widget/qnativeandroidframelayoutparams_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDFRAMELAYOUTPARAMS_P_H
-#define QQMLANDROIDFRAMELAYOUTPARAMS_P_H
+#ifndef QNATIVEANDROIDFRAMELAYOUTPARAMS_P_H
+#define QNATIVEANDROIDFRAMELAYOUTPARAMS_P_H
 
 //
 //  W A R N I N G
@@ -48,17 +48,17 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidmarginlayoutparams_p.h>
+#include <QtQmlAndroid/private/qnativeandroidmarginlayoutparams_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidFrameLayoutParams : public QQmlAndroidMarginLayoutParams
+class Q_QMLANDROID_EXPORT QNativeAndroidFrameLayoutParams : public QNativeAndroidMarginLayoutParams
 {
     Q_OBJECT
     Q_PROPERTY(int gravity READ gravity WRITE setGravity NOTIFY gravityChanged)
 
 public:
-    explicit QQmlAndroidFrameLayoutParams(QQmlAndroidView *view);
+    explicit QNativeAndroidFrameLayoutParams(QNativeAndroidView *view);
 
     int gravity() const;
     void setGravity(int gravity);
@@ -71,9 +71,9 @@ protected:
     void onInflate(QAndroidJniObject &instance) override;
 
 private:
-    QQmlAndroidOptional<int> m_gravity;
+    QNativeAndroidOptional<int> m_gravity;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDFRAMELAYOUTPARAMS_P_H
+#endif // QNATIVEANDROIDFRAMELAYOUTPARAMS_P_H
diff --git a/src/android/widget/qqmlandroidimageview.cpp b/src/android/widget/qnativeandroidimageview.cpp
index fe76930..899bd61 100644
--- a/src/android/widget/qqmlandroidimageview.cpp
+++ b/src/android/widget/qnativeandroidimageview.cpp
@@ -34,22 +34,22 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidimageview_p.h"
+#include "qnativeandroidimageview_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidImageView::QQmlAndroidImageView(QQmlAndroidView *parent) :
-    QQmlAndroidView(parent), m_resource(0)
+QNativeAndroidImageView::QNativeAndroidImageView(QNativeAndroidView *parent) :
+    QNativeAndroidView(parent), m_resource(0)
 {
 }
 
-QUrl QQmlAndroidImageView::imageURI() const
+QUrl QNativeAndroidImageView::imageURI() const
 {
     return m_uri;
 }
 
-void QQmlAndroidImageView::setImageURI(const QUrl &uri)
+void QNativeAndroidImageView::setImageURI(const QUrl &uri)
 {
     if (m_uri != uri) {
         m_uri = uri;
@@ -64,12 +64,12 @@ void QQmlAndroidImageView::setImageURI(const QUrl &uri)
     }
 }
 
-int QQmlAndroidImageView::imageResource() const
+int QNativeAndroidImageView::imageResource() const
 {
     return m_resource;
 }
 
-void QQmlAndroidImageView::setImageResource(int resource)
+void QNativeAndroidImageView::setImageResource(int resource)
 {
     if (m_resource != resource) {
         m_resource = resource;
@@ -78,14 +78,14 @@ void QQmlAndroidImageView::setImageResource(int resource)
     }
 }
 
-int QQmlAndroidImageView::imageTintColor() const
+int QNativeAndroidImageView::imageTintColor() const
 {
     if (m_tint.isNull())
         return 0; // TODO
     return m_tint;
 }
 
-void QQmlAndroidImageView::setImageTintColor(int color)
+void QNativeAndroidImageView::setImageTintColor(int color)
 {
     if (m_tint.isNull() || m_tint != color) {
         m_tint = color;
@@ -103,16 +103,16 @@ void QQmlAndroidImageView::setImageTintColor(int color)
     }
 }
 
-QAndroidJniObject QQmlAndroidImageView::onCreate()
+QAndroidJniObject QNativeAndroidImageView::onCreate()
 {
     return QAndroidJniObject("android/widget/ImageView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidImageView::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidImageView::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidView::onInflate(instance);
+    QNativeAndroidView::onInflate(instance);
 
     if (m_uri.isValid())
         instance.callMethod<void>("setImageURI", "(Landroid/net/Uri;)V", getUri().object());
@@ -127,7 +127,7 @@ void QQmlAndroidImageView::onInflate(QAndroidJniObject &instance)
     }
 }
 
-QAndroidJniObject QQmlAndroidImageView::getUri() const
+QAndroidJniObject QNativeAndroidImageView::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/android/widget/qqmlandroidimageview_p.h b/src/android/widget/qnativeandroidimageview_p.h
index ab933d2..d37ed89 100644
--- a/src/android/widget/qqmlandroidimageview_p.h
+++ b/src/android/widget/qnativeandroidimageview_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDIMAGEVIEW_P_H
-#define QQMLANDROIDIMAGEVIEW_P_H
+#ifndef QNATIVEANDROIDIMAGEVIEW_P_H
+#define QNATIVEANDROIDIMAGEVIEW_P_H
 
 //
 //  W A R N I N G
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidview_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 #include <QtCore/qurl.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidImageView : public QQmlAndroidView
+class Q_QMLANDROID_EXPORT QNativeAndroidImageView : public QNativeAndroidView
 {
     Q_OBJECT
     Q_PROPERTY(QUrl imageURI READ imageURI WRITE setImageURI NOTIFY imageURIChanged)
@@ -62,7 +62,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidImageView : public QQmlAndroidView
     Q_PROPERTY(int imageTintColor READ imageTintColor WRITE setImageTintColor NOTIFY imageTintColorChanged)
 
 public:
-    explicit QQmlAndroidImageView(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidImageView(QNativeAndroidView *parent = nullptr);
 
     QUrl imageURI() const;
     void setImageURI(const QUrl &uri);
@@ -87,9 +87,9 @@ private:
 
     QUrl m_uri;
     int m_resource;
-    QQmlAndroidOptional<int> m_tint;
+    QNativeAndroidOptional<int> m_tint;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDTEXTVIEW_P_H
+#endif // QNATIVEANDROIDTEXTVIEW_P_H
diff --git a/src/android/widget/qqmlandroidlinearlayout.cpp b/src/android/widget/qnativeandroidlinearlayout.cpp
index a1732dc..8fb1261 100644
--- a/src/android/widget/qqmlandroidlinearlayout.cpp
+++ b/src/android/widget/qnativeandroidlinearlayout.cpp
@@ -34,31 +34,31 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidlinearlayout_p.h"
+#include "qnativeandroidlinearlayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidLinearLayout::QQmlAndroidLinearLayout(QQmlAndroidView *parent) :
-    QQmlAndroidViewGroup(parent)
+QNativeAndroidLinearLayout::QNativeAndroidLinearLayout(QNativeAndroidView *parent) :
+    QNativeAndroidViewGroup(parent)
 {
 }
 
-QQmlAndroidLinearLayoutParams *QQmlAndroidLinearLayout::qmlAttachedProperties(QObject *object)
+QNativeAndroidLinearLayoutParams *QNativeAndroidLinearLayout::qmlAttachedProperties(QObject *object)
 {
-    QQmlAndroidView *view = qobject_cast<QQmlAndroidView*>(object);
+    QNativeAndroidView *view = qobject_cast<QNativeAndroidView*>(object);
     if (view)
-        return new QQmlAndroidLinearLayoutParams(view);
+        return new QNativeAndroidLinearLayoutParams(view);
     return 0;
 }
 
-bool QQmlAndroidLinearLayout::isBaselineAligned() const
+bool QNativeAndroidLinearLayout::isBaselineAligned() const
 {
     if (m_baselineAligned.isNull())
         return true;
     return m_baselineAligned;
 }
 
-void QQmlAndroidLinearLayout::setBaselineAligned(bool aligned)
+void QNativeAndroidLinearLayout::setBaselineAligned(bool aligned)
 {
     if (aligned != isBaselineAligned()) {
         m_baselineAligned = aligned;
@@ -68,14 +68,14 @@ void QQmlAndroidLinearLayout::setBaselineAligned(bool aligned)
     }
 }
 
-int QQmlAndroidLinearLayout::baselineAlignedChildIndex() const
+int QNativeAndroidLinearLayout::baselineAlignedChildIndex() const
 {
     if (m_baselineAlignedChildIndex.isNull())
         return -1;
     return m_baselineAlignedChildIndex;
 }
 
-void QQmlAndroidLinearLayout::setBaselineAlignedChildIndex(int index)
+void QNativeAndroidLinearLayout::setBaselineAlignedChildIndex(int index)
 {
     if (index != baselineAlignedChildIndex()) {
         m_baselineAlignedChildIndex = index;
@@ -85,14 +85,14 @@ void QQmlAndroidLinearLayout::setBaselineAlignedChildIndex(int index)
     }
 }
 
-bool QQmlAndroidLinearLayout::isMeasureWithLargestChildEnabled() const
+bool QNativeAndroidLinearLayout::isMeasureWithLargestChildEnabled() const
 {
     if (m_measureWithLargestChild.isNull())
         return false;
     return m_measureWithLargestChild;
 }
 
-void QQmlAndroidLinearLayout::setMeasureWithLargestChildEnabled(bool enabled)
+void QNativeAndroidLinearLayout::setMeasureWithLargestChildEnabled(bool enabled)
 {
     if (enabled != isMeasureWithLargestChildEnabled()) {
         m_measureWithLargestChild = enabled;
@@ -102,14 +102,14 @@ void QQmlAndroidLinearLayout::setMeasureWithLargestChildEnabled(bool enabled)
     }
 }
 
-QQmlAndroidLinearLayout::Orientation QQmlAndroidLinearLayout::orientation() const
+QNativeAndroidLinearLayout::Orientation QNativeAndroidLinearLayout::orientation() const
 {
     if (m_orientation.isNull())
         return HORIZONTAL;
     return m_orientation;
 }
 
-void QQmlAndroidLinearLayout::setOrientation(Orientation value)
+void QNativeAndroidLinearLayout::setOrientation(Orientation value)
 {
     if (value != orientation()) {
         m_orientation = value;
@@ -119,14 +119,14 @@ void QQmlAndroidLinearLayout::setOrientation(Orientation value)
     }
 }
 
-qreal QQmlAndroidLinearLayout::weightSum() const
+qreal QNativeAndroidLinearLayout::weightSum() const
 {
     if (m_weightSum.isNull())
         return -1.0f;
     return m_weightSum;
 }
 
-void QQmlAndroidLinearLayout::setWeightSum(qreal sum)
+void QNativeAndroidLinearLayout::setWeightSum(qreal sum)
 {
     if (sum != weightSum()) {
         m_weightSum = sum;
@@ -136,14 +136,14 @@ void QQmlAndroidLinearLayout::setWeightSum(qreal sum)
     }
 }
 
-QAndroidJniObject QQmlAndroidLinearLayout::onCreate()
+QAndroidJniObject QNativeAndroidLinearLayout::onCreate()
 {
     return QAndroidJniObject("android/widget/LinearLayout",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidLinearLayout::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidLinearLayout::onInflate(QAndroidJniObject &instance)
 {
     if (!m_baselineAligned.isNull())
         instance.callMethod<void>("setBaselineAligned", "(Z)V", m_baselineAligned);
@@ -154,7 +154,7 @@ void QQmlAndroidLinearLayout::onInflate(QAndroidJniObject &instance)
     if (!m_weightSum.isNull())
         instance.callMethod<void>("setWeightSum", "(J)V", m_weightSum);
 
-    QQmlAndroidViewGroup::onInflate(instance);
+    QNativeAndroidViewGroup::onInflate(instance);
 
     if (!m_baselineAlignedChildIndex.isNull())
         instance.callMethod<void>("setBaselineAlignedChildIndex", "(I)V", m_baselineAlignedChildIndex);
diff --git a/src/android/widget/qqmlandroidlinearlayout_p.h b/src/android/widget/qnativeandroidlinearlayout_p.h
index 104af96..259f96e 100644
--- a/src/android/widget/qqmlandroidlinearlayout_p.h
+++ b/src/android/widget/qnativeandroidlinearlayout_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDLINEARLAYOUT_P_H
-#define QQMLANDROIDLINEARLAYOUT_P_H
+#ifndef QNATIVEANDROIDLINEARLAYOUT_P_H
+#define QNATIVEANDROIDLINEARLAYOUT_P_H
 
 //
 //  W A R N I N G
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidviewgroup_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
-#include <QtQmlAndroid/private/qqmlandroidlinearlayoutparams_p.h>
+#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidlinearlayoutparams_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidLinearLayout : public QQmlAndroidViewGroup
+class Q_QMLANDROID_EXPORT QNativeAndroidLinearLayout : public QNativeAndroidViewGroup
 {
     Q_OBJECT
     Q_PROPERTY(bool baselineAligned READ isBaselineAligned WRITE setBaselineAligned NOTIFY baselineAlignedChanged)
@@ -65,9 +65,9 @@ class Q_QMLANDROID_EXPORT QQmlAndroidLinearLayout : public QQmlAndroidViewGroup
     Q_ENUMS(Orientation)
 
 public:
-    explicit QQmlAndroidLinearLayout(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidLinearLayout(QNativeAndroidView *parent = nullptr);
 
-    static QQmlAndroidLinearLayoutParams *qmlAttachedProperties(QObject *object);
+    static QNativeAndroidLinearLayoutParams *qmlAttachedProperties(QObject *object);
 
     enum Orientation {
         HORIZONTAL = 0,
@@ -104,17 +104,17 @@ protected:
     void onInflate(QAndroidJniObject &instance) override;
 
 private:
-    QQmlAndroidOptional<bool> m_baselineAligned;
-    QQmlAndroidOptional<bool> m_baselineAlignedChildIndex;
+    QNativeAndroidOptional<bool> m_baselineAligned;
+    QNativeAndroidOptional<bool> m_baselineAlignedChildIndex;
     // TODO: Drawable divider
     // TODO: int gravity
-    QQmlAndroidOptional<bool> m_measureWithLargestChild;
-    QQmlAndroidOptional<Orientation> m_orientation;
-    QQmlAndroidOptional<qreal> m_weightSum;
+    QNativeAndroidOptional<bool> m_measureWithLargestChild;
+    QNativeAndroidOptional<Orientation> m_orientation;
+    QNativeAndroidOptional<qreal> m_weightSum;
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QQmlAndroidLinearLayout, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QNativeAndroidLinearLayout, QML_HAS_ATTACHED_PROPERTIES)
 
-#endif // QQMLANDROIDLINEARLAYOUT_P_H
+#endif // QNATIVEANDROIDLINEARLAYOUT_P_H
diff --git a/src/android/widget/qqmlandroidlinearlayoutparams.cpp b/src/android/widget/qnativeandroidlinearlayoutparams.cpp
index d700450..df72cb3 100644
--- a/src/android/widget/qqmlandroidlinearlayoutparams.cpp
+++ b/src/android/widget/qnativeandroidlinearlayoutparams.cpp
@@ -34,24 +34,24 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidlinearlayoutparams_p.h"
-#include "qqmlandroidview_p.h"
+#include "qnativeandroidlinearlayoutparams_p.h"
+#include "qnativeandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidLinearLayoutParams::QQmlAndroidLinearLayoutParams(QQmlAndroidView *view) :
-    QQmlAndroidMarginLayoutParams(view)
+QNativeAndroidLinearLayoutParams::QNativeAndroidLinearLayoutParams(QNativeAndroidView *view) :
+    QNativeAndroidMarginLayoutParams(view)
 {
 }
 
-int QQmlAndroidLinearLayoutParams::gravity() const
+int QNativeAndroidLinearLayoutParams::gravity() const
 {
     if (m_gravity.isNull())
         return 0; // TODO
     return m_gravity;
 }
 
-void QQmlAndroidLinearLayoutParams::setGravity(int value)
+void QNativeAndroidLinearLayoutParams::setGravity(int value)
 {
     if (value != gravity()) {
         m_gravity = value;
@@ -60,14 +60,14 @@ void QQmlAndroidLinearLayoutParams::setGravity(int value)
     }
 }
 
-qreal QQmlAndroidLinearLayoutParams::weight() const
+qreal QNativeAndroidLinearLayoutParams::weight() const
 {
     if (m_weight.isNull())
         return 0.0; // TODO
     return m_weight;
 }
 
-void QQmlAndroidLinearLayoutParams::setWeight(qreal value)
+void QNativeAndroidLinearLayoutParams::setWeight(qreal value)
 {
     if (value != weight()) {
         m_weight = value;
@@ -76,16 +76,16 @@ void QQmlAndroidLinearLayoutParams::setWeight(qreal value)
     }
 }
 
-QAndroidJniObject QQmlAndroidLinearLayoutParams::onCreate()
+QAndroidJniObject QNativeAndroidLinearLayoutParams::onCreate()
 {
     return QAndroidJniObject("android/widget/LinearLayout$LayoutParams",
                              "(II)V",
                              MATCH_PARENT, MATCH_PARENT);
 }
 
-void QQmlAndroidLinearLayoutParams::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidLinearLayoutParams::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidMarginLayoutParams::onInflate(instance);
+    QNativeAndroidMarginLayoutParams::onInflate(instance);
 
     if (!m_gravity.isNull())
         instance.setField<jint>("gravity", m_gravity);
diff --git a/src/android/widget/qqmlandroidlinearlayoutparams_p.h b/src/android/widget/qnativeandroidlinearlayoutparams_p.h
index a6084e8..7ca26da 100644
--- a/src/android/widget/qqmlandroidlinearlayoutparams_p.h
+++ b/src/android/widget/qnativeandroidlinearlayoutparams_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDLINEARLAYOUTPARAMS_P_H
-#define QQMLANDROIDLINEARLAYOUTPARAMS_P_H
+#ifndef QNATIVEANDROIDLINEARLAYOUTPARAMS_P_H
+#define QNATIVEANDROIDLINEARLAYOUTPARAMS_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidmarginlayoutparams_p.h>
+#include <QtQmlAndroid/private/qnativeandroidmarginlayoutparams_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidLinearLayoutParams : public QQmlAndroidMarginLayoutParams
+class Q_QMLANDROID_EXPORT QNativeAndroidLinearLayoutParams : public QNativeAndroidMarginLayoutParams
 {
     Q_OBJECT
     Q_PROPERTY(int gravity READ gravity WRITE setGravity NOTIFY gravityChanged)
     Q_PROPERTY(qreal weight READ weight WRITE setWeight NOTIFY weightChanged)
 
 public:
-    explicit QQmlAndroidLinearLayoutParams(QQmlAndroidView *view);
+    explicit QNativeAndroidLinearLayoutParams(QNativeAndroidView *view);
 
     int gravity() const;
     void setGravity(int gravity);
@@ -76,10 +76,10 @@ protected:
     void onInflate(QAndroidJniObject &instance) override;
 
 private:
-    QQmlAndroidOptional<int> m_gravity;
-    QQmlAndroidOptional<qreal> m_weight;
+    QNativeAndroidOptional<int> m_gravity;
+    QNativeAndroidOptional<qreal> m_weight;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDLINEARLAYOUTPARAMS_P_H
+#endif // QNATIVEANDROIDLINEARLAYOUTPARAMS_P_H
diff --git a/src/android/widget/qqmlandroidlistview.cpp b/src/android/widget/qnativeandroidlistview.cpp
index 8b04e6c..8dddd08 100644
--- a/src/android/widget/qqmlandroidlistview.cpp
+++ b/src/android/widget/qnativeandroidlistview.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidlistview_p.h"
+#include "qnativeandroidlistview_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidListView::QQmlAndroidListView(QQmlAndroidView *parent) :
-    QQmlAndroidAdapterView(parent)
+QNativeAndroidListView::QNativeAndroidListView(QNativeAndroidView *parent) :
+    QNativeAndroidAdapterView(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidListView::onCreate()
+QAndroidJniObject QNativeAndroidListView::onCreate()
 {
     return QAndroidJniObject("android/widget/ListView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidListView::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidListView::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidAdapterView::onInflate(instance);
+    QNativeAndroidAdapterView::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qnativeandroidlistview_p.h b/src/android/widget/qnativeandroidlistview_p.h
new file mode 100644
index 0000000..39ab8e9
--- /dev/null
+++ b/src/android/widget/qnativeandroidlistview_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt QML Android module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QNATIVEANDROIDLISTVIEW_P_H
+#define QNATIVEANDROIDLISTVIEW_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQmlAndroid/private/qnativeandroidadapterview_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_QMLANDROID_EXPORT QNativeAndroidListView : public QNativeAndroidAdapterView // TODO: AbsListView
+{
+    Q_OBJECT
+
+public:
+    explicit QNativeAndroidListView(QNativeAndroidView *parent = nullptr);
+
+protected:
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QNATIVEANDROIDLISTVIEW_P_H
diff --git a/src/android/widget/qqmlandroidmarginlayoutparams.cpp b/src/android/widget/qnativeandroidmarginlayoutparams.cpp
index 9e3fd1f..03dccb2 100644
--- a/src/android/widget/qqmlandroidmarginlayoutparams.cpp
+++ b/src/android/widget/qnativeandroidmarginlayoutparams.cpp
@@ -34,24 +34,24 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidmarginlayoutparams_p.h"
-#include "qqmlandroidview_p.h"
+#include "qnativeandroidmarginlayoutparams_p.h"
+#include "qnativeandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidMarginLayoutParams::QQmlAndroidMarginLayoutParams(QQmlAndroidView *view) :
-    QQmlAndroidLayoutParams(view)
+QNativeAndroidMarginLayoutParams::QNativeAndroidMarginLayoutParams(QNativeAndroidView *view) :
+    QNativeAndroidLayoutParams(view)
 {
 }
 
-int QQmlAndroidMarginLayoutParams::margin() const
+int QNativeAndroidMarginLayoutParams::margin() const
 {
     if (m_margin.isNull())
         return 0;
     return m_margin;
 }
 
-void QQmlAndroidMarginLayoutParams::setMargin(int margin)
+void QNativeAndroidMarginLayoutParams::setMargin(int margin)
 {
     if (m_margin.isNull() || m_margin != margin) {
         m_margin = margin;
@@ -60,14 +60,14 @@ void QQmlAndroidMarginLayoutParams::setMargin(int margin)
     }
 }
 
-int QQmlAndroidMarginLayoutParams::topMargin() const
+int QNativeAndroidMarginLayoutParams::topMargin() const
 {
     if (m_topMargin.isNull())
         return margin();
     return m_topMargin;
 }
 
-void QQmlAndroidMarginLayoutParams::setTopMargin(int margin)
+void QNativeAndroidMarginLayoutParams::setTopMargin(int margin)
 {
     if (m_topMargin.isNull() || m_topMargin != margin) {
         m_topMargin = margin;
@@ -76,14 +76,14 @@ void QQmlAndroidMarginLayoutParams::setTopMargin(int margin)
     }
 }
 
-int QQmlAndroidMarginLayoutParams::leftMargin() const
+int QNativeAndroidMarginLayoutParams::leftMargin() const
 {
     if (m_leftMargin.isNull())
         return margin();
     return m_leftMargin;
 }
 
-void QQmlAndroidMarginLayoutParams::setLeftMargin(int margin)
+void QNativeAndroidMarginLayoutParams::setLeftMargin(int margin)
 {
     if (m_leftMargin.isNull() || m_leftMargin != margin) {
         m_leftMargin = margin;
@@ -92,14 +92,14 @@ void QQmlAndroidMarginLayoutParams::setLeftMargin(int margin)
     }
 }
 
-int QQmlAndroidMarginLayoutParams::rightMargin() const
+int QNativeAndroidMarginLayoutParams::rightMargin() const
 {
     if (m_rightMargin.isNull())
         return margin();
     return m_rightMargin;
 }
 
-void QQmlAndroidMarginLayoutParams::setRightMargin(int margin)
+void QNativeAndroidMarginLayoutParams::setRightMargin(int margin)
 {
     if (m_rightMargin.isNull() || m_rightMargin != margin) {
         m_rightMargin = margin;
@@ -108,14 +108,14 @@ void QQmlAndroidMarginLayoutParams::setRightMargin(int margin)
     }
 }
 
-int QQmlAndroidMarginLayoutParams::bottomMargin() const
+int QNativeAndroidMarginLayoutParams::bottomMargin() const
 {
     if (m_bottomMargin.isNull())
         return margin();
     return m_bottomMargin;
 }
 
-void QQmlAndroidMarginLayoutParams::setBottomMargin(int margin)
+void QNativeAndroidMarginLayoutParams::setBottomMargin(int margin)
 {
     if (m_bottomMargin.isNull() || m_bottomMargin != margin) {
         m_bottomMargin = margin;
@@ -124,16 +124,16 @@ void QQmlAndroidMarginLayoutParams::setBottomMargin(int margin)
     }
 }
 
-QAndroidJniObject QQmlAndroidMarginLayoutParams::onCreate()
+QAndroidJniObject QNativeAndroidMarginLayoutParams::onCreate()
 {
     return QAndroidJniObject("android/view/ViewGroup$MarginLayoutParams",
                              "(II)V",
                              MATCH_PARENT, MATCH_PARENT);
 }
 
-void QQmlAndroidMarginLayoutParams::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidMarginLayoutParams::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidLayoutParams::onInflate(instance);
+    QNativeAndroidLayoutParams::onInflate(instance);
 
     instance.callMethod<void>("setMargins",
                               "(IIII)V",
diff --git a/src/android/widget/qqmlandroidmarginlayoutparams_p.h b/src/android/widget/qnativeandroidmarginlayoutparams_p.h
index f608bb7..db2bfa7 100644
--- a/src/android/widget/qqmlandroidmarginlayoutparams_p.h
+++ b/src/android/widget/qnativeandroidmarginlayoutparams_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDMARGINLAYOUTPARAMS_P_H
-#define QQMLANDROIDMARGINLAYOUTPARAMS_P_H
+#ifndef QNATIVEANDROIDMARGINLAYOUTPARAMS_P_H
+#define QNATIVEANDROIDMARGINLAYOUTPARAMS_P_H
 
 //
 //  W A R N I N G
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidlayoutparams_p.h>
+#include <QtQmlAndroid/private/qnativeandroidlayoutparams_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidMarginLayoutParams : public QQmlAndroidLayoutParams
+class Q_QMLANDROID_EXPORT QNativeAndroidMarginLayoutParams : public QNativeAndroidLayoutParams
 {
     Q_OBJECT
     Q_PROPERTY(int margin READ margin WRITE setMargin NOTIFY marginChanged)
@@ -62,7 +62,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidMarginLayoutParams : public QQmlAndroidLayo
     Q_PROPERTY(int bottomMargin READ bottomMargin WRITE setBottomMargin NOTIFY bottomMarginChanged)
 
 public:
-    explicit QQmlAndroidMarginLayoutParams(QQmlAndroidView *view);
+    explicit QNativeAndroidMarginLayoutParams(QNativeAndroidView *view);
 
     int margin() const;
     void setMargin(int margin);
@@ -91,13 +91,13 @@ protected:
     void onInflate(QAndroidJniObject &instance) override;
 
 private:
-    QQmlAndroidOptional<int> m_margin;
-    QQmlAndroidOptional<int> m_topMargin;
-    QQmlAndroidOptional<int> m_leftMargin;
-    QQmlAndroidOptional<int> m_rightMargin;
-    QQmlAndroidOptional<int> m_bottomMargin;
+    QNativeAndroidOptional<int> m_margin;
+    QNativeAndroidOptional<int> m_topMargin;
+    QNativeAndroidOptional<int> m_leftMargin;
+    QNativeAndroidOptional<int> m_rightMargin;
+    QNativeAndroidOptional<int> m_bottomMargin;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDMARGINLAYOUTPARAMS_P_H
+#endif // QNATIVEANDROIDMARGINLAYOUTPARAMS_P_H
diff --git a/src/android/widget/qqmlandroidnumberpicker.cpp b/src/android/widget/qnativeandroidnumberpicker.cpp
index b96f0a1..aca2cf2 100644
--- a/src/android/widget/qqmlandroidnumberpicker.cpp
+++ b/src/android/widget/qnativeandroidnumberpicker.cpp
@@ -34,28 +34,28 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidnumberpicker_p.h"
+#include "qnativeandroidnumberpicker_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidNumberPicker::QQmlAndroidNumberPicker(QQmlAndroidView *parent) :
-    QQmlAndroidLinearLayout(parent), m_value(0)
+QNativeAndroidNumberPicker::QNativeAndroidNumberPicker(QNativeAndroidView *parent) :
+    QNativeAndroidLinearLayout(parent), m_value(0)
 {
 }
 
-int QQmlAndroidNumberPicker::value() const
+int QNativeAndroidNumberPicker::value() const
 {
     return m_value;
 }
 
-void QQmlAndroidNumberPicker::setValue(int value)
+void QNativeAndroidNumberPicker::setValue(int value)
 {
     if (updateValue(value))
         QtQmlAndroid::callIntMethod(instance(), "setValue", value);
 }
 
-bool QQmlAndroidNumberPicker::updateValue(int value)
+bool QNativeAndroidNumberPicker::updateValue(int value)
 {
     if (m_value != value) {
         m_value = value;
@@ -65,16 +65,16 @@ bool QQmlAndroidNumberPicker::updateValue(int value)
     return false;
 }
 
-QAndroidJniObject QQmlAndroidNumberPicker::onCreate()
+QAndroidJniObject QNativeAndroidNumberPicker::onCreate()
 {
     return QAndroidJniObject("android/widget/NumberPicker",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidNumberPicker::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidNumberPicker::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidLinearLayout::onInflate(instance);
+    QNativeAndroidLinearLayout::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/widget/QmlNumberPickerListener",
                                    "(Landroid/widget/NumberPicker;J)V",
@@ -90,7 +90,7 @@ void QQmlAndroidNumberPicker::onInflate(QAndroidJniObject &instance)
     instance.callMethod<void>("setValue", "(I)V", m_value);
 }
 
-void QQmlAndroidNumberPicker::onRegisterNativeMethods(jobject listener)
+void QNativeAndroidNumberPicker::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onValueChange", "(JI)V", reinterpret_cast<void *>(onValueChange)}};
 
@@ -100,11 +100,11 @@ void QQmlAndroidNumberPicker::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QQmlAndroidNumberPicker::onValueChange(JNIEnv *env, jobject object, jlong instance, jint value)
+void QNativeAndroidNumberPicker::onValueChange(JNIEnv *env, jobject object, jlong instance, jint value)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidNumberPicker *picker = reinterpret_cast<QQmlAndroidNumberPicker *>(instance);
+    QNativeAndroidNumberPicker *picker = reinterpret_cast<QNativeAndroidNumberPicker *>(instance);
     if (picker)
         QMetaObject::invokeMethod(picker, "updateValue", Qt::QueuedConnection, Q_ARG(int, value));
 }
diff --git a/src/android/widget/qqmlandroidnumberpicker_p.h b/src/android/widget/qnativeandroidnumberpicker_p.h
index 1b21354..c3142c8 100644
--- a/src/android/widget/qqmlandroidnumberpicker_p.h
+++ b/src/android/widget/qnativeandroidnumberpicker_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDNUMBERPICKER_P_H
-#define QQMLANDROIDNUMBERPICKER_P_H
+#ifndef QNATIVEANDROIDNUMBERPICKER_P_H
+#define QNATIVEANDROIDNUMBERPICKER_P_H
 
 //
 //  W A R N I N G
@@ -48,17 +48,17 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidlinearlayout_p.h>
+#include <QtQmlAndroid/private/qnativeandroidlinearlayout_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidNumberPicker : public QQmlAndroidLinearLayout
+class Q_QMLANDROID_EXPORT QNativeAndroidNumberPicker : public QNativeAndroidLinearLayout
 {
     Q_OBJECT
     Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)
 
 public:
-    explicit QQmlAndroidNumberPicker(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidNumberPicker(QNativeAndroidView *parent = nullptr);
 
     int value() const;
     void setValue(int value);
@@ -83,4 +83,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDNUMBERPICKER_P_H
+#endif // QNATIVEANDROIDNUMBERPICKER_P_H
diff --git a/src/android/widget/qqmlandroidpopupmenu.cpp b/src/android/widget/qnativeandroidpopupmenu.cpp
index bf2a32f..495728c 100644
--- a/src/android/widget/qqmlandroidpopupmenu.cpp
+++ b/src/android/widget/qnativeandroidpopupmenu.cpp
@@ -34,37 +34,37 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidpopupmenu_p.h"
+#include "qnativeandroidpopupmenu_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qqmlandroidmenuitem_p.h"
-#include "qqmlandroidcontext_p.h"
-#include "qqmlandroidview_p.h"
+#include "qnativeandroidmenuitem_p.h"
+#include "qnativeandroidcontext_p.h"
+#include "qnativeandroidview_p.h"
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidPopupMenu::QQmlAndroidPopupMenu(QObject *parent) :
-    QQmlAndroidObject(parent), m_anchor(0)
+QNativeAndroidPopupMenu::QNativeAndroidPopupMenu(QObject *parent) :
+    QNativeAndroidObject(parent), m_anchor(0)
 {
 }
 
-QList<QQmlAndroidMenuItem *> QQmlAndroidPopupMenu::items() const
+QList<QNativeAndroidMenuItem *> QNativeAndroidPopupMenu::items() const
 {
-    QList<QQmlAndroidMenuItem *> lst;
+    QList<QNativeAndroidMenuItem *> lst;
     foreach (QObject *child, children()) {
-        QQmlAndroidMenuItem *item = qobject_cast<QQmlAndroidMenuItem *>(child);
+        QNativeAndroidMenuItem *item = qobject_cast<QNativeAndroidMenuItem *>(child);
         if (item)
             lst += item;
     }
     return lst;
 }
 
-QQmlAndroidView *QQmlAndroidPopupMenu::anchor() const
+QNativeAndroidView *QNativeAndroidPopupMenu::anchor() const
 {
     return m_anchor;
 }
 
-void QQmlAndroidPopupMenu::setAnchor(QQmlAndroidView *anchor)
+void QNativeAndroidPopupMenu::setAnchor(QNativeAndroidView *anchor)
 {
     if (m_anchor != anchor) {
         m_anchor = anchor;
@@ -72,14 +72,14 @@ void QQmlAndroidPopupMenu::setAnchor(QQmlAndroidView *anchor)
     }
 }
 
-int QQmlAndroidPopupMenu::gravity() const
+int QNativeAndroidPopupMenu::gravity() const
 {
     if (m_gravity.isNull())
         return 0; // TODO
     return m_gravity;
 }
 
-void QQmlAndroidPopupMenu::setGravity(int value)
+void QNativeAndroidPopupMenu::setGravity(int value)
 {
     if (value != gravity()) {
         m_gravity = value;
@@ -87,15 +87,15 @@ void QQmlAndroidPopupMenu::setGravity(int value)
     }
 }
 
-void QQmlAndroidPopupMenu::show()
+void QNativeAndroidPopupMenu::show()
 {
-    QQmlAndroidView *anchor = m_anchor ? m_anchor : qobject_cast<QQmlAndroidView *>(parent());
+    QNativeAndroidView *anchor = m_anchor ? m_anchor : qobject_cast<QNativeAndroidView *>(parent());
     if (!anchor) {
         qWarning() << "PopupMenu parent must be either anchored or in a view.";
         return;
     }
 
-    QQmlAndroidContext *context = anchor->context();
+    QNativeAndroidContext *context = anchor->context();
     if (!context) {
         qWarning() << "PopupMenu is not ready - no context.";
         return;
@@ -118,7 +118,7 @@ void QQmlAndroidPopupMenu::show()
         inflate(popup);
 
         QAndroidJniObject menu = popup.callObjectMethod("getMenu", "()Landroid/view/Menu;");
-        foreach (QQmlAndroidMenuItem *item, items()) {
+        foreach (QNativeAndroidMenuItem *item, items()) {
             QAndroidJniObject it = menu.callObjectMethod("add",
                                                          "(Ljava/lang/CharSequence;)Landroid/view/MenuItem;",
                                                          QAndroidJniObject::fromString(item->title()).object());
@@ -129,7 +129,7 @@ void QQmlAndroidPopupMenu::show()
     });
 }
 
-void QQmlAndroidPopupMenu::dismiss()
+void QNativeAndroidPopupMenu::dismiss()
 {
     QtQmlAndroid::callVoidMethod(instance(), "dismiss");
 }
diff --git a/src/android/widget/qqmlandroidpopupmenu_p.h b/src/android/widget/qnativeandroidpopupmenu_p.h
index 1f96d7b..9010bf3 100644
--- a/src/android/widget/qqmlandroidpopupmenu_p.h
+++ b/src/android/widget/qnativeandroidpopupmenu_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDPOPUPMENU_P_H
-#define QQMLANDROIDPOPUPMENU_P_H
+#ifndef QNATIVEANDROIDPOPUPMENU_P_H
+#define QNATIVEANDROIDPOPUPMENU_P_H
 
 //
 //  W A R N I N G
@@ -48,27 +48,27 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidobject_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidobject_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQmlAndroidView;
-class QQmlAndroidMenuItem;
+class QNativeAndroidView;
+class QNativeAndroidMenuItem;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidPopupMenu : public QQmlAndroidObject
+class Q_QMLANDROID_EXPORT QNativeAndroidPopupMenu : public QNativeAndroidObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlAndroidView *anchor READ anchor WRITE setAnchor NOTIFY anchorChanged)
+    Q_PROPERTY(QNativeAndroidView *anchor READ anchor WRITE setAnchor NOTIFY anchorChanged)
     Q_PROPERTY(int gravity READ gravity WRITE setGravity NOTIFY gravityChanged)
 
 public:
-    explicit QQmlAndroidPopupMenu(QObject *parent = nullptr);
+    explicit QNativeAndroidPopupMenu(QObject *parent = nullptr);
 
-    QList<QQmlAndroidMenuItem *> items() const;
+    QList<QNativeAndroidMenuItem *> items() const;
 
-    QQmlAndroidView *anchor() const;
-    void setAnchor(QQmlAndroidView *anchor);
+    QNativeAndroidView *anchor() const;
+    void setAnchor(QNativeAndroidView *anchor);
 
     int gravity() const;
     void setGravity(int gravity);
@@ -84,11 +84,11 @@ Q_SIGNALS:
     void itemClick();
 
 private:
-    QQmlAndroidView *m_anchor;
-    QQmlAndroidOptional<int> m_gravity;
+    QNativeAndroidView *m_anchor;
+    QNativeAndroidOptional<int> m_gravity;
     QAndroidJniObject m_listener;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDPOPUPMENU_P_H
+#endif // QNATIVEANDROIDPOPUPMENU_P_H
diff --git a/src/android/widget/qqmlandroidprogressbar.cpp b/src/android/widget/qnativeandroidprogressbar.cpp
index c5871c9..bf23f2d 100644
--- a/src/android/widget/qqmlandroidprogressbar.cpp
+++ b/src/android/widget/qnativeandroidprogressbar.cpp
@@ -34,22 +34,22 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidprogressbar_p.h"
+#include "qnativeandroidprogressbar_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidProgressBar::QQmlAndroidProgressBar(QQmlAndroidView *parent) :
-    QQmlAndroidView(parent), m_max(100), m_progress(0), m_secondary(0), m_indeterminate(false)
+QNativeAndroidProgressBar::QNativeAndroidProgressBar(QNativeAndroidView *parent) :
+    QNativeAndroidView(parent), m_max(100), m_progress(0), m_secondary(0), m_indeterminate(false)
 {
 }
 
-bool QQmlAndroidProgressBar::isIndeterminate() const
+bool QNativeAndroidProgressBar::isIndeterminate() const
 {
     return m_indeterminate;
 }
 
-void QQmlAndroidProgressBar::setIndeterminate(bool indeterminate)
+void QNativeAndroidProgressBar::setIndeterminate(bool indeterminate)
 {
     if (m_indeterminate != indeterminate) {
         m_indeterminate = indeterminate;
@@ -58,18 +58,18 @@ void QQmlAndroidProgressBar::setIndeterminate(bool indeterminate)
     }
 }
 
-int QQmlAndroidProgressBar::progress() const
+int QNativeAndroidProgressBar::progress() const
 {
     return m_progress;
 }
 
-void QQmlAndroidProgressBar::setProgress(int progress)
+void QNativeAndroidProgressBar::setProgress(int progress)
 {
     if (updateProgress(progress))
         QtQmlAndroid::callIntMethod(instance(), "setProgress", progress);
 }
 
-bool QQmlAndroidProgressBar::updateProgress(int progress)
+bool QNativeAndroidProgressBar::updateProgress(int progress)
 {
     if (m_progress != progress) {
         m_progress = progress;
@@ -79,12 +79,12 @@ bool QQmlAndroidProgressBar::updateProgress(int progress)
     return false;
 }
 
-int QQmlAndroidProgressBar::secondaryProgress() const
+int QNativeAndroidProgressBar::secondaryProgress() const
 {
     return m_secondary;
 }
 
-void QQmlAndroidProgressBar::setSecondaryProgress(int progress)
+void QNativeAndroidProgressBar::setSecondaryProgress(int progress)
 {
     if (m_secondary != progress) {
         m_secondary = progress;
@@ -93,12 +93,12 @@ void QQmlAndroidProgressBar::setSecondaryProgress(int progress)
     }
 }
 
-int QQmlAndroidProgressBar::max() const
+int QNativeAndroidProgressBar::max() const
 {
     return m_max;
 }
 
-void QQmlAndroidProgressBar::setMax(int max)
+void QNativeAndroidProgressBar::setMax(int max)
 {
     if (m_max != max) {
         m_max = max;
@@ -107,28 +107,28 @@ void QQmlAndroidProgressBar::setMax(int max)
     }
 }
 
-QQmlAndroidProgressBar::Style QQmlAndroidProgressBar::style() const
+QNativeAndroidProgressBar::Style QNativeAndroidProgressBar::style() const
 {
     if (m_style.isNull())
         return Medium;
     return m_style;
 }
 
-void QQmlAndroidProgressBar::setStyle(Style style)
+void QNativeAndroidProgressBar::setStyle(Style style)
 {
     m_style = style; // TODO: warning after construction or re-construct?
 }
 
-QAndroidJniObject QQmlAndroidProgressBar::onCreate()
+QAndroidJniObject QNativeAndroidProgressBar::onCreate()
 {
     return QAndroidJniObject("android/widget/ProgressBar",
                              "(Landroid/content/Context;Landroid/util/AttributeSet;I)V",
                              ctx().object(), 0, style());
 }
 
-void QQmlAndroidProgressBar::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidProgressBar::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidView::onInflate(instance);
+    QNativeAndroidView::onInflate(instance);
 
     if (m_progress > 0)
         instance.callMethod<void>("setProgress", "(I)V", m_progress);
diff --git a/src/android/widget/qqmlandroidprogressbar_p.h b/src/android/widget/qnativeandroidprogressbar_p.h
index ddd54b0..ec40fa6 100644
--- a/src/android/widget/qqmlandroidprogressbar_p.h
+++ b/src/android/widget/qnativeandroidprogressbar_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDPROGRESSBAR_P_H
-#define QQMLANDROIDPROGRESSBAR_P_H
+#ifndef QNATIVEANDROIDPROGRESSBAR_P_H
+#define QNATIVEANDROIDPROGRESSBAR_P_H
 
 //
 //  W A R N I N G
@@ -48,12 +48,12 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidview_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidProgressBar : public QQmlAndroidView
+class Q_QMLANDROID_EXPORT QNativeAndroidProgressBar : public QNativeAndroidView
 {
     Q_OBJECT
     Q_PROPERTY(bool indeterminate READ isIndeterminate WRITE setIndeterminate NOTIFY indeterminateChanged)
@@ -64,7 +64,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidProgressBar : public QQmlAndroidView
     Q_ENUMS(Style)
 
 public:
-    explicit QQmlAndroidProgressBar(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidProgressBar(QNativeAndroidView *parent = nullptr);
 
     bool isIndeterminate() const;
     void setIndeterminate(bool indeterminate);
@@ -110,9 +110,9 @@ private:
     int m_progress;
     int m_secondary;
     bool m_indeterminate;
-    QQmlAndroidOptional<Style> m_style;
+    QNativeAndroidOptional<Style> m_style;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDPROGRESSBAR_P_H
+#endif // QNATIVEANDROIDPROGRESSBAR_P_H
diff --git a/src/android/widget/qqmlandroidradiobutton.cpp b/src/android/widget/qnativeandroidradiobutton.cpp
index f2361c8..5cce598 100644
--- a/src/android/widget/qqmlandroidradiobutton.cpp
+++ b/src/android/widget/qnativeandroidradiobutton.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidradiobutton_p.h"
+#include "qnativeandroidradiobutton_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidRadioButton::QQmlAndroidRadioButton(QQmlAndroidView *parent) :
-    QQmlAndroidCompoundButton(parent)
+QNativeAndroidRadioButton::QNativeAndroidRadioButton(QNativeAndroidView *parent) :
+    QNativeAndroidCompoundButton(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidRadioButton::onCreate()
+QAndroidJniObject QNativeAndroidRadioButton::onCreate()
 {
     return QAndroidJniObject("android/widget/RadioButton",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidRadioButton::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidRadioButton::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidCompoundButton::onInflate(instance);
+    QNativeAndroidCompoundButton::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qnativeandroidradiobutton_p.h b/src/android/widget/qnativeandroidradiobutton_p.h
new file mode 100644
index 0000000..2ace82f
--- /dev/null
+++ b/src/android/widget/qnativeandroidradiobutton_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt QML Android module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QNATIVEANDROIDRADIOBUTTON_P_H
+#define QNATIVEANDROIDRADIOBUTTON_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQmlAndroid/private/qnativeandroidcompoundbutton_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_QMLANDROID_EXPORT QNativeAndroidRadioButton : public QNativeAndroidCompoundButton
+{
+    Q_OBJECT
+
+public:
+    explicit QNativeAndroidRadioButton(QNativeAndroidView *parent = nullptr);
+
+protected:
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QNATIVEANDROIDRADIOBUTTON_P_H
diff --git a/src/android/widget/qqmlandroidradiogroup.cpp b/src/android/widget/qnativeandroidradiogroup.cpp
index cbe1d45..fd2e1c6 100644
--- a/src/android/widget/qqmlandroidradiogroup.cpp
+++ b/src/android/widget/qnativeandroidradiogroup.cpp
@@ -34,43 +34,43 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidradiogroup_p.h"
-#include "qqmlandroidradiobutton_p.h"
+#include "qnativeandroidradiogroup_p.h"
+#include "qnativeandroidradiobutton_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidRadioGroup::QQmlAndroidRadioGroup(QQmlAndroidView *parent) :
-    QQmlAndroidLinearLayout(parent), m_checkedButton(0)
+QNativeAndroidRadioGroup::QNativeAndroidRadioGroup(QNativeAndroidView *parent) :
+    QNativeAndroidLinearLayout(parent), m_checkedButton(0)
 {
 }
 
-QQmlAndroidRadioButton *QQmlAndroidRadioGroup::checkedButton() const
+QNativeAndroidRadioButton *QNativeAndroidRadioGroup::checkedButton() const
 {
     return m_checkedButton;
 }
 
-void QQmlAndroidRadioGroup::setCheckedButton(QQmlAndroidRadioButton *button)
+void QNativeAndroidRadioGroup::setCheckedButton(QNativeAndroidRadioButton *button)
 {
     if (updateCheckedButton(button))
         QtQmlAndroid::callIntMethod(instance(), "check", button ? button->identifier() : -1);
 }
 
-void QQmlAndroidRadioGroup::clearCheck()
+void QNativeAndroidRadioGroup::clearCheck()
 {
     QtQmlAndroid::callVoidMethod(instance(), "clearCheck");
 }
 
-QAndroidJniObject QQmlAndroidRadioGroup::onCreate()
+QAndroidJniObject QNativeAndroidRadioGroup::onCreate()
 {
     return QAndroidJniObject("android/widget/RadioGroup",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidRadioGroup::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidRadioGroup::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidLinearLayout::onInflate(instance);
+    QNativeAndroidLinearLayout::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/widget/QmlRadioGroupListener",
                                    "(Landroid/widget/RadioGroup;J)V",
@@ -87,7 +87,7 @@ void QQmlAndroidRadioGroup::onInflate(QAndroidJniObject &instance)
     QMetaObject::invokeMethod(this, "updateCheckedButtonId", Qt::QueuedConnection, Q_ARG(int, checkedId));
 }
 
-void QQmlAndroidRadioGroup::onRegisterNativeMethods(jobject listener)
+void QNativeAndroidRadioGroup::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onCheckedChanged", "(JI)V", reinterpret_cast<void *>(onCheckedChanged)}};
 
@@ -97,19 +97,19 @@ void QQmlAndroidRadioGroup::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QQmlAndroidRadioGroup::onCheckedChanged(JNIEnv *env, jobject object, jlong instance, jint checkedId)
+void QNativeAndroidRadioGroup::onCheckedChanged(JNIEnv *env, jobject object, jlong instance, jint checkedId)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidRadioGroup *group = reinterpret_cast<QQmlAndroidRadioGroup *>(instance);
+    QNativeAndroidRadioGroup *group = reinterpret_cast<QNativeAndroidRadioGroup *>(instance);
     if (group)
         QMetaObject::invokeMethod(group, "updateCheckedButtonId", Qt::QueuedConnection, Q_ARG(int, checkedId));
 }
 
-void QQmlAndroidRadioGroup::updateCheckedButtonId(int checkedId)
+void QNativeAndroidRadioGroup::updateCheckedButtonId(int checkedId)
 {
     foreach (QObject *child, QObject::children()) {
-        QQmlAndroidRadioButton *button = qobject_cast<QQmlAndroidRadioButton *>(child);
+        QNativeAndroidRadioButton *button = qobject_cast<QNativeAndroidRadioButton *>(child);
         if (button && button->identifier() == checkedId) {
             updateCheckedButton(button);
             return;
@@ -118,7 +118,7 @@ void QQmlAndroidRadioGroup::updateCheckedButtonId(int checkedId)
     updateCheckedButton(0);
 }
 
-bool QQmlAndroidRadioGroup::updateCheckedButton(QQmlAndroidRadioButton *button)
+bool QNativeAndroidRadioGroup::updateCheckedButton(QNativeAndroidRadioButton *button)
 {
     if (m_checkedButton != button) {
         m_checkedButton = button;
diff --git a/src/android/widget/qqmlandroidradiogroup_p.h b/src/android/widget/qnativeandroidradiogroup_p.h
index 8b4cb7a..dab3b40 100644
--- a/src/android/widget/qqmlandroidradiogroup_p.h
+++ b/src/android/widget/qnativeandroidradiogroup_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDRADIOGROUP_P_H
-#define QQMLANDROIDRADIOGROUP_P_H
+#ifndef QNATIVEANDROIDRADIOGROUP_P_H
+#define QNATIVEANDROIDRADIOGROUP_P_H
 
 //
 //  W A R N I N G
@@ -48,22 +48,22 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidlinearlayout_p.h>
+#include <QtQmlAndroid/private/qnativeandroidlinearlayout_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQmlAndroidRadioButton;
+class QNativeAndroidRadioButton;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidRadioGroup : public QQmlAndroidLinearLayout
+class Q_QMLANDROID_EXPORT QNativeAndroidRadioGroup : public QNativeAndroidLinearLayout
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlAndroidRadioButton *checkedButton READ checkedButton WRITE setCheckedButton NOTIFY checkedButtonChanged)
+    Q_PROPERTY(QNativeAndroidRadioButton *checkedButton READ checkedButton WRITE setCheckedButton NOTIFY checkedButtonChanged)
 
 public:
-    explicit QQmlAndroidRadioGroup(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidRadioGroup(QNativeAndroidView *parent = nullptr);
 
-    QQmlAndroidRadioButton *checkedButton() const;
-    void setCheckedButton(QQmlAndroidRadioButton *button);
+    QNativeAndroidRadioButton *checkedButton() const;
+    void setCheckedButton(QNativeAndroidRadioButton *button);
 
 public Q_SLOTS:
     void clearCheck();
@@ -80,13 +80,13 @@ protected:
 
 private Q_SLOTS:
     void updateCheckedButtonId(int checkedId);
-    bool updateCheckedButton(QQmlAndroidRadioButton *button);
+    bool updateCheckedButton(QNativeAndroidRadioButton *button);
 
 private:
     QAndroidJniObject m_listener;
-    QQmlAndroidRadioButton* m_checkedButton;
+    QNativeAndroidRadioButton* m_checkedButton;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDRADIOGROUP_P_H
+#endif // QNATIVEANDROIDRADIOGROUP_P_H
diff --git a/src/android/widget/qqmlandroidratingbar.cpp b/src/android/widget/qnativeandroidratingbar.cpp
index 1d4b1b9..4ef126b 100644
--- a/src/android/widget/qqmlandroidratingbar.cpp
+++ b/src/android/widget/qnativeandroidratingbar.cpp
@@ -34,28 +34,28 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidratingbar_p.h"
+#include "qnativeandroidratingbar_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidRatingBar::QQmlAndroidRatingBar(QQmlAndroidView *parent) :
-    QQmlAndroidAbsSeekBar(parent), m_rating(0.0)
+QNativeAndroidRatingBar::QNativeAndroidRatingBar(QNativeAndroidView *parent) :
+    QNativeAndroidAbsSeekBar(parent), m_rating(0.0)
 {
 }
 
-qreal QQmlAndroidRatingBar::rating() const
+qreal QNativeAndroidRatingBar::rating() const
 {
     return m_rating;
 }
 
-void QQmlAndroidRatingBar::setRating(qreal rating)
+void QNativeAndroidRatingBar::setRating(qreal rating)
 {
     if (updateRating(rating))
         QtQmlAndroid::callRealMethod(instance(), "setRating", rating);
 }
 
-bool QQmlAndroidRatingBar::updateRating(qreal rating)
+bool QNativeAndroidRatingBar::updateRating(qreal rating)
 {
     if (!qFuzzyCompare(m_rating, rating)) {
         m_rating = rating;
@@ -65,16 +65,16 @@ bool QQmlAndroidRatingBar::updateRating(qreal rating)
     return false;
 }
 
-QAndroidJniObject QQmlAndroidRatingBar::onCreate()
+QAndroidJniObject QNativeAndroidRatingBar::onCreate()
 {
     return QAndroidJniObject("android/widget/RatingBar",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidRatingBar::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidRatingBar::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidAbsSeekBar::onInflate(instance);
+    QNativeAndroidAbsSeekBar::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/widget/QmlRatingBarListener",
                                    "(Landroid/widget/RatingBar;J)V",
@@ -90,7 +90,7 @@ void QQmlAndroidRatingBar::onInflate(QAndroidJniObject &instance)
     instance.callMethod<void>("setRating", "(F)V", m_rating);
 }
 
-void QQmlAndroidRatingBar::onRegisterNativeMethods(jobject listener)
+void QNativeAndroidRatingBar::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onRatingChanged", "(JFZ)V", reinterpret_cast<void *>(onRatingChanged)}};
 
@@ -100,11 +100,11 @@ void QQmlAndroidRatingBar::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QQmlAndroidRatingBar::onRatingChanged(JNIEnv *env, jobject object, jlong instance, jfloat rating, jboolean fromUser)
+void QNativeAndroidRatingBar::onRatingChanged(JNIEnv *env, jobject object, jlong instance, jfloat rating, jboolean fromUser)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidRatingBar *bar = reinterpret_cast<QQmlAndroidRatingBar *>(instance);
+    QNativeAndroidRatingBar *bar = reinterpret_cast<QNativeAndroidRatingBar *>(instance);
     if (bar && fromUser)
         QMetaObject::invokeMethod(bar, "updateRating", Qt::QueuedConnection, Q_ARG(qreal, rating));
 }
diff --git a/src/android/widget/qqmlandroidratingbar_p.h b/src/android/widget/qnativeandroidratingbar_p.h
index 64ec58b..824bba4 100644
--- a/src/android/widget/qqmlandroidratingbar_p.h
+++ b/src/android/widget/qnativeandroidratingbar_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDRATINGBAR_P_H
-#define QQMLANDROIDRATINGBAR_P_H
+#ifndef QNATIVEANDROIDRATINGBAR_P_H
+#define QNATIVEANDROIDRATINGBAR_P_H
 
 //
 //  W A R N I N G
@@ -48,17 +48,17 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidabsseekbar_p.h>
+#include <QtQmlAndroid/private/qnativeandroidabsseekbar_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidRatingBar : public QQmlAndroidAbsSeekBar
+class Q_QMLANDROID_EXPORT QNativeAndroidRatingBar : public QNativeAndroidAbsSeekBar
 {
     Q_OBJECT
     Q_PROPERTY(qreal rating READ rating WRITE setRating NOTIFY ratingChanged)
 
 public:
-    explicit QQmlAndroidRatingBar(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidRatingBar(QNativeAndroidView *parent = nullptr);
 
     qreal rating() const;
     void setRating(qreal rating);
@@ -83,4 +83,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDRATINGBAR_P_H
+#endif // QNATIVEANDROIDRATINGBAR_P_H
diff --git a/src/android/widget/qqmlandroidrelativelayout.cpp b/src/android/widget/qnativeandroidrelativelayout.cpp
index a1b418c..2161f90 100644
--- a/src/android/widget/qqmlandroidrelativelayout.cpp
+++ b/src/android/widget/qnativeandroidrelativelayout.cpp
@@ -34,33 +34,33 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidrelativelayout_p.h"
+#include "qnativeandroidrelativelayout_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidRelativeLayout::QQmlAndroidRelativeLayout(QQmlAndroidView *parent) :
-    QQmlAndroidViewGroup(parent)
+QNativeAndroidRelativeLayout::QNativeAndroidRelativeLayout(QNativeAndroidView *parent) :
+    QNativeAndroidViewGroup(parent)
 {
 }
 
-QQmlAndroidRelativeLayoutParams *QQmlAndroidRelativeLayout::qmlAttachedProperties(QObject *object)
+QNativeAndroidRelativeLayoutParams *QNativeAndroidRelativeLayout::qmlAttachedProperties(QObject *object)
 {
-    QQmlAndroidView *view = qobject_cast<QQmlAndroidView*>(object);
+    QNativeAndroidView *view = qobject_cast<QNativeAndroidView*>(object);
     if (view)
-        return new QQmlAndroidRelativeLayoutParams(view);
+        return new QNativeAndroidRelativeLayoutParams(view);
     return 0;
 }
 
-QAndroidJniObject QQmlAndroidRelativeLayout::onCreate()
+QAndroidJniObject QNativeAndroidRelativeLayout::onCreate()
 {
     return QAndroidJniObject("android/widget/RelativeLayout",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidRelativeLayout::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidRelativeLayout::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidViewGroup::onInflate(instance);
+    QNativeAndroidViewGroup::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qqmlandroidrelativelayout_p.h b/src/android/widget/qnativeandroidrelativelayout_p.h
index 4a3ed3b..474ce96 100644
--- a/src/android/widget/qqmlandroidrelativelayout_p.h
+++ b/src/android/widget/qnativeandroidrelativelayout_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDRELATIVELAYOUT_P_H
-#define QQMLANDROIDRELATIVELAYOUT_P_H
+#ifndef QNATIVEANDROIDRELATIVELAYOUT_P_H
+#define QNATIVEANDROIDRELATIVELAYOUT_P_H
 
 //
 //  W A R N I N G
@@ -48,19 +48,19 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidviewgroup_p.h>
-#include <QtQmlAndroid/private/qqmlandroidrelativelayoutparams_p.h>
+#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h>
+#include <QtQmlAndroid/private/qnativeandroidrelativelayoutparams_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidRelativeLayout : public QQmlAndroidViewGroup
+class Q_QMLANDROID_EXPORT QNativeAndroidRelativeLayout : public QNativeAndroidViewGroup
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidRelativeLayout(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidRelativeLayout(QNativeAndroidView *parent = nullptr);
 
-    static QQmlAndroidRelativeLayoutParams *qmlAttachedProperties(QObject *object);
+    static QNativeAndroidRelativeLayoutParams *qmlAttachedProperties(QObject *object);
 
     enum Verb {
         LEFT_OF                  = 0,
@@ -94,6 +94,6 @@ protected:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QQmlAndroidRelativeLayout, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QNativeAndroidRelativeLayout, QML_HAS_ATTACHED_PROPERTIES)
 
-#endif // QQMLANDROIDRELATIVELAYOUT_P_H
+#endif // QNATIVEANDROIDRELATIVELAYOUT_P_H
diff --git a/src/android/widget/qqmlandroidrelativelayoutparams.cpp b/src/android/widget/qnativeandroidrelativelayoutparams.cpp
index 890b921..4590346 100644
--- a/src/android/widget/qqmlandroidrelativelayoutparams.cpp
+++ b/src/android/widget/qnativeandroidrelativelayoutparams.cpp
@@ -34,14 +34,14 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidrelativelayoutparams_p.h"
-#include "qqmlandroidrelativelayout_p.h"
-#include "qqmlandroidview_p.h"
+#include "qnativeandroidrelativelayoutparams_p.h"
+#include "qnativeandroidrelativelayout_p.h"
+#include "qnativeandroidview_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidRelativeLayoutParams::QQmlAndroidRelativeLayoutParams(QQmlAndroidView *view) :
-    QQmlAndroidMarginLayoutParams(view),
+QNativeAndroidRelativeLayoutParams::QNativeAndroidRelativeLayoutParams(QNativeAndroidView *view) :
+    QNativeAndroidMarginLayoutParams(view),
     m_above(0),
     m_below(0),
     m_alignTop(0),
@@ -68,12 +68,12 @@ QQmlAndroidRelativeLayoutParams::QQmlAndroidRelativeLayoutParams(QQmlAndroidView
 {
 }
 
-QQmlAndroidView *QQmlAndroidRelativeLayoutParams::above() const
+QNativeAndroidView *QNativeAndroidRelativeLayoutParams::above() const
 {
     return m_above;
 }
 
-void QQmlAndroidRelativeLayoutParams::setAbove(QQmlAndroidView *view)
+void QNativeAndroidRelativeLayoutParams::setAbove(QNativeAndroidView *view)
 {
     if (view != m_above) {
         m_above = view;
@@ -82,12 +82,12 @@ void QQmlAndroidRelativeLayoutParams::setAbove(QQmlAndroidView *view)
     }
 }
 
-QQmlAndroidView *QQmlAndroidRelativeLayoutParams::below() const
+QNativeAndroidView *QNativeAndroidRelativeLayoutParams::below() const
 {
     return m_below;
 }
 
-void QQmlAndroidRelativeLayoutParams::setBelow(QQmlAndroidView *view)
+void QNativeAndroidRelativeLayoutParams::setBelow(QNativeAndroidView *view)
 {
     if (view != m_below) {
         m_below = view;
@@ -96,12 +96,12 @@ void QQmlAndroidRelativeLayoutParams::setBelow(QQmlAndroidView *view)
     }
 }
 
-QQmlAndroidView *QQmlAndroidRelativeLayoutParams::alignTop() const
+QNativeAndroidView *QNativeAndroidRelativeLayoutParams::alignTop() const
 {
     return m_alignTop;
 }
 
-void QQmlAndroidRelativeLayoutParams::setAlignTop(QQmlAndroidView *view)
+void QNativeAndroidRelativeLayoutParams::setAlignTop(QNativeAndroidView *view)
 {
     if (view != m_alignTop) {
         m_alignTop = view;
@@ -110,12 +110,12 @@ void QQmlAndroidRelativeLayoutParams::setAlignTop(QQmlAndroidView *view)
     }
 }
 
-QQmlAndroidView *QQmlAndroidRelativeLayoutParams::alignLeft() const
+QNativeAndroidView *QNativeAndroidRelativeLayoutParams::alignLeft() const
 {
     return m_alignLeft;
 }
 
-void QQmlAndroidRelativeLayoutParams::setAlignLeft(QQmlAndroidView *view)
+void QNativeAndroidRelativeLayoutParams::setAlignLeft(QNativeAndroidView *view)
 {
     if (view != m_alignLeft) {
         m_alignLeft = view;
@@ -124,12 +124,12 @@ void QQmlAndroidRelativeLayoutParams::setAlignLeft(QQmlAndroidView *view)
     }
 }
 
-QQmlAndroidView *QQmlAndroidRelativeLayoutParams::alignRight() const
+QNativeAndroidView *QNativeAndroidRelativeLayoutParams::alignRight() const
 {
     return m_alignRight;
 }
 
-void QQmlAndroidRelativeLayoutParams::setAlignRight(QQmlAndroidView *view)
+void QNativeAndroidRelativeLayoutParams::setAlignRight(QNativeAndroidView *view)
 {
     if (view != m_alignRight) {
         m_alignRight = view;
@@ -138,12 +138,12 @@ void QQmlAndroidRelativeLayoutParams::setAlignRight(QQmlAndroidView *view)
     }
 }
 
-QQmlAndroidView *QQmlAndroidRelativeLayoutParams::alignBottom() const
+QNativeAndroidView *QNativeAndroidRelativeLayoutParams::alignBottom() const
 {
     return m_alignBottom;
 }
 
-void QQmlAndroidRelativeLayoutParams::setAlignBottom(QQmlAndroidView *view)
+void QNativeAndroidRelativeLayoutParams::setAlignBottom(QNativeAndroidView *view)
 {
     if (view != m_alignBottom) {
         m_alignBottom = view;
@@ -152,12 +152,12 @@ void QQmlAndroidRelativeLayoutParams::setAlignBottom(QQmlAndroidView *view)
     }
 }
 
-QQmlAndroidView *QQmlAndroidRelativeLayoutParams::alignStart() const
+QNativeAndroidView *QNativeAndroidRelativeLayoutParams::alignStart() const
 {
     return m_alignStart;
 }
 
-void QQmlAndroidRelativeLayoutParams::setAlignStart(QQmlAndroidView *view)
+void QNativeAndroidRelativeLayoutParams::setAlignStart(QNativeAndroidView *view)
 {
     if (view != m_alignStart) {
         m_alignStart = view;
@@ -166,12 +166,12 @@ void QQmlAndroidRelativeLayoutParams::setAlignStart(QQmlAndroidView *view)
     }
 }
 
-QQmlAndroidView *QQmlAndroidRelativeLayoutParams::alignEnd() const
+QNativeAndroidView *QNativeAndroidRelativeLayoutParams::alignEnd() const
 {
     return m_alignEnd;
 }
 
-void QQmlAndroidRelativeLayoutParams::setAlignEnd(QQmlAndroidView *view)
+void QNativeAndroidRelativeLayoutParams::setAlignEnd(QNativeAndroidView *view)
 {
     if (view != m_alignEnd) {
         m_alignEnd = view;
@@ -180,12 +180,12 @@ void QQmlAndroidRelativeLayoutParams::setAlignEnd(QQmlAndroidView *view)
     }
 }
 
-QQmlAndroidView *QQmlAndroidRelativeLayoutParams::alignBaseline() const
+QNativeAndroidView *QNativeAndroidRelativeLayoutParams::alignBaseline() const
 {
     return m_alignBaseline;
 }
 
-void QQmlAndroidRelativeLayoutParams::setAlignBaseline(QQmlAndroidView *view)
+void QNativeAndroidRelativeLayoutParams::setAlignBaseline(QNativeAndroidView *view)
 {
     if (view != m_alignBaseline) {
         m_alignBaseline = view;
@@ -194,12 +194,12 @@ void QQmlAndroidRelativeLayoutParams::setAlignBaseline(QQmlAndroidView *view)
     }
 }
 
-QQmlAndroidView *QQmlAndroidRelativeLayoutParams::toLeftOf() const
+QNativeAndroidView *QNativeAndroidRelativeLayoutParams::toLeftOf() const
 {
     return m_toLeftOf;
 }
 
-void QQmlAndroidRelativeLayoutParams::setToLeftOf(QQmlAndroidView *view)
+void QNativeAndroidRelativeLayoutParams::setToLeftOf(QNativeAndroidView *view)
 {
     if (view != m_toLeftOf) {
         m_toLeftOf = view;
@@ -208,12 +208,12 @@ void QQmlAndroidRelativeLayoutParams::setToLeftOf(QQmlAndroidView *view)
     }
 }
 
-QQmlAndroidView *QQmlAndroidRelativeLayoutParams::toRightOf() const
+QNativeAndroidView *QNativeAndroidRelativeLayoutParams::toRightOf() const
 {
     return m_toRightOf;
 }
 
-void QQmlAndroidRelativeLayoutParams::setToRightOf(QQmlAndroidView *view)
+void QNativeAndroidRelativeLayoutParams::setToRightOf(QNativeAndroidView *view)
 {
     if (view != m_toRightOf) {
         m_toRightOf = view;
@@ -222,12 +222,12 @@ void QQmlAndroidRelativeLayoutParams::setToRightOf(QQmlAndroidView *view)
     }
 }
 
-QQmlAndroidView *QQmlAndroidRelativeLayoutParams::toStartOf() const
+QNativeAndroidView *QNativeAndroidRelativeLayoutParams::toStartOf() const
 {
     return m_toStartOf;
 }
 
-void QQmlAndroidRelativeLayoutParams::setToStartOf(QQmlAndroidView *view)
+void QNativeAndroidRelativeLayoutParams::setToStartOf(QNativeAndroidView *view)
 {
     if (view != m_toStartOf) {
         m_toStartOf = view;
@@ -236,12 +236,12 @@ void QQmlAndroidRelativeLayoutParams::setToStartOf(QQmlAndroidView *view)
     }
 }
 
-QQmlAndroidView *QQmlAndroidRelativeLayoutParams::toEndOf() const
+QNativeAndroidView *QNativeAndroidRelativeLayoutParams::toEndOf() const
 {
     return m_toEndOf;
 }
 
-void QQmlAndroidRelativeLayoutParams::setToEndOf(QQmlAndroidView *view)
+void QNativeAndroidRelativeLayoutParams::setToEndOf(QNativeAndroidView *view)
 {
     if (view != m_toEndOf) {
         m_toEndOf = view;
@@ -250,12 +250,12 @@ void QQmlAndroidRelativeLayoutParams::setToEndOf(QQmlAndroidView *view)
     }
 }
 
-bool QQmlAndroidRelativeLayoutParams::alignParentTop() const
+bool QNativeAndroidRelativeLayoutParams::alignParentTop() const
 {
     return m_alignParentTop;
 }
 
-void QQmlAndroidRelativeLayoutParams::setAlignParentTop(bool align)
+void QNativeAndroidRelativeLayoutParams::setAlignParentTop(bool align)
 {
     if (align != alignParentTop()) {
         m_alignParentTop = align;
@@ -264,12 +264,12 @@ void QQmlAndroidRelativeLayoutParams::setAlignParentTop(bool align)
     }
 }
 
-bool QQmlAndroidRelativeLayoutParams::alignParentLeft() const
+bool QNativeAndroidRelativeLayoutParams::alignParentLeft() const
 {
     return m_alignParentLeft;
 }
 
-void QQmlAndroidRelativeLayoutParams::setAlignParentLeft(bool align)
+void QNativeAndroidRelativeLayoutParams::setAlignParentLeft(bool align)
 {
     if (align != alignParentLeft()) {
         m_alignParentLeft = align;
@@ -278,12 +278,12 @@ void QQmlAndroidRelativeLayoutParams::setAlignParentLeft(bool align)
     }
 }
 
-bool QQmlAndroidRelativeLayoutParams::alignParentRight() const
+bool QNativeAndroidRelativeLayoutParams::alignParentRight() const
 {
     return m_alignParentRight;
 }
 
-void QQmlAndroidRelativeLayoutParams::setAlignParentRight(bool align)
+void QNativeAndroidRelativeLayoutParams::setAlignParentRight(bool align)
 {
     if (align != alignParentRight()) {
         m_alignParentRight = align;
@@ -292,12 +292,12 @@ void QQmlAndroidRelativeLayoutParams::setAlignParentRight(bool align)
     }
 }
 
-bool QQmlAndroidRelativeLayoutParams::alignParentBottom() const
+bool QNativeAndroidRelativeLayoutParams::alignParentBottom() const
 {
     return m_alignParentBottom;
 }
 
-void QQmlAndroidRelativeLayoutParams::setAlignParentBottom(bool align)
+void QNativeAndroidRelativeLayoutParams::setAlignParentBottom(bool align)
 {
     if (align != alignParentBottom()) {
         m_alignParentBottom = align;
@@ -306,12 +306,12 @@ void QQmlAndroidRelativeLayoutParams::setAlignParentBottom(bool align)
     }
 }
 
-bool QQmlAndroidRelativeLayoutParams::alignParentStart() const
+bool QNativeAndroidRelativeLayoutParams::alignParentStart() const
 {
     return m_alignParentStart;
 }
 
-void QQmlAndroidRelativeLayoutParams::setAlignParentStart(bool align)
+void QNativeAndroidRelativeLayoutParams::setAlignParentStart(bool align)
 {
     if (align != alignParentStart()) {
         m_alignParentStart = align;
@@ -320,12 +320,12 @@ void QQmlAndroidRelativeLayoutParams::setAlignParentStart(bool align)
     }
 }
 
-bool QQmlAndroidRelativeLayoutParams::alignParentEnd() const
+bool QNativeAndroidRelativeLayoutParams::alignParentEnd() const
 {
     return m_alignParentEnd;
 }
 
-void QQmlAndroidRelativeLayoutParams::setAlignParentEnd(bool align)
+void QNativeAndroidRelativeLayoutParams::setAlignParentEnd(bool align)
 {
     if (align != alignParentEnd()) {
         m_alignParentEnd = align;
@@ -334,12 +334,12 @@ void QQmlAndroidRelativeLayoutParams::setAlignParentEnd(bool align)
     }
 }
 
-bool QQmlAndroidRelativeLayoutParams::alignWithParent() const
+bool QNativeAndroidRelativeLayoutParams::alignWithParent() const
 {
     return m_alignWithParent;
 }
 
-void QQmlAndroidRelativeLayoutParams::setAlignWithParent(bool align)
+void QNativeAndroidRelativeLayoutParams::setAlignWithParent(bool align)
 {
     if (align != alignWithParent()) {
         m_alignWithParent = align;
@@ -348,12 +348,12 @@ void QQmlAndroidRelativeLayoutParams::setAlignWithParent(bool align)
     }
 }
 
-bool QQmlAndroidRelativeLayoutParams::centerHorizontal() const
+bool QNativeAndroidRelativeLayoutParams::centerHorizontal() const
 {
     return m_centerHorizontal;
 }
 
-void QQmlAndroidRelativeLayoutParams::setCenterHorizontal(bool center)
+void QNativeAndroidRelativeLayoutParams::setCenterHorizontal(bool center)
 {
     if (center != centerHorizontal()) {
         m_centerHorizontal = center;
@@ -362,12 +362,12 @@ void QQmlAndroidRelativeLayoutParams::setCenterHorizontal(bool center)
     }
 }
 
-bool QQmlAndroidRelativeLayoutParams::centerVertical() const
+bool QNativeAndroidRelativeLayoutParams::centerVertical() const
 {
     return m_centerVertical;
 }
 
-void QQmlAndroidRelativeLayoutParams::setCenterVertical(bool center)
+void QNativeAndroidRelativeLayoutParams::setCenterVertical(bool center)
 {
     if (center != centerVertical()) {
         m_centerVertical = center;
@@ -376,12 +376,12 @@ void QQmlAndroidRelativeLayoutParams::setCenterVertical(bool center)
     }
 }
 
-bool QQmlAndroidRelativeLayoutParams::centerInParent() const
+bool QNativeAndroidRelativeLayoutParams::centerInParent() const
 {
     return m_centerInParent;
 }
 
-void QQmlAndroidRelativeLayoutParams::setCenterInParent(bool center)
+void QNativeAndroidRelativeLayoutParams::setCenterInParent(bool center)
 {
     if (center != centerInParent()) {
         m_centerInParent = center;
@@ -390,14 +390,14 @@ void QQmlAndroidRelativeLayoutParams::setCenterInParent(bool center)
     }
 }
 
-QAndroidJniObject QQmlAndroidRelativeLayoutParams::onCreate()
+QAndroidJniObject QNativeAndroidRelativeLayoutParams::onCreate()
 {
     return QAndroidJniObject("android/widget/RelativeLayout$LayoutParams",
                              "(II)V",
                              WRAP_CONTENT, WRAP_CONTENT);
 }
 
-static void addRule(QAndroidJniObject& instance, QQmlAndroidView *view, QQmlAndroidRelativeLayout::Verb verb)
+static void addRule(QAndroidJniObject& instance, QNativeAndroidView *view, QNativeAndroidRelativeLayout::Verb verb)
 {
     if (view) {
         int anchor = view->instance().callMethod<jint>("getId");
@@ -405,41 +405,41 @@ static void addRule(QAndroidJniObject& instance, QQmlAndroidView *view, QQmlAndr
     }
 }
 
-static void addRule(QAndroidJniObject &instance, bool value, QQmlAndroidRelativeLayout::Verb verb)
+static void addRule(QAndroidJniObject &instance, bool value, QNativeAndroidRelativeLayout::Verb verb)
 {
     if (value)
         instance.callMethod<void>("addRule", "(I)V", verb);
 }
 
-void QQmlAndroidRelativeLayoutParams::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidRelativeLayoutParams::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidMarginLayoutParams::onInflate(instance);
+    QNativeAndroidMarginLayoutParams::onInflate(instance);
 
     instance.setField<jboolean>("alignWithParent", m_alignWithParent);
 
-    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);
+    addRule(instance, m_above, QNativeAndroidRelativeLayout::ABOVE);
+    addRule(instance, m_below, QNativeAndroidRelativeLayout::BELOW);
+    addRule(instance, m_alignTop, QNativeAndroidRelativeLayout::ALIGN_TOP);
+    addRule(instance, m_alignLeft, QNativeAndroidRelativeLayout::ALIGN_LEFT);
+    addRule(instance, m_alignRight, QNativeAndroidRelativeLayout::ALIGN_RIGHT);
+    addRule(instance, m_alignBottom, QNativeAndroidRelativeLayout::ALIGN_BOTTOM);
+    addRule(instance, m_alignStart, QNativeAndroidRelativeLayout::ALIGN_START);
+    addRule(instance, m_alignEnd, QNativeAndroidRelativeLayout::ALIGN_END);
+    addRule(instance, m_alignBaseline, QNativeAndroidRelativeLayout::ALIGN_BASELINE);
+    addRule(instance, m_toLeftOf, QNativeAndroidRelativeLayout::LEFT_OF);
+    addRule(instance, m_toRightOf, QNativeAndroidRelativeLayout::RIGHT_OF);
+    addRule(instance, m_toStartOf, QNativeAndroidRelativeLayout::START_OF);
+    addRule(instance, m_toEndOf, QNativeAndroidRelativeLayout::END_OF);
+
+    addRule(instance, m_alignParentTop, QNativeAndroidRelativeLayout::ALIGN_PARENT_TOP);
+    addRule(instance, m_alignParentLeft, QNativeAndroidRelativeLayout::ALIGN_PARENT_LEFT);
+    addRule(instance, m_alignParentRight, QNativeAndroidRelativeLayout::ALIGN_PARENT_RIGHT);
+    addRule(instance, m_alignParentBottom, QNativeAndroidRelativeLayout::ALIGN_PARENT_BOTTOM);
+    addRule(instance, m_alignParentStart, QNativeAndroidRelativeLayout::ALIGN_PARENT_START);
+    addRule(instance, m_alignParentEnd, QNativeAndroidRelativeLayout::ALIGN_PARENT_END);
+    addRule(instance, m_centerHorizontal, QNativeAndroidRelativeLayout::CENTER_HORIZONTAL);
+    addRule(instance, m_centerVertical, QNativeAndroidRelativeLayout::CENTER_VERTICAL);
+    addRule(instance, m_centerInParent, QNativeAndroidRelativeLayout::CENTER_IN_PARENT);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qqmlandroidrelativelayoutparams_p.h b/src/android/widget/qnativeandroidrelativelayoutparams_p.h
index 332eaf7..9607559 100644
--- a/src/android/widget/qqmlandroidrelativelayoutparams_p.h
+++ b/src/android/widget/qnativeandroidrelativelayoutparams_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDRELATIVELAYOUTPARAMS_P_H
-#define QQMLANDROIDRELATIVELAYOUTPARAMS_P_H
+#ifndef QNATIVEANDROIDRELATIVELAYOUTPARAMS_P_H
+#define QNATIVEANDROIDRELATIVELAYOUTPARAMS_P_H
 
 //
 //  W A R N I N G
@@ -48,26 +48,26 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidmarginlayoutparams_p.h>
+#include <QtQmlAndroid/private/qnativeandroidmarginlayoutparams_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidRelativeLayoutParams : public QQmlAndroidMarginLayoutParams
+class Q_QMLANDROID_EXPORT QNativeAndroidRelativeLayoutParams : public QNativeAndroidMarginLayoutParams
 {
     Q_OBJECT
-    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(QNativeAndroidView *above READ above WRITE setAbove NOTIFY aboveChanged)
+    Q_PROPERTY(QNativeAndroidView *below READ below WRITE setBelow NOTIFY belowChanged)
+    Q_PROPERTY(QNativeAndroidView *alignTop READ alignTop WRITE setAlignTop NOTIFY alignTopChanged)
+    Q_PROPERTY(QNativeAndroidView *alignLeft READ alignLeft WRITE setAlignLeft NOTIFY alignLeftChanged)
+    Q_PROPERTY(QNativeAndroidView *alignRight READ alignRight WRITE setAlignRight NOTIFY alignRightChanged)
+    Q_PROPERTY(QNativeAndroidView *alignBottom READ alignBottom WRITE setAlignBottom NOTIFY alignBottomChanged)
+    Q_PROPERTY(QNativeAndroidView *alignStart READ alignStart WRITE setAlignStart NOTIFY alignStartChanged)
+    Q_PROPERTY(QNativeAndroidView *alignEnd READ alignEnd WRITE setAlignEnd NOTIFY alignEndChanged)
+    Q_PROPERTY(QNativeAndroidView *alignBaseline READ alignBaseline WRITE setAlignBaseline NOTIFY alignBaselineChanged)
+    Q_PROPERTY(QNativeAndroidView *toLeftOf READ toLeftOf WRITE setToLeftOf NOTIFY toLeftOfChanged)
+    Q_PROPERTY(QNativeAndroidView *toRightOf READ toRightOf WRITE setToRightOf NOTIFY toRightOfChanged)
+    Q_PROPERTY(QNativeAndroidView *toStartOf READ toStartOf WRITE setToStartOf NOTIFY toStartOfChanged)
+    Q_PROPERTY(QNativeAndroidView *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)
@@ -80,46 +80,46 @@ class Q_QMLANDROID_EXPORT QQmlAndroidRelativeLayoutParams : public QQmlAndroidMa
     Q_PROPERTY(bool centerInParent READ centerInParent WRITE setCenterInParent NOTIFY centerInParentChanged)
 
 public:
-    explicit QQmlAndroidRelativeLayoutParams(QQmlAndroidView *view);
+    explicit QNativeAndroidRelativeLayoutParams(QNativeAndroidView *view);
 
-    QQmlAndroidView *above() const;
-    void setAbove(QQmlAndroidView *view);
+    QNativeAndroidView *above() const;
+    void setAbove(QNativeAndroidView *view);
 
-    QQmlAndroidView *below() const;
-    void setBelow(QQmlAndroidView *view);
+    QNativeAndroidView *below() const;
+    void setBelow(QNativeAndroidView *view);
 
-    QQmlAndroidView *alignTop() const;
-    void setAlignTop(QQmlAndroidView *view);
+    QNativeAndroidView *alignTop() const;
+    void setAlignTop(QNativeAndroidView *view);
 
-    QQmlAndroidView *alignLeft() const;
-    void setAlignLeft(QQmlAndroidView *view);
+    QNativeAndroidView *alignLeft() const;
+    void setAlignLeft(QNativeAndroidView *view);
 
-    QQmlAndroidView *alignRight() const;
-    void setAlignRight(QQmlAndroidView *view);
+    QNativeAndroidView *alignRight() const;
+    void setAlignRight(QNativeAndroidView *view);
 
-    QQmlAndroidView *alignBottom() const;
-    void setAlignBottom(QQmlAndroidView *view);
+    QNativeAndroidView *alignBottom() const;
+    void setAlignBottom(QNativeAndroidView *view);
 
-    QQmlAndroidView *alignStart() const;
-    void setAlignStart(QQmlAndroidView *view);
+    QNativeAndroidView *alignStart() const;
+    void setAlignStart(QNativeAndroidView *view);
 
-    QQmlAndroidView *alignEnd() const;
-    void setAlignEnd(QQmlAndroidView *view);
+    QNativeAndroidView *alignEnd() const;
+    void setAlignEnd(QNativeAndroidView *view);
 
-    QQmlAndroidView *alignBaseline() const;
-    void setAlignBaseline(QQmlAndroidView *view);
+    QNativeAndroidView *alignBaseline() const;
+    void setAlignBaseline(QNativeAndroidView *view);
 
-    QQmlAndroidView *toLeftOf() const;
-    void setToLeftOf(QQmlAndroidView *view);
+    QNativeAndroidView *toLeftOf() const;
+    void setToLeftOf(QNativeAndroidView *view);
 
-    QQmlAndroidView *toRightOf() const;
-    void setToRightOf(QQmlAndroidView *view);
+    QNativeAndroidView *toRightOf() const;
+    void setToRightOf(QNativeAndroidView *view);
 
-    QQmlAndroidView *toStartOf() const;
-    void setToStartOf(QQmlAndroidView *view);
+    QNativeAndroidView *toStartOf() const;
+    void setToStartOf(QNativeAndroidView *view);
 
-    QQmlAndroidView *toEndOf() const;
-    void setToEndOf(QQmlAndroidView *view);
+    QNativeAndroidView *toEndOf() const;
+    void setToEndOf(QNativeAndroidView *view);
 
     bool alignParentTop() const;
     void setAlignParentTop(bool align);
@@ -182,19 +182,19 @@ protected:
     void onInflate(QAndroidJniObject &instance) override;
 
 private:
-    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;
+    QNativeAndroidView *m_above;
+    QNativeAndroidView *m_below;
+    QNativeAndroidView *m_alignTop;
+    QNativeAndroidView *m_alignLeft;
+    QNativeAndroidView *m_alignRight;
+    QNativeAndroidView *m_alignBottom;
+    QNativeAndroidView *m_alignStart;
+    QNativeAndroidView *m_alignEnd;
+    QNativeAndroidView *m_alignBaseline;
+    QNativeAndroidView *m_toLeftOf;
+    QNativeAndroidView *m_toRightOf;
+    QNativeAndroidView *m_toStartOf;
+    QNativeAndroidView *m_toEndOf;
 
     bool m_alignParentTop;
     bool m_alignParentLeft;
@@ -210,4 +210,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDRELATIVELAYOUTPARAMS_P_H
+#endif // QNATIVEANDROIDRELATIVELAYOUTPARAMS_P_H
diff --git a/src/android/widget/qqmlandroidscrollview.cpp b/src/android/widget/qnativeandroidscrollview.cpp
index 5c1f9b0..6d66764 100644
--- a/src/android/widget/qqmlandroidscrollview.cpp
+++ b/src/android/widget/qnativeandroidscrollview.cpp
@@ -34,30 +34,30 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidscrollview_p.h"
+#include "qnativeandroidscrollview_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidScrollView::QQmlAndroidScrollView(QQmlAndroidView *parent) :
-    QQmlAndroidFrameLayout(parent)
+QNativeAndroidScrollView::QNativeAndroidScrollView(QNativeAndroidView *parent) :
+    QNativeAndroidFrameLayout(parent)
 {
 }
 
-int QQmlAndroidScrollView::scrollX() const
+int QNativeAndroidScrollView::scrollX() const
 {
     if (m_scrollX.isNull())
         return 0;
     return m_scrollX;
 }
 
-void QQmlAndroidScrollView::setScrollX(int x)
+void QNativeAndroidScrollView::setScrollX(int x)
 {
     if (updateScrollX(x))
         QtQmlAndroid::callIntMethod(instance(), "setScrollX", x);
 }
 
-bool QQmlAndroidScrollView::updateScrollX(int x)
+bool QNativeAndroidScrollView::updateScrollX(int x)
 {
     if (m_scrollX.isNull() || m_scrollX != x) {
         m_scrollX = x;
@@ -66,20 +66,20 @@ bool QQmlAndroidScrollView::updateScrollX(int x)
     return false;
 }
 
-int QQmlAndroidScrollView::scrollY() const
+int QNativeAndroidScrollView::scrollY() const
 {
     if (m_scrollY.isNull())
         return 0;
     return m_scrollY;
 }
 
-void QQmlAndroidScrollView::setScrollY(int y)
+void QNativeAndroidScrollView::setScrollY(int y)
 {
     if (updateScrollY(y))
         QtQmlAndroid::callIntMethod(instance(), "setScrollY", y);
 }
 
-bool QQmlAndroidScrollView::updateScrollY(int y)
+bool QNativeAndroidScrollView::updateScrollY(int y)
 {
     if (m_scrollY.isNull() || m_scrollY != y) {
         m_scrollY = y;
@@ -88,7 +88,7 @@ bool QQmlAndroidScrollView::updateScrollY(int y)
     return false;
 }
 
-QAndroidJniObject QQmlAndroidScrollView::onCreate()
+QAndroidJniObject QNativeAndroidScrollView::onCreate()
 {
     return QAndroidJniObject("qt/android/widget/QmlScrollView",
                              "(Landroid/content/Context;J)V",
@@ -96,9 +96,9 @@ QAndroidJniObject QQmlAndroidScrollView::onCreate()
                              reinterpret_cast<jlong>(this));
 }
 
-void QQmlAndroidScrollView::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidScrollView::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidFrameLayout::onInflate(instance);
+    QNativeAndroidFrameLayout::onInflate(instance);
 
     static bool nativeMethodsRegistered = false;
     if (!nativeMethodsRegistered) {
@@ -107,7 +107,7 @@ void QQmlAndroidScrollView::onInflate(QAndroidJniObject &instance)
     }
 }
 
-void QQmlAndroidScrollView::onRegisterNativeMethods(jobject listener)
+void QNativeAndroidScrollView::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onScrollChanged", "(JII)V", reinterpret_cast<void *>(onScrollChanged)}};
 
@@ -117,11 +117,11 @@ void QQmlAndroidScrollView::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QQmlAndroidScrollView::onScrollChanged(JNIEnv *env, jobject object, jlong instance, jint left, jint top)
+void QNativeAndroidScrollView::onScrollChanged(JNIEnv *env, jobject object, jlong instance, jint left, jint top)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidScrollView *view = reinterpret_cast<QQmlAndroidScrollView *>(instance);
+    QNativeAndroidScrollView *view = reinterpret_cast<QNativeAndroidScrollView *>(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/android/widget/qqmlandroidscrollview_p.h b/src/android/widget/qnativeandroidscrollview_p.h
index a7037d1..c477832 100644
--- a/src/android/widget/qqmlandroidscrollview_p.h
+++ b/src/android/widget/qnativeandroidscrollview_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDSCROLLVIEW_P_H
-#define QQMLANDROIDSCROLLVIEW_P_H
+#ifndef QNATIVEANDROIDSCROLLVIEW_P_H
+#define QNATIVEANDROIDSCROLLVIEW_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidframelayout_p.h>
+#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidScrollView : public QQmlAndroidFrameLayout
+class Q_QMLANDROID_EXPORT QNativeAndroidScrollView : public QNativeAndroidFrameLayout
 {
     Q_OBJECT
     Q_PROPERTY(int scrollX READ scrollX WRITE setScrollX NOTIFY scrollXChanged)
     Q_PROPERTY(int scrollY READ scrollY WRITE setScrollY NOTIFY scrollYChanged)
 
 public:
-    explicit QQmlAndroidScrollView(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidScrollView(QNativeAndroidView *parent = nullptr);
 
     int scrollX() const;
     void setScrollX(int x);
@@ -83,10 +83,10 @@ private Q_SLOTS:
     bool updateScrollY(int y);
 
 private:
-    QQmlAndroidOptional<int> m_scrollX;
-    QQmlAndroidOptional<int> m_scrollY;
+    QNativeAndroidOptional<int> m_scrollX;
+    QNativeAndroidOptional<int> m_scrollY;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDSCROLLVIEW_P_H
+#endif // QNATIVEANDROIDSCROLLVIEW_P_H
diff --git a/src/android/widget/qqmlandroidsearchview.cpp b/src/android/widget/qnativeandroidsearchview.cpp
index 45a6769..78ce6b2 100644
--- a/src/android/widget/qqmlandroidsearchview.cpp
+++ b/src/android/widget/qnativeandroidsearchview.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidsearchview_p.h"
+#include "qnativeandroidsearchview_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidSearchView::QQmlAndroidSearchView(QQmlAndroidView *parent) :
-    QQmlAndroidLinearLayout(parent)
+QNativeAndroidSearchView::QNativeAndroidSearchView(QNativeAndroidView *parent) :
+    QNativeAndroidLinearLayout(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidSearchView::onCreate()
+QAndroidJniObject QNativeAndroidSearchView::onCreate()
 {
     return QAndroidJniObject("android/widget/SearchView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidSearchView::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidSearchView::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidLinearLayout::onInflate(instance);
+    QNativeAndroidLinearLayout::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qnativeandroidsearchview_p.h b/src/android/widget/qnativeandroidsearchview_p.h
new file mode 100644
index 0000000..67e382e
--- /dev/null
+++ b/src/android/widget/qnativeandroidsearchview_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt QML Android module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QNATIVEANDROIDSEARCHVIEW_P_H
+#define QNATIVEANDROIDSEARCHVIEW_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQmlAndroid/private/qnativeandroidlinearlayout_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_QMLANDROID_EXPORT QNativeAndroidSearchView : public QNativeAndroidLinearLayout
+{
+    Q_OBJECT
+
+public:
+    explicit QNativeAndroidSearchView(QNativeAndroidView *parent = nullptr);
+
+protected:
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QNATIVEANDROIDSEARCHVIEW_P_H
diff --git a/src/android/widget/qqmlandroidseekbar.cpp b/src/android/widget/qnativeandroidseekbar.cpp
index d7ddce5..48b60d6 100644
--- a/src/android/widget/qqmlandroidseekbar.cpp
+++ b/src/android/widget/qnativeandroidseekbar.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidseekbar_p.h"
+#include "qnativeandroidseekbar_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidSeekBar::QQmlAndroidSeekBar(QQmlAndroidView *parent) :
-    QQmlAndroidAbsSeekBar(parent)
+QNativeAndroidSeekBar::QNativeAndroidSeekBar(QNativeAndroidView *parent) :
+    QNativeAndroidAbsSeekBar(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidSeekBar::onCreate()
+QAndroidJniObject QNativeAndroidSeekBar::onCreate()
 {
     return QAndroidJniObject("android/widget/SeekBar",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidSeekBar::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidSeekBar::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidAbsSeekBar::onInflate(instance);
+    QNativeAndroidAbsSeekBar::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/widget/QmlSeekBarListener",
                                    "(Landroid/widget/SeekBar;J)V",
@@ -66,7 +66,7 @@ void QQmlAndroidSeekBar::onInflate(QAndroidJniObject &instance)
     }
 }
 
-void QQmlAndroidSeekBar::onRegisterNativeMethods(jobject listener)
+void QNativeAndroidSeekBar::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onProgressChanged", "(JIZ)V", reinterpret_cast<void *>(onProgressChanged)}};
 
@@ -76,11 +76,11 @@ void QQmlAndroidSeekBar::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QQmlAndroidSeekBar::onProgressChanged(JNIEnv *env, jobject object, jlong instance, jint progress, jboolean fromUser)
+void QNativeAndroidSeekBar::onProgressChanged(JNIEnv *env, jobject object, jlong instance, jint progress, jboolean fromUser)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidSeekBar *bar = reinterpret_cast<QQmlAndroidSeekBar *>(instance);
+    QNativeAndroidSeekBar *bar = reinterpret_cast<QNativeAndroidSeekBar *>(instance);
     if (bar && fromUser)
         QMetaObject::invokeMethod(bar, "updateProgress", Qt::QueuedConnection, Q_ARG(int, progress));
 }
diff --git a/src/android/widget/qqmlandroidseekbar_p.h b/src/android/widget/qnativeandroidseekbar_p.h
index 971985a..220c6b3 100644
--- a/src/android/widget/qqmlandroidseekbar_p.h
+++ b/src/android/widget/qnativeandroidseekbar_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDSEEKBAR_P_H
-#define QQMLANDROIDSEEKBAR_P_H
+#ifndef QNATIVEANDROIDSEEKBAR_P_H
+#define QNATIVEANDROIDSEEKBAR_P_H
 
 //
 //  W A R N I N G
@@ -48,16 +48,16 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidabsseekbar_p.h>
+#include <QtQmlAndroid/private/qnativeandroidabsseekbar_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidSeekBar : public QQmlAndroidAbsSeekBar
+class Q_QMLANDROID_EXPORT QNativeAndroidSeekBar : public QNativeAndroidAbsSeekBar
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidSeekBar(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidSeekBar(QNativeAndroidView *parent = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
@@ -72,4 +72,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDSEEKBAR_P_H
+#endif // QNATIVEANDROIDSEEKBAR_P_H
diff --git a/src/android/widget/qqmlandroidspace.cpp b/src/android/widget/qnativeandroidspace.cpp
index 66fb525..7f68344 100644
--- a/src/android/widget/qqmlandroidspace.cpp
+++ b/src/android/widget/qnativeandroidspace.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidspace_p.h"
+#include "qnativeandroidspace_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidSpace::QQmlAndroidSpace(QQmlAndroidView *parent) :
-    QQmlAndroidView(parent)
+QNativeAndroidSpace::QNativeAndroidSpace(QNativeAndroidView *parent) :
+    QNativeAndroidView(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidSpace::onCreate()
+QAndroidJniObject QNativeAndroidSpace::onCreate()
 {
     return QAndroidJniObject("android/widget/Space",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidSpace::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidSpace::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidView::onInflate(instance);
+    QNativeAndroidView::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qqmlandroidbutton_p.h b/src/android/widget/qnativeandroidspace_p.h
index 888dd0e..d41c51d 100644
--- a/src/android/widget/qqmlandroidbutton_p.h
+++ b/src/android/widget/qnativeandroidspace_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDBUTTON_P_H
-#define QQMLANDROIDBUTTON_P_H
+#ifndef QNATIVEANDROIDSPACE_P_H
+#define QNATIVEANDROIDSPACE_P_H
 
 //
 //  W A R N I N G
@@ -48,16 +48,16 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidtextview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidview_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidButton : public QQmlAndroidTextView
+class Q_QMLANDROID_EXPORT QNativeAndroidSpace : public QNativeAndroidView
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidButton(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidSpace(QNativeAndroidView *parent = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
@@ -66,4 +66,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDBUTTON_P_H
+#endif // QNATIVEANDROIDSPACE_P_H
diff --git a/src/android/widget/qqmlandroidspinner.cpp b/src/android/widget/qnativeandroidspinner.cpp
index bce7b6c..ee74291 100644
--- a/src/android/widget/qqmlandroidspinner.cpp
+++ b/src/android/widget/qnativeandroidspinner.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidspinner_p.h"
+#include "qnativeandroidspinner_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidSpinner::QQmlAndroidSpinner(QQmlAndroidView *parent) :
-    QQmlAndroidAdapterView(parent)
+QNativeAndroidSpinner::QNativeAndroidSpinner(QNativeAndroidView *parent) :
+    QNativeAndroidAdapterView(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidSpinner::onCreate()
+QAndroidJniObject QNativeAndroidSpinner::onCreate()
 {
     return QAndroidJniObject("android/widget/Spinner",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidSpinner::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidSpinner::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidAdapterView::onInflate(instance);
+    QNativeAndroidAdapterView::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qnativeandroidspinner_p.h b/src/android/widget/qnativeandroidspinner_p.h
new file mode 100644
index 0000000..77280d7
--- /dev/null
+++ b/src/android/widget/qnativeandroidspinner_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt QML Android module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QNATIVEANDROIDSPINNER_P_H
+#define QNATIVEANDROIDSPINNER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQmlAndroid/private/qnativeandroidadapterview_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_QMLANDROID_EXPORT QNativeAndroidSpinner : public QNativeAndroidAdapterView // TODO: AbsSpinner
+{
+    Q_OBJECT
+
+public:
+    explicit QNativeAndroidSpinner(QNativeAndroidView *parent = nullptr);
+
+protected:
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QNATIVEANDROIDSPINNER_P_H
diff --git a/src/android/widget/qqmlandroidswitch.cpp b/src/android/widget/qnativeandroidswitch.cpp
index a4aed2c..7c9aa13 100644
--- a/src/android/widget/qqmlandroidswitch.cpp
+++ b/src/android/widget/qnativeandroidswitch.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidswitch_p.h"
+#include "qnativeandroidswitch_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidSwitch::QQmlAndroidSwitch(QQmlAndroidView *parent) :
-    QQmlAndroidCompoundButton(parent)
+QNativeAndroidSwitch::QNativeAndroidSwitch(QNativeAndroidView *parent) :
+    QNativeAndroidCompoundButton(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidSwitch::onCreate()
+QAndroidJniObject QNativeAndroidSwitch::onCreate()
 {
     return QAndroidJniObject("android/widget/Switch",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidSwitch::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidSwitch::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidCompoundButton::onInflate(instance);
+    QNativeAndroidCompoundButton::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qqmlandroidcalendarview_p.h b/src/android/widget/qnativeandroidswitch_p.h
index cf39cc6..183fdfc 100644
--- a/src/android/widget/qqmlandroidcalendarview_p.h
+++ b/src/android/widget/qnativeandroidswitch_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDCALENDARVIEW_P_H
-#define QQMLANDROIDCALENDARVIEW_P_H
+#ifndef QNATIVEANDROIDSWITCH_P_H
+#define QNATIVEANDROIDSWITCH_P_H
 
 //
 //  W A R N I N G
@@ -48,16 +48,16 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidframelayout_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcompoundbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidCalendarView : public QQmlAndroidFrameLayout
+class Q_QMLANDROID_EXPORT QNativeAndroidSwitch : public QNativeAndroidCompoundButton
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidCalendarView(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidSwitch(QNativeAndroidView *parent = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
@@ -66,4 +66,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDCALENDARVIEW_P_H
+#endif // QNATIVEANDROIDSWITCH_P_H
diff --git a/src/android/widget/qqmlandroidtabhost.cpp b/src/android/widget/qnativeandroidtabhost.cpp
index c237281..855c3bb 100644
--- a/src/android/widget/qqmlandroidtabhost.cpp
+++ b/src/android/widget/qnativeandroidtabhost.cpp
@@ -34,26 +34,26 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidtabhost_p.h"
-#include "qqmlandroidtabspec_p.h"
+#include "qnativeandroidtabhost_p.h"
+#include "qnativeandroidtabspec_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidTabHost::QQmlAndroidTabHost(QQmlAndroidView *parent) :
-    QQmlAndroidFrameLayout(parent)
+QNativeAndroidTabHost::QNativeAndroidTabHost(QNativeAndroidView *parent) :
+    QNativeAndroidFrameLayout(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidTabHost::onCreate()
+QAndroidJniObject QNativeAndroidTabHost::onCreate()
 {
     return QAndroidJniObject("android/widget/TabHost",
                              "(Landroid/content/Context;Landroid/util/AttributeSet;)V",
                              ctx().object(), 0);
 }
 
-void QQmlAndroidTabHost::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidTabHost::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidFrameLayout::onInflate(instance);
+    QNativeAndroidFrameLayout::onInflate(instance);
 
     m_listener = QAndroidJniObject("qt/android/widget/QmlTabHostListener",
                                    "(Landroid/widget/TabHost;J)V",
@@ -69,12 +69,12 @@ void QQmlAndroidTabHost::onInflate(QAndroidJniObject &instance)
     instance.callMethod<void>("setup");
 
     int index = 0;
-    QList<QQmlAndroidTabSpec *> tabs = findChildren<QQmlAndroidTabSpec *>();
-    foreach (QQmlAndroidTabSpec *tab, tabs)
+    QList<QNativeAndroidTabSpec *> tabs = findChildren<QNativeAndroidTabSpec *>();
+    foreach (QNativeAndroidTabSpec *tab, tabs)
         tab->setup(instance, index++);
 }
 
-void QQmlAndroidTabHost::onRegisterNativeMethods(jobject listener)
+void QNativeAndroidTabHost::onRegisterNativeMethods(jobject listener)
 {
     JNINativeMethod methods[] {{"onTabChanged", "(JLjava/lang/String;)V", reinterpret_cast<void *>(onTabChanged)}};
 
@@ -84,11 +84,11 @@ void QQmlAndroidTabHost::onRegisterNativeMethods(jobject listener)
     env->DeleteLocalRef(cls);
 }
 
-void QQmlAndroidTabHost::onTabChanged(JNIEnv *env, jobject object, jlong instance, jstring tabId)
+void QNativeAndroidTabHost::onTabChanged(JNIEnv *env, jobject object, jlong instance, jstring tabId)
 {
     Q_UNUSED(env);
     Q_UNUSED(object);
-    QQmlAndroidTabHost *host = reinterpret_cast<QQmlAndroidTabHost *>(instance);
+    QNativeAndroidTabHost *host = reinterpret_cast<QNativeAndroidTabHost *>(instance);
     if (host)
         QMetaObject::invokeMethod(host, "tabChanged", Qt::QueuedConnection, Q_ARG(QString, QAndroidJniObject(tabId).toString()));
 }
diff --git a/src/android/widget/qqmlandroidtabhost_p.h b/src/android/widget/qnativeandroidtabhost_p.h
index b3cccea..2543fca 100644
--- a/src/android/widget/qqmlandroidtabhost_p.h
+++ b/src/android/widget/qnativeandroidtabhost_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDTABHOST_P_H
-#define QQMLANDROIDTABHOST_P_H
+#ifndef QNATIVEANDROIDTABHOST_P_H
+#define QNATIVEANDROIDTABHOST_P_H
 
 //
 //  W A R N I N G
@@ -48,16 +48,16 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidframelayout_p.h>
+#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidTabHost : public QQmlAndroidFrameLayout
+class Q_QMLANDROID_EXPORT QNativeAndroidTabHost : public QNativeAndroidFrameLayout
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidTabHost(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidTabHost(QNativeAndroidView *parent = nullptr);
 
 Q_SIGNALS:
     void tabChanged(const QString &tabId);
@@ -75,4 +75,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDTABHOST_P_H
+#endif // QNATIVEANDROIDTABHOST_P_H
diff --git a/src/android/widget/qqmlandroidtabspec.cpp b/src/android/widget/qnativeandroidtabspec.cpp
index 1b8502d..4c6f13a 100644
--- a/src/android/widget/qqmlandroidtabspec.cpp
+++ b/src/android/widget/qnativeandroidtabspec.cpp
@@ -34,36 +34,36 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidtabspec_p.h"
-#include "qqmlandroidtabhost_p.h"
-#include "qqmlandroidview_p.h"
+#include "qnativeandroidtabspec_p.h"
+#include "qnativeandroidtabhost_p.h"
+#include "qnativeandroidview_p.h"
 #include "qtqmlandroidfunctions_p.h"
 #include <QtAndroidExtras/qandroidjniobject.h>
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidTabSpec::QQmlAndroidTabSpec(QQmlAndroidView *view) :
+QNativeAndroidTabSpec::QNativeAndroidTabSpec(QNativeAndroidView *view) :
     QObject(view)
 {
-    QQmlAndroidView *parent = qobject_cast<QQmlAndroidView *>(view->parent());
+    QNativeAndroidView *parent = qobject_cast<QNativeAndroidView *>(view->parent());
     if (parent)
         parent->setIdentifier(16908305); // TODO: android.R.id.tabcontent
 }
 
-QQmlAndroidTabSpec *QQmlAndroidTabSpec::qmlAttachedProperties(QObject *object)
+QNativeAndroidTabSpec *QNativeAndroidTabSpec::qmlAttachedProperties(QObject *object)
 {
-    QQmlAndroidView *view = qobject_cast<QQmlAndroidView*>(object);
+    QNativeAndroidView *view = qobject_cast<QNativeAndroidView*>(object);
     if (view)
-        return new QQmlAndroidTabSpec(view);
+        return new QNativeAndroidTabSpec(view);
     return 0;
 }
 
-QString QQmlAndroidTabSpec::label() const
+QString QNativeAndroidTabSpec::label() const
 {
     return m_label;
 }
 
-void QQmlAndroidTabSpec::setLabel(const QString &label)
+void QNativeAndroidTabSpec::setLabel(const QString &label)
 {
     if (m_label != label) {
         m_label = label;
@@ -72,10 +72,10 @@ void QQmlAndroidTabSpec::setLabel(const QString &label)
     }
 }
 
-void QQmlAndroidTabSpec::setup(QAndroidJniObject &host, int index)
+void QNativeAndroidTabSpec::setup(QAndroidJniObject &host, int index)
 {
     int id = -1;
-    QQmlAndroidView *content = qobject_cast<QQmlAndroidView *>(parent());
+    QNativeAndroidView *content = qobject_cast<QNativeAndroidView *>(parent());
     if (content)
         id = content->identifier();
 
diff --git a/src/android/widget/qqmlandroidtabspec_p.h b/src/android/widget/qnativeandroidtabspec_p.h
index 0828098..553ec96 100644
--- a/src/android/widget/qqmlandroidtabspec_p.h
+++ b/src/android/widget/qnativeandroidtabspec_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDTABSPEC_P_H
-#define QQMLANDROIDTABSPEC_P_H
+#ifndef QNATIVEANDROIDTABSPEC_P_H
+#define QNATIVEANDROIDTABSPEC_P_H
 
 //
 //  W A R N I N G
@@ -56,18 +56,18 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQmlAndroidView;
-class QQmlAndroidTabHost;
+class QNativeAndroidView;
+class QNativeAndroidTabHost;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidTabSpec : public QObject
+class Q_QMLANDROID_EXPORT QNativeAndroidTabSpec : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
 
 public:
-    explicit QQmlAndroidTabSpec(QQmlAndroidView *view);
+    explicit QNativeAndroidTabSpec(QNativeAndroidView *view);
 
-    static QQmlAndroidTabSpec *qmlAttachedProperties(QObject *object);
+    static QNativeAndroidTabSpec *qmlAttachedProperties(QObject *object);
 
     QString label() const;
     void setLabel(const QString &label);
@@ -83,6 +83,6 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPEINFO(QQmlAndroidTabSpec, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPEINFO(QNativeAndroidTabSpec, QML_HAS_ATTACHED_PROPERTIES)
 
-#endif // QQMLANDROIDTABSPEC_P_H
+#endif // QNATIVEANDROIDTABSPEC_P_H
diff --git a/src/android/widget/qqmlandroidtabwidget.cpp b/src/android/widget/qnativeandroidtabwidget.cpp
index a73bfa5..41d4267 100644
--- a/src/android/widget/qqmlandroidtabwidget.cpp
+++ b/src/android/widget/qnativeandroidtabwidget.cpp
@@ -34,26 +34,26 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidtabwidget_p.h"
+#include "qnativeandroidtabwidget_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidTabWidget::QQmlAndroidTabWidget(QQmlAndroidView *parent) :
-    QQmlAndroidLinearLayout(parent)
+QNativeAndroidTabWidget::QNativeAndroidTabWidget(QNativeAndroidView *parent) :
+    QNativeAndroidLinearLayout(parent)
 {
     setIdentifier(16908307); // TODO: android.R.id.tabs
 }
 
-QAndroidJniObject QQmlAndroidTabWidget::onCreate()
+QAndroidJniObject QNativeAndroidTabWidget::onCreate()
 {
     return QAndroidJniObject("android/widget/TabWidget",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidTabWidget::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidTabWidget::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidLinearLayout::onInflate(instance);
+    QNativeAndroidLinearLayout::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qnativeandroidtabwidget_p.h b/src/android/widget/qnativeandroidtabwidget_p.h
new file mode 100644
index 0000000..bb3c5c7
--- /dev/null
+++ b/src/android/widget/qnativeandroidtabwidget_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt QML Android module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QNATIVEANDROIDTABWIDGET_P_H
+#define QNATIVEANDROIDTABWIDGET_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQmlAndroid/private/qnativeandroidlinearlayout_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_QMLANDROID_EXPORT QNativeAndroidTabWidget : public QNativeAndroidLinearLayout
+{
+    Q_OBJECT
+
+public:
+    explicit QNativeAndroidTabWidget(QNativeAndroidView *parent = nullptr);
+
+protected:
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QNATIVEANDROIDTABWIDGET_P_H
diff --git a/src/android/widget/qqmlandroidtextview.cpp b/src/android/widget/qnativeandroidtextview.cpp
index f4d6115..c9b31da 100644
--- a/src/android/widget/qqmlandroidtextview.cpp
+++ b/src/android/widget/qnativeandroidtextview.cpp
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidtextview_p.h"
+#include "qnativeandroidtextview_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qqmlandroidcolor_p.h"
+#include "qnativeandroidcolor_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidTextView::QQmlAndroidTextView(QQmlAndroidView *parent) :
-    QQmlAndroidView(parent), m_singleLine(false)
+QNativeAndroidTextView::QNativeAndroidTextView(QNativeAndroidView *parent) :
+    QNativeAndroidView(parent), m_singleLine(false)
 {
 }
 
-QString QQmlAndroidTextView::text() const
+QString QNativeAndroidTextView::text() const
 {
     return m_text;
 }
 
-void QQmlAndroidTextView::setText(const QString &text)
+void QNativeAndroidTextView::setText(const QString &text)
 {
     if (m_text != text) {
         m_text = text;
@@ -59,14 +59,14 @@ void QQmlAndroidTextView::setText(const QString &text)
     }
 }
 
-int QQmlAndroidTextView::textColor() const
+int QNativeAndroidTextView::textColor() const
 {
     if (m_textColor.isNull())
-        return QQmlAndroidColor::BLACK; // TODO
+        return QNativeAndroidColor::BLACK; // TODO
     return m_textColor;
 }
 
-void QQmlAndroidTextView::setTextColor(int color)
+void QNativeAndroidTextView::setTextColor(int color)
 {
     if (color != textColor()) {
         m_textColor = color;
@@ -75,14 +75,14 @@ void QQmlAndroidTextView::setTextColor(int color)
     }
 }
 
-qreal QQmlAndroidTextView::textSize() const
+qreal QNativeAndroidTextView::textSize() const
 {
     if (m_textSize.isNull())
         return -1;
     return m_textSize;
 }
 
-void QQmlAndroidTextView::setTextSize(qreal size)
+void QNativeAndroidTextView::setTextSize(qreal size)
 {
     if (size != textSize()) {
         m_textSize = size;
@@ -91,12 +91,12 @@ void QQmlAndroidTextView::setTextSize(qreal size)
     }
 }
 
-QString QQmlAndroidTextView::hint() const
+QString QNativeAndroidTextView::hint() const
 {
     return m_hint;
 }
 
-void QQmlAndroidTextView::setHint(const QString &hint)
+void QNativeAndroidTextView::setHint(const QString &hint)
 {
     if (m_hint != hint) {
         m_hint = hint;
@@ -105,12 +105,12 @@ void QQmlAndroidTextView::setHint(const QString &hint)
     }
 }
 
-bool QQmlAndroidTextView::isSingleLine() const
+bool QNativeAndroidTextView::isSingleLine() const
 {
     return m_singleLine;
 }
 
-void QQmlAndroidTextView::setSingleLine(bool singleLine)
+void QNativeAndroidTextView::setSingleLine(bool singleLine)
 {
     if (m_singleLine != singleLine) {
         m_singleLine = singleLine;
@@ -119,14 +119,14 @@ void QQmlAndroidTextView::setSingleLine(bool singleLine)
     }
 }
 
-int QQmlAndroidTextView::inputType() const
+int QNativeAndroidTextView::inputType() const
 {
     if (m_inputType.isNull())
         return 0; // TODO
     return m_inputType;
 }
 
-void QQmlAndroidTextView::setInputType(int type)
+void QNativeAndroidTextView::setInputType(int type)
 {
     if (m_inputType.isNull() || m_inputType != type) {
         m_inputType = type;
@@ -135,16 +135,16 @@ void QQmlAndroidTextView::setInputType(int type)
     }
 }
 
-QAndroidJniObject QQmlAndroidTextView::onCreate()
+QAndroidJniObject QNativeAndroidTextView::onCreate()
 {
     return QAndroidJniObject("android/widget/TextView",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidTextView::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidTextView::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidView::onInflate(instance);
+    QNativeAndroidView::onInflate(instance);
 
     if (!m_text.isNull())
         instance.callMethod<void>("setText", "(Ljava/lang/CharSequence;)V", QAndroidJniObject::fromString(m_text).object());
diff --git a/src/android/widget/qqmlandroidtextview_p.h b/src/android/widget/qnativeandroidtextview_p.h
index b6c6c2e..1af8e29 100644
--- a/src/android/widget/qqmlandroidtextview_p.h
+++ b/src/android/widget/qnativeandroidtextview_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDTEXTVIEW_P_H
-#define QQMLANDROIDTEXTVIEW_P_H
+#ifndef QNATIVEANDROIDTEXTVIEW_P_H
+#define QNATIVEANDROIDTEXTVIEW_P_H
 
 //
 //  W A R N I N G
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidview_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 #include <QtGui/qcolor.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidTextView : public QQmlAndroidView
+class Q_QMLANDROID_EXPORT QNativeAndroidTextView : public QNativeAndroidView
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
@@ -65,7 +65,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidTextView : public QQmlAndroidView
     Q_PROPERTY(int inputType READ inputType WRITE setInputType NOTIFY inputTypeChanged)
 
 public:
-    explicit QQmlAndroidTextView(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidTextView(QNativeAndroidView *parent = nullptr);
 
     QString text() const;
     void setText(const QString &text);
@@ -100,12 +100,12 @@ protected:
 private:
     QString m_text;
     QString m_hint;
-    QQmlAndroidOptional<int> m_textColor;
-    QQmlAndroidOptional<qreal> m_textSize;
+    QNativeAndroidOptional<int> m_textColor;
+    QNativeAndroidOptional<qreal> m_textSize;
     bool m_singleLine;
-    QQmlAndroidOptional<int> m_inputType;
+    QNativeAndroidOptional<int> m_inputType;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDTEXTVIEW_P_H
+#endif // QNATIVEANDROIDTEXTVIEW_P_H
diff --git a/src/android/widget/qqmlandroidtimepicker.cpp b/src/android/widget/qnativeandroidtimepicker.cpp
index 9a4853d..a129344 100644
--- a/src/android/widget/qqmlandroidtimepicker.cpp
+++ b/src/android/widget/qnativeandroidtimepicker.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidtimepicker_p.h"
+#include "qnativeandroidtimepicker_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidTimePicker::QQmlAndroidTimePicker(QQmlAndroidView *parent) :
-    QQmlAndroidFrameLayout(parent)
+QNativeAndroidTimePicker::QNativeAndroidTimePicker(QNativeAndroidView *parent) :
+    QNativeAndroidFrameLayout(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidTimePicker::onCreate()
+QAndroidJniObject QNativeAndroidTimePicker::onCreate()
 {
     return QAndroidJniObject("android/widget/TimePicker",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidTimePicker::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidTimePicker::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidFrameLayout::onInflate(instance);
+    QNativeAndroidFrameLayout::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qnativeandroidtimepicker_p.h b/src/android/widget/qnativeandroidtimepicker_p.h
new file mode 100644
index 0000000..b80aad1
--- /dev/null
+++ b/src/android/widget/qnativeandroidtimepicker_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt QML Android module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QNATIVEANDROIDTIMEPICKER_P_H
+#define QNATIVEANDROIDTIMEPICKER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_QMLANDROID_EXPORT QNativeAndroidTimePicker : public QNativeAndroidFrameLayout
+{
+    Q_OBJECT
+
+public:
+    explicit QNativeAndroidTimePicker(QNativeAndroidView *parent = nullptr);
+
+protected:
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QNATIVEANDROIDTIMEPICKER_P_H
diff --git a/src/android/widget/qqmlandroidtoast.cpp b/src/android/widget/qnativeandroidtoast.cpp
index 2f2af16..4f35980 100644
--- a/src/android/widget/qqmlandroidtoast.cpp
+++ b/src/android/widget/qnativeandroidtoast.cpp
@@ -34,24 +34,24 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidtoast_p.h"
+#include "qnativeandroidtoast_p.h"
 #include "qtqmlandroidfunctions_p.h"
-#include "qqmlandroidview_p.h"
+#include "qnativeandroidview_p.h"
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidToast::QQmlAndroidToast(QObject *parent) :
-    QQmlAndroidObject(parent)
+QNativeAndroidToast::QNativeAndroidToast(QObject *parent) :
+    QNativeAndroidObject(parent)
 {
 }
 
-QString QQmlAndroidToast::text() const
+QString QNativeAndroidToast::text() const
 {
     return m_text;
 }
 
-void QQmlAndroidToast::setText(const QString &text)
+void QNativeAndroidToast::setText(const QString &text)
 {
     if (m_text != text) {
         m_text = text;
@@ -59,14 +59,14 @@ void QQmlAndroidToast::setText(const QString &text)
     }
 }
 
-int QQmlAndroidToast::gravity() const
+int QNativeAndroidToast::gravity() const
 {
     if (m_gravity.isNull())
         return 0; // TODO
     return m_gravity;
 }
 
-void QQmlAndroidToast::setGravity(int value)
+void QNativeAndroidToast::setGravity(int value)
 {
     if (value != gravity()) {
         m_gravity = value;
@@ -74,9 +74,9 @@ void QQmlAndroidToast::setGravity(int value)
     }
 }
 
-void QQmlAndroidToast::show()
+void QNativeAndroidToast::show()
 {
-    QQmlAndroidView *view = qobject_cast<QQmlAndroidView *>(parent());
+    QNativeAndroidView *view = qobject_cast<QNativeAndroidView *>(parent());
     if (!view) {
         qWarning() << "Toast must be in a view.";
         return;
@@ -111,7 +111,7 @@ void QQmlAndroidToast::show()
     });
 }
 
-void QQmlAndroidToast::cancel()
+void QNativeAndroidToast::cancel()
 {
     QtQmlAndroid::callVoidMethod(instance(), "cancel");
 }
diff --git a/src/android/widget/qqmlandroidtoast_p.h b/src/android/widget/qnativeandroidtoast_p.h
index 9e9f256..289779a 100644
--- a/src/android/widget/qqmlandroidtoast_p.h
+++ b/src/android/widget/qnativeandroidtoast_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDTOAST_P_H
-#define QQMLANDROIDTOAST_P_H
+#ifndef QNATIVEANDROIDTOAST_P_H
+#define QNATIVEANDROIDTOAST_P_H
 
 //
 //  W A R N I N G
@@ -48,21 +48,21 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidobject_p.h>
-#include <QtQmlAndroid/private/qqmlandroidoptional_p.h>
+#include <QtQmlAndroid/private/qnativeandroidobject_p.h>
+#include <QtQmlAndroid/private/qnativeandroidoptional_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQmlAndroidView;
+class QNativeAndroidView;
 
-class Q_QMLANDROID_EXPORT QQmlAndroidToast : public QQmlAndroidObject
+class Q_QMLANDROID_EXPORT QNativeAndroidToast : public QNativeAndroidObject
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
     Q_PROPERTY(int gravity READ gravity WRITE setGravity NOTIFY gravityChanged)
 
 public:
-    explicit QQmlAndroidToast(QObject *parent = nullptr);
+    explicit QNativeAndroidToast(QObject *parent = nullptr);
 
     QString text() const;
     void setText(const QString &text);
@@ -80,9 +80,9 @@ Q_SIGNALS:
 
 private:
     QString m_text;
-    QQmlAndroidOptional<int> m_gravity;
+    QNativeAndroidOptional<int> m_gravity;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDTOAST_P_H
+#endif // QNATIVEANDROIDTOAST_P_H
diff --git a/src/android/widget/qqmlandroidtogglebutton.cpp b/src/android/widget/qnativeandroidtogglebutton.cpp
index d976fd2..58ee008 100644
--- a/src/android/widget/qqmlandroidtogglebutton.cpp
+++ b/src/android/widget/qnativeandroidtogglebutton.cpp
@@ -34,22 +34,22 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidtogglebutton_p.h"
+#include "qnativeandroidtogglebutton_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidToggleButton::QQmlAndroidToggleButton(QQmlAndroidView *parent) :
-    QQmlAndroidCompoundButton(parent)
+QNativeAndroidToggleButton::QNativeAndroidToggleButton(QNativeAndroidView *parent) :
+    QNativeAndroidCompoundButton(parent)
 {
 }
 
-QString QQmlAndroidToggleButton::textOn() const
+QString QNativeAndroidToggleButton::textOn() const
 {
     return m_textOn;
 }
 
-void QQmlAndroidToggleButton::setTextOn(const QString &text)
+void QNativeAndroidToggleButton::setTextOn(const QString &text)
 {
     if (m_textOn != text) {
         m_textOn = text;
@@ -58,12 +58,12 @@ void QQmlAndroidToggleButton::setTextOn(const QString &text)
     }
 }
 
-QString QQmlAndroidToggleButton::textOff() const
+QString QNativeAndroidToggleButton::textOff() const
 {
     return m_textOff;
 }
 
-void QQmlAndroidToggleButton::setTextOff(const QString &text)
+void QNativeAndroidToggleButton::setTextOff(const QString &text)
 {
     if (m_textOff != text) {
         m_textOff = text;
@@ -72,16 +72,16 @@ void QQmlAndroidToggleButton::setTextOff(const QString &text)
     }
 }
 
-QAndroidJniObject QQmlAndroidToggleButton::onCreate()
+QAndroidJniObject QNativeAndroidToggleButton::onCreate()
 {
     return QAndroidJniObject("android/widget/ToggleButton",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidToggleButton::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidToggleButton::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidCompoundButton::onInflate(instance);
+    QNativeAndroidCompoundButton::onInflate(instance);
 
     if (!m_textOn.isNull())
         instance.callMethod<void>("setTextOn", "(Ljava/lang/CharSequence;)V", QAndroidJniObject::fromString(m_textOn).object());
diff --git a/src/android/widget/qqmlandroidtogglebutton_p.h b/src/android/widget/qnativeandroidtogglebutton_p.h
index 9749692..8a89c3d 100644
--- a/src/android/widget/qqmlandroidtogglebutton_p.h
+++ b/src/android/widget/qnativeandroidtogglebutton_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDTOGGLEBUTTON_P_H
-#define QQMLANDROIDTOGGLEBUTTON_P_H
+#ifndef QNATIVEANDROIDTOGGLEBUTTON_P_H
+#define QNATIVEANDROIDTOGGLEBUTTON_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidcompoundbutton_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcompoundbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidToggleButton : public QQmlAndroidCompoundButton
+class Q_QMLANDROID_EXPORT QNativeAndroidToggleButton : public QNativeAndroidCompoundButton
 {
     Q_OBJECT
     Q_PROPERTY(QString textOn READ textOn WRITE setTextOn NOTIFY textOnChanged)
     Q_PROPERTY(QString textOff READ textOff WRITE setTextOff NOTIFY textOffChanged)
 
 public:
-    explicit QQmlAndroidToggleButton(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidToggleButton(QNativeAndroidView *parent = nullptr);
 
     QString textOn() const;
     void setTextOn(const QString &text);
@@ -82,4 +82,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDTOGGLEBUTTON_P_H
+#endif // QNATIVEANDROIDTOGGLEBUTTON_P_H
diff --git a/src/android/widget/qqmlandroidviewanimator.cpp b/src/android/widget/qnativeandroidviewanimator.cpp
index 4d27ca0..76d56c5 100644
--- a/src/android/widget/qqmlandroidviewanimator.cpp
+++ b/src/android/widget/qnativeandroidviewanimator.cpp
@@ -34,24 +34,24 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidviewanimator_p.h"
+#include "qnativeandroidviewanimator_p.h"
 #include "qtqmlandroidfunctions_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidViewAnimator::QQmlAndroidViewAnimator(QQmlAndroidView *parent) :
-    QQmlAndroidFrameLayout(parent)
+QNativeAndroidViewAnimator::QNativeAndroidViewAnimator(QNativeAndroidView *parent) :
+    QNativeAndroidFrameLayout(parent)
 {
 }
 
-int QQmlAndroidViewAnimator::displayedChild() const
+int QNativeAndroidViewAnimator::displayedChild() const
 {
     if (m_displayedChild.isNull())
         return 0;
     return m_displayedChild;
 }
 
-void QQmlAndroidViewAnimator::setDisplayedChild(int child)
+void QNativeAndroidViewAnimator::setDisplayedChild(int child)
 {
     if (child != displayedChild()) {
         m_displayedChild = child;
@@ -60,14 +60,14 @@ void QQmlAndroidViewAnimator::setDisplayedChild(int child)
     }
 }
 
-int QQmlAndroidViewAnimator::inAnimation() const
+int QNativeAndroidViewAnimator::inAnimation() const
 {
     if (m_inAnimation.isNull())
         return -1;
     return m_inAnimation;
 }
 
-void QQmlAndroidViewAnimator::setInAnimation(int animation)
+void QNativeAndroidViewAnimator::setInAnimation(int animation)
 {
     if (animation != inAnimation()) {
         m_inAnimation = animation;
@@ -81,14 +81,14 @@ void QQmlAndroidViewAnimator::setInAnimation(int animation)
     }
 }
 
-int QQmlAndroidViewAnimator::outAnimation() const
+int QNativeAndroidViewAnimator::outAnimation() const
 {
     if (m_outAnimation.isNull())
         return -1;
     return m_outAnimation;
 }
 
-void QQmlAndroidViewAnimator::setOutAnimation(int animation)
+void QNativeAndroidViewAnimator::setOutAnimation(int animation)
 {
     if (animation != outAnimation()) {
         m_outAnimation = animation;
@@ -102,26 +102,26 @@ void QQmlAndroidViewAnimator::setOutAnimation(int animation)
     }
 }
 
-void QQmlAndroidViewAnimator::showNext()
+void QNativeAndroidViewAnimator::showNext()
 {
     QtQmlAndroid::callVoidMethod(instance(), "showNext");
 }
 
-void QQmlAndroidViewAnimator::showPrevious()
+void QNativeAndroidViewAnimator::showPrevious()
 {
     QtQmlAndroid::callVoidMethod(instance(), "showPrevious");
 }
 
-QAndroidJniObject QQmlAndroidViewAnimator::onCreate()
+QAndroidJniObject QNativeAndroidViewAnimator::onCreate()
 {
     return QAndroidJniObject("android/widget/ViewAnimator",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidViewAnimator::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidViewAnimator::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidFrameLayout::onInflate(instance);
+    QNativeAndroidFrameLayout::onInflate(instance);
 
     if (!m_displayedChild.isNull())
         instance.callMethod<void>("setDisplayedChild", "(I)V", m_displayedChild);
diff --git a/src/android/widget/qqmlandroidviewanimator_p.h b/src/android/widget/qnativeandroidviewanimator_p.h
index 21a8d05..d784382 100644
--- a/src/android/widget/qqmlandroidviewanimator_p.h
+++ b/src/android/widget/qnativeandroidviewanimator_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDVIEWANIMATOR_P_H
-#define QQMLANDROIDVIEWANIMATOR_P_H
+#ifndef QNATIVEANDROIDVIEWANIMATOR_P_H
+#define QNATIVEANDROIDVIEWANIMATOR_P_H
 
 //
 //  W A R N I N G
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidframelayout_p.h>
+#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidViewAnimator : public QQmlAndroidFrameLayout
+class Q_QMLANDROID_EXPORT QNativeAndroidViewAnimator : public QNativeAndroidFrameLayout
 {
     Q_OBJECT
     Q_PROPERTY(int displayedChild READ displayedChild WRITE setDisplayedChild NOTIFY displayedChildChanged)
@@ -60,7 +60,7 @@ class Q_QMLANDROID_EXPORT QQmlAndroidViewAnimator : public QQmlAndroidFrameLayou
     Q_PROPERTY(int outAnimation READ outAnimation WRITE setOutAnimation NOTIFY outAnimationChanged)
 
 public:
-    explicit QQmlAndroidViewAnimator(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidViewAnimator(QNativeAndroidView *parent = nullptr);
 
     int displayedChild() const;
     void setDisplayedChild(int child);
@@ -85,11 +85,11 @@ protected:
     void onInflate(QAndroidJniObject &instance) override;
 
 private:
-    QQmlAndroidOptional<int> m_displayedChild;
-    QQmlAndroidOptional<int> m_inAnimation;
-    QQmlAndroidOptional<int> m_outAnimation;
+    QNativeAndroidOptional<int> m_displayedChild;
+    QNativeAndroidOptional<int> m_inAnimation;
+    QNativeAndroidOptional<int> m_outAnimation;
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDVIEWANIMATOR_P_H
+#endif // QNATIVEANDROIDVIEWANIMATOR_P_H
diff --git a/src/android/widget/qqmlandroidviewflipper.cpp b/src/android/widget/qnativeandroidviewflipper.cpp
index 363ed27..4e5e5b4 100644
--- a/src/android/widget/qqmlandroidviewflipper.cpp
+++ b/src/android/widget/qnativeandroidviewflipper.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidviewflipper_p.h"
+#include "qnativeandroidviewflipper_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidViewFlipper::QQmlAndroidViewFlipper(QQmlAndroidView *parent) :
-    QQmlAndroidViewAnimator(parent)
+QNativeAndroidViewFlipper::QNativeAndroidViewFlipper(QNativeAndroidView *parent) :
+    QNativeAndroidViewAnimator(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidViewFlipper::onCreate()
+QAndroidJniObject QNativeAndroidViewFlipper::onCreate()
 {
     return QAndroidJniObject("android/widget/ViewFlipper",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidViewFlipper::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidViewFlipper::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidViewAnimator::onInflate(instance);
+    QNativeAndroidViewAnimator::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qnativeandroidviewflipper_p.h b/src/android/widget/qnativeandroidviewflipper_p.h
new file mode 100644
index 0000000..d3190b8
--- /dev/null
+++ b/src/android/widget/qnativeandroidviewflipper_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt QML Android module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QNATIVEANDROIDVIEWFLIPPER_P_H
+#define QNATIVEANDROIDVIEWFLIPPER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQmlAndroid/private/qnativeandroidviewanimator_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_QMLANDROID_EXPORT QNativeAndroidViewFlipper : public QNativeAndroidViewAnimator
+{
+    Q_OBJECT
+
+public:
+    explicit QNativeAndroidViewFlipper(QNativeAndroidView *parent = nullptr);
+
+protected:
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QNATIVEANDROIDVIEWFLIPPER_P_H
diff --git a/src/android/widget/qqmlandroidviewswitcher.cpp b/src/android/widget/qnativeandroidviewswitcher.cpp
index 820d3c1..f739b02 100644
--- a/src/android/widget/qqmlandroidviewswitcher.cpp
+++ b/src/android/widget/qnativeandroidviewswitcher.cpp
@@ -34,25 +34,25 @@
 **
 ****************************************************************************/
 
-#include "qqmlandroidviewswitcher_p.h"
+#include "qnativeandroidviewswitcher_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QQmlAndroidViewSwitcher::QQmlAndroidViewSwitcher(QQmlAndroidView *parent) :
-    QQmlAndroidViewAnimator(parent)
+QNativeAndroidViewSwitcher::QNativeAndroidViewSwitcher(QNativeAndroidView *parent) :
+    QNativeAndroidViewAnimator(parent)
 {
 }
 
-QAndroidJniObject QQmlAndroidViewSwitcher::onCreate()
+QAndroidJniObject QNativeAndroidViewSwitcher::onCreate()
 {
     return QAndroidJniObject("android/widget/ViewSwitcher",
                              "(Landroid/content/Context;)V",
                              ctx().object());
 }
 
-void QQmlAndroidViewSwitcher::onInflate(QAndroidJniObject &instance)
+void QNativeAndroidViewSwitcher::onInflate(QAndroidJniObject &instance)
 {
-    QQmlAndroidViewAnimator::onInflate(instance);
+    QNativeAndroidViewAnimator::onInflate(instance);
 }
 
 QT_END_NAMESPACE
diff --git a/src/android/widget/qnativeandroidviewswitcher_p.h b/src/android/widget/qnativeandroidviewswitcher_p.h
new file mode 100644
index 0000000..c4cff66
--- /dev/null
+++ b/src/android/widget/qnativeandroidviewswitcher_p.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt QML Android module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QNATIVEANDROIDVIEWSWITCHER_P_H
+#define QNATIVEANDROIDVIEWSWITCHER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQmlAndroid/private/qnativeandroidviewanimator_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class Q_QMLANDROID_EXPORT QNativeAndroidViewSwitcher : public QNativeAndroidViewAnimator
+{
+    Q_OBJECT
+
+public:
+    explicit QNativeAndroidViewSwitcher(QNativeAndroidView *parent = nullptr);
+
+protected:
+    QAndroidJniObject onCreate() override;
+    void onInflate(QAndroidJniObject &instance) override;
+};
+
+QT_END_NAMESPACE
+
+#endif // QNATIVEANDROIDVIEWSWITCHER_P_H
diff --git a/src/android/widget/qqmlandroidcheckbox_p.h b/src/android/widget/qqmlandroidcheckbox_p.h
deleted file mode 100644
index 947487a..0000000
--- a/src/android/widget/qqmlandroidcheckbox_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLANDROIDCHECKBOX_P_H
-#define QQMLANDROIDCHECKBOX_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qqmlandroidcompoundbutton_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_QMLANDROID_EXPORT QQmlAndroidCheckBox : public QQmlAndroidCompoundButton
-{
-    Q_OBJECT
-
-public:
-    explicit QQmlAndroidCheckBox(QQmlAndroidView *parent = nullptr);
-
-protected:
-    QAndroidJniObject onCreate() override;
-    void onInflate(QAndroidJniObject &instance) override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQMLANDROIDCHECKBOX_P_H
diff --git a/src/android/widget/qqmlandroiddatepicker_p.h b/src/android/widget/qqmlandroiddatepicker_p.h
deleted file mode 100644
index 56626a6..0000000
--- a/src/android/widget/qqmlandroiddatepicker_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLANDROIDDATEPICKER_P_H
-#define QQMLANDROIDDATEPICKER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qqmlandroidframelayout_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_QMLANDROID_EXPORT QQmlAndroidDatePicker : public QQmlAndroidFrameLayout
-{
-    Q_OBJECT
-
-public:
-    explicit QQmlAndroidDatePicker(QQmlAndroidView *parent = nullptr);
-
-protected:
-    QAndroidJniObject onCreate() override;
-    void onInflate(QAndroidJniObject &instance) override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQMLANDROIDDATEPICKER_P_H
diff --git a/src/android/widget/qqmlandroidlistview_p.h b/src/android/widget/qqmlandroidlistview_p.h
deleted file mode 100644
index 5262a24..0000000
--- a/src/android/widget/qqmlandroidlistview_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLANDROIDLISTVIEW_P_H
-#define QQMLANDROIDLISTVIEW_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qqmlandroidadapterview_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_QMLANDROID_EXPORT QQmlAndroidListView : public QQmlAndroidAdapterView // TODO: AbsListView
-{
-    Q_OBJECT
-
-public:
-    explicit QQmlAndroidListView(QQmlAndroidView *parent = nullptr);
-
-protected:
-    QAndroidJniObject onCreate() override;
-    void onInflate(QAndroidJniObject &instance) override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQMLANDROIDLISTVIEW_P_H
diff --git a/src/android/widget/qqmlandroidradiobutton_p.h b/src/android/widget/qqmlandroidradiobutton_p.h
deleted file mode 100644
index 977d45d..0000000
--- a/src/android/widget/qqmlandroidradiobutton_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLANDROIDRADIOBUTTON_P_H
-#define QQMLANDROIDRADIOBUTTON_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qqmlandroidcompoundbutton_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_QMLANDROID_EXPORT QQmlAndroidRadioButton : public QQmlAndroidCompoundButton
-{
-    Q_OBJECT
-
-public:
-    explicit QQmlAndroidRadioButton(QQmlAndroidView *parent = nullptr);
-
-protected:
-    QAndroidJniObject onCreate() override;
-    void onInflate(QAndroidJniObject &instance) override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQMLANDROIDRADIOBUTTON_P_H
diff --git a/src/android/widget/qqmlandroidsearchview_p.h b/src/android/widget/qqmlandroidsearchview_p.h
deleted file mode 100644
index 323a725..0000000
--- a/src/android/widget/qqmlandroidsearchview_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLANDROIDSEARCHVIEW_P_H
-#define QQMLANDROIDSEARCHVIEW_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qqmlandroidlinearlayout_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_QMLANDROID_EXPORT QQmlAndroidSearchView : public QQmlAndroidLinearLayout
-{
-    Q_OBJECT
-
-public:
-    explicit QQmlAndroidSearchView(QQmlAndroidView *parent = nullptr);
-
-protected:
-    QAndroidJniObject onCreate() override;
-    void onInflate(QAndroidJniObject &instance) override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQMLANDROIDSEARCHVIEW_P_H
diff --git a/src/android/widget/qqmlandroidspace_p.h b/src/android/widget/qqmlandroidspace_p.h
deleted file mode 100644
index 1429dc0..0000000
--- a/src/android/widget/qqmlandroidspace_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLANDROIDSPACE_P_H
-#define QQMLANDROIDSPACE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qqmlandroidview_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_QMLANDROID_EXPORT QQmlAndroidSpace : public QQmlAndroidView
-{
-    Q_OBJECT
-
-public:
-    explicit QQmlAndroidSpace(QQmlAndroidView *parent = nullptr);
-
-protected:
-    QAndroidJniObject onCreate() override;
-    void onInflate(QAndroidJniObject &instance) override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQMLANDROIDSPACE_P_H
diff --git a/src/android/widget/qqmlandroidspinner_p.h b/src/android/widget/qqmlandroidspinner_p.h
deleted file mode 100644
index b20dd30..0000000
--- a/src/android/widget/qqmlandroidspinner_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLANDROIDSPINNER_P_H
-#define QQMLANDROIDSPINNER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qqmlandroidadapterview_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_QMLANDROID_EXPORT QQmlAndroidSpinner : public QQmlAndroidAdapterView // TODO: AbsSpinner
-{
-    Q_OBJECT
-
-public:
-    explicit QQmlAndroidSpinner(QQmlAndroidView *parent = nullptr);
-
-protected:
-    QAndroidJniObject onCreate() override;
-    void onInflate(QAndroidJniObject &instance) override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQMLANDROIDSPINNER_P_H
diff --git a/src/android/widget/qqmlandroidswitch_p.h b/src/android/widget/qqmlandroidswitch_p.h
deleted file mode 100644
index 988ae5d..0000000
--- a/src/android/widget/qqmlandroidswitch_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLANDROIDSWITCH_P_H
-#define QQMLANDROIDSWITCH_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qqmlandroidcompoundbutton_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_QMLANDROID_EXPORT QQmlAndroidSwitch : public QQmlAndroidCompoundButton
-{
-    Q_OBJECT
-
-public:
-    explicit QQmlAndroidSwitch(QQmlAndroidView *parent = nullptr);
-
-protected:
-    QAndroidJniObject onCreate() override;
-    void onInflate(QAndroidJniObject &instance) override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQMLANDROIDSWITCH_P_H
diff --git a/src/android/widget/qqmlandroidtimepicker_p.h b/src/android/widget/qqmlandroidtimepicker_p.h
deleted file mode 100644
index adce9a3..0000000
--- a/src/android/widget/qqmlandroidtimepicker_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLANDROIDTIMEPICKER_P_H
-#define QQMLANDROIDTIMEPICKER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qqmlandroidframelayout_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_QMLANDROID_EXPORT QQmlAndroidTimePicker : public QQmlAndroidFrameLayout
-{
-    Q_OBJECT
-
-public:
-    explicit QQmlAndroidTimePicker(QQmlAndroidView *parent = nullptr);
-
-protected:
-    QAndroidJniObject onCreate() override;
-    void onInflate(QAndroidJniObject &instance) override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQMLANDROIDTIMEPICKER_P_H
diff --git a/src/android/widget/qqmlandroidviewflipper_p.h b/src/android/widget/qqmlandroidviewflipper_p.h
deleted file mode 100644
index c489973..0000000
--- a/src/android/widget/qqmlandroidviewflipper_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLANDROIDVIEWFLIPPER_P_H
-#define QQMLANDROIDVIEWFLIPPER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qqmlandroidviewanimator_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_QMLANDROID_EXPORT QQmlAndroidViewFlipper : public QQmlAndroidViewAnimator
-{
-    Q_OBJECT
-
-public:
-    explicit QQmlAndroidViewFlipper(QQmlAndroidView *parent = nullptr);
-
-protected:
-    QAndroidJniObject onCreate() override;
-    void onInflate(QAndroidJniObject &instance) override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQMLANDROIDVIEWFLIPPER_P_H
diff --git a/src/android/widget/qqmlandroidviewswitcher_p.h b/src/android/widget/qqmlandroidviewswitcher_p.h
deleted file mode 100644
index a7124c0..0000000
--- a/src/android/widget/qqmlandroidviewswitcher_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt QML Android module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLANDROIDVIEWSWITCHER_P_H
-#define QQMLANDROIDVIEWSWITCHER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtQmlAndroid/private/qqmlandroidviewanimator_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class Q_QMLANDROID_EXPORT QQmlAndroidViewSwitcher : public QQmlAndroidViewAnimator
-{
-    Q_OBJECT
-
-public:
-    explicit QQmlAndroidViewSwitcher(QQmlAndroidView *parent = nullptr);
-
-protected:
-    QAndroidJniObject onCreate() override;
-    void onInflate(QAndroidJniObject &instance) override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQMLANDROIDVIEWSWITCHER_P_H
diff --git a/src/android/widget/widget.pri b/src/android/widget/widget.pri
index 22d5aea..b00d080 100644
--- a/src/android/widget/widget.pri
+++ b/src/android/widget/widget.pri
@@ -1,87 +1,87 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qqmlandroidabsseekbar_p.h \
-    $$PWD/qqmlandroidadapterview_p.h \
-    $$PWD/qqmlandroidarrayadapter_p.h \
-    $$PWD/qqmlandroidbaseadapter_p.h \
-    $$PWD/qqmlandroidbutton_p.h \
-    $$PWD/qqmlandroidcalendarview_p.h \
-    $$PWD/qqmlandroidcheckbox_p.h \
-    $$PWD/qqmlandroidcompoundbutton_p.h \
-    $$PWD/qqmlandroiddatepicker_p.h \
-    $$PWD/qqmlandroidedittext_p.h \
-    $$PWD/qqmlandroidframelayout_p.h \
-    $$PWD/qqmlandroidframelayoutparams_p.h \
-    $$PWD/qqmlandroidimageview_p.h \
-    $$PWD/qqmlandroidlinearlayout_p.h \
-    $$PWD/qqmlandroidlinearlayoutparams_p.h \
-    $$PWD/qqmlandroidlistview_p.h \
-    $$PWD/qqmlandroidmarginlayoutparams_p.h \
-    $$PWD/qqmlandroidnumberpicker_p.h \
-    $$PWD/qqmlandroidpopupmenu_p.h \
-    $$PWD/qqmlandroidprogressbar_p.h \
-    $$PWD/qqmlandroidradiobutton_p.h \
-    $$PWD/qqmlandroidradiogroup_p.h \
-    $$PWD/qqmlandroidratingbar_p.h \
-    $$PWD/qqmlandroidrelativelayout_p.h \
-    $$PWD/qqmlandroidrelativelayoutparams_p.h \
-    $$PWD/qqmlandroidscrollview_p.h \
-    $$PWD/qqmlandroidsearchview_p.h \
-    $$PWD/qqmlandroidseekbar_p.h \
-    $$PWD/qqmlandroidspace_p.h \
-    $$PWD/qqmlandroidspinner_p.h \
-    $$PWD/qqmlandroidswitch_p.h \
-    $$PWD/qqmlandroidtabhost_p.h \
-    $$PWD/qqmlandroidtabspec_p.h \
-    $$PWD/qqmlandroidtabwidget_p.h \
-    $$PWD/qqmlandroidtextview_p.h \
-    $$PWD/qqmlandroidtimepicker_p.h \
-    $$PWD/qqmlandroidtoast_p.h \
-    $$PWD/qqmlandroidtogglebutton_p.h \
-    $$PWD/qqmlandroidviewanimator_p.h \
-    $$PWD/qqmlandroidviewflipper_p.h \
-    $$PWD/qqmlandroidviewswitcher_p.h
+    $$PWD/qnativeandroidabsseekbar_p.h \
+    $$PWD/qnativeandroidadapterview_p.h \
+    $$PWD/qnativeandroidarrayadapter_p.h \
+    $$PWD/qnativeandroidbaseadapter_p.h \
+    $$PWD/qnativeandroidbutton_p.h \
+    $$PWD/qnativeandroidcalendarview_p.h \
+    $$PWD/qnativeandroidcheckbox_p.h \
+    $$PWD/qnativeandroidcompoundbutton_p.h \
+    $$PWD/qnativeandroiddatepicker_p.h \
+    $$PWD/qnativeandroidedittext_p.h \
+    $$PWD/qnativeandroidframelayout_p.h \
+    $$PWD/qnativeandroidframelayoutparams_p.h \
+    $$PWD/qnativeandroidimageview_p.h \
+    $$PWD/qnativeandroidlinearlayout_p.h \
+    $$PWD/qnativeandroidlinearlayoutparams_p.h \
+    $$PWD/qnativeandroidlistview_p.h \
+    $$PWD/qnativeandroidmarginlayoutparams_p.h \
+    $$PWD/qnativeandroidnumberpicker_p.h \
+    $$PWD/qnativeandroidpopupmenu_p.h \
+    $$PWD/qnativeandroidprogressbar_p.h \
+    $$PWD/qnativeandroidradiobutton_p.h \
+    $$PWD/qnativeandroidradiogroup_p.h \
+    $$PWD/qnativeandroidratingbar_p.h \
+    $$PWD/qnativeandroidrelativelayout_p.h \
+    $$PWD/qnativeandroidrelativelayoutparams_p.h \
+    $$PWD/qnativeandroidscrollview_p.h \
+    $$PWD/qnativeandroidsearchview_p.h \
+    $$PWD/qnativeandroidseekbar_p.h \
+    $$PWD/qnativeandroidspace_p.h \
+    $$PWD/qnativeandroidspinner_p.h \
+    $$PWD/qnativeandroidswitch_p.h \
+    $$PWD/qnativeandroidtabhost_p.h \
+    $$PWD/qnativeandroidtabspec_p.h \
+    $$PWD/qnativeandroidtabwidget_p.h \
+    $$PWD/qnativeandroidtextview_p.h \
+    $$PWD/qnativeandroidtimepicker_p.h \
+    $$PWD/qnativeandroidtoast_p.h \
+    $$PWD/qnativeandroidtogglebutton_p.h \
+    $$PWD/qnativeandroidviewanimator_p.h \
+    $$PWD/qnativeandroidviewflipper_p.h \
+    $$PWD/qnativeandroidviewswitcher_p.h
 
 SOURCES += \
-    $$PWD/qqmlandroidabsseekbar.cpp \
-    $$PWD/qqmlandroidadapterview.cpp \
-    $$PWD/qqmlandroidbaseadapter.cpp \
-    $$PWD/qqmlandroidarrayadapter.cpp \
-    $$PWD/qqmlandroidbutton.cpp \
-    $$PWD/qqmlandroidcalendarview.cpp \
-    $$PWD/qqmlandroidcheckbox.cpp \
-    $$PWD/qqmlandroidcompoundbutton.cpp \
-    $$PWD/qqmlandroiddatepicker.cpp \
-    $$PWD/qqmlandroidedittext.cpp \
-    $$PWD/qqmlandroidframelayout.cpp \
-    $$PWD/qqmlandroidframelayoutparams.cpp \
-    $$PWD/qqmlandroidimageview.cpp \
-    $$PWD/qqmlandroidlinearlayout.cpp \
-    $$PWD/qqmlandroidlinearlayoutparams.cpp \
-    $$PWD/qqmlandroidlistview.cpp \
-    $$PWD/qqmlandroidmarginlayoutparams.cpp \
-    $$PWD/qqmlandroidnumberpicker.cpp \
-    $$PWD/qqmlandroidpopupmenu.cpp \
-    $$PWD/qqmlandroidprogressbar.cpp \
-    $$PWD/qqmlandroidradiobutton.cpp \
-    $$PWD/qqmlandroidradiogroup.cpp \
-    $$PWD/qqmlandroidratingbar.cpp \
-    $$PWD/qqmlandroidrelativelayout.cpp \
-    $$PWD/qqmlandroidrelativelayoutparams.cpp \
-    $$PWD/qqmlandroidscrollview.cpp \
-    $$PWD/qqmlandroidsearchview.cpp \
-    $$PWD/qqmlandroidseekbar.cpp \
-    $$PWD/qqmlandroidspace.cpp \
-    $$PWD/qqmlandroidspinner.cpp \
-    $$PWD/qqmlandroidswitch.cpp \
-    $$PWD/qqmlandroidtabhost.cpp \
-    $$PWD/qqmlandroidtabspec.cpp \
-    $$PWD/qqmlandroidtabwidget.cpp \
-    $$PWD/qqmlandroidtextview.cpp \
-    $$PWD/qqmlandroidtimepicker.cpp \
-    $$PWD/qqmlandroidtoast.cpp \
-    $$PWD/qqmlandroidtogglebutton.cpp \
-    $$PWD/qqmlandroidviewanimator.cpp \
-    $$PWD/qqmlandroidviewflipper.cpp \
-    $$PWD/qqmlandroidviewswitcher.cpp
+    $$PWD/qnativeandroidabsseekbar.cpp \
+    $$PWD/qnativeandroidadapterview.cpp \
+    $$PWD/qnativeandroidbaseadapter.cpp \
+    $$PWD/qnativeandroidarrayadapter.cpp \
+    $$PWD/qnativeandroidbutton.cpp \
+    $$PWD/qnativeandroidcalendarview.cpp \
+    $$PWD/qnativeandroidcheckbox.cpp \
+    $$PWD/qnativeandroidcompoundbutton.cpp \
+    $$PWD/qnativeandroiddatepicker.cpp \
+    $$PWD/qnativeandroidedittext.cpp \
+    $$PWD/qnativeandroidframelayout.cpp \
+    $$PWD/qnativeandroidframelayoutparams.cpp \
+    $$PWD/qnativeandroidimageview.cpp \
+    $$PWD/qnativeandroidlinearlayout.cpp \
+    $$PWD/qnativeandroidlinearlayoutparams.cpp \
+    $$PWD/qnativeandroidlistview.cpp \
+    $$PWD/qnativeandroidmarginlayoutparams.cpp \
+    $$PWD/qnativeandroidnumberpicker.cpp \
+    $$PWD/qnativeandroidpopupmenu.cpp \
+    $$PWD/qnativeandroidprogressbar.cpp \
+    $$PWD/qnativeandroidradiobutton.cpp \
+    $$PWD/qnativeandroidradiogroup.cpp \
+    $$PWD/qnativeandroidratingbar.cpp \
+    $$PWD/qnativeandroidrelativelayout.cpp \
+    $$PWD/qnativeandroidrelativelayoutparams.cpp \
+    $$PWD/qnativeandroidscrollview.cpp \
+    $$PWD/qnativeandroidsearchview.cpp \
+    $$PWD/qnativeandroidseekbar.cpp \
+    $$PWD/qnativeandroidspace.cpp \
+    $$PWD/qnativeandroidspinner.cpp \
+    $$PWD/qnativeandroidswitch.cpp \
+    $$PWD/qnativeandroidtabhost.cpp \
+    $$PWD/qnativeandroidtabspec.cpp \
+    $$PWD/qnativeandroidtabwidget.cpp \
+    $$PWD/qnativeandroidtextview.cpp \
+    $$PWD/qnativeandroidtimepicker.cpp \
+    $$PWD/qnativeandroidtoast.cpp \
+    $$PWD/qnativeandroidtogglebutton.cpp \
+    $$PWD/qnativeandroidviewanimator.cpp \
+    $$PWD/qnativeandroidviewflipper.cpp \
+    $$PWD/qnativeandroidviewswitcher.cpp
diff --git a/src/imports/android/qtqmlandroidplugin.cpp b/src/imports/android/qtqmlandroidplugin.cpp
index c5fdfc6..05fedbe 100644
--- a/src/imports/android/qtqmlandroidplugin.cpp
+++ b/src/imports/android/qtqmlandroidplugin.cpp
@@ -37,7 +37,7 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtQml/qqml.h>
 
-#include <QtQmlAndroid/private/qqmlandroidr_p.h>
+#include <QtQmlAndroid/private/qnativeandroidr_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -52,7 +52,7 @@ public:
 
 void QtQmlAndroidPlugin::registerTypes(const char *uri)
 {
-    qmlRegisterSingletonType<QQmlAndroidR>(uri, 0, 21, "R", QQmlAndroidR::provider);
+    qmlRegisterSingletonType<QNativeAndroidR>(uri, 0, 21, "R", QNativeAndroidR::provider);
 }
 
 QT_END_NAMESPACE
diff --git a/src/imports/app/qtqmlandroidappplugin.cpp b/src/imports/app/qtqmlandroidappplugin.cpp
index 1263964..54d3861 100644
--- a/src/imports/app/qtqmlandroidappplugin.cpp
+++ b/src/imports/app/qtqmlandroidappplugin.cpp
@@ -37,11 +37,11 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtQml/qqml.h>
 
-#include <QtQmlAndroid/private/qqmlandroidactionbar_p.h>
-#include <QtQmlAndroid/private/qqmlandroidactivity_p.h>
-#include <QtQmlAndroid/private/qqmlandroidalertdialog_p.h>
-#include <QtQmlAndroid/private/qqmlandroiddialog_p.h>
-#include <QtQmlAndroid/private/qqmlandroidservice_p.h>
+#include <QtQmlAndroid/private/qnativeandroidactionbar_p.h>
+#include <QtQmlAndroid/private/qnativeandroidactivity_p.h>
+#include <QtQmlAndroid/private/qnativeandroidalertdialog_p.h>
+#include <QtQmlAndroid/private/qnativeandroiddialog_p.h>
+#include <QtQmlAndroid/private/qnativeandroidservice_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -56,11 +56,11 @@ public:
 
 void QtQmlAndroidAppPlugin::registerTypes(const char *uri)
 {
-    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");
+    qmlRegisterType<QNativeAndroidActionBar>(uri, 0, 21, "ActionBar");
+    qmlRegisterType<QNativeAndroidActivity>(uri, 0, 21, "Activity");
+    qmlRegisterType<QNativeAndroidAlertDialog>(uri, 0, 21, "AlertDialog");
+    qmlRegisterType<QNativeAndroidDialog>(uri, 0, 21, "Dialog");
+    qmlRegisterType<QNativeAndroidService>(uri, 0, 21, "Service");
 }
 
 QT_END_NAMESPACE
diff --git a/src/imports/content/qtqmlandroidcontentplugin.cpp b/src/imports/content/qtqmlandroidcontentplugin.cpp
index 857c23b..4d68f4a 100644
--- a/src/imports/content/qtqmlandroidcontentplugin.cpp
+++ b/src/imports/content/qtqmlandroidcontentplugin.cpp
@@ -37,7 +37,7 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtQml/qqml.h>
 
-#include <QtQmlAndroid/private/qqmlandroidcontext_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcontext_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -52,7 +52,7 @@ public:
 
 void QtQmlAndroidContentPlugin::registerTypes(const char *uri)
 {
-    qmlRegisterUncreatableType<QQmlAndroidContext>(uri, 0, 21, "Context", QStringLiteral("Cannot create Context"));
+    qmlRegisterUncreatableType<QNativeAndroidContext>(uri, 0, 21, "Context", QStringLiteral("Cannot create Context"));
 }
 
 QT_END_NAMESPACE
diff --git a/src/imports/graphics/drawable/qtqmlandroiddrawableplugin.cpp b/src/imports/graphics/drawable/qtqmlandroiddrawableplugin.cpp
index b83dfad..8127e05 100644
--- a/src/imports/graphics/drawable/qtqmlandroiddrawableplugin.cpp
+++ b/src/imports/graphics/drawable/qtqmlandroiddrawableplugin.cpp
@@ -37,8 +37,8 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtQml/qqml.h>
 
-#include <QtQmlAndroid/private/qqmlandroidcolordrawable_p.h>
-#include <QtQmlAndroid/private/qqmlandroiddrawable_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcolordrawable_p.h>
+#include <QtQmlAndroid/private/qnativeandroiddrawable_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -53,8 +53,8 @@ public:
 
 void QtQmlAndroidDrawablePlugin::registerTypes(const char *uri)
 {
-    qmlRegisterType<QQmlAndroidColorDrawable>(uri, 0, 21, "ColorDrawable");
-    qmlRegisterType<QQmlAndroidDrawable>(uri, 0, 21, "Drawable");
+    qmlRegisterType<QNativeAndroidColorDrawable>(uri, 0, 21, "ColorDrawable");
+    qmlRegisterType<QNativeAndroidDrawable>(uri, 0, 21, "Drawable");
 }
 
 QT_END_NAMESPACE
diff --git a/src/imports/graphics/qtqmlandroidgraphicsplugin.cpp b/src/imports/graphics/qtqmlandroidgraphicsplugin.cpp
index 1f77c6b..952b4ad 100644
--- a/src/imports/graphics/qtqmlandroidgraphicsplugin.cpp
+++ b/src/imports/graphics/qtqmlandroidgraphicsplugin.cpp
@@ -37,7 +37,7 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtQml/qqml.h>
 
-#include <QtQmlAndroid/private/qqmlandroidcolor_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcolor_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -52,7 +52,7 @@ public:
 
 void QtQmlAndroidGraphicsPlugin::registerTypes(const char *uri)
 {
-    qmlRegisterSingletonType<QQmlAndroidColor>(uri, 0, 21, "Color", QQmlAndroidColor::provider);
+    qmlRegisterSingletonType<QNativeAndroidColor>(uri, 0, 21, "Color", QNativeAndroidColor::provider);
 }
 
 QT_END_NAMESPACE
diff --git a/src/imports/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp b/src/imports/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp
index 2ade385..6b9f59b 100644
--- a/src/imports/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp
+++ b/src/imports/support/v4/widget/qtqmlandroidsupportv4widgetplugin.cpp
@@ -37,8 +37,8 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtQml/qqml.h>
 
-#include <QtQmlAndroid/private/qqmlandroiddrawerlayout_p.h>
-#include <QtQmlAndroid/private/qqmlandroidswiperefreshlayout_p.h>
+#include <QtQmlAndroid/private/qnativeandroiddrawerlayout_p.h>
+#include <QtQmlAndroid/private/qnativeandroidswiperefreshlayout_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -53,8 +53,8 @@ public:
 
 void QtQmlAndroidSupportV4WidgetPlugin::registerTypes(const char *uri)
 {
-    qmlRegisterType<QQmlAndroidDrawerLayout>(uri, 0, 21, "DrawerLayout");
-    qmlRegisterType<QQmlAndroidSwipeRefreshLayout>(uri, 0, 21, "SwipeRefreshLayout");
+    qmlRegisterType<QNativeAndroidDrawerLayout>(uri, 0, 21, "DrawerLayout");
+    qmlRegisterType<QNativeAndroidSwipeRefreshLayout>(uri, 0, 21, "SwipeRefreshLayout");
 }
 
 QT_END_NAMESPACE
diff --git a/src/imports/support/v7/app/qtqmlandroidsupportv7appplugin.cpp b/src/imports/support/v7/app/qtqmlandroidsupportv7appplugin.cpp
index ee0e1cf..85d68bb 100644
--- a/src/imports/support/v7/app/qtqmlandroidsupportv7appplugin.cpp
+++ b/src/imports/support/v7/app/qtqmlandroidsupportv7appplugin.cpp
@@ -37,7 +37,7 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtQml/qqml.h>
 
-#include <QtQmlAndroid/private/qqmlandroidactionbardrawertoggle_p.h>
+#include <QtQmlAndroid/private/qnativeandroidactionbardrawertoggle_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -52,7 +52,7 @@ public:
 
 void QtQmlAndroidSupportV7AppPlugin::registerTypes(const char *uri)
 {
-    qmlRegisterType<QQmlAndroidActionBarDrawerToggle>(uri, 0, 21, "ActionBarDrawerToggle");
+    qmlRegisterType<QNativeAndroidActionBarDrawerToggle>(uri, 0, 21, "ActionBarDrawerToggle");
 }
 
 QT_END_NAMESPACE
diff --git a/src/imports/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp b/src/imports/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp
index aa7d6a5..2b90bc8 100644
--- a/src/imports/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp
+++ b/src/imports/support/v7/widget/qtqmlandroidsupportv7widgetplugin.cpp
@@ -37,9 +37,9 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtQml/qqml.h>
 
-#include <QtQmlAndroid/private/qqmlandroidcardview_p.h>
-#include <QtQmlAndroid/private/qqmlandroidrecycleradapter_p.h>
-#include <QtQmlAndroid/private/qqmlandroidrecyclerview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcardview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidrecycleradapter_p.h>
+#include <QtQmlAndroid/private/qnativeandroidrecyclerview_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -54,9 +54,9 @@ public:
 
 void QtQmlAndroidSupportV7WidgetPlugin::registerTypes(const char *uri)
 {
-    qmlRegisterType<QQmlAndroidCardView>(uri, 0, 21, "CardView");
-    qmlRegisterType<QQmlAndroidRecyclerAdapter>(uri, 0, 21, "RecyclerAdapter");
-    qmlRegisterType<QQmlAndroidRecyclerView>(uri, 0, 21, "RecyclerView");
+    qmlRegisterType<QNativeAndroidCardView>(uri, 0, 21, "CardView");
+    qmlRegisterType<QNativeAndroidRecyclerAdapter>(uri, 0, 21, "RecyclerAdapter");
+    qmlRegisterType<QNativeAndroidRecyclerView>(uri, 0, 21, "RecyclerView");
 }
 
 QT_END_NAMESPACE
diff --git a/src/imports/view/animation/qtqmlandroidanimationplugin.cpp b/src/imports/view/animation/qtqmlandroidanimationplugin.cpp
index 893d857..284ff68 100644
--- a/src/imports/view/animation/qtqmlandroidanimationplugin.cpp
+++ b/src/imports/view/animation/qtqmlandroidanimationplugin.cpp
@@ -37,22 +37,22 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtQml/qqml.h>
 
-#include <QtQmlAndroid/private/qqmlandroidacceleratedecelerateinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidaccelerateinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidalphaanimation_p.h>
-#include <QtQmlAndroid/private/qqmlandroidanimation_p.h>
-#include <QtQmlAndroid/private/qqmlandroidanimationset_p.h>
-#include <QtQmlAndroid/private/qqmlandroidanticipateinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidanticipateovershootinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidbounceinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidcycleinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroiddecelerateinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidlinearinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidovershootinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidpathinterpolator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidrotateanimation_p.h>
-#include <QtQmlAndroid/private/qqmlandroidscaleanimation_p.h>
-#include <QtQmlAndroid/private/qqmlandroidtranslateanimation_p.h>
+#include <QtQmlAndroid/private/qnativeandroidacceleratedecelerateinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidaccelerateinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidalphaanimation_p.h>
+#include <QtQmlAndroid/private/qnativeandroidanimation_p.h>
+#include <QtQmlAndroid/private/qnativeandroidanimationset_p.h>
+#include <QtQmlAndroid/private/qnativeandroidanticipateinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidanticipateovershootinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidbounceinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcycleinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroiddecelerateinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidlinearinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidovershootinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidpathinterpolator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidrotateanimation_p.h>
+#include <QtQmlAndroid/private/qnativeandroidscaleanimation_p.h>
+#include <QtQmlAndroid/private/qnativeandroidtranslateanimation_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -67,23 +67,23 @@ public:
 
 void QtQmlAndroidAnimationPlugin::registerTypes(const char *uri)
 {
-    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", QStringLiteral("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");
+    qmlRegisterType<QNativeAndroidAccelerateDecelerateInterpolator>(uri, 0, 21, "AccelerateDecelerateInterpolator");
+    qmlRegisterType<QNativeAndroidAccelerateInterpolator>(uri, 0, 21, "AccelerateInterpolator");
+    qmlRegisterType<QNativeAndroidAlphaAnimation>(uri, 0, 21, "AlphaAnimation");
+    qmlRegisterType<QNativeAndroidAnimation>(uri, 0, 21, "Animation");
+    qmlRegisterType<QNativeAndroidAnimationSet>(uri, 0, 21, "AnimationSet");
+    qmlRegisterType<QNativeAndroidAnticipateInterpolator>(uri, 0, 21, "AnticipateInterpolator");
+    qmlRegisterType<QNativeAndroidAnticipateOvershootInterpolator>(uri, 0, 21, "AnticipateOvershootInterpolator");
+    qmlRegisterType<QNativeAndroidBounceInterpolator>(uri, 0, 21, "BounceInterpolator");
+    qmlRegisterType<QNativeAndroidCycleInterpolator>(uri, 0, 21, "CycleInterpolator");
+    qmlRegisterType<QNativeAndroidDecelerateInterpolator>(uri, 0, 21, "DecelerateInterpolator");
+    qmlRegisterUncreatableType<QNativeAndroidInterpolator>(uri, 0, 21, "Interpolator", QStringLiteral("Interpolator is abstract"));
+    qmlRegisterType<QNativeAndroidLinearInterpolator>(uri, 0, 21, "LinearInterpolator");
+    qmlRegisterType<QNativeAndroidOvershootInterpolator>(uri, 0, 21, "OvershootInterpolator");
+    qmlRegisterType<QNativeAndroidPathInterpolator>(uri, 0, 21, "PathInterpolator");
+    qmlRegisterType<QNativeAndroidRotateAnimation>(uri, 0, 21, "RotateAnimation");
+    qmlRegisterType<QNativeAndroidScaleAnimation>(uri, 0, 21, "ScaleAnimation");
+    qmlRegisterType<QNativeAndroidTranslateAnimation>(uri, 0, 21, "TranslateAnimation");
 }
 
 QT_END_NAMESPACE
diff --git a/src/imports/view/qtqmlandroidviewplugin.cpp b/src/imports/view/qtqmlandroidviewplugin.cpp
index e616913..f9da7ec 100644
--- a/src/imports/view/qtqmlandroidviewplugin.cpp
+++ b/src/imports/view/qtqmlandroidviewplugin.cpp
@@ -37,13 +37,13 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtQml/qqml.h>
 
-#include <QtQmlAndroid/private/qqmlandroidgravity_p.h>
-#include <QtQmlAndroid/private/qqmlandroidlayoutparams_p.h>
-#include <QtQmlAndroid/private/qqmlandroidmenu_p.h>
-#include <QtQmlAndroid/private/qqmlandroidmenuitem_p.h>
-#include <QtQmlAndroid/private/qqmlandroidview_p.h>
-#include <QtQmlAndroid/private/qqmlandroidviewgroup_p.h>
-#include <QtQmlAndroid/private/qqmlandroidwindow_p.h>
+#include <QtQmlAndroid/private/qnativeandroidgravity_p.h>
+#include <QtQmlAndroid/private/qnativeandroidlayoutparams_p.h>
+#include <QtQmlAndroid/private/qnativeandroidmenu_p.h>
+#include <QtQmlAndroid/private/qnativeandroidmenuitem_p.h>
+#include <QtQmlAndroid/private/qnativeandroidview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidviewgroup_p.h>
+#include <QtQmlAndroid/private/qnativeandroidwindow_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -58,13 +58,13 @@ public:
 
 void QtQmlAndroidViewPlugin::registerTypes(const char *uri)
 {
-    qmlRegisterUncreatableType<QQmlAndroidGravity>(uri, 0, 21, "Gravity", QStringLiteral("Gravity is an enum"));
-    qmlRegisterUncreatableType<QQmlAndroidLayoutParams>(uri, 0, 21, "Layout", QStringLiteral("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>();
+    qmlRegisterUncreatableType<QNativeAndroidGravity>(uri, 0, 21, "Gravity", QStringLiteral("Gravity is an enum"));
+    qmlRegisterUncreatableType<QNativeAndroidLayoutParams>(uri, 0, 21, "Layout", QStringLiteral("Layout is an attached property"));
+    qmlRegisterType<QNativeAndroidMenu>(uri, 0, 21, "Menu");
+    qmlRegisterType<QNativeAndroidMenuItem>(uri, 0, 21, "MenuItem");
+    qmlRegisterType<QNativeAndroidView>(uri, 0, 21, "View");
+    qmlRegisterType<QNativeAndroidViewGroup>(uri, 0, 21, "ViewGroup");
+    qmlRegisterType<QNativeAndroidWindow>();
 }
 
 QT_END_NAMESPACE
diff --git a/src/imports/widget/qtqmlandroidwidgetplugin.cpp b/src/imports/widget/qtqmlandroidwidgetplugin.cpp
index 4287ef5..bd581e2 100644
--- a/src/imports/widget/qtqmlandroidwidgetplugin.cpp
+++ b/src/imports/widget/qtqmlandroidwidgetplugin.cpp
@@ -37,42 +37,42 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtQml/qqml.h>
 
-#include <QtQmlAndroid/private/qqmlandroidarrayadapter_p.h>
-#include <QtQmlAndroid/private/qqmlandroidbutton_p.h>
-#include <QtQmlAndroid/private/qqmlandroidcalendarview_p.h>
-#include <QtQmlAndroid/private/qqmlandroidcheckbox_p.h>
-#include <QtQmlAndroid/private/qqmlandroiddatepicker_p.h>
-#include <QtQmlAndroid/private/qqmlandroidedittext_p.h>
-#include <QtQmlAndroid/private/qqmlandroidframelayout_p.h>
-#include <QtQmlAndroid/private/qqmlandroidframelayoutparams_p.h>
-#include <QtQmlAndroid/private/qqmlandroidimageview_p.h>
-#include <QtQmlAndroid/private/qqmlandroidlinearlayout_p.h>
-#include <QtQmlAndroid/private/qqmlandroidlinearlayoutparams_p.h>
-#include <QtQmlAndroid/private/qqmlandroidlistview_p.h>
-#include <QtQmlAndroid/private/qqmlandroidnumberpicker_p.h>
-#include <QtQmlAndroid/private/qqmlandroidpopupmenu_p.h>
-#include <QtQmlAndroid/private/qqmlandroidprogressbar_p.h>
-#include <QtQmlAndroid/private/qqmlandroidradiobutton_p.h>
-#include <QtQmlAndroid/private/qqmlandroidradiogroup_p.h>
-#include <QtQmlAndroid/private/qqmlandroidratingbar_p.h>
-#include <QtQmlAndroid/private/qqmlandroidrelativelayout_p.h>
-#include <QtQmlAndroid/private/qqmlandroidrelativelayoutparams_p.h>
-#include <QtQmlAndroid/private/qqmlandroidscrollview_p.h>
-#include <QtQmlAndroid/private/qqmlandroidsearchview_p.h>
-#include <QtQmlAndroid/private/qqmlandroidseekbar_p.h>
-#include <QtQmlAndroid/private/qqmlandroidspace_p.h>
-#include <QtQmlAndroid/private/qqmlandroidspinner_p.h>
-#include <QtQmlAndroid/private/qqmlandroidswitch_p.h>
-#include <QtQmlAndroid/private/qqmlandroidtabhost_p.h>
-#include <QtQmlAndroid/private/qqmlandroidtabspec_p.h>
-#include <QtQmlAndroid/private/qqmlandroidtabwidget_p.h>
-#include <QtQmlAndroid/private/qqmlandroidtextview_p.h>
-#include <QtQmlAndroid/private/qqmlandroidtimepicker_p.h>
-#include <QtQmlAndroid/private/qqmlandroidtoast_p.h>
-#include <QtQmlAndroid/private/qqmlandroidtogglebutton_p.h>
-#include <QtQmlAndroid/private/qqmlandroidviewanimator_p.h>
-#include <QtQmlAndroid/private/qqmlandroidviewflipper_p.h>
-#include <QtQmlAndroid/private/qqmlandroidviewswitcher_p.h>
+#include <QtQmlAndroid/private/qnativeandroidarrayadapter_p.h>
+#include <QtQmlAndroid/private/qnativeandroidbutton_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcalendarview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcheckbox_p.h>
+#include <QtQmlAndroid/private/qnativeandroiddatepicker_p.h>
+#include <QtQmlAndroid/private/qnativeandroidedittext_p.h>
+#include <QtQmlAndroid/private/qnativeandroidframelayout_p.h>
+#include <QtQmlAndroid/private/qnativeandroidframelayoutparams_p.h>
+#include <QtQmlAndroid/private/qnativeandroidimageview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidlinearlayout_p.h>
+#include <QtQmlAndroid/private/qnativeandroidlinearlayoutparams_p.h>
+#include <QtQmlAndroid/private/qnativeandroidlistview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidnumberpicker_p.h>
+#include <QtQmlAndroid/private/qnativeandroidpopupmenu_p.h>
+#include <QtQmlAndroid/private/qnativeandroidprogressbar_p.h>
+#include <QtQmlAndroid/private/qnativeandroidradiobutton_p.h>
+#include <QtQmlAndroid/private/qnativeandroidradiogroup_p.h>
+#include <QtQmlAndroid/private/qnativeandroidratingbar_p.h>
+#include <QtQmlAndroid/private/qnativeandroidrelativelayout_p.h>
+#include <QtQmlAndroid/private/qnativeandroidrelativelayoutparams_p.h>
+#include <QtQmlAndroid/private/qnativeandroidscrollview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidsearchview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidseekbar_p.h>
+#include <QtQmlAndroid/private/qnativeandroidspace_p.h>
+#include <QtQmlAndroid/private/qnativeandroidspinner_p.h>
+#include <QtQmlAndroid/private/qnativeandroidswitch_p.h>
+#include <QtQmlAndroid/private/qnativeandroidtabhost_p.h>
+#include <QtQmlAndroid/private/qnativeandroidtabspec_p.h>
+#include <QtQmlAndroid/private/qnativeandroidtabwidget_p.h>
+#include <QtQmlAndroid/private/qnativeandroidtextview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidtimepicker_p.h>
+#include <QtQmlAndroid/private/qnativeandroidtoast_p.h>
+#include <QtQmlAndroid/private/qnativeandroidtogglebutton_p.h>
+#include <QtQmlAndroid/private/qnativeandroidviewanimator_p.h>
+#include <QtQmlAndroid/private/qnativeandroidviewflipper_p.h>
+#include <QtQmlAndroid/private/qnativeandroidviewswitcher_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -87,43 +87,43 @@ public:
 
 void QtQmlAndroidWidgetPlugin::registerTypes(const char *uri)
 {
-    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", QStringLiteral("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");
+    qmlRegisterType<QNativeAndroidArrayAdapter>(uri, 0, 21, "ArrayAdapter");
+    qmlRegisterType<QNativeAndroidBaseAdapter>();
+    qmlRegisterType<QNativeAndroidButton>(uri, 0, 21, "Button");
+    qmlRegisterType<QNativeAndroidCalendarView>(uri, 0, 21, "CalendarView");
+    qmlRegisterType<QNativeAndroidCheckBox>(uri, 0, 21, "CheckBox");
+    qmlRegisterType<QNativeAndroidDatePicker>(uri, 0, 21, "DatePicker");
+    qmlRegisterType<QNativeAndroidEditText>(uri, 0, 21, "EditText");
+    qmlRegisterType<QNativeAndroidFrameLayout>(uri, 0, 21, "FrameLayout");
+    qmlRegisterType<QNativeAndroidFrameLayoutParams>();
+    qmlRegisterType<QNativeAndroidImageView>(uri, 0, 21, "ImageView");
+    qmlRegisterType<QNativeAndroidLinearLayout>(uri, 0, 21, "LinearLayout");
+    qmlRegisterType<QNativeAndroidLinearLayoutParams>();
+    qmlRegisterType<QNativeAndroidListView>(uri, 0, 21, "ListView");
+    qmlRegisterType<QNativeAndroidNumberPicker>(uri, 0, 21, "NumberPicker");
+    qmlRegisterType<QNativeAndroidPopupMenu>(uri, 0, 21, "PopupMenu");
+    qmlRegisterType<QNativeAndroidProgressBar>(uri, 0, 21, "ProgressBar");
+    qmlRegisterType<QNativeAndroidRadioButton>(uri, 0, 21, "RadioButton");
+    qmlRegisterType<QNativeAndroidRadioGroup>(uri, 0, 21, "RadioGroup");
+    qmlRegisterType<QNativeAndroidRatingBar>(uri, 0, 21, "RatingBar");
+    qmlRegisterType<QNativeAndroidRelativeLayout>(uri, 0, 21, "RelativeLayout");
+    qmlRegisterType<QNativeAndroidRelativeLayoutParams>();
+    qmlRegisterType<QNativeAndroidScrollView>(uri, 0, 21, "ScrollView");
+    qmlRegisterType<QNativeAndroidSearchView>(uri, 0, 21, "SearchView");
+    qmlRegisterType<QNativeAndroidSeekBar>(uri, 0, 21, "SeekBar");
+    qmlRegisterType<QNativeAndroidSpace>(uri, 0, 21, "Space");
+    qmlRegisterType<QNativeAndroidSpinner>(uri, 0, 21, "Spinner");
+    qmlRegisterType<QNativeAndroidSwitch>(uri, 0, 21, "Switch");
+    qmlRegisterType<QNativeAndroidTabHost>(uri, 0, 21, "TabHost");
+    qmlRegisterUncreatableType<QNativeAndroidTabSpec>(uri, 0, 21, "TabSpec", QStringLiteral("TabSpec is an attached property"));
+    qmlRegisterType<QNativeAndroidTabWidget>(uri, 0, 21, "TabWidget");
+    qmlRegisterType<QNativeAndroidTextView>(uri, 0, 21, "TextView");
+    qmlRegisterType<QNativeAndroidTimePicker>(uri, 0, 21, "TimePicker");
+    qmlRegisterType<QNativeAndroidToast>(uri, 0, 21, "Toast");
+    qmlRegisterType<QNativeAndroidToggleButton>(uri, 0, 21, "ToggleButton");
+    qmlRegisterType<QNativeAndroidViewAnimator>(uri, 0, 21, "ViewAnimator");
+    qmlRegisterType<QNativeAndroidViewFlipper>(uri, 0, 21, "ViewFlipper");
+    qmlRegisterType<QNativeAndroidViewSwitcher>(uri, 0, 21, "ViewSwitcher");
 }
 
 QT_END_NAMESPACE