Java Refactory: Expose intefaces via org.tinyb.* and D-Bus implementation via tinyb.dbus.*

Allows alternative interface implementations and delegated wrapper implementations for debug and tracing.

Original D-Bus implementation can be retrieved via:
'BluetoothManager org.tinyb.BluetoothFactory.getDBusBluetoothManager()'

A HCI native implementation will follow up w/o use of D-Bus.

Otherwise the Java API is unchanged and this tinyb can replace previous implementation.

Due to the major API change (despite interface is unchanged but BluetoothManager instantiation)
the jar file has been renamed from 'tinyb.jar' to 'tinyb2.jar'.

Same goes with the version number, which will be set to 'v2.0.0'.

The native library and class definition is kept unchanged using the original names so far.

17 files changed, 213 insertions, 160 deletions

diff --git a/java/jni/BluetoothAdapter.cxx b/java/jni/DBusAdapter.cxx
index ffc7257..0c73a94 100644
--- a/java/jni/BluetoothAdapter.cxx
+++ b/java/jni/DBusAdapter.cxx
@@ -26,14 +26,14 @@
 #include "tinyb/BluetoothDevice.hpp"
 #include "tinyb/BluetoothObject.hpp"
 
-#include "tinyb_BluetoothAdapter.h"
+#include "tinyb_dbus_DBusAdapter.h"
 
 #include "JNIMem.hpp"
 #include "helper.hpp"
 
 using namespace tinyb;
 
