24 files changed, 138 insertions, 138 deletions
diff --git a/java/jni/ZT1_jniutils.cpp b/java/jni/ZT1_jniutils.cpp
index 99c5348d..5bda6ae9 100644
--- a/java/jni/ZT1_jniutils.cpp
+++ b/java/jni/ZT1_jniutils.cpp
@@ -15,7 +15,7 @@ jobject createResultObject(JNIEnv *env, ZT1_ResultCode code)
     
     jobject resultObject = NULL;
 
-    resultClass = cache.findClass("com/zerotierone/sdk/ResultCode");
+    resultClass = cache.findClass("com/zerotier/sdk/ResultCode");
     if(resultClass == NULL)
     {
         return NULL; // exception thrown
@@ -42,7 +42,7 @@ jobject createResultObject(JNIEnv *env, ZT1_ResultCode code)
         break;
     }
 
-    jfieldID enumField = cache.findStaticField(resultClass, fieldName.c_str(), "Lcom/zerotierone/sdk/ResultCode;");
+    jfieldID enumField = cache.findStaticField(resultClass, fieldName.c_str(), "Lcom/zerotier/sdk/ResultCode;");
 
     resultObject = env->GetStaticObjectField(resultClass, enumField);
 
@@ -54,7 +54,7 @@ jobject createVirtualNetworkStatus(JNIEnv *env, ZT1_VirtualNetworkStatus status)
 {
     jobject statusObject = NULL;
 
-    jclass statusClass = cache.findClass("com/zerotierone/sdk/VirtualNetworkStatus");
+    jclass statusClass = cache.findClass("com/zerotier/sdk/VirtualNetworkStatus");
     if(statusClass == NULL)
     {
         return NULL; // exception thrown
@@ -83,7 +83,7 @@ jobject createVirtualNetworkStatus(JNIEnv *env, ZT1_VirtualNetworkStatus status)
         break;
     }
 
-    jfieldID enumField = cache.findStaticField(statusClass, fieldName.c_str(), "Lcom/zerotierone/sdk/VirtualNetworkStatus;");
+    jfieldID enumField = cache.findStaticField(statusClass, fieldName.c_str(), "Lcom/zerotier/sdk/VirtualNetworkStatus;");
 
     statusObject = env->GetStaticObjectField(statusClass, enumField);
 
@@ -95,7 +95,7 @@ jobject createEvent(JNIEnv *env, ZT1_Event event)
     jclass eventClass = NULL;
     jobject eventObject = NULL;
 
-    eventClass = cache.findClass("com/zerotierone/sdk/Event");
+    eventClass = cache.findClass("com/zerotier/sdk/Event");
     if(eventClass == NULL)
     {
         return NULL;
@@ -133,7 +133,7 @@ jobject createEvent(JNIEnv *env, ZT1_Event event)
         break;
     }
 
-    jfieldID enumField = cache.findStaticField(eventClass, fieldName.c_str(), "Lcom/zerotierone/sdk/Event;");
+    jfieldID enumField = cache.findStaticField(eventClass, fieldName.c_str(), "Lcom/zerotier/sdk/Event;");
 
     eventObject = env->GetStaticObjectField(eventClass, enumField);
 
@@ -145,7 +145,7 @@ jobject createPeerRole(JNIEnv *env, ZT1_PeerRole role)
     jclass peerRoleClass = NULL;
     jobject peerRoleObject = NULL;
 
-    peerRoleClass = cache.findClass("com/zerotierone/sdk/PeerRole");
+    peerRoleClass = cache.findClass("com/zerotier/sdk/PeerRole");
     if(peerRoleClass == NULL)
     {
         return NULL;
@@ -165,7 +165,7 @@ jobject createPeerRole(JNIEnv *env, ZT1_PeerRole role)
         break;
     }
 
-    jfieldID enumField = cache.findStaticField(peerRoleClass, fieldName.c_str(), "Lcom/zerotierone/sdk/PeerRole;");
+    jfieldID enumField = cache.findStaticField(peerRoleClass, fieldName.c_str(), "Lcom/zerotier/sdk/PeerRole;");
 
     peerRoleObject = env->GetStaticObjectField(peerRoleClass, enumField);
 
@@ -177,7 +177,7 @@ jobject createVirtualNetworkType(JNIEnv *env, ZT1_VirtualNetworkType type)
     jclass vntypeClass = NULL;
     jobject vntypeObject = NULL;
 
-    vntypeClass = cache.findClass("com/zerotierone/sdk/VirtualNetworkType");
+    vntypeClass = cache.findClass("com/zerotier/sdk/VirtualNetworkType");
     if(vntypeClass == NULL)
     {
         return NULL;
@@ -194,7 +194,7 @@ jobject createVirtualNetworkType(JNIEnv *env, ZT1_VirtualNetworkType type)
         break;
     }
 
-    jfieldID enumField = cache.findStaticField(vntypeClass, fieldName.c_str(), "Lcom/zerotierone/sdk/VirtualNetworkType;");
+    jfieldID enumField = cache.findStaticField(vntypeClass, fieldName.c_str(), "Lcom/zerotier/sdk/VirtualNetworkType;");
     vntypeObject = env->GetStaticObjectField(vntypeClass, enumField);
     return vntypeObject;
 }
