diff --git a/Octokit.Reactive/Clients/IObservableUsersClient.cs b/Octokit.Reactive/Clients/IObservableUsersClient.cs
index faa0d502..6c23a459 100644
--- a/Octokit.Reactive/Clients/IObservableUsersClient.cs
+++ b/Octokit.Reactive/Clients/IObservableUsersClient.cs
@@ -59,7 +59,7 @@ namespace Octokit.Reactive
         /// See the <a href="https://developer.github.com/v3/users/gpg_keys/">User GPG Keys documentation</a> for more information.
         /// </remarks>
         [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Gpg")]
-        IObservableUserGpgKeysClient GpgKeys { get; }
+        IObservableUserGpgKeysClient GpgKey { get; }
 
         /// <summary>
         /// A client for GitHub's User Administration API
diff --git a/Octokit.Reactive/Clients/ObservableUserGpgKeysClient.cs b/Octokit.Reactive/Clients/ObservableUserGpgKeysClient.cs
index 5031b560..6f635fb6 100644
--- a/Octokit.Reactive/Clients/ObservableUserGpgKeysClient.cs
+++ b/Octokit.Reactive/Clients/ObservableUserGpgKeysClient.cs
@@ -27,7 +27,7 @@ namespace Octokit.Reactive
         {
             Ensure.ArgumentNotNull(client, "client");
 
-            _client = client.User.GpgKeys;
+            _client = client.User.GpgKey;
         }
 
         /// <summary>
diff --git a/Octokit.Reactive/Clients/ObservableUsersClient.cs b/Octokit.Reactive/Clients/ObservableUsersClient.cs
index e5ba4f94..30891c4d 100644
--- a/Octokit.Reactive/Clients/ObservableUsersClient.cs
+++ b/Octokit.Reactive/Clients/ObservableUsersClient.cs
@@ -17,7 +17,7 @@ namespace Octokit.Reactive
             Followers = new ObservableFollowersClient(client);
             Email = new ObservableUserEmailsClient(client);
             Keys = new ObservableUserKeysClient(client);
-            GpgKeys = new ObservableUserGpgKeysClient(client);
+            GpgKey = new ObservableUserGpgKeysClient(client);
             Administration = new ObservableUserAdministrationClient(client);
         }
 
@@ -85,8 +85,7 @@ namespace Octokit.Reactive
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/users/gpg_keys/">User GPG Keys documentation</a> for more information.
         /// </remarks>
-        public IObservableUserGpgKeysClient GpgKeys { get; private set; }
-
+        public IObservableUserGpgKeysClient GpgKey { get; private set; }
 
         /// <summary>
         /// A client for GitHub's User Administration API
