diff --git a/DysonNetwork.Drive/Startup/BroadcastEventHandler.cs b/DysonNetwork.Drive/Startup/BroadcastEventHandler.cs
index 98667d6..6b22c87 100644
--- a/DysonNetwork.Drive/Startup/BroadcastEventHandler.cs
+++ b/DysonNetwork.Drive/Startup/BroadcastEventHandler.cs
@@ -18,7 +18,7 @@ public class BroadcastEventHandler(
     {
         var js = new NatsJSContext(nats);
         var stream = await js.GetStreamAsync(AccountDeletedEvent.Type, cancellationToken: stoppingToken);
-        var consumer = await stream.CreateOrUpdateConsumerAsync(new ConsumerConfig("DysonNetwork_Drive_AccountDeleted"), cancellationToken: stoppingToken);
+        var consumer = await stream.CreateOrUpdateConsumerAsync(new ConsumerConfig("Dy_Drive_AccountDeleted"), cancellationToken: stoppingToken);
 
         await foreach (var msg in consumer.ConsumeAsync<byte[]>(cancellationToken: stoppingToken))
         {
diff --git a/DysonNetwork.Pass/Startup/BroadcastEventHandler.cs b/DysonNetwork.Pass/Startup/BroadcastEventHandler.cs
index 060c9f8..0bd97ca 100644
--- a/DysonNetwork.Pass/Startup/BroadcastEventHandler.cs
+++ b/DysonNetwork.Pass/Startup/BroadcastEventHandler.cs
@@ -17,7 +17,7 @@ public class BroadcastEventHandler(
     {
         var js = new NatsJSContext(nats);
         var stream = await js.GetStreamAsync(PaymentOrderEventBase.Type, cancellationToken: stoppingToken);
-        var consumer = await stream.CreateOrUpdateConsumerAsync(new ConsumerConfig("DysonNetwork_Pass_Stellar"), cancellationToken: stoppingToken);
+        var consumer = await stream.CreateOrUpdateConsumerAsync(new ConsumerConfig("Dy_Pass_Stellar"), cancellationToken: stoppingToken);
 
         await foreach (var msg in consumer.ConsumeAsync<byte[]>(cancellationToken: stoppingToken))
         {
diff --git a/DysonNetwork.Shared/Stream/AccountEvent.cs b/DysonNetwork.Shared/Stream/AccountEvent.cs
index 016f29f..f1d12f7 100644
--- a/DysonNetwork.Shared/Stream/AccountEvent.cs
+++ b/DysonNetwork.Shared/Stream/AccountEvent.cs
@@ -4,7 +4,7 @@ namespace DysonNetwork.Shared.Stream;
 
 public class AccountDeletedEvent
 {
-    public static string Type => "account.deleted";
+    public static string Type => "account_deleted";
     
     public Guid AccountId { get; set; } = Guid.NewGuid();
     public Instant DeletedAt { get; set; } = SystemClock.Instance.GetCurrentInstant();
diff --git a/DysonNetwork.Shared/Stream/PaymentEvent.cs b/DysonNetwork.Shared/Stream/PaymentEvent.cs
index 31d46b6..2f76867 100644
--- a/DysonNetwork.Shared/Stream/PaymentEvent.cs
+++ b/DysonNetwork.Shared/Stream/PaymentEvent.cs
@@ -7,7 +7,7 @@ public class PaymentOrderEvent : PaymentOrderEventBase
 
 public class PaymentOrderEventBase
 {
-    public static string Type => "payments.orders";
+    public static string Type => "payment_orders";
     
     public Guid OrderId { get; set; }
     public Guid WalletId { get; set; }
diff --git a/DysonNetwork.Sphere/Startup/BroadcastEventHandler.cs b/DysonNetwork.Sphere/Startup/BroadcastEventHandler.cs
index be3eb20..6d97f52 100644
--- a/DysonNetwork.Sphere/Startup/BroadcastEventHandler.cs
+++ b/DysonNetwork.Sphere/Startup/BroadcastEventHandler.cs
@@ -48,7 +48,7 @@ public class BroadcastEventHandler(
     {
         var js = new NatsJSContext(nats);
         var stream = await js.GetStreamAsync(PaymentOrderEventBase.Type, cancellationToken: stoppingToken);
-        var consumer = await stream.CreateOrUpdateConsumerAsync(new ConsumerConfig("DysonNetwork_Sphere_PaymentOrder"),
+        var consumer = await stream.CreateOrUpdateConsumerAsync(new ConsumerConfig("Dy_Sphere_PaymentOrder"),
             cancellationToken: stoppingToken);
 
         await foreach (var msg in consumer.ConsumeAsync<byte[]>(cancellationToken: stoppingToken))
@@ -107,7 +107,7 @@ public class BroadcastEventHandler(
         var js = new NatsJSContext(nats);
         var stream = await js.GetStreamAsync(AccountDeletedEvent.Type, cancellationToken: stoppingToken);
         var consumer =
-            await stream.CreateOrUpdateConsumerAsync(new ConsumerConfig("DysonNetwork_Sphere_AccountDeleted"),
+            await stream.CreateOrUpdateConsumerAsync(new ConsumerConfig("Dy_Sphere_AccountDeleted"),
                 cancellationToken: stoppingToken);
 
         await foreach (var msg in consumer.ConsumeAsync<byte[]>(cancellationToken: stoppingToken))