fix binary protobuf descriptor data (#168)

Fixes #164, #167

cluster-sharding-typed/src/main/java/org/apache/pekko/cluster/sharding/typed/internal/protobuf/ShardingMessages.java

@@ -150,13 +150,13 @@ public final class ShardingMessages {
     }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_akka_cluster_sharding_typed_ShardingEnvelope_descriptor;
+      return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_descriptor;
     }
 
     @java.lang.Override
     protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_akka_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable
+      return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.class, org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.Builder.class);
     }
@@ -426,13 +426,13 @@ public final class ShardingMessages {
         org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelopeOrBuilder {
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_akka_cluster_sharding_typed_ShardingEnvelope_descriptor;
+        return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_descriptor;
       }
 
       @java.lang.Override
       protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_akka_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable
+        return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.class, org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.ShardingEnvelope.Builder.class);
       }
@@ -470,7 +470,7 @@ public final class ShardingMessages {
       @java.lang.Override
       public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_akka_cluster_sharding_typed_ShardingEnvelope_descriptor;
+        return org.apache.pekko.cluster.sharding.typed.internal.protobuf.ShardingMessages.internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_descriptor;
       }
 
       @java.lang.Override
@@ -857,10 +857,10 @@ public final class ShardingMessages {
   }
 
   private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-    internal_static_akka_cluster_sharding_typed_ShardingEnvelope_descriptor;
+    internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_descriptor;
   private static final 
     org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_akka_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable;
+      internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable;
 
   public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
@@ -870,22 +870,23 @@ public final class ShardingMessages {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026ShardingMessages.proto\022\033org.apache.pekko.cluster.s" +
+      "\n\026ShardingMessages.proto\022\'org.apache.pek" +
-      "harding.typed\032\026ContainerFormats.proto\"?\n" +
+      "ko.cluster.sharding.typed\032\026ContainerForm" +
-      "\020ShardingEnvelope\022\020\n\010entityId\030\001 \002(\t\022\031\n\007m" +
+      "ats.proto\"?\n\020ShardingEnvelope\022\020\n\010entityI" +
-      "essage\030\002 \002(\0132\010.PayloadB1\n-org.apache.pekko.cluster.s" +
+      "d\030\001 \002(\t\022\031\n\007message\030\002 \002(\0132\010.PayloadB=\n9or" +
-      "harding.typed.internal.protobufH\001"
+      "g.apache.pekko.cluster.sharding.typed.in" +
+      "ternal.protobufH\001"
     };
     descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
           org.apache.pekko.remote.ContainerFormats.getDescriptor(),
         });
-    internal_static_akka_cluster_sharding_typed_ShardingEnvelope_descriptor =
+    internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_akka_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable = new
+    internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_fieldAccessorTable = new
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_akka_cluster_sharding_typed_ShardingEnvelope_descriptor,
+        internal_static_org_apache_pekko_cluster_sharding_typed_ShardingEnvelope_descriptor,
         new java.lang.String[] { "EntityId", "Message", });
     org.apache.pekko.remote.ContainerFormats.getDescriptor();
   }

cluster-sharding/src/main/java/org/apache/pekko/cluster/sharding/protobuf/msg/ClusterShardingMessages.java

@@ -21339,8 +21339,8 @@ public final class ClusterShardingMessages {
       "ntityIds\030\002 \003(\t\"F\n\027CurrentShardRegionStat" +
       "e\022\033\n\006shards\030\001 \003(\0132\013.ShardState\022\016\n\006failed" +
       "\030\002 \003(\t\"7\n\024RememberedShardState\022\017\n\007shardI" +
-      "d\030\001 \003(\t\022\016\n\006marker\030\002 \001(\010B&\n\"org.apache.pekko.cluster." +
+      "d\030\001 \003(\t\022\016\n\006marker\030\002 \001(\010B2\n.org.apache.pe" +
-      "sharding.protobuf.msgH\001"
+      "kko.cluster.sharding.protobuf.msgH\001"
     };
     descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,

cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ClusterMessages.java

@@ -154,13 +154,13 @@ public final class ClusterMessages {
     }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_ReceptionistEntry_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_org_apache_pekko_cluster_typed_ReceptionistEntry_descriptor;
     }
 
     @java.lang.Override
     protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_ReceptionistEntry_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_org_apache_pekko_cluster_typed_ReceptionistEntry_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.class, org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.Builder.class);
     }
@@ -455,13 +455,13 @@ public final class ClusterMessages {
         org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntryOrBuilder {
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_ReceptionistEntry_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_org_apache_pekko_cluster_typed_ReceptionistEntry_descriptor;
       }
 
       @java.lang.Override
       protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_ReceptionistEntry_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_org_apache_pekko_cluster_typed_ReceptionistEntry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.class, org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.ReceptionistEntry.Builder.class);
       }
@@ -496,7 +496,7 @@ public final class ClusterMessages {
       @java.lang.Override
       public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_ReceptionistEntry_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_org_apache_pekko_cluster_typed_ReceptionistEntry_descriptor;
       }
 
       @java.lang.Override
@@ -935,13 +935,13 @@ public final class ClusterMessages {
     }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_PubSubMessagePublished_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_org_apache_pekko_cluster_typed_PubSubMessagePublished_descriptor;
     }
 
     @java.lang.Override
     protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_PubSubMessagePublished_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_org_apache_pekko_cluster_typed_PubSubMessagePublished_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.class, org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.Builder.class);
     }