diff --git a/Octokit.Tests.Integration/Clients/UserGpgKeysClientTests.cs b/Octokit.Tests.Integration/Clients/UserGpgKeysClientTests.cs
index 60ab3e1e..30e18604 100644
--- a/Octokit.Tests.Integration/Clients/UserGpgKeysClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/UserGpgKeysClientTests.cs
@@ -40,7 +40,7 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
 
             using (var context = await github.CreateGpgKeyContext())
             {
-                var keys = await github.User.GpgKeys.GetAllForCurrent();
+                var keys = await github.User.GpgKey.GetAllForCurrent();
                 Assert.NotEmpty(keys);
 
                 var first = keys[0];
@@ -58,7 +58,7 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
             var github = Helper.GetBasicAuthClient();
             using (var context = await github.CreateGpgKeyContext())
             {
-                var key = await github.User.GpgKeys.Get(context.GpgKeyId);
+                var key = await github.User.GpgKey.Get(context.GpgKeyId);
 
                 Assert.Equal(context.GpgKeyId, key.Id);
                 Assert.Equal(context.KeyId, key.KeyId);
@@ -71,16 +71,16 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
         {
             var github = Helper.GetBasicAuthClient();
 
-            var key = await github.User.GpgKeys.Create(new NewGpgKey(publicKey));
+            var key = await github.User.GpgKey.Create(new NewGpgKey(publicKey));
             Assert.NotNull(key);
             Assert.Equal(knownPublicKey, key.PublicKey);
             Assert.Equal(knownKeyId, key.KeyId);
 
             // Delete the key
-            await github.User.GpgKeys.Delete(key.Id);
+            await github.User.GpgKey.Delete(key.Id);
 
             // Verify key no longer exists
-            var keys = await github.User.GpgKeys.GetAllForCurrent();
+            var keys = await github.User.GpgKey.GetAllForCurrent();
             Assert.False(keys.Any(k => k.KeyId == knownKeyId && k.PublicKey == knownPublicKey));
         }
 
@@ -89,13 +89,13 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
         {
             var github = Helper.GetBasicAuthClient();
 
-            var key = await github.User.GpgKeys.Create(new NewGpgKey(publicKey));
+            var key = await github.User.GpgKey.Create(new NewGpgKey(publicKey));
             Assert.NotNull(key);
 
-            Assert.ThrowsAsync<ApiValidationException>(async () => await github.User.GpgKeys.Create(new NewGpgKey(publicKey)));
+            Assert.ThrowsAsync<ApiValidationException>(async () => await github.User.GpgKey.Create(new NewGpgKey(publicKey)));
 
-            await github.User.GpgKeys.Delete(key.Id);
-            var keys = await github.User.GpgKeys.GetAllForCurrent();
+            await github.User.GpgKey.Delete(key.Id);
+            var keys = await github.User.GpgKey.GetAllForCurrent();
             Assert.False(keys.Any(k => k.KeyId == knownKeyId && k.PublicKey == knownPublicKey));
         }
     }
diff --git a/Octokit.Tests.Integration/Helpers/GithubClientExtensions.cs b/Octokit.Tests.Integration/Helpers/GithubClientExtensions.cs
index ef5e2857..2aa0c726 100644
--- a/Octokit.Tests.Integration/Helpers/GithubClientExtensions.cs
+++ b/Octokit.Tests.Integration/Helpers/GithubClientExtensions.cs
@@ -74,7 +74,7 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
 -----END PGP PUBLIC KEY BLOCK-----
 ";
 
-            var key = await client.User.GpgKeys.Create(new NewGpgKey(publicKey));
+            var key = await client.User.GpgKey.Create(new NewGpgKey(publicKey));
 
             return new GpgKeyContext(key);
         }
diff --git a/Octokit.Tests.Integration/Helpers/GpgKeyContext.cs b/Octokit.Tests.Integration/Helpers/GpgKeyContext.cs
index 58b2a15d..4260151a 100644
--- a/Octokit.Tests.Integration/Helpers/GpgKeyContext.cs
+++ b/Octokit.Tests.Integration/Helpers/GpgKeyContext.cs
@@ -30,7 +30,7 @@ namespace Octokit.Tests.Integration.Helpers
                 var api = Helper.GetBasicAuthClient();
                 try
                 {
-                    api.User.GpgKeys.Delete(Key.Id).Wait(TimeSpan.FromSeconds(15));
+                    api.User.GpgKey.Delete(Key.Id).Wait(TimeSpan.FromSeconds(15));
                 }
                 catch { }
             }
diff --git a/Octokit.Tests.Integration/Helpers/ObservableGithubClientExtensions.cs b/Octokit.Tests.Integration/Helpers/ObservableGithubClientExtensions.cs
index 0d2dcf4e..72730612 100644
--- a/Octokit.Tests.Integration/Helpers/ObservableGithubClientExtensions.cs
+++ b/Octokit.Tests.Integration/Helpers/ObservableGithubClientExtensions.cs
@@ -76,7 +76,7 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
 -----END PGP PUBLIC KEY BLOCK-----
 ";
 
-            var key = await client.User.GpgKeys.Create(new NewGpgKey(publicKey));
+            var key = await client.User.GpgKey.Create(new NewGpgKey(publicKey));
 
             return new GpgKeyContext(key);
         }
