diff --git a/src/ClientContacts/ClientContactsApi.cs b/src/ClientContacts/ClientContactsApi.cs
index fd5cfc7..781862d 100644
--- a/src/ClientContacts/ClientContactsApi.cs
+++ b/src/ClientContacts/ClientContactsApi.cs
@@ -8,9 +8,9 @@ namespace Novaloop.PaymoApi.ClientContacts
 {
     public class ClientContactsApi : IClientContactsApi
     {
-        private readonly IBaseApi<GetClientContactsResponse, ClientContact> _baseApi;
+        private readonly IBaseApi<ClientContactsResponse, ClientContact> _baseApi;
 
-        public ClientContactsApi(IBaseApi<GetClientContactsResponse, ClientContact> baseApi)
+        public ClientContactsApi(IBaseApi<ClientContactsResponse, ClientContact> baseApi)
         {
             _baseApi = baseApi;
             _baseApi.ResourceUri = "clientcontacts";
diff --git a/src/ClientContacts/Models/GetClientContactsResponse.cs b/src/ClientContacts/Models/ClientContactsResponse.cs
similarity index 84%
rename from src/ClientContacts/Models/GetClientContactsResponse.cs
rename to src/ClientContacts/Models/ClientContactsResponse.cs
index 29b1ada..524fa34 100644
--- a/src/ClientContacts/Models/GetClientContactsResponse.cs
+++ b/src/ClientContacts/Models/ClientContactsResponse.cs
@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 
 namespace Novaloop.PaymoApi.ClientContacts.Models
 {
-    public class GetClientContactsResponse
+    public class ClientContactsResponse
     {
         [JsonProperty("clientcontacts")]
         public IEnumerable<ClientContact> ClientContacts { get; set; }
diff --git a/src/Extensions/PaymoApiExtensions.cs b/src/Extensions/PaymoApiExtensions.cs
index 77930d0..c6ca7fe 100644
--- a/src/Extensions/PaymoApiExtensions.cs
+++ b/src/Extensions/PaymoApiExtensions.cs
@@ -2,6 +2,7 @@ using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Novaloop.PaymoApi.ClientContacts;
+using Novaloop.PaymoApi.ClientContacts.Models;
 using Novaloop.PaymoApi.Clients;
 using Novaloop.PaymoApi.Clients.Models;
 using Novaloop.PaymoApi.Shared;
@@ -18,17 +19,17 @@ namespace Novaloop.PaymoApi.Extensions
             var resolvedOptions = (IOptions<ApiOptions>) services.BuildServiceProvider().GetService(typeof(IOptions<ApiOptions>));
             services.AddHttpClient<ApiClient>(client => { client.BaseAddress = new Uri(resolvedOptions.Value.BaseUrl); });
 
-            // Clients
-            services.AddTransient<IBaseApi<ClientsResponse, Client>, BaseApi<ClientsResponse, Client>>();
+            // ClientContacts
+            services.AddTransient<IBaseApi<ClientContactsResponse, Client>, BaseApi<ClientContactsResponse, Client>>();
             services.AddTransient<IClientsApi, ClientsApi>();
 
             // Tasks
-            services.AddTransient<ITasksApi, TasksApi>();
             services.AddTransient<IBaseApi<TasksResponse, Task>, BaseApi<TasksResponse, Task>>();
+            services.AddTransient<ITasksApi, TasksApi>();
 
             // Contacts
-            services.AddTransient<IClientContactsApi, ClientContactsApi>();
             services.AddTransient<IBaseApi<ClientsResponse, Client>, BaseApi<ClientsResponse, Client>>();
+            services.AddTransient<IClientContactsApi, ClientContactsApi>();
 
             return services;
         }
diff --git a/tests/ClientContactsApiTests.cs b/tests/ClientContactsApiTests.cs
index dab9473..e7615fd 100644
--- a/tests/ClientContactsApiTests.cs
+++ b/tests/ClientContactsApiTests.cs
@@ -22,7 +22,7 @@ namespace Novaloop.PaymoApi.Tests
 
         public ClientContactsApiTests()
         {
-            _clientContactsApi = new ClientContactsApi(new BaseApi<GetClientContactsResponse, ClientContact>(DependencyFactory.GeneratePaymoApiClient(), DependencyFactory.GenerateOptions()));
+            _clientContactsApi = new ClientContactsApi(new BaseApi<ClientContactsResponse, ClientContact>(DependencyFactory.GeneratePaymoApiClient(), DependencyFactory.GenerateOptions()));
             _clientsApi = new ClientsApi(new BaseApi<ClientsResponse, Client>(DependencyFactory.GeneratePaymoApiClient(), DependencyFactory.GenerateOptions()));
         }