diff --git a/DysonNetwork.Drive/Startup/BroadcastEventHandler.cs b/DysonNetwork.Drive/Startup/BroadcastEventHandler.cs
index d1f83f7..11525bd 100644
--- a/DysonNetwork.Drive/Startup/BroadcastEventHandler.cs
+++ b/DysonNetwork.Drive/Startup/BroadcastEventHandler.cs
@@ -3,7 +3,7 @@ using DysonNetwork.Drive.Storage;
 using DysonNetwork.Drive.Storage.Model;
 using DysonNetwork.Shared.Models;
 using DysonNetwork.Shared.Proto;
-using DysonNetwork.Shared.Stream;
+using DysonNetwork.Shared.Queue;
 using FFMpegCore;
 using Microsoft.EntityFrameworkCore;
 using NATS.Client.Core;
diff --git a/DysonNetwork.Pass/Account/AccountEventService.cs b/DysonNetwork.Pass/Account/AccountEventService.cs
index 2ea0068..3e94324 100644
--- a/DysonNetwork.Pass/Account/AccountEventService.cs
+++ b/DysonNetwork.Pass/Account/AccountEventService.cs
@@ -3,7 +3,7 @@ using DysonNetwork.Pass.Wallet;
 using DysonNetwork.Shared.Cache;
 using DysonNetwork.Shared.Models;
 using DysonNetwork.Shared.Proto;
-using DysonNetwork.Shared.Stream;
+using DysonNetwork.Shared.Queue;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Localization;
 using NATS.Client.Core;
diff --git a/DysonNetwork.Pass/Account/AccountService.cs b/DysonNetwork.Pass/Account/AccountService.cs
index 061f725..264a821 100644
--- a/DysonNetwork.Pass/Account/AccountService.cs
+++ b/DysonNetwork.Pass/Account/AccountService.cs
@@ -8,7 +8,7 @@ using DysonNetwork.Shared.Cache;
 using DysonNetwork.Shared.Data;
 using DysonNetwork.Shared.Models;
 using DysonNetwork.Shared.Proto;
-using DysonNetwork.Shared.Stream;
+using DysonNetwork.Shared.Queue;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Localization;
 using NATS.Client.Core;
diff --git a/DysonNetwork.Pass/Startup/BroadcastEventHandler.cs b/DysonNetwork.Pass/Startup/BroadcastEventHandler.cs
index 60e349c..6ce9047 100644
--- a/DysonNetwork.Pass/Startup/BroadcastEventHandler.cs
+++ b/DysonNetwork.Pass/Startup/BroadcastEventHandler.cs
@@ -3,7 +3,7 @@ using DysonNetwork.Pass.Account;
 using DysonNetwork.Pass.Wallet;
 using DysonNetwork.Shared.Models;
 using DysonNetwork.Shared.Proto;
-using DysonNetwork.Shared.Stream;
+using DysonNetwork.Shared.Queue;
 using Google.Protobuf;
 using NATS.Client.Core;
 using NATS.Client.JetStream.Models;
diff --git a/DysonNetwork.Pass/Wallet/PaymentService.cs b/DysonNetwork.Pass/Wallet/PaymentService.cs
index 9590107..b8974d4 100644
--- a/DysonNetwork.Pass/Wallet/PaymentService.cs
+++ b/DysonNetwork.Pass/Wallet/PaymentService.cs
@@ -3,7 +3,7 @@ using System.Globalization;
 using DysonNetwork.Pass.Localization;
 using DysonNetwork.Shared.Models;
 using DysonNetwork.Shared.Proto;
-using DysonNetwork.Shared.Stream;
+using DysonNetwork.Shared.Queue;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Localization;
 using NATS.Client.Core;
diff --git a/DysonNetwork.Ring/Connection/WebSocketController.cs b/DysonNetwork.Ring/Connection/WebSocketController.cs
index da3b26a..a3f29c2 100644
--- a/DysonNetwork.Ring/Connection/WebSocketController.cs
+++ b/DysonNetwork.Ring/Connection/WebSocketController.cs
@@ -1,6 +1,6 @@
 using System.Net.WebSockets;
 using DysonNetwork.Shared.Proto;
-using DysonNetwork.Shared.Stream;
+using DysonNetwork.Shared.Queue;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using NATS.Client.Core;
diff --git a/DysonNetwork.Ring/Connection/WebSocketService.cs b/DysonNetwork.Ring/Connection/WebSocketService.cs
index 93253bf..3d17386 100644
--- a/DysonNetwork.Ring/Connection/WebSocketService.cs
+++ b/DysonNetwork.Ring/Connection/WebSocketService.cs
@@ -2,7 +2,7 @@ using System.Collections.Concurrent;
 using System.Net.WebSockets;
 using DysonNetwork.Shared.Models;
 using DysonNetwork.Shared.Proto;