@@ -1147,13 +1147,13 @@ public final class ClusterMessages {
         org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublishedOrBuilder {
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_PubSubMessagePublished_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_org_apache_pekko_cluster_typed_PubSubMessagePublished_descriptor;
       }
 
       @java.lang.Override
       protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_PubSubMessagePublished_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_org_apache_pekko_cluster_typed_PubSubMessagePublished_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.class, org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.PubSubMessagePublished.Builder.class);
       }
@@ -1189,7 +1189,7 @@ public final class ClusterMessages {
       @java.lang.Override
       public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_akka_cluster_typed_PubSubMessagePublished_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ClusterMessages.internal_static_org_apache_pekko_cluster_typed_PubSubMessagePublished_descriptor;
       }
 
       @java.lang.Override
@@ -1480,15 +1480,15 @@ public final class ClusterMessages {
   }
 
   private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-    internal_static_akka_cluster_typed_ReceptionistEntry_descriptor;
+    internal_static_org_apache_pekko_cluster_typed_ReceptionistEntry_descriptor;
   private static final 
     org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_akka_cluster_typed_ReceptionistEntry_fieldAccessorTable;
+      internal_static_org_apache_pekko_cluster_typed_ReceptionistEntry_fieldAccessorTable;
   private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-    internal_static_akka_cluster_typed_PubSubMessagePublished_descriptor;
+    internal_static_org_apache_pekko_cluster_typed_PubSubMessagePublished_descriptor;
   private static final 
     org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_akka_cluster_typed_PubSubMessagePublished_fieldAccessorTable;
+      internal_static_org_apache_pekko_cluster_typed_PubSubMessagePublished_fieldAccessorTable;
 
   public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
@@ -1498,30 +1498,30 @@ public final class ClusterMessages {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\025ClusterMessages.proto\022\022org.apache.pekko.cluster.ty" +
+      "\n\025ClusterMessages.proto\022\036org.apache.pekk" +
-      "ped\032\026ContainerFormats.proto\"R\n\021Reception" +
+      "o.cluster.typed\032\026ContainerFormats.proto\"" +
-      "istEntry\022\020\n\010actorRef\030\001 \002(\t\022\021\n\tsystemUid\030" +
+      "R\n\021ReceptionistEntry\022\020\n\010actorRef\030\001 \002(\t\022\021" +
-      "\002 \002(\004\022\030\n\020createdTimestamp\030\003 \001(\003\"3\n\026PubSu" +
+      "\n\tsystemUid\030\002 \002(\004\022\030\n\020createdTimestamp\030\003 " +
-      "bMessagePublished\022\031\n\007message\030\001 \002(\0132\010.Pay" +
+      "\001(\003\"3\n\026PubSubMessagePublished\022\031\n\007message" +
-      "loadB(\n$org.apache.pekko.cluster.typed.internal.prot" +
+      "\030\001 \002(\0132\010.PayloadB4\n0org.apache.pekko.clu" +
-      "obufH\001"
+      "ster.typed.internal.protobufH\001"
     };
     descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
           org.apache.pekko.remote.ContainerFormats.getDescriptor(),
         });
-    internal_static_akka_cluster_typed_ReceptionistEntry_descriptor =
+    internal_static_org_apache_pekko_cluster_typed_ReceptionistEntry_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_akka_cluster_typed_ReceptionistEntry_fieldAccessorTable = new
+    internal_static_org_apache_pekko_cluster_typed_ReceptionistEntry_fieldAccessorTable = new
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_akka_cluster_typed_ReceptionistEntry_descriptor,
+        internal_static_org_apache_pekko_cluster_typed_ReceptionistEntry_descriptor,
         new java.lang.String[] { "ActorRef", "SystemUid", "CreatedTimestamp", });
-    internal_static_akka_cluster_typed_PubSubMessagePublished_descriptor =
+    internal_static_org_apache_pekko_cluster_typed_PubSubMessagePublished_descriptor =
       getDescriptor().getMessageTypes().get(1);
-    internal_static_akka_cluster_typed_PubSubMessagePublished_fieldAccessorTable = new
+    internal_static_org_apache_pekko_cluster_typed_PubSubMessagePublished_fieldAccessorTable = new
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_akka_cluster_typed_PubSubMessagePublished_descriptor,
+        internal_static_org_apache_pekko_cluster_typed_PubSubMessagePublished_descriptor,
         new java.lang.String[] { "Message", });
     org.apache.pekko.remote.ContainerFormats.getDescriptor();
   }

cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ReliableDelivery.java

@@ -258,13 +258,13 @@ public final class ReliableDelivery {
     }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_SequencedMessage_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_SequencedMessage_descriptor;
     }
 
     @java.lang.Override
     protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_SequencedMessage_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_SequencedMessage_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.Builder.class);
     }
@@ -784,13 +784,13 @@ public final class ReliableDelivery {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessageOrBuilder {
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_SequencedMessage_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_SequencedMessage_descriptor;
       }
 
       @java.lang.Override
       protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_SequencedMessage_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_SequencedMessage_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.SequencedMessage.Builder.class);
       }
