diff --git a/src/StevesBot.Worker.Tests/Unit/DiscordClientExceptionTests.cs b/src/StevesBot.Worker.Tests/Unit/DiscordGatewayClientExceptionTests.cs
similarity index 61%
rename from src/StevesBot.Worker.Tests/Unit/DiscordClientExceptionTests.cs
rename to src/StevesBot.Worker.Tests/Unit/DiscordGatewayClientExceptionTests.cs
index 6be76d7..a3ab333 100644
--- a/src/StevesBot.Worker.Tests/Unit/DiscordClientExceptionTests.cs
+++ b/src/StevesBot.Worker.Tests/Unit/DiscordGatewayClientExceptionTests.cs
@@ -1,24 +1,24 @@
 namespace StevesBot.Worker.Tests.Unit;
 
-public class DiscordClientExceptionTests
+public class DiscordGatewayClientExceptionTests
 {
   [Fact]
   public void Constructor_WhenCalledWithoutParameters_ItShouldCreateInstance()
   {
-    var exception = new DiscordClientException();
+    var exception = new DiscordGatewayClientException();
 
     exception.Should().NotBeNull();
-    exception.Should().BeOfType<DiscordClientException>();
+    exception.Should().BeOfType<DiscordGatewayClientException>();
   }
 
   [Fact]
   public void Constructor_WhenCalledWithMessage_ItShouldCreateInstance()
   {
     var message = "Test message";
-    var exception = new DiscordClientException(message);
+    var exception = new DiscordGatewayClientException(message);
 
     exception.Should().NotBeNull();
-    exception.Should().BeOfType<DiscordClientException>();
+    exception.Should().BeOfType<DiscordGatewayClientException>();
     exception.Message.Should().Be(message);
   }
 
@@ -27,10 +27,10 @@ public class DiscordClientExceptionTests
   {
     var message = "Test message";
     var innerException = new Exception("Inner exception");
-    var exception = new DiscordClientException(message, innerException);
+    var exception = new DiscordGatewayClientException(message, innerException);
 
     exception.Should().NotBeNull();
-    exception.Should().BeOfType<DiscordClientException>();
+    exception.Should().BeOfType<DiscordGatewayClientException>();
     exception.Message.Should().Be(message);
     exception.InnerException.Should().Be(innerException);
   }
diff --git a/src/StevesBot.Worker.Tests/Unit/DiscordClientOptionsTests.cs b/src/StevesBot.Worker.Tests/Unit/DiscordGatewayClientOptionsTests.cs
similarity index 73%
rename from src/StevesBot.Worker.Tests/Unit/DiscordClientOptionsTests.cs
rename to src/StevesBot.Worker.Tests/Unit/DiscordGatewayClientOptionsTests.cs
index cd2f5c5..42cf692 100644
--- a/src/StevesBot.Worker.Tests/Unit/DiscordClientOptionsTests.cs
+++ b/src/StevesBot.Worker.Tests/Unit/DiscordGatewayClientOptionsTests.cs
@@ -1,14 +1,14 @@
 namespace StevesBot.Worker.Tests.Unit;
 
-public class DiscordClientOptionsTests
+public class DiscordGatewayClientOptionsTests
 {
   [Fact]
   public void Constructor_WhenCalledWithoutParameters_ItShouldCreateInstance()
   {
-    var options = new DiscordClientOptions();
+    var options = new DiscordGatewayClientOptions();
 
     options.Should().NotBeNull();
-    options.Should().BeOfType<DiscordClientOptions>();
+    options.Should().BeOfType<DiscordGatewayClientOptions>();
     options.ApiUrl.Should().Be(string.Empty);
     options.AppToken.Should().Be(string.Empty);
     options.Intents.Should().Be(0);
@@ -21,7 +21,7 @@ public class DiscordClientOptionsTests
     var appToken = "test-token";
     var intents = 123;
 
-    var options = new DiscordClientOptions
+    var options = new DiscordGatewayClientOptions
     {
       ApiUrl = apiUrl,
       AppToken = appToken,
@@ -29,7 +29,7 @@ public class DiscordClientOptionsTests
     };
 
     options.Should().NotBeNull();
-    options.Should().BeOfType<DiscordClientOptions>();
+    options.Should().BeOfType<DiscordGatewayClientOptions>();
     options.ApiUrl.Should().Be(apiUrl);
     options.AppToken.Should().Be(appToken);
     options.Intents.Should().Be(intents);
diff --git a/src/StevesBot.Worker/Discord/DiscordClientException.cs b/src/StevesBot.Worker/Discord/DiscordClientException.cs
deleted file mode 100644
index 62803d8..0000000
--- a/src/StevesBot.Worker/Discord/DiscordClientException.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace StevesBot.Worker.Discord;
-
-internal sealed class DiscordClientException : Exception
-{
-  public DiscordClientException()
-  {
-  }
-
-  public DiscordClientException(string message) : base(message)
-  {
-  }
-
-  public DiscordClientException(string message, Exception innerException) : base(message, innerException)
-  {
-  }
-}
\ No newline at end of file
diff --git a/src/StevesBot.Worker/Discord/DiscordGatewayClientException.cs b/src/StevesBot.Worker/Discord/DiscordGatewayClientException.cs
new file mode 100644
index 0000000..e90cc1f
--- /dev/null
+++ b/src/StevesBot.Worker/Discord/DiscordGatewayClientException.cs
@@ -0,0 +1,16 @@
+namespace StevesBot.Worker.Discord;
+
+internal sealed class DiscordGatewayClientException : Exception
+{
+  public DiscordGatewayClientException()
+  {
+  }
+
+  public DiscordGatewayClientException(string message) : base(message)
+  {
+  }
+
+  public DiscordGatewayClientException(string message, Exception innerException) : base(message, innerException)
+  {
+  }
+}
\ No newline at end of file
diff --git a/src/StevesBot.Worker/Discord/DiscordClientOptions.cs b/src/StevesBot.Worker/Discord/DiscordGatewayClientOptions.cs
similarity index 78%
rename from src/StevesBot.Worker/Discord/DiscordClientOptions.cs
rename to src/StevesBot.Worker/Discord/DiscordGatewayClientOptions.cs
index 3d3d11f..5dae7ab 100644
--- a/src/StevesBot.Worker/Discord/DiscordClientOptions.cs
+++ b/src/StevesBot.Worker/Discord/DiscordGatewayClientOptions.cs
@@ -1,6 +1,6 @@
 namespace StevesBot.Worker.Discord;
 
-internal sealed class DiscordClientOptions
+internal sealed class DiscordGatewayClientOptions
 {
   public string ApiUrl { get; init; } = string.Empty;
   public string AppToken { get; init; } = string.Empty;