-using DysonNetwork.Shared.Stream;
+using DysonNetwork.Shared.Queue;
 using NATS.Client.Core;
 using WebSocketPacket = DysonNetwork.Shared.Models.WebSocketPacket;
 
diff --git a/DysonNetwork.Shared/Stream/AccountEvent.cs b/DysonNetwork.Shared/Queue/AccountEvent.cs
similarity index 93%
rename from DysonNetwork.Shared/Stream/AccountEvent.cs
rename to DysonNetwork.Shared/Queue/AccountEvent.cs
index 310258c..40a8cfa 100644
--- a/DysonNetwork.Shared/Stream/AccountEvent.cs
+++ b/DysonNetwork.Shared/Queue/AccountEvent.cs
@@ -1,7 +1,7 @@
 using DysonNetwork.Shared.Models;
 using NodaTime;
 
-namespace DysonNetwork.Shared.Stream;
+namespace DysonNetwork.Shared.Queue;
 
 public class AccountDeletedEvent
 {
diff --git a/DysonNetwork.Shared/Stream/PaymentEvent.cs b/DysonNetwork.Shared/Queue/PaymentEvent.cs
similarity index 92%
rename from DysonNetwork.Shared/Stream/PaymentEvent.cs
rename to DysonNetwork.Shared/Queue/PaymentEvent.cs
index 2f76867..bace25a 100644
--- a/DysonNetwork.Shared/Stream/PaymentEvent.cs
+++ b/DysonNetwork.Shared/Queue/PaymentEvent.cs
@@ -1,4 +1,4 @@
-namespace DysonNetwork.Shared.Stream;
+namespace DysonNetwork.Shared.Queue;
 
 public class PaymentOrderEvent : PaymentOrderEventBase
 {
diff --git a/DysonNetwork.Shared/Stream/Streamer.cs b/DysonNetwork.Shared/Queue/QueueHelper.cs
similarity index 87%
rename from DysonNetwork.Shared/Stream/Streamer.cs
rename to DysonNetwork.Shared/Queue/QueueHelper.cs
index 8a2df5e..e9168ea 100644
--- a/DysonNetwork.Shared/Stream/Streamer.cs
+++ b/DysonNetwork.Shared/Queue/QueueHelper.cs
@@ -1,9 +1,9 @@
 using NATS.Client.JetStream;
 using NATS.Client.JetStream.Models;
 
-namespace DysonNetwork.Shared.Stream;
+namespace DysonNetwork.Shared.Queue;
 
-public static class Streamer
+public static class QueueHelper
 {
     public static async Task<INatsJSStream> EnsureStreamCreated(
         this INatsJSContext context,
diff --git a/DysonNetwork.Shared/Stream/WebSocketPacketEvent.cs b/DysonNetwork.Shared/Queue/WebSocketPacketEvent.cs
similarity index 96%
rename from DysonNetwork.Shared/Stream/WebSocketPacketEvent.cs
rename to DysonNetwork.Shared/Queue/WebSocketPacketEvent.cs
index 4707c6d..65f90b7 100644
--- a/DysonNetwork.Shared/Stream/WebSocketPacketEvent.cs
+++ b/DysonNetwork.Shared/Queue/WebSocketPacketEvent.cs
@@ -1,6 +1,6 @@
 using NodaTime;
 
-namespace DysonNetwork.Shared.Stream;
+namespace DysonNetwork.Shared.Queue;
 
 public class WebSocketPacketEvent
 {
diff --git a/DysonNetwork.Sphere/Startup/BroadcastEventHandler.cs b/DysonNetwork.Sphere/Startup/BroadcastEventHandler.cs
index f45df45..e32b2d7 100644
--- a/DysonNetwork.Sphere/Startup/BroadcastEventHandler.cs
+++ b/DysonNetwork.Sphere/Startup/BroadcastEventHandler.cs
@@ -2,7 +2,7 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using DysonNetwork.Shared.Models;
 using DysonNetwork.Shared.Proto;
-using DysonNetwork.Shared.Stream;
+using DysonNetwork.Shared.Queue;
 using DysonNetwork.Sphere.Chat;
 using DysonNetwork.Sphere.Post;
 using Google.Protobuf;
diff --git a/DysonNetwork.Zone/Startup/BroadcastEventHandler.cs b/DysonNetwork.Zone/Startup/BroadcastEventHandler.cs
index a80d21c..50eff46 100644
--- a/DysonNetwork.Zone/Startup/BroadcastEventHandler.cs
+++ b/DysonNetwork.Zone/Startup/BroadcastEventHandler.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using DysonNetwork.Shared.Proto;
-using DysonNetwork.Shared.Stream;
+using DysonNetwork.Shared.Queue;
 using NATS.Client.Core;
 using NATS.Client.JetStream.Models;
 using NATS.Net;