-jobject Java_tinyb_BluetoothAdapter_getBluetoothType(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusAdapter_getBluetoothType(JNIEnv *env, jobject obj)
 {
     try {
         (void)obj;
@@ -53,7 +53,7 @@ jobject Java_tinyb_BluetoothAdapter_getBluetoothType(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jobject Java_tinyb_BluetoothAdapter_clone(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusAdapter_clone(JNIEnv *env, jobject obj)
 {
     try {
         return generic_clone<BluetoothAdapter>(env, obj);
@@ -71,7 +71,7 @@ jobject Java_tinyb_BluetoothAdapter_clone(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jboolean Java_tinyb_BluetoothAdapter_startDiscovery(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusAdapter_startDiscovery(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -91,7 +91,7 @@ jboolean Java_tinyb_BluetoothAdapter_startDiscovery(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-jboolean Java_tinyb_BluetoothAdapter_stopDiscovery(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusAdapter_stopDiscovery(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -111,7 +111,7 @@ jboolean Java_tinyb_BluetoothAdapter_stopDiscovery(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-jobject Java_tinyb_BluetoothAdapter_getDevices(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusAdapter_getDevices(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -134,7 +134,7 @@ jobject Java_tinyb_BluetoothAdapter_getDevices(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jint Java_tinyb_BluetoothAdapter_removeDevices(JNIEnv *env, jobject obj)
+jint Java_tinyb_dbus_DBusAdapter_removeDevices(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -164,7 +164,7 @@ jint Java_tinyb_BluetoothAdapter_removeDevices(JNIEnv *env, jobject obj)
     return 0;
 }
 
-jstring Java_tinyb_BluetoothAdapter_getAddress(JNIEnv *env, jobject obj)
+jstring Java_tinyb_dbus_DBusAdapter_getAddress(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -185,7 +185,7 @@ jstring Java_tinyb_BluetoothAdapter_getAddress(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jstring Java_tinyb_BluetoothAdapter_getName(JNIEnv *env, jobject obj)
+jstring Java_tinyb_dbus_DBusAdapter_getName(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -206,7 +206,7 @@ jstring Java_tinyb_BluetoothAdapter_getName(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jstring Java_tinyb_BluetoothAdapter_getAlias(JNIEnv *env, jobject obj)
+jstring Java_tinyb_dbus_DBusAdapter_getAlias(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -227,7 +227,7 @@ jstring Java_tinyb_BluetoothAdapter_getAlias(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-void Java_tinyb_BluetoothAdapter_setAlias(JNIEnv *env, jobject obj, jstring str)
+void Java_tinyb_dbus_DBusAdapter_setAlias(JNIEnv *env, jobject obj, jstring str)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -248,7 +248,7 @@ void Java_tinyb_BluetoothAdapter_setAlias(JNIEnv *env, jobject obj, jstring str)
     }
 }
 
-jlong Java_tinyb_BluetoothAdapter_getBluetoothClass(JNIEnv *env, jobject obj)
+jlong Java_tinyb_dbus_DBusAdapter_getBluetoothClass(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -268,7 +268,7 @@ jlong Java_tinyb_BluetoothAdapter_getBluetoothClass(JNIEnv *env, jobject obj)
     return 0;
 }
 
-jboolean Java_tinyb_BluetoothAdapter_getPowered(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusAdapter_getPowered(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -288,7 +288,7 @@ jboolean Java_tinyb_BluetoothAdapter_getPowered(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-void Java_tinyb_BluetoothAdapter_setPowered(JNIEnv *env, jobject obj, jboolean val)
+void Java_tinyb_dbus_DBusAdapter_setPowered(JNIEnv *env, jobject obj, jboolean val)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -308,7 +308,7 @@ void Java_tinyb_BluetoothAdapter_setPowered(JNIEnv *env, jobject obj, jboolean v
     }
 }
 
-void Java_tinyb_BluetoothAdapter_enablePoweredNotifications(JNIEnv *env, jobject obj, jobject callback)
+void Java_tinyb_dbus_DBusAdapter_enablePoweredNotifications(JNIEnv *env, jobject obj, jobject callback)
 {
     try {
         BluetoothAdapter *obj_adapter =
@@ -343,7 +343,7 @@ void Java_tinyb_BluetoothAdapter_enablePoweredNotifications(JNIEnv *env, jobject
     }
 }
 
-void Java_tinyb_BluetoothAdapter_disablePoweredNotifications(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusAdapter_disablePoweredNotifications(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter =
@@ -362,7 +362,7 @@ void Java_tinyb_BluetoothAdapter_disablePoweredNotifications(JNIEnv *env, jobjec
     }
 }
 
-jboolean Java_tinyb_BluetoothAdapter_getDiscoverable(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusAdapter_getDiscoverable(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -382,7 +382,7 @@ jboolean Java_tinyb_BluetoothAdapter_getDiscoverable(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-void Java_tinyb_BluetoothAdapter_setDiscoverable(JNIEnv *env, jobject obj, jboolean val)
+void Java_tinyb_dbus_DBusAdapter_setDiscoverable(JNIEnv *env, jobject obj, jboolean val)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -402,7 +402,7 @@ void Java_tinyb_BluetoothAdapter_setDiscoverable(JNIEnv *env, jobject obj, jbool
     }
 }
 
-void Java_tinyb_BluetoothAdapter_enableDiscoverableNotifications(JNIEnv *env, jobject obj, jobject callback)
+void Java_tinyb_dbus_DBusAdapter_enableDiscoverableNotifications(JNIEnv *env, jobject obj, jobject callback)
 {
     try {
         BluetoothAdapter *obj_adapter =
@@ -437,7 +437,7 @@ void Java_tinyb_BluetoothAdapter_enableDiscoverableNotifications(JNIEnv *env, jo
     }
 }
 
-void Java_tinyb_BluetoothAdapter_disableDiscoverableNotifications(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusAdapter_disableDiscoverableNotifications(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter =
@@ -456,7 +456,7 @@ void Java_tinyb_BluetoothAdapter_disableDiscoverableNotifications(JNIEnv *env, j
     }
 }
 
-jlong Java_tinyb_BluetoothAdapter_getDiscoverableTimeout(JNIEnv *env, jobject obj)
+jlong Java_tinyb_dbus_DBusAdapter_getDiscoverableTimeout(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -476,7 +476,7 @@ jlong Java_tinyb_BluetoothAdapter_getDiscoverableTimeout(JNIEnv *env, jobject ob
     return 0;
 }
 
-void Java_tinyb_BluetoothAdapter_setDiscoverableTimout(JNIEnv *env, jobject obj, jlong timeout)
+void Java_tinyb_dbus_DBusAdapter_setDiscoverableTimout(JNIEnv *env, jobject obj, jlong timeout)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -499,7 +499,7 @@ void Java_tinyb_BluetoothAdapter_setDiscoverableTimout(JNIEnv *env, jobject obj,
     }
 }
 
-jboolean Java_tinyb_BluetoothAdapter_getPairable(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusAdapter_getPairable(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -519,7 +519,7 @@ jboolean Java_tinyb_BluetoothAdapter_getPairable(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-void Java_tinyb_BluetoothAdapter_enablePairableNotifications(JNIEnv *env, jobject obj, jobject callback)
+void Java_tinyb_dbus_DBusAdapter_enablePairableNotifications(JNIEnv *env, jobject obj, jobject callback)
 {
     try {
         BluetoothAdapter *obj_adapter =
@@ -554,7 +554,7 @@ void Java_tinyb_BluetoothAdapter_enablePairableNotifications(JNIEnv *env, jobjec
     }
 }
 
-void Java_tinyb_BluetoothAdapter_disablePairableNotifications(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusAdapter_disablePairableNotifications(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter =
@@ -573,7 +573,7 @@ void Java_tinyb_BluetoothAdapter_disablePairableNotifications(JNIEnv *env, jobje
     }
 }
 
-void Java_tinyb_BluetoothAdapter_setPairable(JNIEnv *env, jobject obj, jboolean val)
+void Java_tinyb_dbus_DBusAdapter_setPairable(JNIEnv *env, jobject obj, jboolean val)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -593,7 +593,7 @@ void Java_tinyb_BluetoothAdapter_setPairable(JNIEnv *env, jobject obj, jboolean
     }
 }
 
-jlong Java_tinyb_BluetoothAdapter_getPairableTimeout(JNIEnv *env, jobject obj)
+jlong Java_tinyb_dbus_DBusAdapter_getPairableTimeout(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -613,7 +613,7 @@ jlong Java_tinyb_BluetoothAdapter_getPairableTimeout(JNIEnv *env, jobject obj)
     return 0;
 }
 
-void Java_tinyb_BluetoothAdapter_setPairableTimeout(JNIEnv *env, jobject obj, jlong timeout)
+void Java_tinyb_dbus_DBusAdapter_setPairableTimeout(JNIEnv *env, jobject obj, jlong timeout)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -636,7 +636,7 @@ void Java_tinyb_BluetoothAdapter_setPairableTimeout(JNIEnv *env, jobject obj, jl
     }
 }
 
-jboolean Java_tinyb_BluetoothAdapter_getDiscovering(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusAdapter_getDiscovering(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -656,7 +656,7 @@ jboolean Java_tinyb_BluetoothAdapter_getDiscovering(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-void Java_tinyb_BluetoothAdapter_enableDiscoveringNotifications(JNIEnv *env, jobject obj, jobject callback)
+void Java_tinyb_dbus_DBusAdapter_enableDiscoveringNotifications(JNIEnv *env, jobject obj, jobject callback)
 {
     try {
         BluetoothAdapter *obj_adapter =
@@ -691,7 +691,7 @@ void Java_tinyb_BluetoothAdapter_enableDiscoveringNotifications(JNIEnv *env, job
     }
 }
 
-void Java_tinyb_BluetoothAdapter_disableDiscoveringNotifications(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusAdapter_disableDiscoveringNotifications(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter =
@@ -710,7 +710,7 @@ void Java_tinyb_BluetoothAdapter_disableDiscoveringNotifications(JNIEnv *env, jo
     }
 }
 
-jobjectArray Java_tinyb_BluetoothAdapter_getUUIDs(JNIEnv *env, jobject obj)
+jobjectArray Java_tinyb_dbus_DBusAdapter_getUUIDs(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -746,7 +746,7 @@ jobjectArray Java_tinyb_BluetoothAdapter_getUUIDs(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jstring Java_tinyb_BluetoothAdapter_getModalias(JNIEnv *env, jobject obj)
+jstring Java_tinyb_dbus_DBusAdapter_getModalias(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -769,7 +769,7 @@ jstring Java_tinyb_BluetoothAdapter_getModalias(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-void Java_tinyb_BluetoothAdapter_delete(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusAdapter_delete(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothAdapter *adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -787,7 +787,7 @@ void Java_tinyb_BluetoothAdapter_delete(JNIEnv *env, jobject obj)
     }
 }
 
-void Java_tinyb_BluetoothAdapter_setDiscoveryFilter(JNIEnv *env, jobject obj, jobject uuids, jint rssi, jint pathloss, jint transportType)
+void Java_tinyb_dbus_DBusAdapter_setDiscoveryFilter(JNIEnv *env, jobject obj, jobject uuids, jint rssi, jint pathloss, jint transportType)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
@@ -824,7 +824,7 @@ void Java_tinyb_BluetoothAdapter_setDiscoveryFilter(JNIEnv *env, jobject obj, jo
     }
 }
 
-jobject Java_tinyb_BluetoothAdapter_connectDevice(JNIEnv *env, jobject obj, jstring jaddress, jstring jaddressType)
+jobject Java_tinyb_dbus_DBusAdapter_connectDevice(JNIEnv *env, jobject obj, jstring jaddress, jstring jaddressType)
 {
     try {
         BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
diff --git a/java/jni/BluetoothDevice.cxx b/java/jni/DBusDevice.cxx
index 5f9dcf4..896f154 100644
--- a/java/jni/BluetoothDevice.cxx
+++ b/java/jni/DBusDevice.cxx
@@ -27,14 +27,14 @@
 #include "tinyb/BluetoothGattService.hpp"
 #include "tinyb/BluetoothObject.hpp"
 
-#include "tinyb_BluetoothDevice.h"
+#include "tinyb_dbus_DBusDevice.h"
 
 #include "JNIMem.hpp"
 #include "helper.hpp"
 
 using namespace tinyb;
 
-jobject Java_tinyb_BluetoothDevice_getBluetoothType(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusDevice_getBluetoothType(JNIEnv *env, jobject obj)
 {
     try {
         (void)obj;
@@ -54,7 +54,7 @@ jobject Java_tinyb_BluetoothDevice_getBluetoothType(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jobject Java_tinyb_BluetoothDevice_clone(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusDevice_clone(JNIEnv *env, jobject obj)
 {
     try {
         return generic_clone<BluetoothDevice>(env, obj);
@@ -72,7 +72,7 @@ jobject Java_tinyb_BluetoothDevice_clone(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jboolean Java_tinyb_BluetoothDevice_disconnect(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusDevice_disconnect(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -92,7 +92,7 @@ jboolean Java_tinyb_BluetoothDevice_disconnect(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-void Java_tinyb_BluetoothDevice_connectAsyncStart(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusDevice_connectAsyncStart(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -111,7 +111,7 @@ void Java_tinyb_BluetoothDevice_connectAsyncStart(JNIEnv *env, jobject obj)
     }
 }
 
-jboolean Java_tinyb_BluetoothDevice_connectAsyncFinish(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusDevice_connectAsyncFinish(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -131,7 +131,7 @@ jboolean Java_tinyb_BluetoothDevice_connectAsyncFinish(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-jboolean Java_tinyb_BluetoothDevice_connect(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusDevice_connect(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -151,7 +151,7 @@ jboolean Java_tinyb_BluetoothDevice_connect(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-jboolean Java_tinyb_BluetoothDevice_connectProfile(JNIEnv *env, jobject obj, jstring str)
+jboolean Java_tinyb_dbus_DBusDevice_connectProfile(JNIEnv *env, jobject obj, jstring str)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -173,7 +173,7 @@ jboolean Java_tinyb_BluetoothDevice_connectProfile(JNIEnv *env, jobject obj, jst
     return JNI_FALSE;
 }
 
-jboolean Java_tinyb_BluetoothDevice_disconnectProfile(JNIEnv *env, jobject obj, jstring str)
+jboolean Java_tinyb_dbus_DBusDevice_disconnectProfile(JNIEnv *env, jobject obj, jstring str)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -195,7 +195,7 @@ jboolean Java_tinyb_BluetoothDevice_disconnectProfile(JNIEnv *env, jobject obj,
     return JNI_FALSE;
 }
 
-jboolean Java_tinyb_BluetoothDevice_pair(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusDevice_pair(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -215,7 +215,7 @@ jboolean Java_tinyb_BluetoothDevice_pair(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-jboolean Java_tinyb_BluetoothDevice_remove(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusDevice_remove(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -235,7 +235,7 @@ jboolean Java_tinyb_BluetoothDevice_remove(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-jboolean Java_tinyb_BluetoothDevice_cancelPairing(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusDevice_cancelPairing(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -255,7 +255,7 @@ jboolean Java_tinyb_BluetoothDevice_cancelPairing(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-jobject Java_tinyb_BluetoothDevice_getServices(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusDevice_getServices(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -278,7 +278,7 @@ jobject Java_tinyb_BluetoothDevice_getServices(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jstring Java_tinyb_BluetoothDevice_getAddress(JNIEnv *env, jobject obj)
+jstring Java_tinyb_dbus_DBusDevice_getAddress(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -299,7 +299,7 @@ jstring Java_tinyb_BluetoothDevice_getAddress(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jstring Java_tinyb_BluetoothDevice_getName(JNIEnv *env, jobject obj)
+jstring Java_tinyb_dbus_DBusDevice_getName(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -320,7 +320,7 @@ jstring Java_tinyb_BluetoothDevice_getName(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jstring Java_tinyb_BluetoothDevice_getAlias(JNIEnv *env, jobject obj)
+jstring Java_tinyb_dbus_DBusDevice_getAlias(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -341,7 +341,7 @@ jstring Java_tinyb_BluetoothDevice_getAlias(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-void Java_tinyb_BluetoothDevice_setAlias(JNIEnv *env, jobject obj, jstring str)
+void Java_tinyb_dbus_DBusDevice_setAlias(JNIEnv *env, jobject obj, jstring str)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -362,7 +362,7 @@ void Java_tinyb_BluetoothDevice_setAlias(JNIEnv *env, jobject obj, jstring str)
     }
 }
 
-jint Java_tinyb_BluetoothDevice_getBluetoothClass(JNIEnv *env, jobject obj)
+jint Java_tinyb_dbus_DBusDevice_getBluetoothClass(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -382,7 +382,7 @@ jint Java_tinyb_BluetoothDevice_getBluetoothClass(JNIEnv *env, jobject obj)
     return 0;
 }
 
-jshort Java_tinyb_BluetoothDevice_getAppearance(JNIEnv *env, jobject obj)
+jshort Java_tinyb_dbus_DBusDevice_getAppearance(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -402,7 +402,7 @@ jshort Java_tinyb_BluetoothDevice_getAppearance(JNIEnv *env, jobject obj)
     return 0;
 }
 
-jstring Java_tinyb_BluetoothDevice_getIcon(JNIEnv *env, jobject obj)
+jstring Java_tinyb_dbus_DBusDevice_getIcon(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -425,7 +425,7 @@ jstring Java_tinyb_BluetoothDevice_getIcon(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jboolean Java_tinyb_BluetoothDevice_getPaired(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusDevice_getPaired(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -445,7 +445,7 @@ jboolean Java_tinyb_BluetoothDevice_getPaired(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-void Java_tinyb_BluetoothDevice_enablePairedNotifications(JNIEnv *env, jobject obj, jobject callback)
+void Java_tinyb_dbus_DBusDevice_enablePairedNotifications(JNIEnv *env, jobject obj, jobject callback)
 {
     try {
         BluetoothDevice *obj_device =
@@ -480,7 +480,7 @@ void Java_tinyb_BluetoothDevice_enablePairedNotifications(JNIEnv *env, jobject o
     }
 }
 
-void Java_tinyb_BluetoothDevice_disablePairedNotifications(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusDevice_disablePairedNotifications(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device =
@@ -499,7 +499,7 @@ void Java_tinyb_BluetoothDevice_disablePairedNotifications(JNIEnv *env, jobject
     }
 }
 
-jboolean Java_tinyb_BluetoothDevice_getTrusted(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusDevice_getTrusted(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -519,7 +519,7 @@ jboolean Java_tinyb_BluetoothDevice_getTrusted(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-void Java_tinyb_BluetoothDevice_setTrusted(JNIEnv *env, jobject obj, jboolean val)
+void Java_tinyb_dbus_DBusDevice_setTrusted(JNIEnv *env, jobject obj, jboolean val)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -539,7 +539,7 @@ void Java_tinyb_BluetoothDevice_setTrusted(JNIEnv *env, jobject obj, jboolean va
     }
 }
 
-void Java_tinyb_BluetoothDevice_enableTrustedNotifications(JNIEnv *env, jobject obj, jobject callback)
+void Java_tinyb_dbus_DBusDevice_enableTrustedNotifications(JNIEnv *env, jobject obj, jobject callback)
 {
     try {
         BluetoothDevice *obj_device =
@@ -574,7 +574,7 @@ void Java_tinyb_BluetoothDevice_enableTrustedNotifications(JNIEnv *env, jobject
     }
 }
 
-void Java_tinyb_BluetoothDevice_disableTrustedNotifications(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusDevice_disableTrustedNotifications(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device =
@@ -593,7 +593,7 @@ void Java_tinyb_BluetoothDevice_disableTrustedNotifications(JNIEnv *env, jobject
     }
 }
 
-jboolean Java_tinyb_BluetoothDevice_getBlocked(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusDevice_getBlocked(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -613,7 +613,7 @@ jboolean Java_tinyb_BluetoothDevice_getBlocked(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-void Java_tinyb_BluetoothDevice_setBlocked(JNIEnv *env, jobject obj, jboolean val)
+void Java_tinyb_dbus_DBusDevice_setBlocked(JNIEnv *env, jobject obj, jboolean val)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -633,7 +633,7 @@ void Java_tinyb_BluetoothDevice_setBlocked(JNIEnv *env, jobject obj, jboolean va
     }
 }
 
-void Java_tinyb_BluetoothDevice_enableBlockedNotifications(JNIEnv *env, jobject obj, jobject callback)
+void Java_tinyb_dbus_DBusDevice_enableBlockedNotifications(JNIEnv *env, jobject obj, jobject callback)
 {
     try {
         BluetoothDevice *obj_device =
@@ -668,7 +668,7 @@ void Java_tinyb_BluetoothDevice_enableBlockedNotifications(JNIEnv *env, jobject
     }
 }
 
-void Java_tinyb_BluetoothDevice_disableBlockedNotifications(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusDevice_disableBlockedNotifications(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device =
@@ -687,7 +687,7 @@ void Java_tinyb_BluetoothDevice_disableBlockedNotifications(JNIEnv *env, jobject
     }
 }
 
-jboolean Java_tinyb_BluetoothDevice_getLegacyPairing(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusDevice_getLegacyPairing(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -707,7 +707,7 @@ jboolean Java_tinyb_BluetoothDevice_getLegacyPairing(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-jshort Java_tinyb_BluetoothDevice_getRSSI(JNIEnv *env, jobject obj)
+jshort Java_tinyb_dbus_DBusDevice_getRSSI(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -727,7 +727,7 @@ jshort Java_tinyb_BluetoothDevice_getRSSI(JNIEnv *env, jobject obj)
     return 0;
 }
 
-void Java_tinyb_BluetoothDevice_enableRSSINotifications(JNIEnv *env, jobject obj, jobject callback)
+void Java_tinyb_dbus_DBusDevice_enableRSSINotifications(JNIEnv *env, jobject obj, jobject callback)
 {
     try {
         BluetoothDevice *obj_device =
@@ -762,7 +762,7 @@ void Java_tinyb_BluetoothDevice_enableRSSINotifications(JNIEnv *env, jobject obj
     }
 }
 
-void Java_tinyb_BluetoothDevice_disableRSSINotifications(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusDevice_disableRSSINotifications(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device =
@@ -781,7 +781,7 @@ void Java_tinyb_BluetoothDevice_disableRSSINotifications(JNIEnv *env, jobject ob
     }
 }
 
-jboolean Java_tinyb_BluetoothDevice_getConnected(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusDevice_getConnected(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -801,7 +801,7 @@ jboolean Java_tinyb_BluetoothDevice_getConnected(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-void Java_tinyb_BluetoothDevice_enableConnectedNotifications(JNIEnv *env, jobject obj, jobject callback)
+void Java_tinyb_dbus_DBusDevice_enableConnectedNotifications(JNIEnv *env, jobject obj, jobject callback)
 {
     try {
         BluetoothDevice *obj_device =
@@ -836,7 +836,7 @@ void Java_tinyb_BluetoothDevice_enableConnectedNotifications(JNIEnv *env, jobjec
     }
 }
 
-void Java_tinyb_BluetoothDevice_disableConnectedNotifications(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusDevice_disableConnectedNotifications(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device =
@@ -855,7 +855,7 @@ void Java_tinyb_BluetoothDevice_disableConnectedNotifications(JNIEnv *env, jobje
     }
 }
 
-jobjectArray Java_tinyb_BluetoothDevice_getUUIDs(JNIEnv *env, jobject obj)
+jobjectArray Java_tinyb_dbus_DBusDevice_getUUIDs(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -887,7 +887,7 @@ jobjectArray Java_tinyb_BluetoothDevice_getUUIDs(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jstring Java_tinyb_BluetoothDevice_getModalias(JNIEnv *env, jobject obj)
+jstring Java_tinyb_dbus_DBusDevice_getModalias(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -910,7 +910,7 @@ jstring Java_tinyb_BluetoothDevice_getModalias(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jobject Java_tinyb_BluetoothDevice_getAdapter(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusDevice_getAdapter(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -940,7 +940,7 @@ jobject Java_tinyb_BluetoothDevice_getAdapter(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jobject Java_tinyb_BluetoothDevice_getManufacturerData(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusDevice_getManufacturerData(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -989,7 +989,7 @@ jobject Java_tinyb_BluetoothDevice_getManufacturerData(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-void Java_tinyb_BluetoothDevice_enableManufacturerDataNotifications(JNIEnv *env, jobject obj, jobject callback)
+void Java_tinyb_dbus_DBusDevice_enableManufacturerDataNotifications(JNIEnv *env, jobject obj, jobject callback)
 {
     try {
         BluetoothDevice *obj_device =
@@ -1042,7 +1042,7 @@ void Java_tinyb_BluetoothDevice_enableManufacturerDataNotifications(JNIEnv *env,
     }
 }
 
-void Java_tinyb_BluetoothDevice_disableManufacturerDataNotifications(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusDevice_disableManufacturerDataNotifications(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device =
@@ -1061,7 +1061,7 @@ void Java_tinyb_BluetoothDevice_disableManufacturerDataNotifications(JNIEnv *env
     }
 }
 
-jobject Java_tinyb_BluetoothDevice_getServiceData(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusDevice_getServiceData(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -1106,7 +1106,7 @@ jobject Java_tinyb_BluetoothDevice_getServiceData(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-void Java_tinyb_BluetoothDevice_enableServiceDataNotifications(JNIEnv *env, jobject obj, jobject callback)
+void Java_tinyb_dbus_DBusDevice_enableServiceDataNotifications(JNIEnv *env, jobject obj, jobject callback)
 {
     try {
         BluetoothDevice *obj_device =
@@ -1154,7 +1154,7 @@ void Java_tinyb_BluetoothDevice_enableServiceDataNotifications(JNIEnv *env, jobj
     }
 }
 
-void Java_tinyb_BluetoothDevice_disableServiceDataNotifications(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusDevice_disableServiceDataNotifications(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device =
@@ -1175,7 +1175,7 @@ void Java_tinyb_BluetoothDevice_disableServiceDataNotifications(JNIEnv *env, job
 
 
 
-jshort Java_tinyb_BluetoothDevice_getTxPower(JNIEnv *env, jobject obj)
+jshort Java_tinyb_dbus_DBusDevice_getTxPower(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -1195,7 +1195,7 @@ jshort Java_tinyb_BluetoothDevice_getTxPower(JNIEnv *env, jobject obj)
     return 0;
 }
 
-jboolean Java_tinyb_BluetoothDevice_getServicesResolved(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusDevice_getServicesResolved(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);
@@ -1215,7 +1215,7 @@ jboolean Java_tinyb_BluetoothDevice_getServicesResolved(JNIEnv *env, jobject obj
     return JNI_FALSE;
 }
 
-void Java_tinyb_BluetoothDevice_enableServicesResolvedNotifications(JNIEnv *env, jobject obj, jobject callback)
+void Java_tinyb_dbus_DBusDevice_enableServicesResolvedNotifications(JNIEnv *env, jobject obj, jobject callback)
 {
     try {
         BluetoothDevice *obj_device =
@@ -1250,7 +1250,7 @@ void Java_tinyb_BluetoothDevice_enableServicesResolvedNotifications(JNIEnv *env,
     }
 }
 
-void Java_tinyb_BluetoothDevice_disableServicesResolvedNotifications(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusDevice_disableServicesResolvedNotifications(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device =
@@ -1271,7 +1271,7 @@ void Java_tinyb_BluetoothDevice_disableServicesResolvedNotifications(JNIEnv *env
 
 
 
-void Java_tinyb_BluetoothDevice_delete(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusDevice_delete(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *b_device = getInstance<BluetoothDevice>(env, obj);
diff --git a/java/jni/BluetoothEvent.cxx b/java/jni/DBusEvent.cxx
index b3acd34..14b6431 100644
--- a/java/jni/BluetoothEvent.cxx
+++ b/java/jni/DBusEvent.cxx
@@ -22,9 +22,9 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "tinyb_BluetoothEvent.h"
+#include "tinyb_dbus_DBusEvent.h"
 
-jobject Java_tinyb_BluetoothEvent_getType(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusEvent_getType(JNIEnv *env, jobject obj)
 {
     (void)env;
     (void)obj;
@@ -32,7 +32,7 @@ jobject Java_tinyb_BluetoothEvent_getType(JNIEnv *env, jobject obj)
     return NULL;
 }
 
-jstring Java_tinyb_BluetoothEvent_getName(JNIEnv *env, jobject obj)
+jstring Java_tinyb_dbus_DBusEvent_getName(JNIEnv *env, jobject obj)
 {
     (void)env;
     (void)obj;
@@ -40,7 +40,7 @@ jstring Java_tinyb_BluetoothEvent_getName(JNIEnv *env, jobject obj)
     return NULL;
 }
 
-jstring Java_tinyb_BluetoothEvent_getIdentifier(JNIEnv *env, jobject obj)
+jstring Java_tinyb_dbus_DBusEvent_getIdentifier(JNIEnv *env, jobject obj)
 {
     (void)env;
     (void)obj;
@@ -48,7 +48,7 @@ jstring Java_tinyb_BluetoothEvent_getIdentifier(JNIEnv *env, jobject obj)
     return NULL;
 }
 
-jboolean Java_tinyb_BluetoothEvent_executeCallback(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusEvent_executeCallback(JNIEnv *env, jobject obj)
 {
     (void)env;
     (void)obj;
@@ -56,7 +56,7 @@ jboolean Java_tinyb_BluetoothEvent_executeCallback(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-jboolean Java_tinyb_BluetoothEvent_hasCallback(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusEvent_hasCallback(JNIEnv *env, jobject obj)
 {
     (void)env;
     (void)obj;
@@ -64,7 +64,7 @@ jboolean Java_tinyb_BluetoothEvent_hasCallback(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-void Java_tinyb_BluetoothEvent_init(JNIEnv *env, jobject obj, jobject type, jstring name,
+void Java_tinyb_dbus_DBusEvent_init(JNIEnv *env, jobject obj, jobject type, jstring name,
                                 jstring identifier, jobject parent, jobject callback,
                                 jobject arg_data)
 {
@@ -78,7 +78,7 @@ void Java_tinyb_BluetoothEvent_init(JNIEnv *env, jobject obj, jobject type, jstr
     (void)arg_data;
 }
 
-void Java_tinyb_BluetoothEvent_delete(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusEvent_delete(JNIEnv *env, jobject obj)
 {
     (void)env;
     (void)obj;
diff --git a/java/jni/BluetoothGattCharacteristic.cxx b/java/jni/DBusGattCharacteristic.cxx
index 0a62b51..a3e9428 100644
--- a/java/jni/BluetoothGattCharacteristic.cxx
+++ b/java/jni/DBusGattCharacteristic.cxx
@@ -27,14 +27,14 @@
 #include "tinyb/BluetoothGattService.hpp"
 #include "tinyb/BluetoothObject.hpp"
 
-#include "tinyb_BluetoothGattCharacteristic.h"
+#include "tinyb_dbus_DBusGattCharacteristic.h"
 
 #include "JNIMem.hpp"
 #include "helper.hpp"
 
 using namespace tinyb;
 
-jobject Java_tinyb_BluetoothGattCharacteristic_getBluetoothType(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusGattCharacteristic_getBluetoothType(JNIEnv *env, jobject obj)
 {
     try {
         (void)obj;
@@ -54,7 +54,7 @@ jobject Java_tinyb_BluetoothGattCharacteristic_getBluetoothType(JNIEnv *env, job
     return nullptr;
 }
 
-jobject Java_tinyb_BluetoothGattCharacteristic_clone(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusGattCharacteristic_clone(JNIEnv *env, jobject obj)
 {
     try {
         return generic_clone<BluetoothGattCharacteristic>(env, obj);
@@ -72,7 +72,7 @@ jobject Java_tinyb_BluetoothGattCharacteristic_clone(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jbyteArray Java_tinyb_BluetoothGattCharacteristic_readValue(JNIEnv *env, jobject obj)
+jbyteArray Java_tinyb_dbus_DBusGattCharacteristic_readValue(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattCharacteristic *obj_gatt_char =
@@ -98,7 +98,7 @@ jbyteArray Java_tinyb_BluetoothGattCharacteristic_readValue(JNIEnv *env, jobject
     return nullptr;
 }
 
-jboolean Java_tinyb_BluetoothGattCharacteristic_writeValue(JNIEnv *env, jobject obj, jbyteArray argValue)
+jboolean Java_tinyb_dbus_DBusGattCharacteristic_writeValue(JNIEnv *env, jobject obj, jbyteArray argValue)
 {
     try {
         if (!argValue)
@@ -131,7 +131,7 @@ jboolean Java_tinyb_BluetoothGattCharacteristic_writeValue(JNIEnv *env, jobject
     return JNI_FALSE;
 }
 
-void Java_tinyb_BluetoothGattCharacteristic_enableValueNotifications(JNIEnv *env, jobject obj, jobject callback)
+void Java_tinyb_dbus_DBusGattCharacteristic_enableValueNotifications(JNIEnv *env, jobject obj, jobject callback)
 {
     try {
         BluetoothGattCharacteristic *obj_gatt_char =
@@ -164,7 +164,7 @@ void Java_tinyb_BluetoothGattCharacteristic_enableValueNotifications(JNIEnv *env
     }
 }
 
-void Java_tinyb_BluetoothGattCharacteristic_disableValueNotifications(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusGattCharacteristic_disableValueNotifications(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattCharacteristic *obj_gatt_char =
@@ -183,7 +183,7 @@ void Java_tinyb_BluetoothGattCharacteristic_disableValueNotifications(JNIEnv *en
     }
 }
 
-jstring Java_tinyb_BluetoothGattCharacteristic_getUUID(JNIEnv *env, jobject obj)
+jstring Java_tinyb_dbus_DBusGattCharacteristic_getUUID(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattCharacteristic *obj_gatt_char =
@@ -205,7 +205,7 @@ jstring Java_tinyb_BluetoothGattCharacteristic_getUUID(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jobject Java_tinyb_BluetoothGattCharacteristic_getService(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusGattCharacteristic_getService(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattCharacteristic *obj_gatt_char =
@@ -236,7 +236,7 @@ jobject Java_tinyb_BluetoothGattCharacteristic_getService(JNIEnv *env, jobject o
     return nullptr;
 }
 
-jbyteArray Java_tinyb_BluetoothGattCharacteristic_getValue(JNIEnv *env, jobject obj)
+jbyteArray Java_tinyb_dbus_DBusGattCharacteristic_getValue(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattCharacteristic *obj_gatt_char =
@@ -262,7 +262,7 @@ jbyteArray Java_tinyb_BluetoothGattCharacteristic_getValue(JNIEnv *env, jobject
     return nullptr;
 }
 
-jboolean Java_tinyb_BluetoothGattCharacteristic_getNotifying(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusGattCharacteristic_getNotifying(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattCharacteristic *obj_gatt_char =
@@ -282,7 +282,7 @@ jboolean Java_tinyb_BluetoothGattCharacteristic_getNotifying(JNIEnv *env, jobjec
     return JNI_FALSE;
 }
 
-jobjectArray Java_tinyb_BluetoothGattCharacteristic_getFlags(JNIEnv *env, jobject obj)
+jobjectArray Java_tinyb_dbus_DBusGattCharacteristic_getFlags(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattCharacteristic *obj_gatt_char =
@@ -315,7 +315,7 @@ jobjectArray Java_tinyb_BluetoothGattCharacteristic_getFlags(JNIEnv *env, jobjec
     return nullptr;
 }
 
-jobject Java_tinyb_BluetoothGattCharacteristic_getDescriptors(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusGattCharacteristic_getDescriptors(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattCharacteristic *obj_gatt_char =
@@ -339,7 +339,7 @@ jobject Java_tinyb_BluetoothGattCharacteristic_getDescriptors(JNIEnv *env, jobje
     return nullptr;
 }
 
-void Java_tinyb_BluetoothGattCharacteristic_delete(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusGattCharacteristic_delete(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattCharacteristic *obj_gatt_char =
diff --git a/java/jni/BluetoothGattDescriptor.cxx b/java/jni/DBusGattDescriptor.cxx
index e43b8db..bdb83fc 100644
--- a/java/jni/BluetoothGattDescriptor.cxx
+++ b/java/jni/DBusGattDescriptor.cxx
@@ -26,14 +26,14 @@
 #include "tinyb/BluetoothGattDescriptor.hpp"
 #include "tinyb/BluetoothObject.hpp"
 
-#include "tinyb_BluetoothGattDescriptor.h"
+#include "tinyb_dbus_DBusGattDescriptor.h"
 
 #include "JNIMem.hpp"
 #include "helper.hpp"
 
 using namespace tinyb;
 
-jobject Java_tinyb_BluetoothGattDescriptor_getBluetoothType(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusGattDescriptor_getBluetoothType(JNIEnv *env, jobject obj)
 {
     try {
         (void)obj;
@@ -53,7 +53,7 @@ jobject Java_tinyb_BluetoothGattDescriptor_getBluetoothType(JNIEnv *env, jobject
     return nullptr;
 }
 
-jobject Java_tinyb_BluetoothGattDescriptor_clone(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusGattDescriptor_clone(JNIEnv *env, jobject obj)
 {
     try {
         return generic_clone<BluetoothGattDescriptor>(env, obj);
@@ -71,7 +71,7 @@ jobject Java_tinyb_BluetoothGattDescriptor_clone(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jbyteArray Java_tinyb_BluetoothGattDescriptor_readValue(JNIEnv *env, jobject obj)
+jbyteArray Java_tinyb_dbus_DBusGattDescriptor_readValue(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattDescriptor *obj_gatt_desc = getInstance<BluetoothGattDescriptor>(env, obj);
@@ -96,7 +96,7 @@ jbyteArray Java_tinyb_BluetoothGattDescriptor_readValue(JNIEnv *env, jobject obj
     return nullptr;
 }
 
-jboolean Java_tinyb_BluetoothGattDescriptor_writeValue(JNIEnv *env, jobject obj, jbyteArray argValue)
+jboolean Java_tinyb_dbus_DBusGattDescriptor_writeValue(JNIEnv *env, jobject obj, jbyteArray argValue)
 {
     try {
         if (!argValue)
@@ -127,7 +127,7 @@ jboolean Java_tinyb_BluetoothGattDescriptor_writeValue(JNIEnv *env, jobject obj,
     return JNI_FALSE;
 }
 
-jstring Java_tinyb_BluetoothGattDescriptor_getUUID(JNIEnv *env, jobject obj)
+jstring Java_tinyb_dbus_DBusGattDescriptor_getUUID(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattDescriptor *obj_gatt_desc = getInstance<BluetoothGattDescriptor>(env, obj);
@@ -148,7 +148,7 @@ jstring Java_tinyb_BluetoothGattDescriptor_getUUID(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jobject Java_tinyb_BluetoothGattDescriptor_getCharacteristic(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusGattDescriptor_getCharacteristic(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattDescriptor *obj_gatt_desc = getInstance<BluetoothGattDescriptor>(env, obj);
@@ -178,7 +178,7 @@ jobject Java_tinyb_BluetoothGattDescriptor_getCharacteristic(JNIEnv *env, jobjec
     return nullptr;
 }
 
-jbyteArray Java_tinyb_BluetoothGattDescriptor_getValue(JNIEnv *env, jobject obj)
+jbyteArray Java_tinyb_dbus_DBusGattDescriptor_getValue(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattDescriptor *obj_gatt_desc = getInstance<BluetoothGattDescriptor>(env, obj);
@@ -204,7 +204,7 @@ jbyteArray Java_tinyb_BluetoothGattDescriptor_getValue(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-void Java_tinyb_BluetoothGattDescriptor_enableValueNotifications(JNIEnv *env, jobject obj, jobject callback)
+void Java_tinyb_dbus_DBusGattDescriptor_enableValueNotifications(JNIEnv *env, jobject obj, jobject callback)
 {
     try {
         BluetoothGattDescriptor *obj_gatt_desc =
@@ -237,7 +237,7 @@ void Java_tinyb_BluetoothGattDescriptor_enableValueNotifications(JNIEnv *env, jo
     }
 }
 
-void Java_tinyb_BluetoothGattDescriptor_disableValueNotifications(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusGattDescriptor_disableValueNotifications(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattDescriptor *obj_gatt_desc =
@@ -257,7 +257,7 @@ void Java_tinyb_BluetoothGattDescriptor_disableValueNotifications(JNIEnv *env, j
 }
 
 
-void Java_tinyb_BluetoothGattDescriptor_delete(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusGattDescriptor_delete(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattDescriptor *obj_gatt_desc = getInstance<BluetoothGattDescriptor>(env, obj);
diff --git a/java/jni/BluetoothGattService.cxx b/java/jni/DBusGattService.cxx
index 2f1c922..6ac0963 100644
--- a/java/jni/BluetoothGattService.cxx
+++ b/java/jni/DBusGattService.cxx
@@ -27,13 +27,13 @@
 #include "tinyb/BluetoothGattCharacteristic.hpp"
 #include "tinyb/BluetoothObject.hpp"
 
-#include "tinyb_BluetoothGattService.h"
+#include "tinyb_dbus_DBusGattService.h"
 
 #include "helper.hpp"
 
 using namespace tinyb;
 
-jobject Java_tinyb_BluetoothGattService_getBluetoothType(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusGattService_getBluetoothType(JNIEnv *env, jobject obj)
 {
     try {
         (void)obj;
@@ -53,7 +53,7 @@ jobject Java_tinyb_BluetoothGattService_getBluetoothType(JNIEnv *env, jobject ob
     return nullptr;
 }
 
-jobject Java_tinyb_BluetoothGattService_clone(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusGattService_clone(JNIEnv *env, jobject obj)
 {
     try {
         return generic_clone<BluetoothGattService>(env, obj);
@@ -71,7 +71,7 @@ jobject Java_tinyb_BluetoothGattService_clone(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jstring Java_tinyb_BluetoothGattService_getUUID(JNIEnv *env, jobject obj)
+jstring Java_tinyb_dbus_DBusGattService_getUUID(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattService *obj_gatt_serv = getInstance<BluetoothGattService>(env, obj);
@@ -92,7 +92,7 @@ jstring Java_tinyb_BluetoothGattService_getUUID(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jobject Java_tinyb_BluetoothGattService_getDevice(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusGattService_getDevice(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattService *obj_gatt_serv = getInstance<BluetoothGattService>(env, obj);
@@ -122,7 +122,7 @@ jobject Java_tinyb_BluetoothGattService_getDevice(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jboolean Java_tinyb_BluetoothGattService_getPrimary(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusGattService_getPrimary(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattService *obj_gatt_serv = getInstance<BluetoothGattService>(env, obj);
@@ -142,7 +142,7 @@ jboolean Java_tinyb_BluetoothGattService_getPrimary(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-jobject Java_tinyb_BluetoothGattService_getCharacteristics(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusGattService_getCharacteristics(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattService *obj_gatt_serv = getInstance<BluetoothGattService>(env, obj);
@@ -165,7 +165,7 @@ jobject Java_tinyb_BluetoothGattService_getCharacteristics(JNIEnv *env, jobject
     return nullptr;
 }
 
-void Java_tinyb_BluetoothGattService_delete(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusGattService_delete(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothGattService *obj_gatt_serv = getInstance<BluetoothGattService>(env, obj);
diff --git a/java/jni/BluetoothManager.cxx b/java/jni/DBusManager.cxx
index dc6b038..85f7fd7 100644
--- a/java/jni/BluetoothManager.cxx
+++ b/java/jni/DBusManager.cxx
@@ -27,13 +27,13 @@
 #include "tinyb/BluetoothGattService.hpp"
 #include "tinyb/BluetoothManager.hpp"
 
-#include "tinyb_BluetoothManager.h"
+#include "tinyb_dbus_DBusManager.h"
 
 #include "helper.hpp"
 
 using namespace tinyb;
 
-jobject Java_tinyb_BluetoothManager_getBluetoothType(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusManager_getBluetoothType(JNIEnv *env, jobject obj)
 {
     try {
         (void)obj;
@@ -107,7 +107,7 @@ static void getObject_cleaner(std::string *name_to_write, std::string *identifie
         delete identifier_to_write;
 }
 
-jobject Java_tinyb_BluetoothManager_find(JNIEnv *env, jobject obj, jint type,
+jobject Java_tinyb_dbus_DBusManager_find(JNIEnv *env, jobject obj, jint type,
                                             jstring name, jstring identifier, jobject parent,
                                             jlong milliseconds)
 {
@@ -157,7 +157,7 @@ jobject Java_tinyb_BluetoothManager_find(JNIEnv *env, jobject obj, jint type,
 }
 
 
-jobject Java_tinyb_BluetoothManager_getObject(JNIEnv *env, jobject obj, jint type,
+jobject Java_tinyb_dbus_DBusManager_getObject(JNIEnv *env, jobject obj, jint type,
                                             jstring name, jstring identifier, jobject parent)
 {
     try {
@@ -202,7 +202,7 @@ jobject Java_tinyb_BluetoothManager_getObject(JNIEnv *env, jobject obj, jint typ
     return nullptr;
 }
 
-jobject Java_tinyb_BluetoothManager_getObjects(JNIEnv *env, jobject obj, jint type,
+jobject Java_tinyb_dbus_DBusManager_getObjects(JNIEnv *env, jobject obj, jint type,
                                             jstring name, jstring identifier, jobject parent)
 {
     try {
@@ -239,7 +239,7 @@ jobject Java_tinyb_BluetoothManager_getObjects(JNIEnv *env, jobject obj, jint ty
     return nullptr;
 }
 
-jobject Java_tinyb_BluetoothManager_getAdapters(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusManager_getAdapters(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothManager *manager = getInstance<BluetoothManager>(env, obj);
@@ -262,7 +262,7 @@ jobject Java_tinyb_BluetoothManager_getAdapters(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jobject Java_tinyb_BluetoothManager_getDevices(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusManager_getDevices(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothManager *manager = getInstance<BluetoothManager>(env, obj);
@@ -285,7 +285,7 @@ jobject Java_tinyb_BluetoothManager_getDevices(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jobject Java_tinyb_BluetoothManager_getServices(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusManager_getServices(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothManager *manager = getInstance<BluetoothManager>(env, obj);
@@ -308,7 +308,7 @@ jobject Java_tinyb_BluetoothManager_getServices(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
-jboolean Java_tinyb_BluetoothManager_setDefaultAdapter(JNIEnv *env, jobject obj, jobject adapter)
+jboolean Java_tinyb_dbus_DBusManager_setDefaultAdapter(JNIEnv *env, jobject obj, jobject adapter)
 {
     try {
         if (adapter == nullptr)
@@ -332,7 +332,7 @@ jboolean Java_tinyb_BluetoothManager_setDefaultAdapter(JNIEnv *env, jobject obj,
     return JNI_FALSE;
 }
 
-jobject Java_tinyb_BluetoothManager_getDefaultAdapter(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusManager_getDefaultAdapter(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothManager *manager = getInstance<BluetoothManager>(env, obj);
@@ -362,7 +362,7 @@ jobject Java_tinyb_BluetoothManager_getDefaultAdapter(JNIEnv *env, jobject obj)
     return NULL;
 }
 
-jboolean Java_tinyb_BluetoothManager_startDiscovery(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusManager_startDiscovery(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothManager *manager = getInstance<BluetoothManager>(env, obj);
@@ -381,7 +381,7 @@ jboolean Java_tinyb_BluetoothManager_startDiscovery(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-jboolean Java_tinyb_BluetoothManager_stopDiscovery(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusManager_stopDiscovery(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothManager *manager = getInstance<BluetoothManager>(env, obj);
@@ -400,7 +400,7 @@ jboolean Java_tinyb_BluetoothManager_stopDiscovery(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-jboolean Java_tinyb_BluetoothManager_getDiscovering(JNIEnv *env, jobject obj)
+jboolean Java_tinyb_dbus_DBusManager_getDiscovering(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothManager *manager = getInstance<BluetoothManager>(env, obj);
@@ -419,7 +419,7 @@ jboolean Java_tinyb_BluetoothManager_getDiscovering(JNIEnv *env, jobject obj)
     return JNI_FALSE;
 }
 
-void Java_tinyb_BluetoothManager_init(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusManager_init(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothManager *manager = BluetoothManager::get_bluetooth_manager();
@@ -437,7 +437,7 @@ void Java_tinyb_BluetoothManager_init(JNIEnv *env, jobject obj)
     }
 }
 
-void Java_tinyb_BluetoothManager_delete(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusManager_delete(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothManager *manager = getInstance<BluetoothManager>(env, obj);
@@ -455,7 +455,7 @@ void Java_tinyb_BluetoothManager_delete(JNIEnv *env, jobject obj)
     }
 }
 
-jstring Java_tinyb_BluetoothManager_getNativeAPIVersion(JNIEnv *env, jclass clazz)
+jstring Java_tinyb_dbus_DBusManager_getNativeAPIVersion(JNIEnv *env, jclass clazz)
 {
     try {
         (void) clazz;
diff --git a/java/jni/BluetoothObject.cxx b/java/jni/DBusObject.cxx
index 0f1e390..623ab26 100644
--- a/java/jni/BluetoothObject.cxx
+++ b/java/jni/DBusObject.cxx
@@ -24,32 +24,32 @@
 
 #include "tinyb/BluetoothObject.hpp"
 
-#include "tinyb_BluetoothObject.h"
+#include "tinyb_dbus_DBusObject.h"
 
 #include "helper.hpp"
 
 using namespace tinyb;
 
-jobject Java_tinyb_BluetoothObject_getBluetoothType(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusObject_getBluetoothType(JNIEnv *env, jobject obj)
 {
     (void)obj;
 
     return get_bluetooth_type(env, "NONE");
 }
 
-jobject Java_tinyb_BluetoothObject_clone(JNIEnv *env, jobject obj)
+jobject Java_tinyb_dbus_DBusObject_clone(JNIEnv *env, jobject obj)
 {
     return generic_clone<BluetoothObject>(env, obj);
 }
 
-void Java_tinyb_BluetoothObject_delete(JNIEnv *env, jobject obj)
+void Java_tinyb_dbus_DBusObject_delete(JNIEnv *env, jobject obj)
 {
     BluetoothObject *obj_b = getInstance<BluetoothObject>(env, obj);
 
     delete obj_b;
 }
 
-jboolean Java_tinyb_BluetoothObject_operatorEqual(JNIEnv *env, jobject obj, jobject other)
+jboolean Java_tinyb_dbus_DBusObject_operatorEqual(JNIEnv *env, jobject obj, jobject other)
 {
     if (!other)
     {
@@ -61,7 +61,7 @@ jboolean Java_tinyb_BluetoothObject_operatorEqual(JNIEnv *env, jobject obj, jobj
     return (*obj_b) == (*obj_other);
 }
 
-jstring Java_tinyb_BluetoothObject_getObjectPath(JNIEnv *env, jobject obj)
+jstring Java_tinyb_dbus_DBusObject_getObjectPath(JNIEnv *env, jobject obj)
 {
     BluetoothObject *obj_b = getInstance<BluetoothObject>(env, obj);
 
diff --git a/java/jni/helper.cxx b/java/jni/helper.cxx
index 9987ae3..dda3c13 100644
--- a/java/jni/helper.cxx
+++ b/java/jni/helper.cxx
@@ -211,9 +211,9 @@ tinyb::TransportType from_int_to_transport_type(int type)
 
 jobject get_bluetooth_type(JNIEnv *env, const char *field_name)
 {
-    jclass b_type_enum = search_class(env, JAVA_PACKAGE "/BluetoothType");
+    jclass b_type_enum = search_class(env, JAVA_MAIN_PACKAGE "/BluetoothType");
 
-    jfieldID b_type_field = search_field(env, b_type_enum, field_name, "L" JAVA_PACKAGE "/BluetoothType;", true);
+    jfieldID b_type_field = search_field(env, b_type_enum, field_name, "L" JAVA_MAIN_PACKAGE "/BluetoothType;", true);
 
     jobject result = env->GetStaticObjectField(b_type_enum, b_type_field);
     env->DeleteLocalRef(b_type_enum);
diff --git a/src/BluetoothAdapter.cpp b/src/BluetoothAdapter.cpp
index ba8873b..eab4eac 100644
--- a/src/BluetoothAdapter.cpp
+++ b/src/BluetoothAdapter.cpp
@@ -88,7 +88,7 @@ std::string BluetoothAdapter::get_class_name() const
 
 std::string BluetoothAdapter::get_java_class() const
 {
-    return std::string(JAVA_PACKAGE "/BluetoothAdapter");
+    return std::string(JAVA_DBUS_PACKAGE "/DBusAdapter");
 }
 
 std::string BluetoothAdapter::get_object_path() const
diff --git a/src/BluetoothDevice.cpp b/src/BluetoothDevice.cpp
index 1565941..97538cd 100644
--- a/src/BluetoothDevice.cpp
+++ b/src/BluetoothDevice.cpp
@@ -148,7 +148,7 @@ std::string BluetoothDevice::get_class_name() const
 
 std::string BluetoothDevice::get_java_class() const
 {
-    return std::string(JAVA_PACKAGE "/BluetoothDevice");
+    return std::string(JAVA_DBUS_PACKAGE "/DBusDevice");
 }
 
 std::string BluetoothDevice::get_object_path() const
diff --git a/src/BluetoothGattCharacteristic.cpp b/src/BluetoothGattCharacteristic.cpp
index a087ae6..30914e9 100644
--- a/src/BluetoothGattCharacteristic.cpp
+++ b/src/BluetoothGattCharacteristic.cpp
@@ -60,7 +60,7 @@ std::string BluetoothGattCharacteristic::get_class_name() const
 
 std::string BluetoothGattCharacteristic::get_java_class() const
 {
-    return std::string(JAVA_PACKAGE "/BluetoothGattCharacteristic");
+    return std::string(JAVA_DBUS_PACKAGE "/DBusGattCharacteristic");
 }
 
 std::string BluetoothGattCharacteristic::get_object_path() const
diff --git a/src/BluetoothGattDescriptor.cpp b/src/BluetoothGattDescriptor.cpp
index ff5f804..72acdd3 100644
--- a/src/BluetoothGattDescriptor.cpp
+++ b/src/BluetoothGattDescriptor.cpp
@@ -59,7 +59,7 @@ std::string BluetoothGattDescriptor::get_class_name() const
 
 std::string BluetoothGattDescriptor::get_java_class() const
 {
-    return std::string(JAVA_PACKAGE "/BluetoothGattDescriptor");
+    return std::string(JAVA_DBUS_PACKAGE "/DBusGattDescriptor");
 }
 
 std::string BluetoothGattDescriptor::get_object_path() const
diff --git a/src/BluetoothGattService.cpp b/src/BluetoothGattService.cpp
index bc3fd53..d63893e 100644
--- a/src/BluetoothGattService.cpp
+++ b/src/BluetoothGattService.cpp
@@ -38,7 +38,7 @@ std::string BluetoothGattService::get_class_name() const
 
 std::string BluetoothGattService::get_java_class() const
 {
-    return std::string(JAVA_PACKAGE "/BluetoothGattService");
+    return std::string(JAVA_DBUS_PACKAGE "/DBusGattService");
 }
 
 std::string BluetoothGattService::get_object_path() const
diff --git a/src/BluetoothManager.cpp b/src/BluetoothManager.cpp
index 5c6c82a..b6868d0 100644
--- a/src/BluetoothManager.cpp
+++ b/src/BluetoothManager.cpp
@@ -109,7 +109,7 @@ std::string BluetoothManager::get_class_name() const
 
 std::string BluetoothManager::get_java_class() const
 {
-    return std::string(JAVA_PACKAGE "/BluetoothManager");
+    return std::string(JAVA_DBUS_PACKAGE "/DBusManager");
 }
 
 std::string BluetoothManager::get_object_path() const
diff --git a/src/BluetoothObject.cpp b/src/BluetoothObject.cpp
index 79c8b6e..2e8ddaf 100644
--- a/src/BluetoothObject.cpp
+++ b/src/BluetoothObject.cpp
@@ -29,7 +29,7 @@ using namespace tinyb;
 
 std::string BluetoothObject::get_java_class() const
 {
-   return std::string(JAVA_PACKAGE "/BluetoothObject");
+   return std::string(JAVA_DBUS_PACKAGE "/DBusObject");
 }
 
 std::string BluetoothObject::get_class_name() const
diff --git a/src/org.bluez.xml b/src/org.bluez.xml
index c87384b..da200c6 100644
--- a/src/org.bluez.xml
+++ b/src/org.bluez.xml
@@ -20,6 +20,12 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+
+Author: Sven Gothel <[email protected]>
+Copyright (c) 2020 Gothel Software e.K.
+
+Permission / License unchanged BSD style.
+
 -->
 <node>
   <interface name="org.bluez.Adapter1">
@@ -139,4 +145,51 @@ THE SOFTWARE.
     <property name="ServiceData" type="a{sv}" access="read"/>
     <property name="IncludeTxPower" type="b" access="read"/>
   </interface>  
+
+  <interface name="org.bluez.AgentManager1">
+    <method name="RegisterAgent">
+      <arg name="agent" type="o" direction="in" />
+      <arg name="capability" type="s" direction="in" />
+    </method>
+    <method name="UnregisterAgent">
+      <arg name="agent" type="o" direction="in" />
+    </method>
+    <method name="RequestDefaultAgent">
+      <arg name="agent" type="o" direction="in" />
+    </method>
+  </interface>
+
+  <interface name="org.bluez.Agent1">
+    <method name="Release"/>
+    <method name="RequestPinCode">
+      <arg name="pincode" type="s" direction="out" />
+      <arg name="device" type="o" direction="in" />
+    </method>
+    <method name="DisplayPinCode">
+      <arg name="device" type="o" direction="in" />
+      <arg name="pincode" type="s" direction="in" />
+    </method>
+    <method name="RequestPasskey">
+      <arg name="passkey" type="u" direction="out" />
+      <arg name="device" type="o" direction="in" />
+    </method>
+    <method name="DisplayPasskey">
+      <arg name="device" type="o" direction="in" />
+      <arg name="passkey" type="u" direction="in" />
+      <arg name="entered" type="q" direction="in" />
+    </method>
+    <method name="RequestConfirmation">
+      <arg name="device" type="o" direction="in" />
+      <arg name="passkey" type="u" direction="in" />
+    </method>
+    <method name="RequestAuthorization">
+      <arg name="device" type="o" direction="in" />
+    </method>
+    <method name="AuthorizeService">
+      <arg name="device" type="o" direction="in" />
+      <arg name="uuid" type="s" direction="in" />
+    </method>
+    <method name="Cancel"/>
+  </interface>
+
 </node>