@@ -204,7 +204,7 @@ jobject createVirtualNetworkConfigOperation(JNIEnv *env, ZT1_VirtualNetworkConfi
     jclass vnetConfigOpClass = NULL;
     jobject vnetConfigOpObject = NULL;
 
-    vnetConfigOpClass = cache.findClass("com/zerotierone/sdk/VirtualNetworkConfigOperation");
+    vnetConfigOpClass = cache.findClass("com/zerotier/sdk/VirtualNetworkConfigOperation");
     if(vnetConfigOpClass == NULL)
     {
         return NULL;
@@ -227,7 +227,7 @@ jobject createVirtualNetworkConfigOperation(JNIEnv *env, ZT1_VirtualNetworkConfi
         break;
     }
 
-    jfieldID enumField = cache.findStaticField(vnetConfigOpClass, fieldName.c_str(), "Lcom/zerotierone/sdk/VirtualNetworkConfigOperation;");
+    jfieldID enumField = cache.findStaticField(vnetConfigOpClass, fieldName.c_str(), "Lcom/zerotier/sdk/VirtualNetworkConfigOperation;");
     vnetConfigOpObject = env->GetStaticObjectField(vnetConfigOpClass, enumField);
     return vnetConfigOpObject;
 }
@@ -386,7 +386,7 @@ jobject newMulticastGroup(JNIEnv *env, const ZT1_MulticastGroup &mc)
     jfieldID macField = NULL;
     jfieldID adiField = NULL;
 
-    multicastGroupClass = cache.findClass("com/zerotierone/sdk/MulticastGroup");
+    multicastGroupClass = cache.findClass("com/zerotier/sdk/MulticastGroup");
     if(multicastGroupClass == NULL)
     {
         return NULL;
@@ -442,7 +442,7 @@ jobject newPeerPhysicalPath(JNIEnv *env, const ZT1_PeerPhysicalPath &ppp)
 
     jmethodID ppp_constructor = NULL;
 
-    pppClass = cache.findClass("com/zerotierone/sdk/PeerPhysicalPath");
+    pppClass = cache.findClass("com/zerotier/sdk/PeerPhysicalPath");
     if(pppClass == NULL)
     {
         return NULL;
@@ -524,7 +524,7 @@ jobject newPeer(JNIEnv *env, const ZT1_Peer &peer)
 
     jmethodID peer_constructor = NULL;
 
-    peerClass = cache.findClass("com/zerotierone/sdk/Peer");
+    peerClass = cache.findClass("com/zerotier/sdk/Peer");
     if(peerClass == NULL)
     {
         return NULL;
@@ -572,7 +572,7 @@ jobject newPeer(JNIEnv *env, const ZT1_Peer &peer)
         return NULL;
     }
 
-    roleField = cache.findField(peerClass, "role", "Lcom/zerotierone/sdk/PeerRole;");
+    roleField = cache.findField(peerClass, "role", "Lcom/zerotier/sdk/PeerRole;");
     if(roleField == NULL)
     {
         return NULL;
@@ -636,10 +636,10 @@ jobject newNetworkConfig(JNIEnv *env, const ZT1_VirtualNetworkConfig &vnetConfig
     jfieldID multicastSubscriptionsField = NULL;
     jfieldID assignedAddressesField = NULL;
 
-    vnetConfigClass = cache.findClass("com/zerotierone/sdk/VirtualNetworkConfig");
+    vnetConfigClass = cache.findClass("com/zerotier/sdk/VirtualNetworkConfig");
     if(vnetConfigClass == NULL)
     {
-        LOGE("Couldn't find com.zerotierone.sdk.VirtualNetworkConfig");
+        LOGE("Couldn't find com.zerotier.sdk.VirtualNetworkConfig");
         return NULL;
     }
 
@@ -679,14 +679,14 @@ jobject newNetworkConfig(JNIEnv *env, const ZT1_VirtualNetworkConfig &vnetConfig
         return NULL;
     }
 
-    statusField = cache.findField(vnetConfigClass, "status", "Lcom/zerotierone/sdk/VirtualNetworkStatus;");
+    statusField = cache.findField(vnetConfigClass, "status", "Lcom/zerotier/sdk/VirtualNetworkStatus;");
     if(statusField == NULL)
     {
         LOGE("Error getting status field");
         return NULL;
     }
 
-    typeField = cache.findField(vnetConfigClass, "type", "Lcom/zerotierone/sdk/VirtualNetworkType;");
+    typeField = cache.findField(vnetConfigClass, "type", "Lcom/zerotier/sdk/VirtualNetworkType;");
     if(typeField == NULL)
     {
         LOGE("Error getting type field");
@@ -809,11 +809,11 @@ jobject newNetworkConfig(JNIEnv *env, const ZT1_VirtualNetworkConfig &vnetConfig
 
 jobject newVersion(JNIEnv *env, int major, int minor, int rev, long featureFlags)
 {
-   // create a com.zerotierone.sdk.Version object
+   // create a com.zerotier.sdk.Version object
     jclass versionClass = NULL;
     jmethodID versionConstructor = NULL;
 
-    versionClass = cache.findClass("com/zerotierone/sdk/Version");
+    versionClass = cache.findClass("com/zerotier/sdk/Version");
     if(versionClass == NULL)
     {
         return NULL;
diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index d67b83a1..55eec9a6 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -105,7 +105,7 @@ namespace {
 
         jmethodID configListenerCallbackMethod = cache.findMethod(configListenerClass,
             "onNetworkConfigurationUpdated",
-            "(JLcom/zerotierone/sdk/VirtualNetworkConfigOperation;Lcom/zerotierone/sdk/VirtualNetworkConfig;)I");
+            "(JLcom/zerotier/sdk/VirtualNetworkConfigOperation;Lcom/zerotier/sdk/VirtualNetworkConfig;)I");
         if(configListenerCallbackMethod == NULL)
         {
             LOGE("Couldn't find onVirtualNetworkFrame() method");
@@ -186,7 +186,7 @@ namespace {
         }
 
         jmethodID onEventMethod = cache.findMethod(eventListenerClass,
-            "onEvent", "(Lcom/zerotierone/sdk/Event;)V");
+            "onEvent", "(Lcom/zerotier/sdk/Event;)V");
         if(onEventMethod == NULL)
         {
             LOGE("Couldn't find onEvent method");
@@ -195,7 +195,7 @@ namespace {
 
 
         jmethodID onOutOfDateMethod = cache.findMethod(eventListenerClass,
-            "onOutOfDate", "(Lcom/zerotierone/sdk/Version;)V");
+            "onOutOfDate", "(Lcom/zerotier/sdk/Version;)V");
         if(onOutOfDateMethod == NULL)
         {
             LOGE("Couldn't find onOutOfDate method");
@@ -204,7 +204,7 @@ namespace {
 
 
         jmethodID onNetworkErrorMethod = cache.findMethod(eventListenerClass,
-            "onNetworkError", "(Lcom/zerotierone/sdk/Event;Ljava/net/InetSocketAddress;)V");
+            "onNetworkError", "(Lcom/zerotier/sdk/Event;Ljava/net/InetSocketAddress;)V");
         if(onNetworkErrorMethod == NULL)
         {
             LOGE("Couldn't find onNetworkError method");
@@ -463,11 +463,11 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved)
 
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    node_init
- * Signature: (J)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (J)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_node_1init(
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
     JNIEnv *env, jobject obj, jlong now)
 {
     LOGD("Creating ZT1_Node struct");
@@ -480,7 +480,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_node_1init(
 
     jclass cls = env->GetObjectClass(obj);
     jfieldID fid = cache.findField(
-        cls, "getListener", "Lcom/zerotierone/sdk/DataStoreGetListener;");
+        cls, "getListener", "Lcom/zerotier/sdk/DataStoreGetListener;");
 
     if(fid == NULL)
     {
@@ -495,7 +495,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_node_1init(
     ref->dataStoreGetListener = env->NewGlobalRef(tmp);
 
     fid = cache.findField(
-        cls, "putListener", "Lcom/zerotierone/sdk/DataStorePutListener;");
+        cls, "putListener", "Lcom/zerotier/sdk/DataStorePutListener;");
 
     if(fid == NULL)
     {
@@ -510,7 +510,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_node_1init(
     ref->dataStorePutListener = env->NewGlobalRef(tmp);
 
     fid = cache.findField(
-        cls, "sender", "Lcom/zerotierone/sdk/PacketSender;");
+        cls, "sender", "Lcom/zerotier/sdk/PacketSender;");
     if(fid == NULL)
     {
         return NULL; // exception already thrown
@@ -524,7 +524,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_node_1init(
     ref->packetSender = env->NewGlobalRef(tmp);
 
     fid = cache.findField(
-        cls, "frameListener", "Lcom/zerotierone/sdk/VirtualNetworkFrameListener;");
+        cls, "frameListener", "Lcom/zerotier/sdk/VirtualNetworkFrameListener;");
     if(fid == NULL)
     {
         return NULL; // exception already thrown
@@ -538,7 +538,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_node_1init(
     ref->frameListener = env->NewGlobalRef(tmp);
 
     fid = cache.findField(
-        cls, "configListener", "Lcom/zerotierone/sdk/VirtualNetworkConfigListener;");
+        cls, "configListener", "Lcom/zerotier/sdk/VirtualNetworkConfigListener;");
     if(fid == NULL)
     {
         return NULL; // exception already thrown
@@ -552,7 +552,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_node_1init(
     ref->configListener = env->NewGlobalRef(tmp);
 
     fid = cache.findField(
-        cls, "eventListener", "Lcom/zerotierone/sdk/EventListener;");
+        cls, "eventListener", "Lcom/zerotier/sdk/EventListener;");
     if(fid == NULL)
     {
         return NULL;
@@ -597,11 +597,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_node_1init(
 }
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    node_delete
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_zerotierone_sdk_Node_node_1delete(
+JNIEXPORT void JNICALL Java_com_zerotier_sdk_Node_node_1delete(
     JNIEnv *env, jobject obj, jlong id)
 {
     LOGD("Destroying ZT1_Node struct");
@@ -625,11 +625,11 @@ JNIEXPORT void JNICALL Java_com_zerotierone_sdk_Node_node_1delete(
 }
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    processVirtualNetworkFrame
- * Signature: (JJJJJII[B[J)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (JJJJJII[B[J)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_processVirtualNetworkFrame(
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processVirtualNetworkFrame(
     JNIEnv *env, jobject obj, 
     jlong id, 
     jlong in_now, 
@@ -691,11 +691,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_processVirtualNetworkFra
 }
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    processWirePacket
- * Signature: (JJLjava/net/InetSocketAddress;I[B[J)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (JJLjava/net/InetSocketAddress;I[B[J)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_processWirePacket(
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
     JNIEnv *env, jobject obj, 
     jlong id,
     jlong in_now, 
@@ -817,11 +817,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_processWirePacket(
 }
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    processBackgroundTasks
- * Signature: (JJ[J)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (JJ[J)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_processBackgroundTasks(
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processBackgroundTasks(
     JNIEnv *env, jobject obj, 
     jlong id,
     jlong in_now,
@@ -854,11 +854,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_processBackgroundTasks(
 }
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    join
- * Signature: (JJ)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (JJ)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_join(
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_join(
     JNIEnv *env, jobject obj, jlong id, jlong in_nwid)
 {
     uint64_t nodeId = (uint64_t) id;
@@ -877,11 +877,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_join(
 }
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    leave
- * Signature: (JJ)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (JJ)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_leave(
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_leave(
     JNIEnv *env, jobject obj, jlong id, jlong in_nwid)
 {
     uint64_t nodeId = (uint64_t) id;
@@ -900,11 +900,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_leave(
 }
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    multicastSubscribe
- * Signature: (JJJJ)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (JJJJ)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_multicastSubscribe(
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_multicastSubscribe(
     JNIEnv *env, jobject obj, 
     jlong id, 
     jlong in_nwid,
@@ -930,11 +930,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_multicastSubscribe(
 }
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    multicastUnsubscribe
- * Signature: (JJJJ)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (JJJJ)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_multicastUnsubscribe(
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_multicastUnsubscribe(
     JNIEnv *env, jobject obj, 
     jlong id, 
     jlong in_nwid,
@@ -960,11 +960,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_multicastUnsubscribe(
 }
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    address
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_com_zerotierone_sdk_Node_address(
+JNIEXPORT jlong JNICALL Java_com_zerotier_sdk_Node_address(
     JNIEnv *env , jobject obj, jlong id)
 {
     uint64_t nodeId = (uint64_t) id;
@@ -980,11 +980,11 @@ JNIEXPORT jlong JNICALL Java_com_zerotierone_sdk_Node_address(
 }
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    status
- * Signature: (J)Lcom/zerotierone/sdk/NodeStatus;
+ * Signature: (J)Lcom/zerotier/sdk/NodeStatus;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_status
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_status
    (JNIEnv *env, jobject obj, jlong id)
 {
     uint64_t nodeId = (uint64_t) id;
@@ -998,8 +998,8 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_status
     jclass nodeStatusClass = NULL;
     jmethodID nodeStatusConstructor = NULL;
 
-    // create a com.zerotierone.sdk.NodeStatus object
-    nodeStatusClass = cache.findClass("com/zerotierone/sdk/NodeStatus");
+    // create a com.zerotier.sdk.NodeStatus object
+    nodeStatusClass = cache.findClass("com/zerotier/sdk/NodeStatus");
     if(nodeStatusClass == NULL)
     {
         return NULL;
@@ -1072,11 +1072,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_status
 }
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    networkConfig
- * Signature: (J)Lcom/zerotierone/sdk/VirtualNetworkConfig;
+ * Signature: (J)Lcom/zerotier/sdk/VirtualNetworkConfig;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_networkConfig(
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_networkConfig(
     JNIEnv *env, jobject obj, jlong id, jlong nwid)
 {
     uint64_t nodeId = (uint64_t) id;
@@ -1097,11 +1097,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_networkConfig(
 }
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    version
- * Signature: (J)Lcom/zerotierone/sdk/Version;
+ * Signature: (J)Lcom/zerotier/sdk/Version;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_version(
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_version(
     JNIEnv *env, jobject obj)
 {
     int major = 0;
@@ -1115,11 +1115,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_version(
 }
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    peers
  * Signature: (J)Ljava/util/ArrayList;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_peers(
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_peers(
     JNIEnv *env, jobject obj, jlong id)
 {
     uint64_t nodeId = (uint64_t) id;
@@ -1157,11 +1157,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_peers(
 }
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    networks
  * Signature: (J)Ljava/util/ArrayList;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_networks(
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_networks(
     JNIEnv *env, jobject obj, jlong id)
 {
     uint64_t nodeId = (uint64_t) id;
diff --git a/java/jni/com_zerotierone_sdk_Node.h b/java/jni/com_zerotierone_sdk_Node.h
index eb88def5..a55c6702 100644
--- a/java/jni/com_zerotierone_sdk_Node.h
+++ b/java/jni/com_zerotierone_sdk_Node.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
 #include <jni.h>
-/* Header for class com_zerotierone_sdk_Node */
+/* Header for class com_zerotier_sdk_Node */
 
 #ifndef _Included_com_zerotierone_sdk_Node
 #define _Included_com_zerotierone_sdk_Node
@@ -8,123 +8,123 @@
 extern "C" {
 #endif
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    node_init
- * Signature: (J)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (J)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_node_1init
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    node_delete
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_com_zerotierone_sdk_Node_node_1delete
+JNIEXPORT void JNICALL Java_com_zerotier_sdk_Node_node_1delete
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    processVirtualNetworkFrame
- * Signature: (JJJJJII[B[J)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (JJJJJII[B[J)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_processVirtualNetworkFrame
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processVirtualNetworkFrame
   (JNIEnv *, jobject, jlong, jlong, jlong, jlong, jlong, jint, jint, jbyteArray, jlongArray);
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    processWirePacket
- * Signature: (JJLjava/net/InetSockAddress;I[B[J)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (JJLjava/net/InetSockAddress;I[B[J)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_processWirePacket
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket
   (JNIEnv *, jobject, jlong, jlong, jobject, jint, jbyteArray, jlongArray);
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    processBackgroundTasks
- * Signature: (JJ[J)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (JJ[J)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_processBackgroundTasks
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processBackgroundTasks
   (JNIEnv *, jobject, jlong, jlong, jlongArray);
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    join
- * Signature: (JJ)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (JJ)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_join
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_join
   (JNIEnv *, jobject, jlong, jlong);
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    leave
- * Signature: (JJ)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (JJ)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_leave
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_leave
   (JNIEnv *, jobject, jlong, jlong);
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    multicastSubscribe
- * Signature: (JJJJ)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (JJJJ)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_multicastSubscribe
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_multicastSubscribe
   (JNIEnv *, jobject, jlong, jlong, jlong, jlong);
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    multicastUnsubscribe
- * Signature: (JJJJ)Lcom/zerotierone/sdk/ResultCode;
+ * Signature: (JJJJ)Lcom/zerotier/sdk/ResultCode;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_multicastUnsubscribe
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_multicastUnsubscribe
   (JNIEnv *, jobject, jlong, jlong, jlong, jlong);
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    address
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_com_zerotierone_sdk_Node_address
+JNIEXPORT jlong JNICALL Java_com_zerotier_sdk_Node_address
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    status
- * Signature: (J)Lcom/zerotierone/sdk/NodeStatus;
+ * Signature: (J)Lcom/zerotier/sdk/NodeStatus;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_status
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_status
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    networkConfig
- * Signature: (JJ)Lcom/zerotierone/sdk/VirtualNetworkConfig;
+ * Signature: (JJ)Lcom/zerotier/sdk/VirtualNetworkConfig;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_networkConfig
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_networkConfig
   (JNIEnv *, jobject, jlong, jlong);
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    version
- * Signature: ()Lcom/zerotierone/sdk/Version;
+ * Signature: ()Lcom/zerotier/sdk/Version;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_version
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_version
   (JNIEnv *, jobject);
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    peers
  * Signature: (J)Ljava/util/ArrayList;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_peers
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_peers
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     com_zerotierone_sdk_Node
+ * Class:     com_zerotier_sdk_Node
  * Method:    networks
  * Signature: (J)Ljava/util/ArrayList;
  */
-JNIEXPORT jobject JNICALL Java_com_zerotierone_sdk_Node_networks
+JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_networks
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
diff --git a/java/src/com/zerotierone/sdk/DataStoreGetListener.java b/java/src/com/zerotier/sdk/DataStoreGetListener.java
index c82f744f..b525be63 100644
--- a/java/src/com/zerotierone/sdk/DataStoreGetListener.java
+++ b/java/src/com/zerotier/sdk/DataStoreGetListener.java
@@ -24,7 +24,7 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 public interface DataStoreGetListener {
 
diff --git a/java/src/com/zerotierone/sdk/DataStorePutListener.java b/java/src/com/zerotier/sdk/DataStorePutListener.java
index 277cfcc6..77e55027 100644
--- a/java/src/com/zerotierone/sdk/DataStorePutListener.java
+++ b/java/src/com/zerotier/sdk/DataStorePutListener.java
@@ -24,7 +24,7 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 public interface DataStorePutListener {
 
diff --git a/java/src/com/zerotierone/sdk/Event.java b/java/src/com/zerotier/sdk/Event.java
index 04249fd4..d315990b 100644
--- a/java/src/com/zerotierone/sdk/Event.java
+++ b/java/src/com/zerotier/sdk/Event.java
@@ -25,7 +25,7 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 public enum Event {
     /**
diff --git a/java/src/com/zerotierone/sdk/EventListener.java b/java/src/com/zerotier/sdk/EventListener.java
index 84b82615..078023d9 100644
--- a/java/src/com/zerotierone/sdk/EventListener.java
+++ b/java/src/com/zerotier/sdk/EventListener.java
@@ -25,7 +25,7 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 import java.net.InetSocketAddress;
 import java.lang.String;
diff --git a/java/src/com/zerotierone/sdk/MulticastGroup.java b/java/src/com/zerotier/sdk/MulticastGroup.java
index aa75ab85..5c4df87a 100644
--- a/java/src/com/zerotierone/sdk/MulticastGroup.java
+++ b/java/src/com/zerotier/sdk/MulticastGroup.java
@@ -24,7 +24,7 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 
 public final class MulticastGroup {
diff --git a/java/src/com/zerotierone/sdk/NativeUtils.java b/java/src/com/zerotier/sdk/NativeUtils.java
index d761c68c..07e1ef5b 100644
--- a/java/src/com/zerotierone/sdk/NativeUtils.java
+++ b/java/src/com/zerotier/sdk/NativeUtils.java
@@ -1,4 +1,4 @@
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/java/src/com/zerotierone/sdk/Node.java b/java/src/com/zerotier/sdk/Node.java
index 005147f3..8484ab59 100644
--- a/java/src/com/zerotierone/sdk/Node.java
+++ b/java/src/com/zerotier/sdk/Node.java
@@ -25,7 +25,7 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
diff --git a/java/src/com/zerotierone/sdk/NodeException.java b/java/src/com/zerotier/sdk/NodeException.java
index 81111a58..3071069a 100644
--- a/java/src/com/zerotierone/sdk/NodeException.java
+++ b/java/src/com/zerotier/sdk/NodeException.java
@@ -25,7 +25,7 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 import java.lang.RuntimeException;
 
diff --git a/java/src/com/zerotierone/sdk/NodeStatus.java b/java/src/com/zerotier/sdk/NodeStatus.java
index 163e3056..94376d85 100644
--- a/java/src/com/zerotierone/sdk/NodeStatus.java
+++ b/java/src/com/zerotier/sdk/NodeStatus.java
@@ -25,7 +25,7 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 public final class NodeStatus {
 	private long address;
diff --git a/java/src/com/zerotierone/sdk/PacketSender.java b/java/src/com/zerotier/sdk/PacketSender.java
index a4cbb0e5..d038b11d 100644
--- a/java/src/com/zerotierone/sdk/PacketSender.java
+++ b/java/src/com/zerotier/sdk/PacketSender.java
@@ -24,7 +24,7 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 import java.net.InetSocketAddress;
 
diff --git a/java/src/com/zerotierone/sdk/Peer.java b/java/src/com/zerotier/sdk/Peer.java
index f01755ba..407e6cd4 100644
--- a/java/src/com/zerotierone/sdk/Peer.java
+++ b/java/src/com/zerotier/sdk/Peer.java
@@ -25,7 +25,7 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 import java.util.ArrayList;
 
diff --git a/java/src/com/zerotierone/sdk/PeerPhysicalPath.java b/java/src/com/zerotier/sdk/PeerPhysicalPath.java
index 15f04241..d64ea56b 100644
--- a/java/src/com/zerotierone/sdk/PeerPhysicalPath.java
+++ b/java/src/com/zerotier/sdk/PeerPhysicalPath.java
@@ -25,7 +25,7 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 import java.net.InetSocketAddress;
 
diff --git a/java/src/com/zerotierone/sdk/PeerRole.java b/java/src/com/zerotier/sdk/PeerRole.java
index 7f507f6d..56c3ac0c 100644
--- a/java/src/com/zerotierone/sdk/PeerRole.java
+++ b/java/src/com/zerotier/sdk/PeerRole.java
@@ -25,7 +25,7 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 public enum PeerRole {
     /**
diff --git a/java/src/com/zerotierone/sdk/ResultCode.java b/java/src/com/zerotier/sdk/ResultCode.java
index bb73f68c..5da82b31 100644
--- a/java/src/com/zerotierone/sdk/ResultCode.java
+++ b/java/src/com/zerotier/sdk/ResultCode.java
@@ -25,7 +25,7 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 /**
  * Function return code: OK (0) or error results
diff --git a/java/src/com/zerotierone/sdk/Version.java b/java/src/com/zerotier/sdk/Version.java
index 14e9f152..d7fa0ce4 100644
--- a/java/src/com/zerotierone/sdk/Version.java
+++ b/java/src/com/zerotier/sdk/Version.java
@@ -25,7 +25,7 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 public final class Version {
     private Version() {}
diff --git a/java/src/com/zerotierone/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
index 10d9f873..032ba267 100644
--- a/java/src/com/zerotierone/sdk/VirtualNetworkConfig.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
@@ -25,7 +25,7 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 import java.lang.String;
 import java.util.ArrayList;
diff --git a/java/src/com/zerotierone/sdk/VirtualNetworkConfigListener.java b/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java
index 2a26d79d..15ae301c 100644
--- a/java/src/com/zerotierone/sdk/VirtualNetworkConfigListener.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfigListener.java
@@ -26,7 +26,7 @@
  */
 
 
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 
 public interface VirtualNetworkConfigListener {
diff --git a/java/src/com/zerotierone/sdk/VirtualNetworkConfigOperation.java b/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java
index 989961b3..b70eb478 100644
--- a/java/src/com/zerotierone/sdk/VirtualNetworkConfigOperation.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfigOperation.java
@@ -24,7 +24,7 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 public enum VirtualNetworkConfigOperation {
     /**
diff --git a/java/src/com/zerotierone/sdk/VirtualNetworkFrameListener.java b/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java
index 07051a57..17c6540d 100644
--- a/java/src/com/zerotierone/sdk/VirtualNetworkFrameListener.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkFrameListener.java
@@ -25,7 +25,7 @@
  * LLC. Start here: http://www.zerotier.com/
  */
 
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 public interface VirtualNetworkFrameListener {
     /**
diff --git a/java/src/com/zerotierone/sdk/VirtualNetworkStatus.java b/java/src/com/zerotier/sdk/VirtualNetworkStatus.java
index 78df06b9..2d00561a 100644
--- a/java/src/com/zerotierone/sdk/VirtualNetworkStatus.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkStatus.java
@@ -24,7 +24,7 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 public enum VirtualNetworkStatus {
     /**
diff --git a/java/src/com/zerotierone/sdk/VirtualNetworkType.java b/java/src/com/zerotier/sdk/VirtualNetworkType.java
index adc2eaff..ab1f4e08 100644
--- a/java/src/com/zerotierone/sdk/VirtualNetworkType.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkType.java
@@ -24,7 +24,7 @@
  * redistribute it in a modified binary form, please contact ZeroTier Networks
  * LLC. Start here: http://www.zerotier.com/
  */
-package com.zerotierone.sdk;
+package com.zerotier.sdk;
 
 public enum VirtualNetworkType {
     /**