@@ -840,7 +840,7 @@ public final class ReliableDelivery {
       @java.lang.Override
       public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_SequencedMessage_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_SequencedMessage_descriptor;
       }
 
       @java.lang.Override
@@ -1650,13 +1650,13 @@ public final class ReliableDelivery {
     }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_RegisterConsumer_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_RegisterConsumer_descriptor;
     }
 
     @java.lang.Override
     protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_RegisterConsumer_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_RegisterConsumer_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.Builder.class);
     }
@@ -1883,13 +1883,13 @@ public final class ReliableDelivery {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumerOrBuilder {
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_RegisterConsumer_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_RegisterConsumer_descriptor;
       }
 
       @java.lang.Override
       protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_RegisterConsumer_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_RegisterConsumer_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RegisterConsumer.Builder.class);
       }
@@ -1920,7 +1920,7 @@ public final class ReliableDelivery {
       @java.lang.Override
       public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_RegisterConsumer_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_RegisterConsumer_descriptor;
       }
 
       @java.lang.Override
@@ -2308,13 +2308,13 @@ public final class ReliableDelivery {
     }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Request_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Request_descriptor;
     }
 
     @java.lang.Override
     protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Request_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Request_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request.Builder.class);
     }
@@ -2629,13 +2629,13 @@ public final class ReliableDelivery {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.RequestOrBuilder {
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Request_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Request_descriptor;
       }
 
       @java.lang.Override
       protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Request_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Request_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Request.Builder.class);
       }
@@ -2672,7 +2672,7 @@ public final class ReliableDelivery {
       @java.lang.Override
       public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Request_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Request_descriptor;
       }
 
       @java.lang.Override
@@ -3104,13 +3104,13 @@ public final class ReliableDelivery {
     }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Resend_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Resend_descriptor;
     }
 
     @java.lang.Override
     protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Resend_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Resend_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend.Builder.class);
     }
@@ -3311,13 +3311,13 @@ public final class ReliableDelivery {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.ResendOrBuilder {
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Resend_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Resend_descriptor;
       }
 
       @java.lang.Override
       protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Resend_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Resend_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Resend.Builder.class);
       }
@@ -3348,7 +3348,7 @@ public final class ReliableDelivery {
       @java.lang.Override
       public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Resend_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Resend_descriptor;
       }
 
       @java.lang.Override
@@ -3639,13 +3639,13 @@ public final class ReliableDelivery {
     }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Ack_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Ack_descriptor;
     }
 
     @java.lang.Override
     protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Ack_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Ack_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack.Builder.class);
     }
@@ -3846,13 +3846,13 @@ public final class ReliableDelivery {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.AckOrBuilder {
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Ack_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Ack_descriptor;
       }
 
       @java.lang.Override
       protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Ack_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Ack_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Ack.Builder.class);
       }
@@ -3883,7 +3883,7 @@ public final class ReliableDelivery {
       @java.lang.Override
       public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Ack_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Ack_descriptor;
       }
 
       @java.lang.Override
@@ -4264,13 +4264,13 @@ public final class ReliableDelivery {
     }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_State_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_State_descriptor;
     }
 
     @java.lang.Override
     protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_State_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_State_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State.Builder.class);
     }
@@ -4617,13 +4617,13 @@ public final class ReliableDelivery {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.StateOrBuilder {
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_State_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_State_descriptor;
       }
 
       @java.lang.Override
       protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_State_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_State_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.State.Builder.class);
       }
@@ -4670,7 +4670,7 @@ public final class ReliableDelivery {
       @java.lang.Override
       public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_State_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_State_descriptor;
       }
 
       @java.lang.Override
@@ -5608,13 +5608,13 @@ public final class ReliableDelivery {
     }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Confirmed_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Confirmed_descriptor;
     }
 
     @java.lang.Override
     protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Confirmed_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Confirmed_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder.class);
     }
@@ -5917,13 +5917,13 @@ public final class ReliableDelivery {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.ConfirmedOrBuilder {
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Confirmed_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Confirmed_descriptor;
       }
 
       @java.lang.Override
       protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Confirmed_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Confirmed_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed.Builder.class);
       }
@@ -5958,7 +5958,7 @@ public final class ReliableDelivery {
       @java.lang.Override
       public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Confirmed_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Confirmed_descriptor;
       }
 
       @java.lang.Override
@@ -6508,13 +6508,13 @@ public final class ReliableDelivery {
     }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_MessageSent_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_MessageSent_descriptor;
     }
 
     @java.lang.Override
     protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_MessageSent_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_MessageSent_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder.class);
     }
@@ -6970,13 +6970,13 @@ public final class ReliableDelivery {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSentOrBuilder {
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_MessageSent_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_MessageSent_descriptor;
       }
 
       @java.lang.Override
       protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_MessageSent_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_MessageSent_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.MessageSent.Builder.class);
       }
@@ -7024,7 +7024,7 @@ public final class ReliableDelivery {
       @java.lang.Override
       public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_MessageSent_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_MessageSent_descriptor;
       }
 
       @java.lang.Override
@@ -7752,13 +7752,13 @@ public final class ReliableDelivery {
     }
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Cleanup_descriptor;
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Cleanup_descriptor;
     }
 
     @java.lang.Override
     protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Cleanup_fieldAccessorTable
