Rename .java files

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

33 files changed, 89 insertions, 89 deletions

diff --git a/README b/README
index a98d7e2..fbb4810 100644
--- a/README
+++ b/README
@@ -45,8 +45,8 @@ stay the same, using QQmlApplicationEngine to load the main.qml:
 Using an options menu in Activity requires changing the activity
 type in AndroidManifest.xml. The default activity type for Qt apps
 is "org.qtproject.qt5.android.bindings.QtActivity", which must be
-changed to "qt.android.app.QmlActivity". In order to create the
-file, click "Create Templates" in Qt Creator:
+changed to "qt.android.app.QtNativeActivity". In order to create
+the file, click "Create Templates" in Qt Creator:
 
     Projects -> Build & Run -> Build Steps -> Build Android APK
 
diff --git a/examples/qmlandroid/catalog/android/AndroidManifest.xml b/examples/qmlandroid/catalog/android/AndroidManifest.xml
index f6f9c8c..e203ab7 100644
--- a/examples/qmlandroid/catalog/android/AndroidManifest.xml
+++ b/examples/qmlandroid/catalog/android/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='utf-8'?>
 <manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:theme="@android:style/Theme.Material.Light.DarkActionBar">
-        <service android:name="qt.android.app.QmlService" />
+        <service android:name="qt.android.app.QtNativeService" />
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
-                  android:name="qt.android.app.QmlActivity"
+                  android:name="qt.android.app.QtNativeActivity"
                   android:label="-- %%INSERT_APP_NAME%% --"
                   android:screenOrientation="unspecified"
                   android:launchMode="singleTop">
diff --git a/src/android/app/qnativeandroidactivity.cpp b/src/android/app/qnativeandroidactivity.cpp
index 4208b2a..6412158 100644
--- a/src/android/app/qnativeandroidactivity.cpp
+++ b/src/android/app/qnativeandroidactivity.cpp
@@ -175,7 +175,7 @@ void QNativeAndroidActivity::updateOptionsMenu()
 
     QAndroidJniObject activity = instance();
     QtQmlAndroid::callFunction([=]() {
-        activity.callMethod<void>("setOptionsMenu", "(Lqt/android/view/QmlMenu;)V", menu.object());
+        activity.callMethod<void>("setOptionsMenu", "(Lqt/android/view/QtNativeMenu;)V", menu.object());
     });
 }
 
