diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
index 0c3677f99..584d3c44f 100644
--- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
@@ -1466,7 +1466,7 @@ namespace Discord.WebSocket
                                     var data = (payload as JToken).ToObject<VoiceServerUpdateEvent>(_serializer);
                                     var guild = State.GetGuild(data.GuildId);
 
-                                    var voiceServer = new Entities.Guilds.SocketVoiceServer(data.GuildId, data.Endpoint, data.Token);
+                                    var voiceServer = new SocketVoiceServer(data.GuildId, data.Endpoint, data.Token);
                                     await TimedInvokeAsync(_voiceServerUpdatedEvent, nameof(UserVoiceStateUpdated), voiceServer).ConfigureAwait(false);
 
                                     if (guild != null)
diff --git a/src/Discord.Net.WebSocket/Entities/Guilds/SocketVoiceServer.cs b/src/Discord.Net.WebSocket/SocketVoiceServer.cs
similarity index 91%
rename from src/Discord.Net.WebSocket/Entities/Guilds/SocketVoiceServer.cs
rename to src/Discord.Net.WebSocket/SocketVoiceServer.cs
index 9874e971e..53940ab90 100644
--- a/src/Discord.Net.WebSocket/Entities/Guilds/SocketVoiceServer.cs
+++ b/src/Discord.Net.WebSocket/SocketVoiceServer.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics;
 
-namespace Discord.WebSocket.Entities.Guilds
+namespace Discord.WebSocket
 {
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     public class SocketVoiceServer