+      return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Cleanup_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.Builder.class);
     }
@@ -7972,13 +7972,13 @@ public final class ReliableDelivery {
         org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.CleanupOrBuilder {
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Cleanup_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Cleanup_descriptor;
       }
 
       @java.lang.Override
       protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Cleanup_fieldAccessorTable
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Cleanup_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.class, org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.Cleanup.Builder.class);
       }
@@ -8009,7 +8009,7 @@ public final class ReliableDelivery {
       @java.lang.Override
       public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_akka_cluster_typed_delivery_Cleanup_descriptor;
+        return org.apache.pekko.cluster.typed.internal.protobuf.ReliableDelivery.internal_static_org_apache_pekko_cluster_typed_delivery_Cleanup_descriptor;
       }
 
       @java.lang.Override
@@ -8285,50 +8285,50 @@ public final class ReliableDelivery {
   }
 
   private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-    internal_static_akka_cluster_typed_delivery_SequencedMessage_descriptor;
+    internal_static_org_apache_pekko_cluster_typed_delivery_SequencedMessage_descriptor;
   private static final 
     org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_akka_cluster_typed_delivery_SequencedMessage_fieldAccessorTable;
+      internal_static_org_apache_pekko_cluster_typed_delivery_SequencedMessage_fieldAccessorTable;
   private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-    internal_static_akka_cluster_typed_delivery_RegisterConsumer_descriptor;
+    internal_static_org_apache_pekko_cluster_typed_delivery_RegisterConsumer_descriptor;
   private static final 
     org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_akka_cluster_typed_delivery_RegisterConsumer_fieldAccessorTable;
+      internal_static_org_apache_pekko_cluster_typed_delivery_RegisterConsumer_fieldAccessorTable;
   private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-    internal_static_akka_cluster_typed_delivery_Request_descriptor;
+    internal_static_org_apache_pekko_cluster_typed_delivery_Request_descriptor;
   private static final 
     org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_akka_cluster_typed_delivery_Request_fieldAccessorTable;
+      internal_static_org_apache_pekko_cluster_typed_delivery_Request_fieldAccessorTable;
   private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-    internal_static_akka_cluster_typed_delivery_Resend_descriptor;
+    internal_static_org_apache_pekko_cluster_typed_delivery_Resend_descriptor;
   private static final 
     org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_akka_cluster_typed_delivery_Resend_fieldAccessorTable;
+      internal_static_org_apache_pekko_cluster_typed_delivery_Resend_fieldAccessorTable;
   private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-    internal_static_akka_cluster_typed_delivery_Ack_descriptor;
+    internal_static_org_apache_pekko_cluster_typed_delivery_Ack_descriptor;
   private static final 
     org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_akka_cluster_typed_delivery_Ack_fieldAccessorTable;
+      internal_static_org_apache_pekko_cluster_typed_delivery_Ack_fieldAccessorTable;
   private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-    internal_static_akka_cluster_typed_delivery_State_descriptor;
+    internal_static_org_apache_pekko_cluster_typed_delivery_State_descriptor;
   private static final 
     org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_akka_cluster_typed_delivery_State_fieldAccessorTable;
+      internal_static_org_apache_pekko_cluster_typed_delivery_State_fieldAccessorTable;
   private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-    internal_static_akka_cluster_typed_delivery_Confirmed_descriptor;
+    internal_static_org_apache_pekko_cluster_typed_delivery_Confirmed_descriptor;
   private static final 
     org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_akka_cluster_typed_delivery_Confirmed_fieldAccessorTable;
+      internal_static_org_apache_pekko_cluster_typed_delivery_Confirmed_fieldAccessorTable;
   private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-    internal_static_akka_cluster_typed_delivery_MessageSent_descriptor;
+    internal_static_org_apache_pekko_cluster_typed_delivery_MessageSent_descriptor;
   private static final 
     org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_akka_cluster_typed_delivery_MessageSent_fieldAccessorTable;
+      internal_static_org_apache_pekko_cluster_typed_delivery_MessageSent_fieldAccessorTable;
   private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-    internal_static_akka_cluster_typed_delivery_Cleanup_descriptor;
+    internal_static_org_apache_pekko_cluster_typed_delivery_Cleanup_descriptor;
   private static final 
     org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_akka_cluster_typed_delivery_Cleanup_fieldAccessorTable;