diff --git a/src/android/app/qnativeandroidservice.cpp b/src/android/app/qnativeandroidservice.cpp
index ccb0d49..5c5e9a9 100644
--- a/src/android/app/qnativeandroidservice.cpp
+++ b/src/android/app/qnativeandroidservice.cpp
@@ -73,7 +73,7 @@ void QNativeAndroidService::start()
                                                      cls.object());
         intent.callObjectMethod("putExtra",
                                 "(Ljava/lang/String;J)Landroid/content/Intent;",
-                                QAndroidJniObject::fromString(QStringLiteral("QmlService")).object(),
+                                QAndroidJniObject::fromString(QStringLiteral("QtNativeService")).object(),
                                 reinterpret_cast<jlong>(this));
         QAndroidJniObject component = context.callObjectMethod("startService",
                                                                "(Landroid/content/Intent;)Landroid/content/ComponentName;",
@@ -98,7 +98,7 @@ void QNativeAndroidService::stop()
                                                      cls.object());
         intent.callObjectMethod("putExtra",
                                 "(Ljava/lang/String;J)Landroid/content/Intent;",
-                                QAndroidJniObject::fromString(QStringLiteral("QmlService")).object(),
+                                QAndroidJniObject::fromString(QStringLiteral("QtNativeService")).object(),
                                 reinterpret_cast<jlong>(this));
         context.callMethod<jboolean>("stopService",
                                      "(Landroid/content/Intent;)Z",
@@ -108,7 +108,7 @@ void QNativeAndroidService::stop()
 
 QAndroidJniObject QNativeAndroidService::onCreate()
 {
-    return QAndroidJniObject("qt/android/app/QmlService");
+    return QAndroidJniObject("qt/android/app/QtNativeService");
 }
 
 void QNativeAndroidService::onInflate(QAndroidJniObject& instance)
diff --git a/src/android/java/java.pri b/src/android/java/java.pri
index 8ae10ef..2bc8037 100644
--- a/src/android/java/java.pri
+++ b/src/android/java/java.pri
@@ -1,18 +1,18 @@
 OTHER_FILES += \
-    $$PWD/native/qt/android/app/QmlActivity.java \
-    $$PWD/native/qt/android/app/QmlService.java \
-    $$PWD/native/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java \
-    $$PWD/native/qt/android/support/v7/widget/QmlRecyclerAdapter.java \
-    $$PWD/native/qt/android/view/QmlMenu.java \
-    $$PWD/native/qt/android/view/QmlMenuItem.java \
-    $$PWD/native/qt/android/view/QmlViewListener.java \
-    $$PWD/native/qt/android/widget/QmlCompoundButtonListener.java \
-    $$PWD/native/qt/android/widget/QmlNumberPickerListener.java \
-    $$PWD/native/qt/android/widget/QmlRadioGroupListener.java \
-    $$PWD/native/qt/android/widget/QmlRatingBarListener.java \
-    $$PWD/native/qt/android/widget/QmlScrollView.java \
-    $$PWD/native/qt/android/widget/QmlSeekBarListener.java \
-    $$PWD/natiev/qt/android/widget/QmlTabHostListener.java
+    $$PWD/native/qt/android/app/QtNativeActivity.java \
+    $$PWD/native/qt/android/app/QtNativeService.java \
+    $$PWD/native/qt/android/support/v4/widget/QtNativeSwipeRefreshLayoutListener.java \
+    $$PWD/native/qt/android/support/v7/widget/QtNativeRecyclerAdapter.java \
+    $$PWD/native/qt/android/view/QtNativeMenu.java \
+    $$PWD/native/qt/android/view/QtNativeMenuItem.java \
+    $$PWD/native/qt/android/view/QtNativeViewListener.java \
+    $$PWD/native/qt/android/widget/QtNativeCompoundButtonListener.java \
+    $$PWD/native/qt/android/widget/QtNativeNumberPickerListener.java \
+    $$PWD/native/qt/android/widget/QtNativeRadioGroupListener.java \
+    $$PWD/native/qt/android/widget/QtNativeRatingBarListener.java \
+    $$PWD/native/qt/android/widget/QtNativeScrollView.java \
+    $$PWD/native/qt/android/widget/QtNativeSeekBarListener.java \
+    $$PWD/natiev/qt/android/widget/QtNativeTabHostListener.java
 
 java.files = $$PWD/native
 java.path = $$[QT_INSTALL_PREFIX]/src/android/java
diff --git a/src/android/java/native/qt/android/app/QmlActivity.java b/src/android/java/native/qt/android/app/QtNativeActivity.java
index 21666b4..5be9d9d 100644
--- a/src/android/java/native/qt/android/app/QmlActivity.java
+++ b/src/android/java/native/qt/android/app/QtNativeActivity.java
@@ -45,15 +45,15 @@ import android.util.TypedValue;
 
 import android.view.Menu;
 
-import qt.android.view.QmlMenu;
+import qt.android.view.QtNativeMenu;
 
-public class QmlActivity extends org.qtproject.qt5.android.bindings.QtActivity
+public class QtNativeActivity extends org.qtproject.qt5.android.bindings.QtActivity
 {
-    public QmlActivity() {
+    public QtNativeActivity() {
         m_menu = null;
     }
 
-    public void setOptionsMenu(QmlMenu menu) {
+    public void setOptionsMenu(QtNativeMenu menu) {
         if (m_menu != menu) {
             m_menu = menu;
             invalidateOptionsMenu();
@@ -90,5 +90,5 @@ public class QmlActivity extends org.qtproject.qt5.android.bindings.QtActivity
         m_menu.closed(menu);
     }
 
-    private QmlMenu m_menu;
+    private QtNativeMenu m_menu;
 }
diff --git a/src/android/java/native/qt/android/app/QmlService.java b/src/android/java/native/qt/android/app/QtNativeService.java
index 16203ce..85dc7af 100644
--- a/src/android/java/native/qt/android/app/QmlService.java
+++ b/src/android/java/native/qt/android/app/QtNativeService.java
@@ -40,54 +40,54 @@ import android.app.Service;
 import android.os.IBinder;
 import android.content.Intent;
 
-public class QmlService extends Service
+public class QtNativeService extends Service
 {
-    public QmlService() {
+    public QtNativeService() {
     }
 
     @Override
     public void onCreate() {
-        System.out.println("### QmlService.onCreate");
+        System.out.println("### QtNativeService.onCreate");
         onCreated(0);
     }
 
     @Override
     public void onDestroy() {
-        System.out.println("### QmlService.onDestroy");
+        System.out.println("### QtNativeService.onDestroy");
         onDestroyed(0);
     }
 
     @Override
     public IBinder onBind(Intent intent) {
-        long instance = intent.getLongExtra("QmlService", 0);
-        System.out.println("### TODO: QmlService.onBind " + instance);
+        long instance = intent.getLongExtra("QtNativeService", 0);
+        System.out.println("### TODO: QtNativeService.onBind " + instance);
         return null;
     }
 
     @Override
     public void onRebind(Intent intent) {
-        long instance = intent.getLongExtra("QmlService", 0);
-        System.out.println("### TODO: QmlService.onRebind " + instance);
+        long instance = intent.getLongExtra("QtNativeService", 0);
+        System.out.println("### TODO: QtNativeService.onRebind " + instance);
     }
 
     @Override
     public boolean onUnbind(Intent intent) {
-        long instance = intent.getLongExtra("QmlService", 0);
-        System.out.println("### TODO: QmlService.onUnbind " + instance);
+        long instance = intent.getLongExtra("QtNativeService", 0);
+        System.out.println("### TODO: QtNativeService.onUnbind " + instance);
         return false;
     }
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        long instance = intent.getLongExtra("QmlService", 0);
-        System.out.println("### QmlService.onStartCommand " + instance);
+        long instance = intent.getLongExtra("QtNativeService", 0);
+        System.out.println("### QtNativeService.onStartCommand " + instance);
         return onStartCommand(instance, flags, startId) ? START_STICKY : START_NOT_STICKY;
     }
 
     @Override
     public void onTaskRemoved(Intent rootIntent) {
-        long instance = rootIntent.getLongExtra("QmlService", 0);
-        System.out.println("### QmlService.onTaskRemoved " + instance);
+        long instance = rootIntent.getLongExtra("QtNativeService", 0);
+        System.out.println("### QtNativeService.onTaskRemoved " + instance);
     }
 
     private static native void onCreated(long instance);
diff --git a/src/android/java/native/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java b/src/android/java/native/qt/android/support/v4/widget/QtNativeSwipeRefreshLayoutListener.java
index 208413e..b33a2c6 100644
--- a/src/android/java/native/qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener.java
+++ b/src/android/java/native/qt/android/support/v4/widget/QtNativeSwipeRefreshLayoutListener.java
@@ -38,9 +38,9 @@ package qt.android.support.v4.widget;
 
 import android.support.v4.widget.SwipeRefreshLayout;
 
-public class QmlSwipeRefreshLayoutListener implements SwipeRefreshLayout.OnRefreshListener
+public class QtNativeSwipeRefreshLayoutListener implements SwipeRefreshLayout.OnRefreshListener
 {
-    public QmlSwipeRefreshLayoutListener(SwipeRefreshLayout layout, long instance) {
+    public QtNativeSwipeRefreshLayoutListener(SwipeRefreshLayout layout, long instance) {
         m_instance = instance;
         layout.setOnRefreshListener(this);
     }
diff --git a/src/android/java/native/qt/android/support/v7/widget/QmlRecyclerAdapter.java b/src/android/java/native/qt/android/support/v7/widget/QtNativeRecyclerAdapter.java
index fcf015d..095a7c5 100644
--- a/src/android/java/native/qt/android/support/v7/widget/QmlRecyclerAdapter.java
+++ b/src/android/java/native/qt/android/support/v7/widget/QtNativeRecyclerAdapter.java
@@ -42,9 +42,9 @@ import android.support.v7.widget.RecyclerView;
 
 import java.lang.Integer;
 
-public class QmlRecyclerAdapter extends RecyclerView.Adapter<QmlRecyclerAdapter.ViewHolder>
+public class QtNativeRecyclerAdapter extends RecyclerView.Adapter<QtNativeRecyclerAdapter.ViewHolder>
 {
-    public QmlRecyclerAdapter(int count, long instance) {
+    public QtNativeRecyclerAdapter(int count, long instance) {
         m_count = count;
         m_instance = instance;
     }
diff --git a/src/android/java/native/qt/android/view/QmlMenu.java b/src/android/java/native/qt/android/view/QtNativeMenu.java
index 43a195e..db08b55 100644
--- a/src/android/java/native/qt/android/view/QmlMenu.java
+++ b/src/android/java/native/qt/android/view/QtNativeMenu.java
@@ -41,20 +41,20 @@ import java.util.ArrayList;
 import android.view.Menu;
 import android.view.MenuItem;
 
-import qt.android.view.QmlMenuItem;
+import qt.android.view.QtNativeMenuItem;
 
-public class QmlMenu
+public class QtNativeMenu
 {
-    public QmlMenu() {
-        m_items = new ArrayList<QmlMenuItem>();
+    public QtNativeMenu() {
+        m_items = new ArrayList<QtNativeMenuItem>();
     }
 
-    public void add(QmlMenuItem item) {
+    public void add(QtNativeMenuItem item) {
         m_items.add(item);
     }
 
     public boolean create(Menu menu) {
-        for (QmlMenuItem item : m_items) {
+        for (QtNativeMenuItem item : m_items) {
             MenuItem mi = menu.add(item.getTitle());
             item.create(mi);
         }
@@ -68,5 +68,5 @@ public class QmlMenu
     public void closed(Menu menu) {
     }
 
-    private ArrayList<QmlMenuItem> m_items;
+    private ArrayList<QtNativeMenuItem> m_items;
 }
diff --git a/src/android/java/native/qt/android/view/QmlMenuItem.java b/src/android/java/native/qt/android/view/QtNativeMenuItem.java
index fbd9b36..c62c23a 100644
--- a/src/android/java/native/qt/android/view/QmlMenuItem.java
+++ b/src/android/java/native/qt/android/view/QtNativeMenuItem.java
@@ -40,10 +40,10 @@ import java.lang.CharSequence;
 import android.view.MenuItem;
 import android.view.View;
 
-public class QmlMenuItem implements MenuItem.OnMenuItemClickListener,
+public class QtNativeMenuItem implements MenuItem.OnMenuItemClickListener,
                                     MenuItem.OnActionExpandListener
 {
-    public QmlMenuItem(long instance) {
+    public QtNativeMenuItem(long instance) {
         m_instance = instance;
         m_enabled = true;
         m_visible = true;
diff --git a/src/android/java/native/qt/android/view/QmlViewListener.java b/src/android/java/native/qt/android/view/QtNativeViewListener.java
index 941e4bf..dc3462f 100644
--- a/src/android/java/native/qt/android/view/QmlViewListener.java
+++ b/src/android/java/native/qt/android/view/QtNativeViewListener.java
@@ -39,12 +39,12 @@ package qt.android.view;
 import android.view.View;
 import android.widget.AdapterView;
 
-public class QmlViewListener implements View.OnClickListener,
+public class QtNativeViewListener implements View.OnClickListener,
                                         View.OnFocusChangeListener,
                                         View.OnLayoutChangeListener,
                                         View.OnLongClickListener
 {
-    public QmlViewListener(View view, long instance) {
+    public QtNativeViewListener(View view, long instance) {
         m_instance = instance;
         if (!(view instanceof AdapterView)) {
             view.setOnClickListener(this);
diff --git a/src/android/java/native/qt/android/widget/QmlAdapterViewListener.java b/src/android/java/native/qt/android/widget/QtNativeAdapterViewListener.java
index 0b9720d..f834334 100644
--- a/src/android/java/native/qt/android/widget/QmlAdapterViewListener.java
+++ b/src/android/java/native/qt/android/widget/QtNativeAdapterViewListener.java
@@ -40,9 +40,9 @@ import android.view.View;
 import android.widget.Spinner;
 import android.widget.AdapterView;
 
-public class QmlAdapterViewListener implements AdapterView.OnItemClickListener
+public class QtNativeAdapterViewListener implements AdapterView.OnItemClickListener
 {
-    public QmlAdapterViewListener(AdapterView view, long instance) {
+    public QtNativeAdapterViewListener(AdapterView view, long instance) {
         m_instance = instance;
         if (!(view instanceof Spinner)) {
             view.setOnItemClickListener(this);
diff --git a/src/android/java/native/qt/android/widget/QmlCompoundButtonListener.java b/src/android/java/native/qt/android/widget/QtNativeCompoundButtonListener.java
index 2c30531..bc113be 100644
--- a/src/android/java/native/qt/android/widget/QmlCompoundButtonListener.java
+++ b/src/android/java/native/qt/android/widget/QtNativeCompoundButtonListener.java
@@ -38,9 +38,9 @@ package qt.android.widget;
 
 import android.widget.CompoundButton;
 
-public class QmlCompoundButtonListener implements CompoundButton.OnCheckedChangeListener
+public class QtNativeCompoundButtonListener implements CompoundButton.OnCheckedChangeListener
 {
-    public QmlCompoundButtonListener(CompoundButton button, long instance) {
+    public QtNativeCompoundButtonListener(CompoundButton button, long instance) {
         m_instance = instance;
         button.setOnCheckedChangeListener(this);
     }
diff --git a/src/android/java/native/qt/android/widget/QmlNumberPickerListener.java b/src/android/java/native/qt/android/widget/QtNativeNumberPickerListener.java
index 681c059..fa5322a 100644
--- a/src/android/java/native/qt/android/widget/QmlNumberPickerListener.java
+++ b/src/android/java/native/qt/android/widget/QtNativeNumberPickerListener.java
@@ -38,9 +38,9 @@ package qt.android.widget;
 
 import android.widget.NumberPicker;
 
-public class QmlNumberPickerListener implements NumberPicker.OnValueChangeListener
+public class QtNativeNumberPickerListener implements NumberPicker.OnValueChangeListener
 {
-    public QmlNumberPickerListener(NumberPicker picker, long instance) {
+    public QtNativeNumberPickerListener(NumberPicker picker, long instance) {
         m_instance = instance;
         picker.setOnValueChangedListener(this);
     }
diff --git a/src/android/java/native/qt/android/widget/QmlRadioGroupListener.java b/src/android/java/native/qt/android/widget/QtNativeRadioGroupListener.java
index c605a33..365ae27 100644
--- a/src/android/java/native/qt/android/widget/QmlRadioGroupListener.java
+++ b/src/android/java/native/qt/android/widget/QtNativeRadioGroupListener.java
@@ -39,9 +39,9 @@ package qt.android.widget;
 import android.widget.RadioGroup;
 import android.widget.RadioButton;
 
-public class QmlRadioGroupListener implements RadioGroup.OnCheckedChangeListener
+public class QtNativeRadioGroupListener implements RadioGroup.OnCheckedChangeListener
 {
-    public QmlRadioGroupListener(RadioGroup group, long instance) {
+    public QtNativeRadioGroupListener(RadioGroup group, long instance) {
         m_instance = instance;
         group.setOnCheckedChangeListener(this);
     }
diff --git a/src/android/java/native/qt/android/widget/QmlRatingBarListener.java b/src/android/java/native/qt/android/widget/QtNativeRatingBarListener.java
index 5c8705f..f142857 100644
--- a/src/android/java/native/qt/android/widget/QmlRatingBarListener.java
+++ b/src/android/java/native/qt/android/widget/QtNativeRatingBarListener.java
@@ -38,9 +38,9 @@ package qt.android.widget;
 
 import android.widget.RatingBar;
 
-public class QmlRatingBarListener implements RatingBar.OnRatingBarChangeListener
+public class QtNativeRatingBarListener implements RatingBar.OnRatingBarChangeListener
 {
-    public QmlRatingBarListener(RatingBar ratingBar, long instance) {
+    public QtNativeRatingBarListener(RatingBar ratingBar, long instance) {
         m_instance = instance;
         ratingBar.setOnRatingBarChangeListener(this);
     }
diff --git a/src/android/java/native/qt/android/widget/QmlScrollView.java b/src/android/java/native/qt/android/widget/QtNativeScrollView.java
index 7b0f19c..1bb1e20 100644
--- a/src/android/java/native/qt/android/widget/QmlScrollView.java
+++ b/src/android/java/native/qt/android/widget/QtNativeScrollView.java
@@ -39,9 +39,9 @@ package qt.android.widget;
 import android.content.Context;
 import android.widget.ScrollView;
 
-public class QmlScrollView extends ScrollView
+public class QtNativeScrollView extends ScrollView
 {
-    public QmlScrollView(Context context, long instance) {
+    public QtNativeScrollView(Context context, long instance) {
         super(context);
         m_instance = instance;
     }
diff --git a/src/android/java/native/qt/android/widget/QmlSeekBarListener.java b/src/android/java/native/qt/android/widget/QtNativeSeekBarListener.java
index 45cf130..4fe28aa 100644
--- a/src/android/java/native/qt/android/widget/QmlSeekBarListener.java
+++ b/src/android/java/native/qt/android/widget/QtNativeSeekBarListener.java
@@ -38,9 +38,9 @@ package qt.android.widget;
 
 import android.widget.SeekBar;
 
-public class QmlSeekBarListener implements SeekBar.OnSeekBarChangeListener
+public class QtNativeSeekBarListener implements SeekBar.OnSeekBarChangeListener
 {
-    public QmlSeekBarListener(SeekBar seekBar, long instance) {
+    public QtNativeSeekBarListener(SeekBar seekBar, long instance) {
         m_instance = instance;
         seekBar.setOnSeekBarChangeListener(this);
     }
diff --git a/src/android/java/native/qt/android/widget/QmlTabHostListener.java b/src/android/java/native/qt/android/widget/QtNativeTabHostListener.java
index ef2b1f1..8edd82d 100644
--- a/src/android/java/native/qt/android/widget/QmlTabHostListener.java
+++ b/src/android/java/native/qt/android/widget/QtNativeTabHostListener.java
@@ -38,9 +38,9 @@ package qt.android.widget;
 
 import android.widget.TabHost;
 
-public class QmlTabHostListener implements TabHost.OnTabChangeListener
+public class QtNativeTabHostListener implements TabHost.OnTabChangeListener
 {
-    public QmlTabHostListener(TabHost host, long instance) {
+    public QtNativeTabHostListener(TabHost host, long instance) {
         m_instance = instance;
         host.setOnTabChangedListener(this);
     }
diff --git a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
index 6bfaf0f..98dab5d 100644
--- a/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
+++ b/src/android/support/v4/widget/qnativeandroidswiperefreshlayout.cpp
@@ -76,7 +76,7 @@ void QNativeAndroidSwipeRefreshLayout::onInflate(QAndroidJniObject &instance)
 {
     QNativeAndroidViewGroup::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/support/v4/widget/QmlSwipeRefreshLayoutListener",
+    m_listener = QAndroidJniObject("qt/android/support/v4/widget/QtNativeSwipeRefreshLayoutListener",
                                    "(Landroid/support/v4/widget/SwipeRefreshLayout;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp b/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp
index 25ced36..7434be8 100644
--- a/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp
+++ b/src/android/support/v7/widget/qnativeandroidrecycleradapter.cpp
@@ -77,7 +77,7 @@ void QNativeAndroidRecyclerAdapter::setDelegate(QQmlComponent *delegate)
 
 QAndroidJniObject QNativeAndroidRecyclerAdapter::onCreate()
 {
-    return QAndroidJniObject("qt/android/support/v7/widget/QmlRecyclerAdapter",
+    return QAndroidJniObject("qt/android/support/v7/widget/QtNativeRecyclerAdapter",
                              "(IJ)V",
                              m_count,
                              reinterpret_cast<jlong>(this));
@@ -99,8 +99,8 @@ void QNativeAndroidRecyclerAdapter::onInflate(QAndroidJniObject &instance)
 
 void QNativeAndroidRecyclerAdapter::onRegisterNativeMethods(jobject adapter)
 {
-    JNINativeMethod methods[] {{"onCreateViewHolder", "(JLandroid/view/ViewGroup;I)Lqt/android/support/v7/widget/QmlRecyclerAdapter$ViewHolder;", reinterpret_cast<void *>(onCreateViewHolder)},
-                               {"onBindViewHolder", "(JLqt/android/support/v7/widget/QmlRecyclerAdapter$ViewHolder;I)V", reinterpret_cast<void *>(onBindViewHolder)}};
+    JNINativeMethod methods[] {{"onCreateViewHolder", "(JLandroid/view/ViewGroup;I)Lqt/android/support/v7/widget/QtNativeRecyclerAdapter$ViewHolder;", reinterpret_cast<void *>(onCreateViewHolder)},
+                               {"onBindViewHolder", "(JLqt/android/support/v7/widget/QtNativeRecyclerAdapter$ViewHolder;I)V", reinterpret_cast<void *>(onBindViewHolder)}};
 
     QAndroidJniEnvironment env;
     jclass cls = env->GetObjectClass(adapter);
@@ -119,7 +119,7 @@ jobject QNativeAndroidRecyclerAdapter::onCreateViewHolder(JNIEnv *env, jobject o
         QNativeAndroidView *item = nullptr;
         QMetaObject::invokeMethod(adapter, "createItem", Qt::BlockingQueuedConnection, Q_RETURN_ARG(QNativeAndroidView *, item));
         item->construct();
-        adapter->m_holders += QAndroidJniObject("qt/android/support/v7/widget/QmlRecyclerAdapter$ViewHolder",
+        adapter->m_holders += QAndroidJniObject("qt/android/support/v7/widget/QtNativeRecyclerAdapter$ViewHolder",
                                                 "(Landroid/view/View;J)V",
                                                 item->instance().object(),
                                                 reinterpret_cast<jlong>(item));
diff --git a/src/android/view/qnativeandroidmenu.cpp b/src/android/view/qnativeandroidmenu.cpp
index 5636890..7c3c3bd 100644
--- a/src/android/view/qnativeandroidmenu.cpp
+++ b/src/android/view/qnativeandroidmenu.cpp
@@ -57,7 +57,7 @@ QList<QNativeAndroidMenuItem *> QNativeAndroidMenu::items() const
 
 QAndroidJniObject QNativeAndroidMenu::onCreate()
 {
-    return QAndroidJniObject("qt/android/view/QmlMenu");
+    return QAndroidJniObject("qt/android/view/QtNativeMenu");
 }
 
 void QNativeAndroidMenu::onInflate(QAndroidJniObject &instance)
@@ -65,7 +65,7 @@ void QNativeAndroidMenu::onInflate(QAndroidJniObject &instance)
     foreach (QNativeAndroidMenuItem *item, items()) {
         item->construct();
         if (item->isValid())
-            instance.callMethod<void>("add", "(Lqt/android/view/QmlMenuItem;)V", item->instance().object());
+            instance.callMethod<void>("add", "(Lqt/android/view/QtNativeMenuItem;)V", item->instance().object());
     }
 }
 
diff --git a/src/android/view/qnativeandroidmenuitem.cpp b/src/android/view/qnativeandroidmenuitem.cpp
index 8867a21..4b6e094 100644
--- a/src/android/view/qnativeandroidmenuitem.cpp
+++ b/src/android/view/qnativeandroidmenuitem.cpp
@@ -159,7 +159,7 @@ void QNativeAndroidMenuItem::setActionView(QNativeAndroidView *view)
 
 QAndroidJniObject QNativeAndroidMenuItem::onCreate()
 {
-    return QAndroidJniObject("qt/android/view/QmlMenuItem",
+    return QAndroidJniObject("qt/android/view/QtNativeMenuItem",
                              "(J)V",
                              reinterpret_cast<jlong>(this));
 }
diff --git a/src/android/view/qnativeandroidview.cpp b/src/android/view/qnativeandroidview.cpp
index 31f8e4d..e621ce6 100644
--- a/src/android/view/qnativeandroidview.cpp
+++ b/src/android/view/qnativeandroidview.cpp
@@ -715,7 +715,7 @@ void QNativeAndroidView::onInflate(QAndroidJniObject &instance)
 
     QNativeAndroidContextual::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/view/QmlViewListener",
+    m_listener = QAndroidJniObject("qt/android/view/QtNativeViewListener",
                                    "(Landroid/view/View;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidadapterview.cpp b/src/android/widget/qnativeandroidadapterview.cpp
index 1fc3bfb..e921a7b 100644
--- a/src/android/widget/qnativeandroidadapterview.cpp
+++ b/src/android/widget/qnativeandroidadapterview.cpp
@@ -83,7 +83,7 @@ QAndroidJniObject QNativeAndroidAdapterView::onCreate()
 
 void QNativeAndroidAdapterView::onInflate(QAndroidJniObject &instance)
 {
-    m_listener = QAndroidJniObject("qt/android/widget/QmlAdapterViewListener",
+    m_listener = QAndroidJniObject("qt/android/widget/QtNativeAdapterViewListener",
                                    "(Landroid/widget/AdapterView;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidcompoundbutton.cpp b/src/android/widget/qnativeandroidcompoundbutton.cpp
index abee8bd..73727e8 100644
--- a/src/android/widget/qnativeandroidcompoundbutton.cpp
+++ b/src/android/widget/qnativeandroidcompoundbutton.cpp
@@ -81,7 +81,7 @@ void QNativeAndroidCompoundButton::onInflate(QAndroidJniObject &instance)
 {
     QNativeAndroidButton::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/widget/QmlCompoundButtonListener",
+    m_listener = QAndroidJniObject("qt/android/widget/QtNativeCompoundButtonListener",
                                    "(Landroid/widget/CompoundButton;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidnumberpicker.cpp b/src/android/widget/qnativeandroidnumberpicker.cpp
index e260400..00fa2e7 100644
--- a/src/android/widget/qnativeandroidnumberpicker.cpp
+++ b/src/android/widget/qnativeandroidnumberpicker.cpp
@@ -76,7 +76,7 @@ void QNativeAndroidNumberPicker::onInflate(QAndroidJniObject &instance)
 {
     QNativeAndroidLinearLayout::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/widget/QmlNumberPickerListener",
+    m_listener = QAndroidJniObject("qt/android/widget/QtNativeNumberPickerListener",
                                    "(Landroid/widget/NumberPicker;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidradiogroup.cpp b/src/android/widget/qnativeandroidradiogroup.cpp
index b2811cb..183c733 100644
--- a/src/android/widget/qnativeandroidradiogroup.cpp
+++ b/src/android/widget/qnativeandroidradiogroup.cpp
@@ -72,7 +72,7 @@ void QNativeAndroidRadioGroup::onInflate(QAndroidJniObject &instance)
 {
     QNativeAndroidLinearLayout::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/widget/QmlRadioGroupListener",
+    m_listener = QAndroidJniObject("qt/android/widget/QtNativeRadioGroupListener",
                                    "(Landroid/widget/RadioGroup;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidratingbar.cpp b/src/android/widget/qnativeandroidratingbar.cpp
index d3e7f29..a3ebd07 100644
--- a/src/android/widget/qnativeandroidratingbar.cpp
+++ b/src/android/widget/qnativeandroidratingbar.cpp
@@ -76,7 +76,7 @@ void QNativeAndroidRatingBar::onInflate(QAndroidJniObject &instance)
 {
     QNativeAndroidAbsSeekBar::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/widget/QmlRatingBarListener",
+    m_listener = QAndroidJniObject("qt/android/widget/QtNativeRatingBarListener",
                                    "(Landroid/widget/RatingBar;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidscrollview.cpp b/src/android/widget/qnativeandroidscrollview.cpp
index caa6cc4..11ea491 100644
--- a/src/android/widget/qnativeandroidscrollview.cpp
+++ b/src/android/widget/qnativeandroidscrollview.cpp
@@ -90,7 +90,7 @@ bool QNativeAndroidScrollView::updateScrollY(int y)
 
 QAndroidJniObject QNativeAndroidScrollView::onCreate()
 {
-    return QAndroidJniObject("qt/android/widget/QmlScrollView",
+    return QAndroidJniObject("qt/android/widget/QtNativeScrollView",
                              "(Landroid/content/Context;J)V",
                              ctx().object(),
                              reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidseekbar.cpp b/src/android/widget/qnativeandroidseekbar.cpp
index 48efbb1..4f73ddf 100644
--- a/src/android/widget/qnativeandroidseekbar.cpp
+++ b/src/android/widget/qnativeandroidseekbar.cpp
@@ -54,7 +54,7 @@ void QNativeAndroidSeekBar::onInflate(QAndroidJniObject &instance)
 {
     QNativeAndroidAbsSeekBar::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/widget/QmlSeekBarListener",
+    m_listener = QAndroidJniObject("qt/android/widget/QtNativeSeekBarListener",
                                    "(Landroid/widget/SeekBar;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));
diff --git a/src/android/widget/qnativeandroidtabhost.cpp b/src/android/widget/qnativeandroidtabhost.cpp
index 73a3e1d..ea27050 100644
--- a/src/android/widget/qnativeandroidtabhost.cpp
+++ b/src/android/widget/qnativeandroidtabhost.cpp
@@ -55,7 +55,7 @@ void QNativeAndroidTabHost::onInflate(QAndroidJniObject &instance)
 {
     QNativeAndroidFrameLayout::onInflate(instance);
 
-    m_listener = QAndroidJniObject("qt/android/widget/QmlTabHostListener",
+    m_listener = QAndroidJniObject("qt/android/widget/QtNativeTabHostListener",
                                    "(Landroid/widget/TabHost;J)V",
                                    instance.object(),
                                    reinterpret_cast<jlong>(this));