diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto
index 8dc1dc2..377211b 100644
--- a/meshtastic/admin.proto
+++ b/meshtastic/admin.proto
@@ -12,7 +12,7 @@ import "meshtastic/module_config.proto";
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "AdminProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/apponly.proto b/meshtastic/apponly.proto
index 100833f..2612ed6 100644
--- a/meshtastic/apponly.proto
+++ b/meshtastic/apponly.proto
@@ -8,7 +8,7 @@ import "meshtastic/config.proto";
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "AppOnlyProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/atak.proto b/meshtastic/atak.proto
index 5dc08c9..093fb59 100644
--- a/meshtastic/atak.proto
+++ b/meshtastic/atak.proto
@@ -5,7 +5,7 @@ package meshtastic;
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "ATAKProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/cannedmessages.proto b/meshtastic/cannedmessages.proto
index baa5134..59f3dcc 100644
--- a/meshtastic/cannedmessages.proto
+++ b/meshtastic/cannedmessages.proto
@@ -5,7 +5,7 @@ package meshtastic;
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "CannedMessageConfigProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/channel.proto b/meshtastic/channel.proto
index 4b77242..d459b62 100644
--- a/meshtastic/channel.proto
+++ b/meshtastic/channel.proto
@@ -5,7 +5,7 @@ package meshtastic;
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "ChannelProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/clientonly.proto b/meshtastic/clientonly.proto
index 2b919ef..c80f428 100644
--- a/meshtastic/clientonly.proto
+++ b/meshtastic/clientonly.proto
@@ -8,7 +8,7 @@ import "meshtastic/mesh.proto";
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "ClientOnlyProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/config.proto b/meshtastic/config.proto
index f17a078..4d352c1 100644
--- a/meshtastic/config.proto
+++ b/meshtastic/config.proto
@@ -7,7 +7,7 @@ import "meshtastic/device_ui.proto";
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "ConfigProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 message Config {
diff --git a/meshtastic/connection_status.proto b/meshtastic/connection_status.proto
index 7551596..641e916 100644
--- a/meshtastic/connection_status.proto
+++ b/meshtastic/connection_status.proto
@@ -5,7 +5,7 @@ package meshtastic;
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "ConnStatusProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 message DeviceConnectionStatus {
diff --git a/meshtastic/device_ui.proto b/meshtastic/device_ui.proto
index 5b6bb5d..28d2910 100644
--- a/meshtastic/device_ui.proto
+++ b/meshtastic/device_ui.proto
@@ -5,7 +5,7 @@ package meshtastic;
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "DeviceUIProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto
index d449373..e8c7703 100644
--- a/meshtastic/deviceonly.proto
+++ b/meshtastic/deviceonly.proto
@@ -12,7 +12,7 @@ import "nanopb.proto";
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "DeviceOnly";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 option (nanopb_fileopt).include = "<vector>";
 
diff --git a/meshtastic/interdevice.proto b/meshtastic/interdevice.proto
index 4616c08..f646368 100644
--- a/meshtastic/interdevice.proto
+++ b/meshtastic/interdevice.proto
@@ -5,7 +5,7 @@ package meshtastic;
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "InterdeviceProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 // encapsulate up to 1k of NMEA string data
diff --git a/meshtastic/localonly.proto b/meshtastic/localonly.proto
index bcb2796..50e7305 100644
--- a/meshtastic/localonly.proto
+++ b/meshtastic/localonly.proto
@@ -8,7 +8,7 @@ import "meshtastic/module_config.proto";
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "LocalOnlyProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index 59f8c10..b10c780 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -13,7 +13,7 @@ import "meshtastic/xmodem.proto";
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "MeshProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/module_config.proto b/meshtastic/module_config.proto
index be8a693..f03e167 100644
--- a/meshtastic/module_config.proto
+++ b/meshtastic/module_config.proto
@@ -5,7 +5,7 @@ package meshtastic;
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "ModuleConfigProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/mqtt.proto b/meshtastic/mqtt.proto
index 4edf0c4..616780d 100644
--- a/meshtastic/mqtt.proto
+++ b/meshtastic/mqtt.proto
@@ -8,7 +8,7 @@ import "meshtastic/mesh.proto";
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "MQTTProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/paxcount.proto b/meshtastic/paxcount.proto
index 47b2639..5084f9d 100644
--- a/meshtastic/paxcount.proto
+++ b/meshtastic/paxcount.proto
@@ -5,7 +5,7 @@ package meshtastic;
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "PaxcountProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/portnums.proto b/meshtastic/portnums.proto
index e388a6f..24f0b16 100644
--- a/meshtastic/portnums.proto
+++ b/meshtastic/portnums.proto
@@ -5,7 +5,7 @@ package meshtastic;
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "Portnums";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/powermon.proto b/meshtastic/powermon.proto
index 77206f4..5973b16 100644
--- a/meshtastic/powermon.proto
+++ b/meshtastic/powermon.proto
@@ -5,7 +5,7 @@ package meshtastic;
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "PowerMonProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /* Note: There are no 'PowerMon' messages normally in use (PowerMons are sent only as structured logs - slogs).
diff --git a/meshtastic/remote_hardware.proto b/meshtastic/remote_hardware.proto
index ba4a693..d919203 100644
--- a/meshtastic/remote_hardware.proto
+++ b/meshtastic/remote_hardware.proto
@@ -5,7 +5,7 @@ package meshtastic;
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "RemoteHardware";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/rtttl.proto b/meshtastic/rtttl.proto
index 11c8b92..06d94fc 100644
--- a/meshtastic/rtttl.proto
+++ b/meshtastic/rtttl.proto
@@ -5,7 +5,7 @@ package meshtastic;
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "RTTTLConfigProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/storeforward.proto b/meshtastic/storeforward.proto
index 651eae5..a4a18b2 100644
--- a/meshtastic/storeforward.proto
+++ b/meshtastic/storeforward.proto
@@ -5,7 +5,7 @@ package meshtastic;
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "StoreAndForwardProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/telemetry.proto b/meshtastic/telemetry.proto
index 448adf3..4296f1b 100644
--- a/meshtastic/telemetry.proto
+++ b/meshtastic/telemetry.proto
@@ -5,7 +5,7 @@ package meshtastic;
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "TelemetryProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 /*
diff --git a/meshtastic/xmodem.proto b/meshtastic/xmodem.proto
index 732780a..2a049d1 100644
--- a/meshtastic/xmodem.proto
+++ b/meshtastic/xmodem.proto
@@ -5,7 +5,7 @@ package meshtastic;
 option csharp_namespace = "Meshtastic.Protobufs";
 option go_package = "github.com/meshtastic/go/generated";
 option java_outer_classname = "XmodemProtos";
-option java_package = "com.geeksville.mesh";
+option java_package = "org.meshtastic.proto";
 option swift_prefix = "";
 
 message XModem {