+      internal_static_org_apache_pekko_cluster_typed_delivery_Cleanup_fieldAccessorTable;
 
   public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       getDescriptor() {
@@ -8338,89 +8338,90 @@ public final class ReliableDelivery {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026ReliableDelivery.proto\022\033org.apache.pekko.cluster.t" +
+      "\n\026ReliableDelivery.proto\022\'org.apache.pek" +
-      "yped.delivery\032\026ContainerFormats.proto\"\262\001" +
+      "ko.cluster.typed.delivery\032\026ContainerForm" +
-      "\n\020SequencedMessage\022\022\n\nproducerId\030\001 \002(\t\022\r" +
+      "ats.proto\"\262\001\n\020SequencedMessage\022\022\n\nproduc" +
-      "\n\005seqNr\030\002 \002(\003\022\r\n\005first\030\003 \002(\010\022\013\n\003ack\030\004 \002(" +
+      "erId\030\001 \002(\t\022\r\n\005seqNr\030\002 \002(\003\022\r\n\005first\030\003 \002(\010" +
-      "\010\022\035\n\025producerControllerRef\030\005 \002(\t\022\031\n\007mess" +
+      "\022\013\n\003ack\030\004 \002(\010\022\035\n\025producerControllerRef\030\005" +
-      "age\030\006 \002(\0132\010.Payload\022\022\n\nfirstChunk\030\007 \001(\010\022" +
+      " \002(\t\022\031\n\007message\030\006 \002(\0132\010.Payload\022\022\n\nfirst" +
-      "\021\n\tlastChunk\030\010 \001(\010\"1\n\020RegisterConsumer\022\035" +
+      "Chunk\030\007 \001(\010\022\021\n\tlastChunk\030\010 \001(\010\"1\n\020Regist" +
-      "\n\025consumerControllerRef\030\001 \002(\t\"f\n\007Request" +
+      "erConsumer\022\035\n\025consumerControllerRef\030\001 \002(" +
-      "\022\026\n\016confirmedSeqNr\030\001 \002(\003\022\030\n\020requestUpToS" +
+      "\t\"f\n\007Request\022\026\n\016confirmedSeqNr\030\001 \002(\003\022\030\n\020" +
-      "eqNr\030\002 \002(\003\022\025\n\rsupportResend\030\003 \002(\010\022\022\n\nvia" +
+      "requestUpToSeqNr\030\002 \002(\003\022\025\n\rsupportResend\030" +
-      "Timeout\030\004 \002(\010\"\033\n\006Resend\022\021\n\tfromSeqNr\030\001 \002" +
+      "\003 \002(\010\022\022\n\nviaTimeout\030\004 \002(\010\"\033\n\006Resend\022\021\n\tf" +
-      "(\003\"\035\n\003Ack\022\026\n\016confirmedSeqNr\030\001 \002(\003\"\266\001\n\005St" +
+      "romSeqNr\030\001 \002(\003\"\035\n\003Ack\022\026\n\016confirmedSeqNr\030" +
-      "ate\022\024\n\014currentSeqNr\030\001 \002(\003\022\035\n\025highestConf" +
+      "\001 \002(\003\"\316\001\n\005State\022\024\n\014currentSeqNr\030\001 \002(\003\022\035\n" +
-      "irmedSeqNr\030\002 \002(\003\0229\n\tconfirmed\030\003 \003(\0132&.ak" +
+      "\025highestConfirmedSeqNr\030\002 \002(\003\022E\n\tconfirme" +
-      "ka.cluster.typed.delivery.Confirmed\022=\n\013u" +
+      "d\030\003 \003(\01322.org.apache.pekko.cluster.typed" +
-      "nconfirmed\030\004 \003(\0132(.org.apache.pekko.cluster.typed.de" +
+      ".delivery.Confirmed\022I\n\013unconfirmed\030\004 \003(\013" +
-      "livery.MessageSent\"@\n\tConfirmed\022\r\n\005seqNr" +
+      "24.org.apache.pekko.cluster.typed.delive" +
-      "\030\001 \002(\003\022\021\n\tqualifier\030\002 \002(\t\022\021\n\ttimestamp\030\003" +
+      "ry.MessageSent\"@\n\tConfirmed\022\r\n\005seqNr\030\001 \002" +
-      " \002(\003\"\221\001\n\013MessageSent\022\r\n\005seqNr\030\001 \002(\003\022\021\n\tq" +
+      "(\003\022\021\n\tqualifier\030\002 \002(\t\022\021\n\ttimestamp\030\003 \002(\003" +
-      "ualifier\030\002 \002(\t\022\013\n\003ack\030\003 \002(\010\022\021\n\ttimestamp" +
+      "\"\221\001\n\013MessageSent\022\r\n\005seqNr\030\001 \002(\003\022\021\n\tquali" +
-      "\030\004 \002(\003\022\031\n\007message\030\005 \002(\0132\010.Payload\022\022\n\nfir" +
+      "fier\030\002 \002(\t\022\013\n\003ack\030\003 \002(\010\022\021\n\ttimestamp\030\004 \002" +
-      "stChunk\030\006 \001(\010\022\021\n\tlastChunk\030\007 \001(\010\"\035\n\007Clea" +
+      "(\003\022\031\n\007message\030\005 \002(\0132\010.Payload\022\022\n\nfirstCh" +
-      "nup\022\022\n\nqualifiers\030\001 \003(\tB(\n$org.apache.pekko.cluster." +
+      "unk\030\006 \001(\010\022\021\n\tlastChunk\030\007 \001(\010\"\035\n\007Cleanup\022" +
-      "typed.internal.protobufH\001"
+      "\022\n\nqualifiers\030\001 \003(\tB4\n0org.apache.pekko." +
+      "cluster.typed.internal.protobufH\001"
     };
     descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
           org.apache.pekko.remote.ContainerFormats.getDescriptor(),
         });