diff --git a/Octokit.Tests.Integration/Reactive/ObservableUserGpgKeysClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableUserGpgKeysClientTests.cs
index c24d756d..7934dd6f 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableUserGpgKeysClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableUserGpgKeysClientTests.cs
@@ -27,7 +27,7 @@ namespace Octokit.Tests.Integration.Reactive
         {
             using (var context = _gitHubClient.CreateGpgKeyContext())
             {
-                var observable = _gitHubClient.User.GpgKeys.GetAllForCurrent();
+                var observable = _gitHubClient.User.GpgKey.GetAllForCurrent();
                 var keys = await observable.ToList();
 
                 Assert.NotEmpty(keys);
@@ -46,7 +46,7 @@ namespace Octokit.Tests.Integration.Reactive
         {
             using (var context = await _gitHubClient.CreateGpgKeyContext())
             {
-                var observable = _gitHubClient.User.GpgKeys.Get(context.GpgKeyId);
+                var observable = _gitHubClient.User.GpgKey.Get(context.GpgKeyId);
                 var key = await observable;
 
                 Assert.Equal(knownKeyId, key.KeyId);
@@ -77,7 +77,7 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
 -----END PGP PUBLIC KEY BLOCK-----
 ";
             // Create a key
-            var observable = _gitHubClient.User.GpgKeys.Create(new NewGpgKey(publicKey));
+            var observable = _gitHubClient.User.GpgKey.Create(new NewGpgKey(publicKey));
             var key = await observable;
 
             Assert.NotNull(key);
@@ -85,10 +85,10 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
             Assert.Equal(knownPublicKey, key.PublicKey);
 
             // Delete the key
-            await _gitHubClient.User.GpgKeys.Delete(key.Id);
+            await _gitHubClient.User.GpgKey.Delete(key.Id);
 
             // Verify key no longer exists
-            var keys = await _gitHubClient.User.GpgKeys.GetAllForCurrent().ToList();
+            var keys = await _gitHubClient.User.GpgKey.GetAllForCurrent().ToList();
             Assert.False(keys.Any(k => k.KeyId == knownKeyId && k.PublicKey == knownPublicKey));
         }
     }
diff --git a/Octokit.Tests/Clients/UserGpgKeysClientTests.cs b/Octokit.Tests/Clients/UserGpgKeysClientTests.cs
index 73fe4df7..a634ab9d 100644
--- a/Octokit.Tests/Clients/UserGpgKeysClientTests.cs
+++ b/Octokit.Tests/Clients/UserGpgKeysClientTests.cs
@@ -28,13 +28,13 @@ namespace Octokit.Tests.Clients
                 var connection = Substitute.For<IApiConnection>();
                 var client = new UserGpgKeysClient(connection);
 
-                var expectedUri = ApiUrls.GpgKeys().ToString();
+                var expectedUri = "user/gpg_keys";
                 client.GetAllForCurrent();
 
                 connection.Received().GetAll<GpgKey>(
                     Arg.Is<Uri>(u => u.ToString() == expectedUri),
                     Arg.Any<Dictionary<string, string>>(),
-                    Arg.Is<string>(s => s == AcceptHeaders.GpgKeysPreview),
+                    Arg.Is<string>(s => s == "application/vnd.github.cryptographer-preview+sha"),
                     Arg.Any<ApiOptions>());
             }
         }
@@ -47,13 +47,13 @@ namespace Octokit.Tests.Clients
                 var connection = Substitute.For<IApiConnection>();
                 var client = new UserGpgKeysClient(connection);
 
-                var expectedUri = ApiUrls.GpgKeys(1).ToString();
+                var expectedUri = "user/gpg_keys/1";
                 client.Get(1);
 
                 connection.Received().Get<GpgKey>(
                     Arg.Is<Uri>(u => u.ToString() == expectedUri),
                     Arg.Any<Dictionary<string, string>>(),
-                    Arg.Is<string>(s => s == AcceptHeaders.GpgKeysPreview));
+                    Arg.Is<string>(s => s == "application/vnd.github.cryptographer-preview+sha"));
             }
         }
 
@@ -72,13 +72,13 @@ namespace Octokit.Tests.Clients
                 var connection = Substitute.For<IApiConnection>();
                 var client = new UserGpgKeysClient(connection);
 
-                var expectedUri = ApiUrls.GpgKeys().ToString();
+                var expectedUri = "user/gpg_keys";
                 client.Create(new NewGpgKey("ABCDEFG"));
 
                 connection.Received().Post<GpgKey>(
                     Arg.Is<Uri>(u => u.ToString() == expectedUri),
                     Arg.Any<object>(),
-                    Arg.Is<string>(s => s == AcceptHeaders.GpgKeysPreview));
+                    Arg.Is<string>(s => s == "application/vnd.github.cryptographer-preview+sha"));
             }
 
             [Fact]
@@ -87,11 +87,11 @@ namespace Octokit.Tests.Clients
                 var connection = Substitute.For<IApiConnection>();
                 var client = new UserGpgKeysClient(connection);
 
