diff --git a/src/Discord.Net.Net45/Discord.Net.csproj b/src/Discord.Net.Net45/Discord.Net.csproj
index 359f650a3..c430727bc 100644
--- a/src/Discord.Net.Net45/Discord.Net.csproj
+++ b/src/Discord.Net.Net45/Discord.Net.csproj
@@ -418,6 +418,9 @@
     <Compile Include="..\Discord.Net\Enums\ConnectionState.cs">
       <Link>Enums\ConnectionState.cs</Link>
     </Compile>
+    <Compile Include="..\Discord.Net\Enums\GameType.cs">
+      <Link>Enums\GameType.cs</Link>
+    </Compile>
     <Compile Include="..\Discord.Net\Enums\ImageType.cs">
       <Link>Enums\ImageType.cs</Link>
     </Compile>
@@ -439,6 +442,9 @@
     <Compile Include="..\Discord.Net\Enums\StringEnum.cs">
       <Link>Enums\StringEnum.cs</Link>
     </Compile>
+    <Compile Include="..\Discord.Net\Enums\TokenType.cs">
+      <Link>Enums\TokenType.cs</Link>
+    </Compile>
     <Compile Include="..\Discord.Net\Enums\UserStatus.cs">
       <Link>Enums\UserStatus.cs</Link>
     </Compile>
@@ -610,8 +616,6 @@
     <Compile Include="..\Discord.Net\TaskManager.cs">
       <Link>TaskManager.cs</Link>
     </Compile>
-    <Compile Include="Enums\GameType.cs" />
-    <Compile Include="Enums\TokenType.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Discord.Net.Net45/Enums/GameType.cs b/src/Discord.Net.Net45/Enums/GameType.cs
deleted file mode 100644
index 446271b47..000000000
--- a/src/Discord.Net.Net45/Enums/GameType.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Discord
-{
-    public enum GameType : int
-    {
-        Default = 0,   // "NotStreaming", pretty much
-        Twitch
-    }
-}
diff --git a/src/Discord.Net.Net45/Enums/TokenType.cs b/src/Discord.Net/Enums/TokenType.cs
similarity index 65%
rename from src/Discord.Net.Net45/Enums/TokenType.cs
rename to src/Discord.Net/Enums/TokenType.cs
index 6ffeaffd0..2a665847b 100644
--- a/src/Discord.Net.Net45/Enums/TokenType.cs
+++ b/src/Discord.Net/Enums/TokenType.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Discord
+namespace Discord
 {
     public enum TokenType
     {
diff --git a/test/Discord.Net.Tests/Tests.cs b/test/Discord.Net.Tests/Tests.cs
index 64425221d..4b2aa46ef 100644
--- a/test/Discord.Net.Tests/Tests.cs
+++ b/test/Discord.Net.Tests/Tests.cs
@@ -54,7 +54,7 @@ namespace Discord.Tests
             _targetBot = new DiscordClient();
             _observerBot = new DiscordClient();
 
-            await _hostClient.Connect(HostBotToken);
+            await _hostClient.Connect(HostBotToken, TokenType.Bot);
 
             await Task.Delay(3000);
 
@@ -79,7 +79,7 @@ namespace Discord.Tests
         {
             AssertEvent(
                 "READY never received",
-                async () => await _observerBot.Connect(ObserverBotToken),
+                async () => await _observerBot.Connect(ObserverBotToken, TokenType.Bot),
                 x => _observerBot.Ready += x,
                 x => _observerBot.Ready -= x,
                 null,