-    internal_static_akka_cluster_typed_delivery_SequencedMessage_descriptor =
+    internal_static_org_apache_pekko_cluster_typed_delivery_SequencedMessage_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_akka_cluster_typed_delivery_SequencedMessage_fieldAccessorTable = new
+    internal_static_org_apache_pekko_cluster_typed_delivery_SequencedMessage_fieldAccessorTable = new
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_akka_cluster_typed_delivery_SequencedMessage_descriptor,
+        internal_static_org_apache_pekko_cluster_typed_delivery_SequencedMessage_descriptor,
         new java.lang.String[] { "ProducerId", "SeqNr", "First", "Ack", "ProducerControllerRef", "Message", "FirstChunk", "LastChunk", });
-    internal_static_akka_cluster_typed_delivery_RegisterConsumer_descriptor =
+    internal_static_org_apache_pekko_cluster_typed_delivery_RegisterConsumer_descriptor =
       getDescriptor().getMessageTypes().get(1);
-    internal_static_akka_cluster_typed_delivery_RegisterConsumer_fieldAccessorTable = new
+    internal_static_org_apache_pekko_cluster_typed_delivery_RegisterConsumer_fieldAccessorTable = new
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_akka_cluster_typed_delivery_RegisterConsumer_descriptor,
+        internal_static_org_apache_pekko_cluster_typed_delivery_RegisterConsumer_descriptor,
         new java.lang.String[] { "ConsumerControllerRef", });
-    internal_static_akka_cluster_typed_delivery_Request_descriptor =
+    internal_static_org_apache_pekko_cluster_typed_delivery_Request_descriptor =
       getDescriptor().getMessageTypes().get(2);
-    internal_static_akka_cluster_typed_delivery_Request_fieldAccessorTable = new
+    internal_static_org_apache_pekko_cluster_typed_delivery_Request_fieldAccessorTable = new
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_akka_cluster_typed_delivery_Request_descriptor,
+        internal_static_org_apache_pekko_cluster_typed_delivery_Request_descriptor,
         new java.lang.String[] { "ConfirmedSeqNr", "RequestUpToSeqNr", "SupportResend", "ViaTimeout", });
-    internal_static_akka_cluster_typed_delivery_Resend_descriptor =
+    internal_static_org_apache_pekko_cluster_typed_delivery_Resend_descriptor =
       getDescriptor().getMessageTypes().get(3);
-    internal_static_akka_cluster_typed_delivery_Resend_fieldAccessorTable = new
+    internal_static_org_apache_pekko_cluster_typed_delivery_Resend_fieldAccessorTable = new
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_akka_cluster_typed_delivery_Resend_descriptor,
+        internal_static_org_apache_pekko_cluster_typed_delivery_Resend_descriptor,
         new java.lang.String[] { "FromSeqNr", });
-    internal_static_akka_cluster_typed_delivery_Ack_descriptor =
+    internal_static_org_apache_pekko_cluster_typed_delivery_Ack_descriptor =
       getDescriptor().getMessageTypes().get(4);
-    internal_static_akka_cluster_typed_delivery_Ack_fieldAccessorTable = new
+    internal_static_org_apache_pekko_cluster_typed_delivery_Ack_fieldAccessorTable = new
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_akka_cluster_typed_delivery_Ack_descriptor,
+        internal_static_org_apache_pekko_cluster_typed_delivery_Ack_descriptor,
         new java.lang.String[] { "ConfirmedSeqNr", });
-    internal_static_akka_cluster_typed_delivery_State_descriptor =
+    internal_static_org_apache_pekko_cluster_typed_delivery_State_descriptor =
       getDescriptor().getMessageTypes().get(5);
-    internal_static_akka_cluster_typed_delivery_State_fieldAccessorTable = new
+    internal_static_org_apache_pekko_cluster_typed_delivery_State_fieldAccessorTable = new
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_akka_cluster_typed_delivery_State_descriptor,
+        internal_static_org_apache_pekko_cluster_typed_delivery_State_descriptor,
         new java.lang.String[] { "CurrentSeqNr", "HighestConfirmedSeqNr", "Confirmed", "Unconfirmed", });
-    internal_static_akka_cluster_typed_delivery_Confirmed_descriptor =
+    internal_static_org_apache_pekko_cluster_typed_delivery_Confirmed_descriptor =
       getDescriptor().getMessageTypes().get(6);
-    internal_static_akka_cluster_typed_delivery_Confirmed_fieldAccessorTable = new
+    internal_static_org_apache_pekko_cluster_typed_delivery_Confirmed_fieldAccessorTable = new
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_akka_cluster_typed_delivery_Confirmed_descriptor,
+        internal_static_org_apache_pekko_cluster_typed_delivery_Confirmed_descriptor,
         new java.lang.String[] { "SeqNr", "Qualifier", "Timestamp", });
-    internal_static_akka_cluster_typed_delivery_MessageSent_descriptor =
+    internal_static_org_apache_pekko_cluster_typed_delivery_MessageSent_descriptor =
       getDescriptor().getMessageTypes().get(7);
-    internal_static_akka_cluster_typed_delivery_MessageSent_fieldAccessorTable = new
+    internal_static_org_apache_pekko_cluster_typed_delivery_MessageSent_fieldAccessorTable = new
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_akka_cluster_typed_delivery_MessageSent_descriptor,
+        internal_static_org_apache_pekko_cluster_typed_delivery_MessageSent_descriptor,
         new java.lang.String[] { "SeqNr", "Qualifier", "Ack", "Timestamp", "Message", "FirstChunk", "LastChunk", });