-                var expectedUri = ApiUrls.GpgKeys().ToString();
+                var expectedUri = "user/gpg_keys";
                 client.Create(new NewGpgKey("ABCDEFG"));
 
                 connection.Received().Post<GpgKey>(
-                    Arg.Any<Uri>(),
+                    Arg.Is<Uri>(u => u.ToString() == expectedUri),
                     Arg.Is<NewGpgKey>(a =>
                         a.ArmoredPublicKey == "ABCDEFG"),
                     Arg.Any<string>());
@@ -106,13 +106,13 @@ namespace Octokit.Tests.Clients
                 var connection = Substitute.For<IApiConnection>();
                 var client = new UserGpgKeysClient(connection);
 
-                var expectedUri = ApiUrls.GpgKeys(1).ToString();
+                var expectedUri = "user/gpg_keys/1";
                 client.Delete(1);
 
                 connection.Received().Delete(
                     Arg.Is<Uri>(u => u.ToString() == expectedUri),
                     Arg.Any<object>(),
-                    Arg.Is<string>(s => s == AcceptHeaders.GpgKeysPreview));
+                    Arg.Is<string>(s => s == "application/vnd.github.cryptographer-preview+sha"));
             }
         }
     }
diff --git a/Octokit.Tests/Reactive/ObservableUserGpgKeysClientTests.cs b/Octokit.Tests/Reactive/ObservableUserGpgKeysClientTests.cs
index ca2cc0b6..2d5f79d2 100644
--- a/Octokit.Tests/Reactive/ObservableUserGpgKeysClientTests.cs
+++ b/Octokit.Tests/Reactive/ObservableUserGpgKeysClientTests.cs
@@ -21,7 +21,7 @@ namespace Octokit.Tests.Reactive
 
                 client.GetAllForCurrent();
 
-                githubClient.User.GpgKeys.Received().GetAllForCurrent(Arg.Any<ApiOptions>());
+                githubClient.User.GpgKey.Received().GetAllForCurrent(Arg.Any<ApiOptions>());
             }
         }
 
@@ -35,7 +35,7 @@ namespace Octokit.Tests.Reactive
 
                 client.Get(1);
 
-                githubClient.User.GpgKeys.Received().Get(1);
+                githubClient.User.GpgKey.Received().Get(1);
             }
         }
 
@@ -49,7 +49,7 @@ namespace Octokit.Tests.Reactive
 
                 client.Create(new NewGpgKey("ABCDEFG"));
 
-                githubClient.User.GpgKeys.Received().Create(Arg.Is<NewGpgKey>(k => k.ArmoredPublicKey == "ABCDEFG"));
+                githubClient.User.GpgKey.Received().Create(Arg.Is<NewGpgKey>(k => k.ArmoredPublicKey == "ABCDEFG"));
             }
         }
 
@@ -63,7 +63,7 @@ namespace Octokit.Tests.Reactive
 
                 client.Delete(1);
 
-                githubClient.User.GpgKeys.Received().Delete(1);
+                githubClient.User.GpgKey.Received().Delete(1);
             }
         }
 
diff --git a/Octokit/Clients/IUsersClient.cs b/Octokit/Clients/IUsersClient.cs
index 046441ae..93c5fc34 100644
--- a/Octokit/Clients/IUsersClient.cs
+++ b/Octokit/Clients/IUsersClient.cs
@@ -28,7 +28,7 @@ namespace Octokit
         IUserKeysClient Keys { get; }
 
         [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Gpg")]
-        IUserGpgKeysClient GpgKeys { get; }
+        IUserGpgKeysClient GpgKey { get; }
 
         /// <summary>
         /// Returns the user specified by the login.
diff --git a/Octokit/Clients/UsersClient.cs b/Octokit/Clients/UsersClient.cs
index e041615a..1b98e13b 100644
--- a/Octokit/Clients/UsersClient.cs
+++ b/Octokit/Clients/UsersClient.cs
@@ -22,7 +22,7 @@ namespace Octokit
             Email = new UserEmailsClient(apiConnection);
             Followers = new FollowersClient(apiConnection);
             Keys = new UserKeysClient(apiConnection);
-            GpgKeys = new UserGpgKeysClient(apiConnection);
+            GpgKey = new UserGpgKeysClient(apiConnection);
 
             Administration = new UserAdministrationClient(apiConnection);
         }
@@ -49,7 +49,7 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/users/gpg_keys/">User GPG Keys documentation</a> for more information.
         /// </remarks>
-        public IUserGpgKeysClient GpgKeys { get; private set; }
+        public IUserGpgKeysClient GpgKey { get; private set; }
 
         /// <summary>
         /// Returns the user specified by the login.