diff --git a/src/Discord.Net.Rpc/API/DiscordRpcApiClient.cs b/src/Discord.Net.Rpc/API/DiscordRpcApiClient.cs
index d413fd815..da6cce925 100644
--- a/src/Discord.Net.Rpc/API/DiscordRpcApiClient.cs
+++ b/src/Discord.Net.Rpc/API/DiscordRpcApiClient.cs
@@ -91,7 +91,7 @@ namespace Discord.API
                     using (var reader = new StreamReader(decompressed))
                     using (var jsonReader = new JsonTextReader(reader))
                     {
-                        var msg = _serializer.Deserialize<API.Rpc.RpcMessage>(jsonReader);
+                        var msg = _serializer.Deserialize<API.Rpc.RpcFrame>(jsonReader);
                         await _receivedRpcEvent.InvokeAsync(msg.Cmd, msg.Event, msg.Data).ConfigureAwait(false);
                         if (msg.Nonce.IsSpecified && msg.Nonce.Value.HasValue)
                             ProcessMessage(msg);
@@ -103,7 +103,7 @@ namespace Discord.API
                 using (var reader = new StringReader(text))
                 using (var jsonReader = new JsonTextReader(reader))
                 {
-                    var msg = _serializer.Deserialize<API.Rpc.RpcMessage>(jsonReader);
+                    var msg = _serializer.Deserialize<API.Rpc.RpcFrame>(jsonReader);
                     await _receivedRpcEvent.InvokeAsync(msg.Cmd, msg.Event, msg.Data).ConfigureAwait(false);
                     if (msg.Nonce.IsSpecified && msg.Nonce.Value.HasValue)
                         ProcessMessage(msg);
@@ -220,7 +220,7 @@ namespace Discord.API
 
             byte[] bytes = null;
             var guid = Guid.NewGuid();
-            payload = new API.Rpc.RpcMessage { Cmd = cmd, Event = evt, Args = payload, Nonce = guid };
+            payload = new API.Rpc.RpcFrame { Cmd = cmd, Event = evt, Args = payload, Nonce = guid };
             if (payload != null)
             {
                 var json = SerializeJson(payload);
@@ -351,7 +351,7 @@ namespace Discord.API
             return await SendRpcAsync<SubscriptionResponse>("UNSUBSCRIBE", msg, evt: evt, options: options).ConfigureAwait(false);
         }
 
-        private bool ProcessMessage(API.Rpc.RpcMessage msg)
+        private bool ProcessMessage(API.Rpc.RpcFrame msg)
         {
             RpcRequest requestTracker;
             if (_requests.TryGetValue(msg.Nonce.Value.Value, out requestTracker))
diff --git a/src/Discord.Net.Rpc/API/Rpc/RpcMessage.cs b/src/Discord.Net.Rpc/API/RpcFrame.cs
similarity index 94%
rename from src/Discord.Net.Rpc/API/Rpc/RpcMessage.cs
rename to src/Discord.Net.Rpc/API/RpcFrame.cs
index 41616222c..cac150e3b 100644
--- a/src/Discord.Net.Rpc/API/Rpc/RpcMessage.cs
+++ b/src/Discord.Net.Rpc/API/RpcFrame.cs
@@ -4,7 +4,7 @@ using System;
 
 namespace Discord.API.Rpc
 {
-    public class RpcMessage
+    public class RpcFrame
     {
         [JsonProperty("cmd")]
         public string Cmd { get; set; }