94 files changed, 1626 insertions, 1626 deletions

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/widget/qqmlandroidedittext_p.h b/src/android/widget/qnativeandroidbutton_p.h
index 5263a90..18ed287 100644
--- a/src/android/widget/qqmlandroidedittext_p.h
+++ b/src/android/widget/qnativeandroidbutton_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDEDITTEXT_P_H
-#define QQMLANDROIDEDITTEXT_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/qqmlandroidtextview_p.h>
+#include <QtQmlAndroid/private/qnativeandroidtextview_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidEditText : public QQmlAndroidTextView
+class Q_QMLANDROID_EXPORT QNativeAndroidButton : public QNativeAndroidTextView
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidEditText(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidButton(QNativeAndroidView *parent = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
@@ -66,4 +66,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDEDITTEXT_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/qqmlandroidcheckbox_p.h b/src/android/widget/qnativeandroidcheckbox_p.h
index 947487a..5c488e4 100644
--- a/src/android/widget/qqmlandroidcheckbox_p.h
+++ b/src/android/widget/qnativeandroidcheckbox_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDCHECKBOX_P_H
-#define QQMLANDROIDCHECKBOX_P_H
+#ifndef QNATIVEANDROIDCHECKBOX_P_H
+#define QNATIVEANDROIDCHECKBOX_P_H
 
 //
 //  W A R N I N G
@@ -48,16 +48,16 @@
 // We mean it.
 //
 
-#include <QtQmlAndroid/private/qqmlandroidcompoundbutton_p.h>
+#include <QtQmlAndroid/private/qnativeandroidcompoundbutton_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidCheckBox : public QQmlAndroidCompoundButton
+class Q_QMLANDROID_EXPORT QNativeAndroidCheckBox : public QNativeAndroidCompoundButton
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidCheckBox(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidCheckBox(QNativeAndroidView *parent = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
@@ -66,4 +66,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDCHECKBOX_P_H
+#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/widget/qqmlandroidabsseekbar_p.h b/src/android/widget/qnativeandroidedittext_p.h
index f7bb356..733922b 100644
--- a/src/android/widget/qqmlandroidabsseekbar_p.h
+++ b/src/android/widget/qnativeandroidedittext_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLANDROIDABSSEEKBAR_P_H
-#define QQMLANDROIDABSSEEKBAR_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/qqmlandroidprogressbar_p.h>
+#include <QtQmlAndroid/private/qnativeandroidtextview_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QMLANDROID_EXPORT QQmlAndroidAbsSeekBar : public QQmlAndroidProgressBar
+class Q_QMLANDROID_EXPORT QNativeAndroidEditText : public QNativeAndroidTextView
 {
     Q_OBJECT
 
 public:
-    explicit QQmlAndroidAbsSeekBar(QQmlAndroidView *parent = nullptr);
+    explicit QNativeAndroidEditText(QNativeAndroidView *parent = nullptr);
 
 protected:
     QAndroidJniObject onCreate() override;
@@ -66,4 +66,4 @@ protected:
 
 QT_END_NAMESPACE
 
-#endif // QQMLANDROIDABSSEEKBAR_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/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/qqmlandroidtabwidget_p.h b/src/android/widget/qqmlandroidtabwidget_p.h
deleted file mode 100644
index f072db2..0000000
--- a/src/android/widget/qqmlandroidtabwidget_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 QQMLANDROIDTABWIDGET_P_H
-#define QQMLANDROIDTABWIDGET_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 QQmlAndroidTabWidget : public QQmlAndroidLinearLayout
-{
-    Q_OBJECT
-
-public:
-    explicit QQmlAndroidTabWidget(QQmlAndroidView *parent = nullptr);
-
-protected:
-    QAndroidJniObject onCreate() override;
-    void onInflate(QAndroidJniObject &instance) override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QQMLANDROIDTABWIDGET_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