diff --git a/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs b/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs
index a7f26489..f7ab6835 100644
--- a/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs
@@ -11,7 +11,7 @@ public class DeploymentStatusClientTests : IDisposable
     IDeploymentsClient _deploymentsClient;
     Repository _repository;
     Commit _commit;
-    GitDeployment _deployment;
+    Deployment _deployment;
     string _repositoryOwner;
 
     public DeploymentStatusClientTests()
diff --git a/Octokit.Tests/Clients/DeploymentsClientTests.cs b/Octokit.Tests/Clients/DeploymentsClientTests.cs
index 21f97ec0..b1e73f17 100644
--- a/Octokit.Tests/Clients/DeploymentsClientTests.cs
+++ b/Octokit.Tests/Clients/DeploymentsClientTests.cs
@@ -52,7 +52,7 @@ public class DeploymentsClientTests
             var expectedUrl = "repos/owner/name/deployments";
 
             client.GetAll("owner", "name");
-            connection.Received().GetAll<GitDeployment>(Arg.Is<Uri>(u => u.ToString() == expectedUrl),
+            connection.Received().GetAll<Deployment>(Arg.Is<Uri>(u => u.ToString() == expectedUrl),
                                                         Arg.Any<IDictionary<string, string>>(),
                                                         Arg.Any<string>());
         }
@@ -64,7 +64,7 @@ public class DeploymentsClientTests
             var client = new DeploymentsClient(connection);
 
             client.GetAll("owner", "name");
-            connection.Received().GetAll<GitDeployment>(Arg.Any<Uri>(),
+            connection.Received().GetAll<Deployment>(Arg.Any<Uri>(),
                                                         Arg.Any<IDictionary<string, string>>(),
                                                         expectedAcceptsHeader);
         }
@@ -115,7 +115,7 @@ public class DeploymentsClientTests
             var expectedUrl = "repos/owner/name/deployments";
 
             client.Create("owner", "name", newDeployment);
-            connection.Received().Post<GitDeployment>(Arg.Is<Uri>(u => u.ToString() == expectedUrl),
+            connection.Received().Post<Deployment>(Arg.Is<Uri>(u => u.ToString() == expectedUrl),
                                                       Arg.Any<NewDeployment>(),
                                                       Arg.Any<string>());
         }
@@ -127,7 +127,7 @@ public class DeploymentsClientTests
             var client = new DeploymentsClient(connection);
 
             client.Create("owner", "name", newDeployment);
-            connection.Received().Post<GitDeployment>(Arg.Any<Uri>(),
+            connection.Received().Post<Deployment>(Arg.Any<Uri>(),
                                                       newDeployment,
                                                       Arg.Any<string>());
         }
@@ -139,7 +139,7 @@ public class DeploymentsClientTests
             var client = new DeploymentsClient(connection);
 
             client.Create("owner", "name", newDeployment);
-            connection.Received().Post<GitDeployment>(Arg.Any<Uri>(),
+            connection.Received().Post<Deployment>(Arg.Any<Uri>(),
                                                       Arg.Any<NewDeployment>(),
                                                       Arg.Is(expectedAcceptsHeader));
         }
diff --git a/Octokit/Clients/DeploymentsClient.cs b/Octokit/Clients/DeploymentsClient.cs
index 5ded6e1a..665ff3d8 100644
--- a/Octokit/Clients/DeploymentsClient.cs
+++ b/Octokit/Clients/DeploymentsClient.cs
@@ -33,13 +33,13 @@ namespace Octokit
         /// </remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <returns>All the <see cref="GitDeployment"/>s for the specified repository.</returns>
-        public Task<IReadOnlyList<GitDeployment>> GetAll(string owner, string name)
+        /// <returns>All the <see cref="Deployment"/>s for the specified repository.</returns>
+        public Task<IReadOnlyList<Deployment>> GetAll(string owner, string name)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, "login");
             Ensure.ArgumentNotNullOrEmptyString(name, "name");
 
-            return ApiConnection.GetAll<GitDeployment>(ApiUrls.Deployments(owner, name),
+            return ApiConnection.GetAll<Deployment>(ApiUrls.Deployments(owner, name),
                                                        null, acceptsHeader);
         }
 
@@ -50,14 +50,14 @@ namespace Octokit
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="newDeployment">A <see cref="NewDeployment"/> instance describing the new deployment to create</param>
-        /// <returns>The created <see cref="GitDeployment"></returns>
-        public Task<GitDeployment> Create(string owner, string name, NewDeployment newDeployment)
+        /// <returns>The created <see cref="Deployment"></returns>
+        public Task<Deployment> Create(string owner, string name, NewDeployment newDeployment)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
             Ensure.ArgumentNotNullOrEmptyString(name, "name");
             Ensure.ArgumentNotNull(newDeployment, "deployment");
 
-            return ApiConnection.Post<GitDeployment>(ApiUrls.Deployments(owner, name),
+            return ApiConnection.Post<Deployment>(ApiUrls.Deployments(owner, name),
                                                      newDeployment, acceptsHeader);
         }
 
diff --git a/Octokit/Clients/IDeploymentsClient.cs b/Octokit/Clients/IDeploymentsClient.cs
index a07050f5..5bb557fd 100644
--- a/Octokit/Clients/IDeploymentsClient.cs
+++ b/Octokit/Clients/IDeploymentsClient.cs
@@ -21,8 +21,8 @@ namespace Octokit
         /// </remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <returns>All the <see cref="GitDeployment"/>s for the specified repository.</returns>
