diff --git a/cloudcafe/cloudkeep/barbican/client.py b/cloudcafe/cloudkeep/barbican/client.py
index a5eb8a0a..1d30cfa8 100644
--- a/cloudcafe/cloudkeep/barbican/client.py
+++ b/cloudcafe/cloudkeep/barbican/client.py
@@ -13,10 +13,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from cafe.engine.http.client import AutoMarshallingHttpClient
+from cafe.engine.http.client import AutoMarshallingHTTPClient
 
 
-class BarbicanRestClient(AutoMarshallingHttpClient):
+class BarbicanRestClient(AutoMarshallingHTTPClient):
     def __init__(self, token=None, serialize_format=None,
                  deserialize_format=None):
         super(BarbicanRestClient, self).__init__(
diff --git a/cloudcafe/database/client.py b/cloudcafe/database/client.py
index 314a030a..553b588e 100644
--- a/cloudcafe/database/client.py
+++ b/cloudcafe/database/client.py
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from cafe.engine.http.client import AutoMarshallingHttpClient
+from cafe.engine.http.client import AutoMarshallingHTTPClient
 
 from reddwarfclient import *
 from reddwarfclient import xml
 
 
-class DBaaSAPIClient(AutoMarshallingHttpClient):
+class DBaaSAPIClient(AutoMarshallingHTTPClient):
     """
     This class can be used to call directly into the REST API and
     wraps the python-reddwarfclient (so you can use that too)!
diff --git a/cloudcafe/images/v1/client.py b/cloudcafe/images/v1/client.py
index d1860961..6041220e 100644
--- a/cloudcafe/images/v1/client.py
+++ b/cloudcafe/images/v1/client.py
@@ -13,12 +13,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from cafe.engine.http.client import AutoMarshallingHttpClient
+from cafe.engine.http.client import AutoMarshallingHTTPClient
 from cloudcafe.images.v1.models.image import Image, ImageMinList
 from cloudcafe.images.v1.models.member import MemberList
 
 
-class ImagesClient(AutoMarshallingHttpClient):
+class ImagesClient(AutoMarshallingHTTPClient):
     """Client for Image API."""
 
     def __init__(self, url, auth_token, serialize_format, deserialize_format):
diff --git a/cloudcafe/images/v2/client.py b/cloudcafe/images/v2/client.py
index 984c5bf6..59338ca6 100644
--- a/cloudcafe/images/v2/client.py
+++ b/cloudcafe/images/v2/client.py
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from cafe.engine.http.client import AutoMarshallingHttpClient
+from cafe.engine.http.client import AutoMarshallingHTTPClient
 from cloudcafe.images.v2.models.image import (Image, Images, ImageUpdate,
                                               Member, Members)
 from cloudcafe.images.v2.models.task import Task, Tasks
 
 
-class ImagesClient(AutoMarshallingHttpClient):
+class ImagesClient(AutoMarshallingHTTPClient):
     """@summary: Client for Images v2"""
 
     def __init__(self, base_url, auth_token, serialize_format,
diff --git a/cloudcafe/stacktach/stacktach_db_api/client.py b/cloudcafe/stacktach/stacktach_db_api/client.py
index 033d6ce4..70e90121 100644
--- a/cloudcafe/stacktach/stacktach_db_api/client.py
+++ b/cloudcafe/stacktach/stacktach_db_api/client.py
@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from cafe.engine.http.client import AutoMarshallingHttpClient
+from cafe.engine.http.client import AutoMarshallingHTTPClient
 
 from cloudcafe.stacktach.stacktach_db_api.models.stacktach_db_api import \
     (ServerLaunch, ServerLaunches, ServerDelete, ServerDeletes,
      ServerExist, ServerExists, ImageUsages, ImageDeletes, ImageExists)
 
 
-class StackTachDBClient(AutoMarshallingHttpClient):
+class StackTachDBClient(AutoMarshallingHTTPClient):
 
     def __init__(self, db_url, serialize_format, deserialize_format=None):
         super(StackTachDBClient, self).__init__(serialize_format,
diff --git a/cloudcafe/stacktach/stacky_api/client.py b/cloudcafe/stacktach/stacky_api/client.py
index 03c77bff..9cbe9b73 100644
--- a/cloudcafe/stacktach/stacky_api/client.py
+++ b/cloudcafe/stacktach/stacky_api/client.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from cafe.engine.http.client import AutoMarshallingHttpClient
+from cafe.engine.http.client import AutoMarshallingHTTPClient
 
 from cloudcafe.stacktach.stacky_api.models.stacky_api import \
     (Deployments, EventNames, HostNames, TimingsSummaries,
@@ -22,7 +22,7 @@ from cloudcafe.stacktach.stacky_api.models.stacky_api import \
      KpiDetails, WatchEvents, Reports, EventIdDetails)
 
 
-class StackTachClient(AutoMarshallingHttpClient):
+class StackTachClient(AutoMarshallingHTTPClient):
 
     def __init__(self, url, serialize_format, deserialize_format=None):
         super(StackTachClient, self).__init__(serialize_format,