-    internal_static_akka_cluster_typed_delivery_Cleanup_descriptor =
+    internal_static_org_apache_pekko_cluster_typed_delivery_Cleanup_descriptor =
       getDescriptor().getMessageTypes().get(8);
-    internal_static_akka_cluster_typed_delivery_Cleanup_fieldAccessorTable = new
+    internal_static_org_apache_pekko_cluster_typed_delivery_Cleanup_fieldAccessorTable = new
       org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_akka_cluster_typed_delivery_Cleanup_descriptor,
+        internal_static_org_apache_pekko_cluster_typed_delivery_Cleanup_descriptor,
         new java.lang.String[] { "Qualifiers", });
     org.apache.pekko.remote.ContainerFormats.getDescriptor();
   }

cluster/src/main/java/org/apache/pekko/cluster/protobuf/msg/ClusterMessages.java

@@ -15986,23 +15986,23 @@ public final class ClusterMessages {
       }
 
       @java.lang.Override
-      public Version.Builder newBuilderForType() { return newBuilder(); }
+      public Builder newBuilderForType() { return newBuilder(); }
-      public static Version.Builder newBuilder() {
+      public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
       }
       public static Builder newBuilder(org.apache.pekko.cluster.protobuf.msg.ClusterMessages.VectorClock.Version prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
       @java.lang.Override
-      public Version.Builder toBuilder() {
+      public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
-            ? new Version.Builder() : new Version.Builder().mergeFrom(this);
+            ? new Builder() : new Builder().mergeFrom(this);
       }
 
       @java.lang.Override
-      protected Version.Builder newBuilderForType(
+      protected Builder newBuilderForType(
           org.apache.pekko.protobufv3.internal.GeneratedMessageV3.BuilderParent parent) {
-        Version.Builder builder = new Version.Builder(parent);
+        Builder builder = new Builder(parent);
         return builder;
       }
       /**

multi-node-testkit/src/main/java/org/apache/pekko/remote/testconductor/TestConductorProtocol.java

@@ -6521,7 +6521,8 @@ public final class TestConductorProtocol {
       "\n\010Throttle\020\001\022\016\n\nDisconnect\020\002\022\t\n\005Abort\020\003\022" +
       "\010\n\004Exit\020\004\022\014\n\010Shutdown\020\005\022\022\n\016ShutdownAbrup" +
       "t\020\006*,\n\tDirection\022\010\n\004Send\020\001\022\013\n\007Receive\020\002\022" +
-      "\010\n\004Both\020\003B\035\n\031org.apache.pekko.remote.testconductorH\001"
+      "\010\n\004Both\020\003B)\n%org.apache.pekko.remote.tes" +
+      "tconductorH\001"
     };
     descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,

persistence-query/src/main/java/org/apache/pekko/persistence/query/internal/protobuf/QueryMessages.java

@@ -337,14 +337,14 @@ public final class QueryMessages {
     public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
         getDescriptor() {
       return org.apache.pekko.persistence.query.internal.protobuf.QueryMessages
-          .internal_static_akka_persistence_query_EventEnvelope_descriptor;
+          .internal_static_org_apache_pekko_persistence_query_EventEnvelope_descriptor;
     }
 
     @java.lang.Override
     protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return org.apache.pekko.persistence.query.internal.protobuf.QueryMessages
-          .internal_static_akka_persistence_query_EventEnvelope_fieldAccessorTable
+          .internal_static_org_apache_pekko_persistence_query_EventEnvelope_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
               org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
                   .class,
@@ -1019,14 +1019,14 @@ public final class QueryMessages {
       public static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.pekko.persistence.query.internal.protobuf.QueryMessages
-            .internal_static_akka_persistence_query_EventEnvelope_descriptor;
+            .internal_static_org_apache_pekko_persistence_query_EventEnvelope_descriptor;
       }
 
       @java.lang.Override
       protected org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return org.apache.pekko.persistence.query.internal.protobuf.QueryMessages
-            .internal_static_akka_persistence_query_EventEnvelope_fieldAccessorTable
+            .internal_static_org_apache_pekko_persistence_query_EventEnvelope_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
                 org.apache.pekko.persistence.query.internal.protobuf.QueryMessages.EventEnvelope
                     .class,
@@ -1088,7 +1088,7 @@ public final class QueryMessages {
       @java.lang.Override
       public org.apache.pekko.protobufv3.internal.Descriptors.Descriptor getDescriptorForType() {
         return org.apache.pekko.persistence.query.internal.protobuf.QueryMessages
-            .internal_static_akka_persistence_query_EventEnvelope_descriptor;
+            .internal_static_org_apache_pekko_persistence_query_EventEnvelope_descriptor;
       }
 
       @java.lang.Override
@@ -2089,9 +2089,9 @@ public final class QueryMessages {
   }
 
   private static final org.apache.pekko.protobufv3.internal.Descriptors.Descriptor
-      internal_static_akka_persistence_query_EventEnvelope_descriptor;
+      internal_static_org_apache_pekko_persistence_query_EventEnvelope_descriptor;
   private static final org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable
-      internal_static_akka_persistence_query_EventEnvelope_fieldAccessorTable;
+      internal_static_org_apache_pekko_persistence_query_EventEnvelope_fieldAccessorTable;
 
   public static org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor getDescriptor() {
     return descriptor;
@@ -2101,15 +2101,15 @@ public final class QueryMessages {
 
   static {
     java.lang.String[] descriptorData = {
-      "\n\023QueryMessages.proto\022\026org.apache.pekko.persistence."
+      "\n\023QueryMessages.proto\022\"org.apache.pekko."
-          + "query\032\026ContainerFormats.proto\"\321\001\n\rEventE"
+          + "persistence.query\032\026ContainerFormats.prot"
-          + "nvelope\022\026\n\016persistence_id\030\001 \002(\t\022\023\n\013entit"
+          + "o\"\321\001\n\rEventEnvelope\022\026\n\016persistence_id\030\001 "
-          + "y_type\030\002 \002(\t\022\r\n\005slice\030\003 \002(\005\022\023\n\013sequence_"
+          + "\002(\t\022\023\n\013entity_type\030\002 \002(\t\022\r\n\005slice\030\003 \002(\005\022"
-          + "nr\030\004 \002(\003\022\021\n\ttimestamp\030\005 \002(\003\022\016\n\006offset\030\006 "
+          + "\023\n\013sequence_nr\030\004 \002(\003\022\021\n\ttimestamp\030\005 \002(\003\022"
-          + "\002(\t\022\027\n\017offset_manifest\030\007 \002(\t\022\027\n\005event\030\010 "
+          + "\016\n\006offset\030\006 \002(\t\022\027\n\017offset_manifest\030\007 \002(\t"
-          + "\001(\0132\010.Payload\022\032\n\010metadata\030\t \001(\0132\010.Payloa"
+          + "\022\027\n\005event\030\010 \001(\0132\010.Payload\022\032\n\010metadata\030\t "
-          + "dB,\n(org.apache.pekko.persistence.query.internal.pro"
+          + "\001(\0132\010.PayloadB8\n4org.apache.pekko.persis"
-          + "tobufH\001"
+          + "tence.query.internal.protobufH\001"
     };
     descriptor =
         org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
@@ -2118,11 +2118,11 @@ public final class QueryMessages {
                 new org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor[] {
                   org.apache.pekko.remote.ContainerFormats.getDescriptor(),
                 });
-    internal_static_akka_persistence_query_EventEnvelope_descriptor =
+    internal_static_org_apache_pekko_persistence_query_EventEnvelope_descriptor =
         getDescriptor().getMessageTypes().get(0);
-    internal_static_akka_persistence_query_EventEnvelope_fieldAccessorTable =
+    internal_static_org_apache_pekko_persistence_query_EventEnvelope_fieldAccessorTable =
         new org.apache.pekko.protobufv3.internal.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_akka_persistence_query_EventEnvelope_descriptor,
+            internal_static_org_apache_pekko_persistence_query_EventEnvelope_descriptor,
             new java.lang.String[] {
               "PersistenceId",
               "EntityType",

persistence-typed/src/main/java/org/apache/pekko/persistence/typed/serialization/ReplicatedEventSourcing.java

@@ -13046,8 +13046,8 @@ public final class ReplicatedEventSourcing {
           + "\022\031\n\007payload\030\003 \001(\0132\010.Payload\022\021\n\ttimestamp"
           + "\030\004 \001(\003\0223\n\010metadata\030\005 \001(\0132!.ReplicatedPub"
           + "lishedEventMetaData*-\n\014ORSetDeltaOp\022\007\n\003A"
-          + "dd\020\000\022\n\n\006Remove\020\001\022\010\n\004Full\020\002B(\n$org.apache.pekko.persi"
+          + "dd\020\000\022\n\n\006Remove\020\001\022\010\n\004Full\020\002B4\n0org.apache"
-          + "stence.typed.serializationH\001"
+          + ".pekko.persistence.typed.serializationH\001"
     };
     descriptor =
         org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor

remote-tests/src/test/java/org/apache/pekko/remote/artery/protobuf/TestMessages.java

@@ -2235,8 +2235,8 @@ public final class TestMessages {
       "d\030\001 \002(\004\022\014\n\004name\030\002 \002(\t\022\016\n\006status\030\003 \002(\010\022\023\n" +
       "\013description\030\004 \001(\t\022\017\n\007payload\030\005 \001(\014\022\024\n\005i" +
       "tems\030\006 \003(\0132\005.Item\" \n\004Item\022\n\n\002id\030\001 \002(\004\022\014\n" +
-      "\004name\030\002 \002(\tB\035\n\033org.apache.pekko.remote.artery.protob" +
+      "\004name\030\002 \002(\tB)\n\'org.apache.pekko.remote.a" +
-      "uf"
+      "rtery.protobuf"
     };
     descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,

stream/src/main/java/org/apache/pekko/stream/StreamRefMessages.java

@@ -5685,7 +5685,7 @@ public final class StreamRefMessages {
       "OnNext\022\r\n\005seqNr\030\001 \002(\003\022\031\n\007payload\030\002 \002(\0132\010" +
       ".Payload\"$\n\023RemoteStreamFailure\022\r\n\005cause" +
       "\030\001 \001(\014\"&\n\025RemoteStreamCompleted\022\r\n\005seqNr" +
-      "\030\001 \002(\003B\017\n\013org.apache.pekko.streamH\001"
+      "\030\001 \002(\003B\033\n\027org.apache.pekko.streamH\001"
     };
     descriptor = org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,