-        Task<IReadOnlyList<GitDeployment>> GetAll(string owner, string name);
+        /// <returns>All the <see cref="Deployment"/>s for the specified repository.</returns>
+        Task<IReadOnlyList<Deployment>> GetAll(string owner, string name);
         
         /// <summary>
         /// Creates a new deployment for the specified repository.
@@ -31,8 +31,8 @@ namespace Octokit
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="newDeployment">A <see cref="NewDeployment"/> instance describing the new deployment to create</param>
-        /// <returns>The created <see cref="GitDeployment"></returns>
-        Task<GitDeployment> Create(string owner, string name, NewDeployment newDeployment);
+        /// <returns>The created <see cref="Deployment"></returns>
+        Task<Deployment> Create(string owner, string name, NewDeployment newDeployment);
 
         /// <summary>
         /// Client for managing deployment status.
diff --git a/Octokit/Models/Response/GitDeployment.cs b/Octokit/Models/Response/Deployment.cs
similarity index 84%
rename from Octokit/Models/Response/GitDeployment.cs
rename to Octokit/Models/Response/Deployment.cs
index 0de5a91a..cf8e3623 100644
--- a/Octokit/Models/Response/GitDeployment.cs
+++ b/Octokit/Models/Response/Deployment.cs
@@ -1,8 +1,11 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Octokit
 {
-    public class GitDeployment
+    [SuppressMessage("Microsoft.Naming", "CA1724:TypeNamesShouldNotMatchNamespaces",
+        Justification="People can use fully qualified names if they want to use both.")]
+    public class Deployment
     {
         /// <summary>
         /// Id of this deployment.
diff --git a/Octokit/Octokit-Mono.csproj b/Octokit/Octokit-Mono.csproj
index 25d12f01..2d1fca44 100644
--- a/Octokit/Octokit-Mono.csproj
+++ b/Octokit/Octokit-Mono.csproj
@@ -250,10 +250,10 @@
     <Compile Include="Clients\DeploymentsClient.cs" />
     <Compile Include="Clients\IDeploymentsClient.cs" />
     <Compile Include="Models\Request\NewDeployment.cs" />
-    <Compile Include="Models\Response\GitDeployment.cs" />
     <Compile Include="Clients\IDeploymentStatusClient.cs" />
     <Compile Include="Models\Request\NewDeploymentStatus.cs" />
     <Compile Include="Models\Response\DeploymentStatus.cs" />
+    <Compile Include="Models\Response\Deployment.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 ff75e645..ef43300a 100644
--- a/Octokit/Octokit-MonoAndroid.csproj
+++ b/Octokit/Octokit-MonoAndroid.csproj
@@ -260,10 +260,10 @@
     <Compile Include="Clients\DeploymentsClient.cs" />
     <Compile Include="Clients\IDeploymentsClient.cs" />
     <Compile Include="Models\Request\NewDeployment.cs" />
-    <Compile Include="Models\Response\GitDeployment.cs" />
     <Compile Include="Clients\IDeploymentStatusClient.cs" />
     <Compile Include="Models\Request\NewDeploymentStatus.cs" />
     <Compile Include="Models\Response\DeploymentStatus.cs" />
+    <Compile Include="Models\Response\Deployment.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 4d6b1ad9..d1774b94 100644
--- a/Octokit/Octokit-Monotouch.csproj
+++ b/Octokit/Octokit-Monotouch.csproj
@@ -255,10 +255,10 @@
     <Compile Include="Clients\DeploymentsClient.cs" />
     <Compile Include="Clients\IDeploymentsClient.cs" />
     <Compile Include="Models\Request\NewDeployment.cs" />
-    <Compile Include="Models\Response\GitDeployment.cs" />
     <Compile Include="Clients\IDeploymentStatusClient.cs" />
     <Compile Include="Models\Request\NewDeploymentStatus.cs" />
     <Compile Include="Models\Response\DeploymentStatus.cs" />
+    <Compile Include="Models\Response\Deployment.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 41b181a8..1f420523 100644
--- a/Octokit/Octokit-netcore45.csproj
+++ b/Octokit/Octokit-netcore45.csproj
@@ -248,10 +248,10 @@
     <Compile Include="Clients\DeploymentsClient.cs" />
     <Compile Include="Clients\IDeploymentsClient.cs" />
     <Compile Include="Models\Request\NewDeployment.cs" />
-    <Compile Include="Models\Response\GitDeployment.cs" />
     <Compile Include="Clients\IDeploymentStatusClient.cs" />
     <Compile Include="Models\Request\NewDeploymentStatus.cs" />
     <Compile Include="Models\Response\DeploymentStatus.cs" />
+    <Compile Include="Models\Response\Deployment.cs" />
   </ItemGroup>
   <ItemGroup>
     <CodeAnalysisDictionary Include="..\CustomDictionary.xml">
diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj
index 3587649b..24b9c7a9 100644
--- a/Octokit/Octokit.csproj
+++ b/Octokit/Octokit.csproj
@@ -59,7 +59,7 @@
     <Compile Include="Clients\IDeploymentStatusClient.cs" />
     <Compile Include="Models\Request\NewDeploymentStatus.cs" />
     <Compile Include="Models\Request\NewDeployment.cs" />
-    <Compile Include="Models\Response\GitDeployment.cs" />
+    <Compile Include="Models\Response\Deployment.cs" />
     <Compile Include="Clients\DeploymentsClient.cs" />
     <Compile Include="Clients\IDeploymentsClient.cs" />
     <Compile Include="Clients\SearchClient.cs" />