diff --git a/Octokit.Reactive/Clients/IObservableUserFollowersClient.cs b/Octokit.Reactive/Clients/IObservableFollowersClient.cs
similarity index 98%
rename from Octokit.Reactive/Clients/IObservableUserFollowersClient.cs
rename to Octokit.Reactive/Clients/IObservableFollowersClient.cs
index b6232c32..295e03ea 100644
--- a/Octokit.Reactive/Clients/IObservableUserFollowersClient.cs
+++ b/Octokit.Reactive/Clients/IObservableFollowersClient.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace Octokit.Reactive
 {
-    public interface IObservableUserFollowersClient
+    public interface IObservableFollowersClient
     {
         /// <summary>
         /// List the authenticated user’s followers
diff --git a/Octokit.Reactive/Clients/ObservableUserFollowersClient.cs b/Octokit.Reactive/Clients/ObservableFollowersClient.cs
similarity index 96%
rename from Octokit.Reactive/Clients/ObservableUserFollowersClient.cs
rename to Octokit.Reactive/Clients/ObservableFollowersClient.cs
index 066a9474..c5ee6a20 100644
--- a/Octokit.Reactive/Clients/ObservableUserFollowersClient.cs
+++ b/Octokit.Reactive/Clients/ObservableFollowersClient.cs
@@ -5,16 +5,16 @@ using Octokit.Reactive.Internal;
 
 namespace Octokit.Reactive
 {
-    public class ObservableUserFollowersClient : IObservableUserFollowersClient
+    public class ObservableFollowersClient : IObservableFollowersClient
     {
-        readonly IUserFollowersClient _client;
+        readonly IFollowersClient _client;
         readonly IConnection _connection;
 
         /// <summary>
         /// Initializes a new User Followers API client.
         /// </summary>
         /// <param name="client">An <see cref="IGitHubClient" /> used to make the requests</param>
-        public ObservableUserFollowersClient(IGitHubClient client)
+        public ObservableFollowersClient(IGitHubClient client)
         {
             Ensure.ArgumentNotNull(client, "client");
 
diff --git a/Octokit.Reactive/Octokit.Reactive-Mono.csproj b/Octokit.Reactive/Octokit.Reactive-Mono.csproj
index e2db17ad..2f21b5e6 100644
--- a/Octokit.Reactive/Octokit.Reactive-Mono.csproj
+++ b/Octokit.Reactive/Octokit.Reactive-Mono.csproj
@@ -120,6 +120,8 @@
     <Compile Include="Clients\ObservableSearchClient.cs" />
     <Compile Include="Clients\IObservableWatchedClient.cs" />
     <Compile Include="Clients\ObservableWatchedClient.cs" />
+    <Compile Include="Clients\IObservableFollowersClient.cs" />
+    <Compile Include="Clients\ObservableFollowersClient.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/Octokit.Reactive/Octokit.Reactive-MonoAndroid.csproj b/Octokit.Reactive/Octokit.Reactive-MonoAndroid.csproj
index d3ffec27..cd6ab187 100644
--- a/Octokit.Reactive/Octokit.Reactive-MonoAndroid.csproj
+++ b/Octokit.Reactive/Octokit.Reactive-MonoAndroid.csproj
@@ -129,6 +129,8 @@
     <Compile Include="Clients\ObservableSearchClient.cs" />
     <Compile Include="Clients\IObservableWatchedClient.cs" />
     <Compile Include="Clients\ObservableWatchedClient.cs" />
+    <Compile Include="Clients\IObservableFollowersClient.cs" />
+    <Compile Include="Clients\ObservableFollowersClient.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <ItemGroup>
diff --git a/Octokit.Reactive/Octokit.Reactive-Monotouch.csproj b/Octokit.Reactive/Octokit.Reactive-Monotouch.csproj
index c593c7dd..0f441e35 100644
--- a/Octokit.Reactive/Octokit.Reactive-Monotouch.csproj
+++ b/Octokit.Reactive/Octokit.Reactive-Monotouch.csproj
@@ -124,6 +124,8 @@
     <Compile Include="Clients\ObservableSearchClient.cs" />
     <Compile Include="Clients\IObservableWatchedClient.cs" />
     <Compile Include="Clients\ObservableWatchedClient.cs" />
+    <Compile Include="Clients\IObservableFollowersClient.cs" />
+    <Compile Include="Clients\ObservableFollowersClient.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/Octokit.Reactive/Octokit.Reactive.csproj b/Octokit.Reactive/Octokit.Reactive.csproj
index f14b813c..6c5c7e71 100644
--- a/Octokit.Reactive/Octokit.Reactive.csproj
+++ b/Octokit.Reactive/Octokit.Reactive.csproj
@@ -74,7 +74,7 @@
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
     <Compile Include="Clients\IObservableWatchedClient.cs" />
-    <Compile Include="Clients\IObservableUserFollowersClient.cs" />
+    <Compile Include="Clients\IObservableFollowersClient.cs" />
     <Compile Include="Clients\ObservableSearchClient.cs" />
     <Compile Include="Clients\IObservableBlobClient.cs" />
     <Compile Include="Clients\IObservableGistCommentsClient.cs" />
@@ -121,7 +121,7 @@
     <Compile Include="Clients\ObservableStarredClient.cs" />
     <Compile Include="Clients\ObservableTagsClient.cs" />
     <Compile Include="Clients\ObservableTreesClient.cs" />
-    <Compile Include="Clients\ObservableUserFollowersClient.cs" />
+    <Compile Include="Clients\ObservableFollowersClient.cs" />
     <Compile Include="Clients\ObservableUsersClient.cs" />
     <Compile Include="Clients\IObservableAssigneesClient.cs" />
     <Compile Include="Clients\IObservableNotificationsClient.cs" />
diff --git a/Octokit.Tests.Integration/Clients/UserFollowersClientTests.cs b/Octokit.Tests.Integration/Clients/FollowersClientTests.cs
similarity index 97%
rename from Octokit.Tests.Integration/Clients/UserFollowersClientTests.cs
rename to Octokit.Tests.Integration/Clients/FollowersClientTests.cs
index 70341d16..4d7f1e0f 100644
--- a/Octokit.Tests.Integration/Clients/UserFollowersClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/FollowersClientTests.cs
@@ -8,12 +8,12 @@ using Octokit;
 using Octokit.Tests.Integration;
 using Xunit;
 
-public class UserFollowersClientTests : IDisposable
+public class FollowersClientTests : IDisposable
 {
     readonly GitHubClient _github;
     readonly User _currentUser;
 
-    public UserFollowersClientTests()
+    public FollowersClientTests()
     {
         _github = new GitHubClient(new ProductHeaderValue("OctokitTests"))
         {
diff --git a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
index d9f3b731..9587edf9 100644
--- a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
+++ b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
@@ -69,7 +69,7 @@
     <Compile Include="Clients\MilestonesClientTests.cs" />
     <Compile Include="Clients\ReferencesClientTests.cs" />
     <Compile Include="Clients\TreeClientTests.cs" />
-    <Compile Include="Clients\UserFollowersClientTests.cs" />
+    <Compile Include="Clients\FollowersClientTests.cs" />
     <Compile Include="IntegrationTestAttribute.cs" />
     <Compile Include="Clients\IssuesClientTests.cs" />
     <Compile Include="Clients\MiscellaneousClientTests.cs" />
diff --git a/Octokit.Tests/Clients/UserFollowersClientTests.cs b/Octokit.Tests/Clients/FollowersClientTests.cs
similarity index 88%
rename from Octokit.Tests/Clients/UserFollowersClientTests.cs
rename to Octokit.Tests/Clients/FollowersClientTests.cs
index d80083c6..9c24b839 100644
--- a/Octokit.Tests/Clients/UserFollowersClientTests.cs
+++ b/Octokit.Tests/Clients/FollowersClientTests.cs
@@ -15,14 +15,14 @@ namespace Octokit.Tests.Clients
     /// Client tests mostly just need to make sure they call the IApiConnection with the correct 
     /// relative Uri. No need to fake up the response. All *those* tests are in ApiConnectionTests.cs.
     /// </summary>
-    public class UserFollowersClientTests
+    public class FollowersClientTests
     {
         public class TheConstructor
         {
             [Fact]
             public void EnsuresNonNullArguments()
             {
-                Assert.Throws<ArgumentNullException>(() => new UserFollowersClient(null));
+                Assert.Throws<ArgumentNullException>(() => new FollowersClient(null));
             }
         }
 
@@ -32,7 +32,7 @@ namespace Octokit.Tests.Clients
             public void RequestsTheCorrectUrl()
             {
                 var connection = Substitute.For<IApiConnection>();
-                var client = new UserFollowersClient(connection);
+                var client = new FollowersClient(connection);
 
                 client.GetAllForCurrent();
 
@@ -47,7 +47,7 @@ namespace Octokit.Tests.Clients
             public void RequestsTheCorrectUrl()
             {
                 var connection = Substitute.For<IApiConnection>();
-                var client = new UserFollowersClient(connection);
+                var client = new FollowersClient(connection);
 
                 client.GetAll("alfhenrik");
 
@@ -59,7 +59,7 @@ namespace Octokit.Tests.Clients
             public void EnsureNonNullArguments()
             {
                 var connection = Substitute.For<IApiConnection>();
-                var client = new UserFollowersClient(connection);
+                var client = new FollowersClient(connection);
 
                 AssertEx.Throws<ArgumentNullException>(async () => await client.GetAll(null));
                 AssertEx.Throws<ArgumentException>(async () => await client.GetAll(""));
@@ -72,7 +72,7 @@ namespace Octokit.Tests.Clients
             public void RequestsTheCorrectUrl()
             {
                 var connection = Substitute.For<IApiConnection>();
-                var client = new UserFollowersClient(connection);
+                var client = new FollowersClient(connection);
 
                 client.GetFollowingForCurrent();
 
@@ -86,7 +86,7 @@ namespace Octokit.Tests.Clients
             public void RequestsTheCorrectUrl()
             {
                 var connection = Substitute.For<IApiConnection>();
-                var client = new UserFollowersClient(connection);
+                var client = new FollowersClient(connection);
 
                 client.GetFollowing("alfhenrik");
 
@@ -97,7 +97,7 @@ namespace Octokit.Tests.Clients
             public void EnsuresNonNullArguments()
             {
                 var connection = Substitute.For<IApiConnection>();
-                var client = new UserFollowersClient(connection);
+                var client = new FollowersClient(connection);
 
                 AssertEx.Throws<ArgumentNullException>(async () => await client.GetFollowing(null));
                 AssertEx.Throws<ArgumentException>(async () => await client.GetFollowing(""));
@@ -118,7 +118,7 @@ namespace Octokit.Tests.Clients
                     null, null).Returns(response);
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
-                var client = new UserFollowersClient(apiConnection);
+                var client = new FollowersClient(apiConnection);
 
                 var result = await client.IsFollowingForCurrent("alfhenrik");
 
@@ -135,7 +135,7 @@ namespace Octokit.Tests.Clients
                     null, null).Returns(response);
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
-                var client = new UserFollowersClient(apiConnection);
+                var client = new FollowersClient(apiConnection);
 
                 AssertEx.Throws<ApiException>(async () => await client.IsFollowingForCurrent("alfhenrik"));
             }
@@ -144,7 +144,7 @@ namespace Octokit.Tests.Clients
             public void EnsuresNonNullArguments()
             {
                 var connection = Substitute.For<IApiConnection>();
-                var client = new UserFollowersClient(connection);
+                var client = new FollowersClient(connection);
 
                 AssertEx.Throws<ArgumentNullException>(async () => await client.IsFollowingForCurrent(null));
                 AssertEx.Throws<ArgumentException>(async () => await client.IsFollowingForCurrent(""));
@@ -165,7 +165,7 @@ namespace Octokit.Tests.Clients
                     null, null).Returns(response);
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
-                var client = new UserFollowersClient(apiConnection);
+                var client = new FollowersClient(apiConnection);
 
                 var result = await client.IsFollowing("alfhenrik", "alfhenrik-test");
 
@@ -182,7 +182,7 @@ namespace Octokit.Tests.Clients
                     null, null).Returns(response);
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
-                var client = new UserFollowersClient(apiConnection);
+                var client = new FollowersClient(apiConnection);
 
                 AssertEx.Throws<ApiException>(async () => await client.IsFollowing("alfhenrik", "alfhenrik-test"));
             }
@@ -191,7 +191,7 @@ namespace Octokit.Tests.Clients
             public void EnsuresNonNullArguments()
             {
                 var connection = Substitute.For<IApiConnection>();
-                var client = new UserFollowersClient(connection);
+                var client = new FollowersClient(connection);
 
                 AssertEx.Throws<ArgumentNullException>(async () => await client.IsFollowing(null,  "alfhenrik-test"));
                 AssertEx.Throws<ArgumentNullException>(async () => await client.IsFollowing("alfhenrik", null));
@@ -214,7 +214,7 @@ namespace Octokit.Tests.Clients
                     Args.Object).Returns(response);
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
-                var client = new UserFollowersClient(apiConnection);
+                var client = new FollowersClient(apiConnection);
 
                 var result = await client.Follow("alfhenrik");
 
@@ -231,7 +231,7 @@ namespace Octokit.Tests.Clients
                     new { }).Returns(response);
                 var apiConnection = Substitute.For<IApiConnection>();
                 apiConnection.Connection.Returns(connection);
-                var client = new UserFollowersClient(apiConnection);
+                var client = new FollowersClient(apiConnection);
 
                 AssertEx.Throws<ApiException>(async () => await client.Follow("alfhenrik"));
             }
@@ -240,7 +240,7 @@ namespace Octokit.Tests.Clients
             public async Task EnsureNonNullArguments()
             {
                 var connection = Substitute.For<IApiConnection>();
-                var client = new UserFollowersClient(connection);
+                var client = new FollowersClient(connection);
 
                 await AssertEx.Throws<ArgumentNullException>(async () => await client.Follow(null));
                 await AssertEx.Throws<ArgumentException>(async () => await client.Follow(""));
@@ -253,7 +253,7 @@ namespace Octokit.Tests.Clients
             public void RequestsTheCorrectUrl()
             {
                 var connection = Substitute.For<IApiConnection>();
-                var client = new UserFollowersClient(connection);
+                var client = new FollowersClient(connection);
 
                 client.Unfollow("alfhenrik");
 
@@ -264,7 +264,7 @@ namespace Octokit.Tests.Clients
             public async Task EnsureNonNullArguments()
             {
                 var connection = Substitute.For<IApiConnection>();
-                var client = new UserFollowersClient(connection);
+                var client = new FollowersClient(connection);
 
                 await AssertEx.Throws<ArgumentNullException>(async () => await client.Unfollow(null));
                 await AssertEx.Throws<ArgumentException>(async () => await client.Unfollow(""));
diff --git a/Octokit.Tests/Octokit.Tests.csproj b/Octokit.Tests/Octokit.Tests.csproj
index 8681b073..9b4eda2c 100644
--- a/Octokit.Tests/Octokit.Tests.csproj
+++ b/Octokit.Tests/Octokit.Tests.csproj
@@ -87,7 +87,7 @@
     <Compile Include="Clients\SshKeysClientTests.cs" />
     <Compile Include="Clients\TreesClientTests.cs" />
     <Compile Include="Clients\WatchedClientTests.cs" />
-    <Compile Include="Clients\UserFollowersClientTests.cs" />
+    <Compile Include="Clients\FollowersClientTests.cs" />
     <Compile Include="Exceptions\ApiExceptionTests.cs" />
     <Compile Include="Exceptions\ApiValidationExceptionTests.cs" />
     <Compile Include="Exceptions\TwoFactorChallengeFailedException.cs" />
@@ -137,7 +137,7 @@
     <Compile Include="Reactive\ObservableRepositoriesClientTests.cs" />
     <Compile Include="Reactive\ObservableStarredClientTests.cs" />
     <Compile Include="Reactive\ObservableTreesClientTests.cs" />
-    <Compile Include="Reactive\ObservableUserFollowersTest.cs" />
+    <Compile Include="Reactive\ObservableFollowersTest.cs" />
     <Compile Include="SimpleJsonSerializerTests.cs" />
     <Compile Include="Clients\UsersClientTests.cs" />
   </ItemGroup>
diff --git a/Octokit.Tests/Reactive/ObservableUserFollowersTest.cs b/Octokit.Tests/Reactive/ObservableFollowersTest.cs
similarity index 82%
rename from Octokit.Tests/Reactive/ObservableUserFollowersTest.cs
rename to Octokit.Tests/Reactive/ObservableFollowersTest.cs
index d751c228..145c4dbc 100644
--- a/Octokit.Tests/Reactive/ObservableUserFollowersTest.cs
+++ b/Octokit.Tests/Reactive/ObservableFollowersTest.cs
@@ -11,7 +11,7 @@ using Xunit;
 
 namespace Octokit.Tests.Reactive
 {
-    public class ObservableUserFollowersTest
+    public class ObservableFollowersTest
     {
         public class TheGetAllForCurrentMethod
         {
@@ -19,7 +19,7 @@ namespace Octokit.Tests.Reactive
             public void RequestsTheCorrectUrl()
             {
                 var githubClient = Substitute.For<IGitHubClient>();
-                var client = new ObservableUserFollowersClient(githubClient);
+                var client = new ObservableFollowersClient(githubClient);
 
                 client.GetAllForCurrent();
 
@@ -34,7 +34,7 @@ namespace Octokit.Tests.Reactive
             public void RequestsTheCorrectUrl()
             {
                 var githubClient = Substitute.For<IGitHubClient>();
-                var client = new ObservableUserFollowersClient(githubClient);
+                var client = new ObservableFollowersClient(githubClient);
 
                 client.GetAll("alfhenrik");
 
@@ -45,7 +45,7 @@ namespace Octokit.Tests.Reactive
             [Fact]
             public async Task EnsuresNonNullArguments()
             {
-                var client = new ObservableUserFollowersClient(Substitute.For<IGitHubClient>());
+                var client = new ObservableFollowersClient(Substitute.For<IGitHubClient>());
 
                 await AssertEx.Throws<ArgumentNullException>(async () => await client.GetAll(null));
                 await AssertEx.Throws<ArgumentException>(async () => await client.GetAll(""));
@@ -58,7 +58,7 @@ namespace Octokit.Tests.Reactive
             public void RequestsTheCorrectUrl()
             {
                 var githubClient = Substitute.For<IGitHubClient>();
-                var client = new ObservableUserFollowersClient(githubClient);
+                var client = new ObservableFollowersClient(githubClient);
 
                 client.GetFollowingForCurrent();
 
@@ -73,7 +73,7 @@ namespace Octokit.Tests.Reactive
             public void RequestsTheCorrectUrl()
             {
                 var githubClient = Substitute.For<IGitHubClient>();
-                var client = new ObservableUserFollowersClient(githubClient);
+                var client = new ObservableFollowersClient(githubClient);
 
                 client.GetFollowing("alfhenrik");
 
@@ -84,7 +84,7 @@ namespace Octokit.Tests.Reactive
             [Fact]
             public async Task EnsuresNonNullArguments()
             {
-                var client = new ObservableUserFollowersClient(Substitute.For<IGitHubClient>());
+                var client = new ObservableFollowersClient(Substitute.For<IGitHubClient>());
 
                 await AssertEx.Throws<ArgumentNullException>(async () => await client.GetFollowing(null));
                 await AssertEx.Throws<ArgumentException>(async () => await client.GetFollowing(""));
@@ -97,7 +97,7 @@ namespace Octokit.Tests.Reactive
             public void IsFollowingForCurrentFromClientUserFollowers()
             {
                 var githubClient = Substitute.For<IGitHubClient>();
-                var client = new ObservableUserFollowersClient(githubClient);
+                var client = new ObservableFollowersClient(githubClient);
 
                 client.IsFollowingForCurrent("alfhenrik");
 
@@ -108,7 +108,7 @@ namespace Octokit.Tests.Reactive
             [Fact]
             public async Task EnsuresNonNullArguments()
             {
-                var client = new ObservableUserFollowersClient(Substitute.For<IGitHubClient>());
+                var client = new ObservableFollowersClient(Substitute.For<IGitHubClient>());
 
                 await AssertEx.Throws<ArgumentNullException>(async () => await client.IsFollowingForCurrent(null));
                 await AssertEx.Throws<ArgumentException>(async () => await client.IsFollowingForCurrent(""));
@@ -121,7 +121,7 @@ namespace Octokit.Tests.Reactive
             public void IsFollowingFromClientUserFollowers()
             {
                 var githubClient = Substitute.For<IGitHubClient>();
-                var client = new ObservableUserFollowersClient(githubClient);
+                var client = new ObservableFollowersClient(githubClient);
 
                 client.IsFollowing("alfhenrik", "alfhenrik-test");
 
@@ -132,7 +132,7 @@ namespace Octokit.Tests.Reactive
             [Fact]
             public async Task EnsuresNonNullArguments()
             {
-                var client = new ObservableUserFollowersClient(Substitute.For<IGitHubClient>());
+                var client = new ObservableFollowersClient(Substitute.For<IGitHubClient>());
 
                 await AssertEx.Throws<ArgumentNullException>(async () => await client.IsFollowing(null, "alfhenrik-test"));
                 await AssertEx.Throws<ArgumentException>(async () => await client.IsFollowing("", "alfhenrik-test"));
@@ -147,7 +147,7 @@ namespace Octokit.Tests.Reactive
             public void FollowFromClientUserFollowers()
             {
                 var githubClient = Substitute.For<IGitHubClient>();
-                var client = new ObservableUserFollowersClient(githubClient);
+                var client = new ObservableFollowersClient(githubClient);
 
                 client.Follow("alfhenrik");
 
@@ -158,7 +158,7 @@ namespace Octokit.Tests.Reactive
             [Fact]
             public async Task EnsuresNonNullArguments()
             {
-                var client = new ObservableUserFollowersClient(Substitute.For<IGitHubClient>());
+                var client = new ObservableFollowersClient(Substitute.For<IGitHubClient>());
 
                 await AssertEx.Throws<ArgumentNullException>(async () => await client.Follow(null));
                 await AssertEx.Throws<ArgumentException>(async () => await client.Follow(""));
@@ -171,7 +171,7 @@ namespace Octokit.Tests.Reactive
             public void UnfollowFromClientUserFollowers()
             {
                 var githubClient = Substitute.For<IGitHubClient>();
-                var client = new ObservableUserFollowersClient(githubClient);
+                var client = new ObservableFollowersClient(githubClient);
 
                 client.Unfollow("alfhenrik");
 
@@ -182,7 +182,7 @@ namespace Octokit.Tests.Reactive
             [Fact]
             public async Task EnsuresNonNullArguments()
             {
-                var client = new ObservableUserFollowersClient(Substitute.For<IGitHubClient>());
+                var client = new ObservableFollowersClient(Substitute.For<IGitHubClient>());
 
                 await AssertEx.Throws<ArgumentNullException>(async () => await client.Unfollow(null));
                 await AssertEx.Throws<ArgumentException>(async () => await client.Unfollow(""));
diff --git a/Octokit/Clients/UserFollowersClient.cs b/Octokit/Clients/FollowersClient.cs
similarity index 98%
rename from Octokit/Clients/UserFollowersClient.cs
rename to Octokit/Clients/FollowersClient.cs
index ebd3c9a3..c4ba64dc 100644
--- a/Octokit/Clients/UserFollowersClient.cs
+++ b/Octokit/Clients/FollowersClient.cs
@@ -13,13 +13,13 @@ namespace Octokit
     /// <remarks>
     /// See the <a href="http://developer.github.com/v3/users/followers/">Followers API documentation</a> for more information.
     ///</remarks>
-    public class UserFollowersClient : ApiClient, IUserFollowersClient
+    public class FollowersClient : ApiClient, IFollowersClient
     {
         /// <summary>
         /// Initializes a new GitHub User Followers API client.
         /// </summary>
         /// <param name="apiConnection">An API connection</param>
-        public UserFollowersClient(IApiConnection apiConnection) : base(apiConnection) 
+        public FollowersClient(IApiConnection apiConnection) : base(apiConnection) 
         { 
         }
 
diff --git a/Octokit/Clients/IUserFollowersClient.cs b/Octokit/Clients/IFollowersClient.cs
similarity index 99%
rename from Octokit/Clients/IUserFollowersClient.cs
rename to Octokit/Clients/IFollowersClient.cs
index b5b7487a..1813354e 100644
--- a/Octokit/Clients/IUserFollowersClient.cs
+++ b/Octokit/Clients/IFollowersClient.cs
@@ -10,7 +10,7 @@ namespace Octokit
     /// <remarks>
     /// See the <a href="http://developer.github.com/v3/users/followers/">Followers API documentation</a> for more information.
     ///</remarks>
-    public interface IUserFollowersClient
+    public interface IFollowersClient
     {
         /// <summary>
         /// List the authenticated user’s followers
diff --git a/Octokit/Clients/IUsersClient.cs b/Octokit/Clients/IUsersClient.cs
index 119ca011..eddc0039 100644
--- a/Octokit/Clients/IUsersClient.cs
+++ b/Octokit/Clients/IUsersClient.cs
@@ -48,6 +48,6 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="http://developer.github.com/v3/users/followers/">Followers API documentation</a> for more information.
         ///</remarks>
-        IUserFollowersClient Followers { get; }
+        IFollowersClient Followers { get; }
     }
 }
diff --git a/Octokit/Clients/UsersClient.cs b/Octokit/Clients/UsersClient.cs
index 4baf5203..c68ece71 100644
--- a/Octokit/Clients/UsersClient.cs
+++ b/Octokit/Clients/UsersClient.cs
@@ -23,7 +23,7 @@ namespace Octokit
         /// <param name="apiConnection">An API connection</param>
         public UsersClient(IApiConnection apiConnection) : base(apiConnection)
         {
-            Followers = new UserFollowersClient(apiConnection);
+            Followers = new FollowersClient(apiConnection);
         }
 
         /// <summary>
@@ -76,6 +76,6 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="http://developer.github.com/v3/users/followers/">Followers API documentation</a> for more information.
         ///</remarks>
-        public IUserFollowersClient Followers { get; private set; }
+        public IFollowersClient Followers { get; private set; }
     }
 }
diff --git a/Octokit/Octokit-Mono.csproj b/Octokit/Octokit-Mono.csproj
index 1ed9a1e1..e04ec6ec 100644
--- a/Octokit/Octokit-Mono.csproj
+++ b/Octokit/Octokit-Mono.csproj
@@ -255,6 +255,8 @@
     <Compile Include="Models\Response\Emoji.cs" />
     <Compile Include="Clients\IUserFollowersClient.cs" />
     <Compile Include="Clients\UserFollowersClient.cs" />
+    <Compile Include="Clients\FollowersClient.cs" />
+    <Compile Include="Clients\IFollowersClient.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Octokit/Octokit-MonoAndroid.csproj b/Octokit/Octokit-MonoAndroid.csproj
index 9e04b8d5..0f8c4cf6 100644
--- a/Octokit/Octokit-MonoAndroid.csproj
+++ b/Octokit/Octokit-MonoAndroid.csproj
@@ -265,6 +265,8 @@
     <Compile Include="Models\Response\Emoji.cs" />
     <Compile Include="Clients\IUserFollowersClient.cs" />
     <Compile Include="Clients\UserFollowersClient.cs" />
+    <Compile Include="Clients\FollowersClient.cs" />
+    <Compile Include="Clients\IFollowersClient.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Octokit/Octokit-Monotouch.csproj b/Octokit/Octokit-Monotouch.csproj
index 10972e28..40fb75ce 100644
--- a/Octokit/Octokit-Monotouch.csproj
+++ b/Octokit/Octokit-Monotouch.csproj
@@ -260,6 +260,8 @@
     <Compile Include="Models\Response\Emoji.cs" />
     <Compile Include="Clients\IUserFollowersClient.cs" />
     <Compile Include="Clients\UserFollowersClient.cs" />
+    <Compile Include="Clients\FollowersClient.cs" />
+    <Compile Include="Clients\IFollowersClient.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Octokit/Octokit-netcore45.csproj b/Octokit/Octokit-netcore45.csproj
index 527d7489..c855b507 100644
--- a/Octokit/Octokit-netcore45.csproj
+++ b/Octokit/Octokit-netcore45.csproj
@@ -57,6 +57,7 @@
     <Compile Include="Clients\CommitsClient.cs" />
     <Compile Include="Clients\CommitStatusClient.cs" />
     <Compile Include="Clients\EventsClient.cs" />
+    <Compile Include="Clients\FollowersClient.cs" />
     <Compile Include="Clients\GistsClient.cs" />
     <Compile Include="Clients\GitDatabaseClient.cs" />
     <Compile Include="Clients\IActivitiesClient.cs" />
@@ -66,6 +67,7 @@
     <Compile Include="Clients\ICommitsClient.cs" />
     <Compile Include="Clients\ICommitStatusClient.cs" />
     <Compile Include="Clients\IEventsClient.cs" />
+    <Compile Include="Clients\IFollowersClient.cs" />
     <Compile Include="Clients\IGistsClient.cs" />
     <Compile Include="Clients\IGitDatabaseClient.cs" />
     <Compile Include="Clients\IIssueCommentsClient.cs" />
@@ -89,7 +91,6 @@
     <Compile Include="Clients\IssuesEventsClient.cs" />
     <Compile Include="Clients\ITreesClient.cs" />
     <Compile Include="Clients\ITeamsClient.cs" />
-    <Compile Include="Clients\IUserFollowersClient.cs" />
     <Compile Include="Clients\IUsersClient.cs" />
     <Compile Include="Clients\IWatchedClient.cs" />
     <Compile Include="Clients\MilestonesClient.cs" />
@@ -105,7 +106,6 @@
     <Compile Include="Clients\TagsClient.cs" />
     <Compile Include="Clients\TreesClient.cs" />
     <Compile Include="Clients\TeamsClient.cs" />
-    <Compile Include="Clients\UserFollowersClient.cs" />
     <Compile Include="Clients\UsersClient.cs" />
     <Compile Include="Clients\WatchedClient.cs" />
     <Compile Include="Exceptions\ApiException.cs" />
diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj
index 3785beb5..6402442c 100644
--- a/Octokit/Octokit.csproj
+++ b/Octokit/Octokit.csproj
@@ -55,11 +55,11 @@
     </Compile>
     <Compile Include="Clients\ActivitiesClient.cs" />
     <Compile Include="Clients\IWatchedClient.cs" />
-    <Compile Include="Clients\IUserFollowersClient.cs" />
     <Compile Include="Clients\SearchClient.cs" />
     <Compile Include="Clients\ISearchClient.cs" />
     <Compile Include="Clients\WatchedClient.cs" />
-    <Compile Include="Clients\UserFollowersClient.cs" />
+    <Compile Include="Clients\IFollowersClient.cs" />
+    <Compile Include="Clients\FollowersClient.cs" />
     <Compile Include="Models\Request\BaseSearchRequest.cs" />
     <Compile Include="Helpers\EnumExtensions.cs">
       <SubType>Code</SubType>