diff --git a/CustomDictionary.xml b/CustomDictionary.xml
index a9c1edd1..8cd1d26f 100644
--- a/CustomDictionary.xml
+++ b/CustomDictionary.xml
@@ -21,6 +21,7 @@
       <Word>Mergeable</Word>
       <Word>Symlink</Word>
       <Word>Submodule</Word>
+      <Word>Forkee</Word>
     </Recognized>
   </Words>
   <Acronyms>
diff --git a/Octokit.Tests/Clients/EventsClientTests.cs b/Octokit.Tests/Clients/EventsClientTests.cs
index dbbf6436..7dc221ab 100644
--- a/Octokit.Tests/Clients/EventsClientTests.cs
+++ b/Octokit.Tests/Clients/EventsClientTests.cs
@@ -6,7 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using NSubstitute;
 using Octokit.Internal;
-using Octokit.Models.Response.ActivityPayloads;
+using Octokit;
 using Octokit.Tests.Helpers;
 using Xunit;
 
diff --git a/Octokit.Tests/OctoKit.Tests-NetCore45.csproj b/Octokit.Tests/OctoKit.Tests-NetCore45.csproj
index 2a3b65c9..304e2083 100644
--- a/Octokit.Tests/OctoKit.Tests-NetCore45.csproj
+++ b/Octokit.Tests/OctoKit.Tests-NetCore45.csproj
@@ -167,10 +167,6 @@
       <Project>{c8bc13b6-3fa3-4716-827d-e7706f976fe1}</Project>
       <Name>Octokit-NetCore45</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Octokit\Octokit.csproj">
-      <Project>{08DD4305-7787-4823-A53F-4D0F725A07F3}</Project>
-      <Name>Octokit</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/Octokit.Tests/Octokit.Tests-Portable.csproj b/Octokit.Tests/Octokit.Tests-Portable.csproj
index 3299ae38..9042716f 100644
--- a/Octokit.Tests/Octokit.Tests-Portable.csproj
+++ b/Octokit.Tests/Octokit.Tests-Portable.csproj
@@ -170,10 +170,6 @@
       <Project>{ddb20481-e17d-4e0a-b2c0-ffff78d4ed71}</Project>
       <Name>Octokit-Portable</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Octokit\Octokit.csproj">
-      <Project>{08DD4305-7787-4823-A53F-4D0F725A07F3}</Project>
-      <Name>Octokit</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/Octokit/Http/SimpleJsonSerializer.cs b/Octokit/Http/SimpleJsonSerializer.cs
index 3c9cfb5d..7faf5278 100644
--- a/Octokit/Http/SimpleJsonSerializer.cs
+++ b/Octokit/Http/SimpleJsonSerializer.cs
@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
-using System.Text.RegularExpressions;
-using Octokit.Models.Response.ActivityPayloads;
+using Octokit;
 using Octokit.Reflection;
 
 namespace Octokit.Internal
diff --git a/Octokit/Models/Response/Activity.cs b/Octokit/Models/Response/Activity.cs
index 5f0da164..7c3146e6 100644
--- a/Octokit/Models/Response/Activity.cs
+++ b/Octokit/Models/Response/Activity.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using Octokit.Models.Response.ActivityPayloads;
+using Octokit;
 
 namespace Octokit
 {
diff --git a/Octokit/Models/Response/ActivityPayloads/ActivityPayload.cs b/Octokit/Models/Response/ActivityPayloads/ActivityPayload.cs
index ad5aa1fa..9e2cdfd1 100644
--- a/Octokit/Models/Response/ActivityPayloads/ActivityPayload.cs
+++ b/Octokit/Models/Response/ActivityPayloads/ActivityPayload.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics;
 
-namespace Octokit.Models.Response.ActivityPayloads
+namespace Octokit
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class ActivityPayload
diff --git a/Octokit/Models/Response/ActivityPayloads/CommitCommentPayload.cs b/Octokit/Models/Response/ActivityPayloads/CommitCommentPayload.cs
index 3e4988ff..9e35c994 100644
--- a/Octokit/Models/Response/ActivityPayloads/CommitCommentPayload.cs
+++ b/Octokit/Models/Response/ActivityPayloads/CommitCommentPayload.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics;
 
-namespace Octokit.Models.Response.ActivityPayloads
+namespace Octokit
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class CommitCommentPayload : ActivityPayload
diff --git a/Octokit/Models/Response/ActivityPayloads/ForkEventPayload.cs b/Octokit/Models/Response/ActivityPayloads/ForkEventPayload.cs
index 07a19a13..f48d01c0 100644
--- a/Octokit/Models/Response/ActivityPayloads/ForkEventPayload.cs
+++ b/Octokit/Models/Response/ActivityPayloads/ForkEventPayload.cs
@@ -1,12 +1,10 @@
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 
-namespace Octokit.Models.Response.ActivityPayloads
+namespace Octokit
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class ForkEventPayload : ActivityPayload
     {
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Forkee")]
         public Repository Forkee { get; protected set; }
     }
 }
