diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1331e1b..dab7608 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,7 @@ if (ZTS_ENABLE_PINVOKE)
     # Features
     set(BUILD_STATIC_LIB       FALSE)
     set(BUILD_SHARED_LIB        TRUE)
-    set(BUILD_EXAMPLES         FALSE)
+    set(BUILD_HOST_EXAMPLES    FALSE)
     set(ALLOW_INSTALL_TARGET   FALSE)
     set(BUILD_HOST_SELFTEST    FALSE)
     # Sources and libraries
@@ -131,7 +131,7 @@ if (ZTS_ENABLE_RUST)
     # Features
     set(BUILD_STATIC_LIB        TRUE)
     set(BUILD_SHARED_LIB       FALSE)
-    set(BUILD_EXAMPLES         FALSE)
+    set(BUILD_HOST_EXAMPLES    FALSE)
     set(ALLOW_INSTALL_TARGET   FALSE)
     set(BUILD_HOST_SELFTEST    FALSE)
 endif()
@@ -144,7 +144,7 @@ if (ZTS_ENABLE_PYTHON)
     # Targets
     set(BUILD_STATIC_LIB       FALSE)
     set(BUILD_SHARED_LIB        TRUE)
-    set(BUILD_EXAMPLES         FALSE)
+    set(BUILD_HOST_EXAMPLES    FALSE)
     set(ALLOW_INSTALL_TARGET   FALSE)
     set(BUILD_HOST_SELFTEST    FALSE)
     # Sources and libraries
@@ -192,7 +192,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Android")
     set(BUILD_STATIC_LIB       FALSE)
     set(BUILD_SHARED_LIB        TRUE)
     set(BUILD_HOST_SELFTEST    FALSE)
-    set(BUILD_EXAMPLES         FALSE)
+    set(BUILD_HOST_EXAMPLES    FALSE)
     set(ALLOW_INSTALL_TARGET   FALSE)
     set(LANG_WRAPPER_FILE ${LIBZT_SRC_DIR}/bindings/java/*.cxx)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DZTS_ENABLE_JAVA=1")
@@ -202,7 +202,7 @@ if(BUILD_MACOS_FRAMEWORK)
     set(BUILD_STATIC_LIB        TRUE)
     set(BUILD_SHARED_LIB        TRUE)
     set(BUILD_HOST_SELFTEST    FALSE)
-    set(BUILD_EXAMPLES         FALSE)
+    set(BUILD_HOST_EXAMPLES    FALSE)
     set(ALLOW_INSTALL_TARGET   FALSE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOMIT_JSON_SUPPORT=1")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DOMIT_JSON_SUPPORT=1")
@@ -217,7 +217,7 @@ if(BUILD_IOS_FRAMEWORK)
     set(BUILD_STATIC_LIB        TRUE)
     set(BUILD_SHARED_LIB        TRUE)
     set(BUILD_HOST_SELFTEST    FALSE)
-    set(BUILD_EXAMPLES         FALSE)
+    set(BUILD_HOST_EXAMPLES    FALSE)
     set(ALLOW_INSTALL_TARGET   FALSE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOMIT_JSON_SUPPORT=1")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DOMIT_JSON_SUPPORT=1")
diff --git a/examples/c/callbackapi.c b/examples/c/callbackapi.c
index 02d92ec..8bb1722 100644
--- a/examples/c/callbackapi.c
+++ b/examples/c/callbackapi.c
@@ -52,7 +52,7 @@ int main(int argc, char** argv)
 {
     if (argc != 2) {
         printf("\nUsage:\n");
-        printf("pingable-node <net_id>\n");
+        printf("callbackapi <net_id>\n");
         exit(0);
     }
     long long int net_id = strtoull(argv[1], NULL, 16);   // At least 64 bits
diff --git a/examples/c/nonblockingclient.c b/examples/c/nonblockingclient.c
index 4d7f4d5..78f77e1 100644
--- a/examples/c/nonblockingclient.c
+++ b/examples/c/nonblockingclient.c
@@ -14,7 +14,7 @@ int main(int argc, char** argv)
 {
     if (argc != 5) {
         printf("\nlibzt example client\n");
-        printf("client <id_storage_path> <net_id> <remote_addr> <remote_port>\n");
+        printf("nonblockingclient <id_storage_path> <net_id> <remote_addr> <remote_port>\n");
         exit(0);
     }
     char* storage_path = argv[1];
diff --git a/examples/c/nonblockingserver.c b/examples/c/nonblockingserver.c
index 81a33b9..228bcb2 100644
--- a/examples/c/nonblockingserver.c
+++ b/examples/c/nonblockingserver.c
@@ -14,7 +14,7 @@ int main(int argc, char** argv)
 {
     if (argc != 5) {
         printf("\nlibzt example server\n");
-        printf("server <id_storage_path> <net_id> <local_addr> <local_port>\n");
+        printf("nonblockingserver <id_storage_path> <net_id> <local_addr> <local_port>\n");
         exit(0);
     }
     char* storage_path = argv[1];
diff --git a/examples/c/statistics.c b/examples/c/statistics.c
index 6fa59d2..4f14306 100644
--- a/examples/c/statistics.c
+++ b/examples/c/statistics.c
@@ -14,7 +14,7 @@ int main(int argc, char** argv)
 {
     if (argc != 2) {
         printf("\nUsage:\n");
-        printf("pingable-node <net_id>\n");
+        printf("statistics <net_id>\n");
         exit(0);
     }
     long long int net_id = strtoull(argv[1], NULL, 16);   // At least 64 bits
diff --git a/pkg/android/app/src/main/java/com/example/zerotier/MainActivity.java b/pkg/android/app/src/main/java/com/example/zerotier/MainActivity.java
deleted file mode 100644
index 8b13789..0000000
--- a/pkg/android/app/src/main/java/com/example/zerotier/MainActivity.java
+++ /dev/null
@@ -1 +0,0 @@
-