diff --git a/Octokit/Models/Response/ActivityPayloads/IssueCommentPayload.cs b/Octokit/Models/Response/ActivityPayloads/IssueCommentPayload.cs
index 6ebdc538..581add5c 100644
--- a/Octokit/Models/Response/ActivityPayloads/IssueCommentPayload.cs
+++ b/Octokit/Models/Response/ActivityPayloads/IssueCommentPayload.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics;
 
-namespace Octokit.Models.Response.ActivityPayloads
+namespace Octokit
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class IssueCommentPayload : ActivityPayload
diff --git a/Octokit/Models/Response/ActivityPayloads/IssueEventPayload.cs b/Octokit/Models/Response/ActivityPayloads/IssueEventPayload.cs
index e49dff89..04f18177 100644
--- a/Octokit/Models/Response/ActivityPayloads/IssueEventPayload.cs
+++ b/Octokit/Models/Response/ActivityPayloads/IssueEventPayload.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics;
 
-namespace Octokit.Models.Response.ActivityPayloads
+namespace Octokit
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class IssueEventPayload : ActivityPayload
diff --git a/Octokit/Models/Response/ActivityPayloads/PullRequestCommentPayload.cs b/Octokit/Models/Response/ActivityPayloads/PullRequestCommentPayload.cs
index 23603b7f..026935e0 100644
--- a/Octokit/Models/Response/ActivityPayloads/PullRequestCommentPayload.cs
+++ b/Octokit/Models/Response/ActivityPayloads/PullRequestCommentPayload.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics;
 
-namespace Octokit.Models.Response.ActivityPayloads
+namespace Octokit
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class PullRequestCommentPayload : ActivityPayload
diff --git a/Octokit/Models/Response/ActivityPayloads/PullRequestEventPayload.cs b/Octokit/Models/Response/ActivityPayloads/PullRequestEventPayload.cs
index cc900dd1..ebaf48de 100644
--- a/Octokit/Models/Response/ActivityPayloads/PullRequestEventPayload.cs
+++ b/Octokit/Models/Response/ActivityPayloads/PullRequestEventPayload.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics;
 
-namespace Octokit.Models.Response.ActivityPayloads
+namespace Octokit
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class PullRequestEventPayload : ActivityPayload
diff --git a/Octokit/Models/Response/ActivityPayloads/PushEventPayload.cs b/Octokit/Models/Response/ActivityPayloads/PushEventPayload.cs
index 5a5ccc49..ad6cdf73 100644
--- a/Octokit/Models/Response/ActivityPayloads/PushEventPayload.cs
+++ b/Octokit/Models/Response/ActivityPayloads/PushEventPayload.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace Octokit.Models.Response.ActivityPayloads
+namespace Octokit
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class PushEventPayload : ActivityPayload
diff --git a/Octokit/Models/Response/ActivityPayloads/StarredEventPayload.cs b/Octokit/Models/Response/ActivityPayloads/StarredEventPayload.cs
index 50aa884c..7bc43a2a 100644
--- a/Octokit/Models/Response/ActivityPayloads/StarredEventPayload.cs
+++ b/Octokit/Models/Response/ActivityPayloads/StarredEventPayload.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics;
 
-namespace Octokit.Models.Response.ActivityPayloads
+namespace Octokit
 {
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class StarredEventPayload : ActivityPayload