diff --git a/cloudcafe/meniscus/common/cleanup_client.py b/cloudcafe/meniscus/common/cleanup_client.py
index 83378693..9f4464ce 100644
--- a/cloudcafe/meniscus/common/cleanup_client.py
+++ b/cloudcafe/meniscus/common/cleanup_client.py
@@ -13,7 +13,7 @@ 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.clients.mongo import BaseMongoClient
+from cafe.engine.mongo.client import BaseMongoClient
 
 
 class MeniscusDbClient(BaseMongoClient):
diff --git a/cloudcafe/meniscus/coordinator_api/client.py b/cloudcafe/meniscus/coordinator_api/client.py
index b14bc98c..0cfd5d67 100644
--- a/cloudcafe/meniscus/coordinator_api/client.py
+++ b/cloudcafe/meniscus/coordinator_api/client.py
@@ -13,7 +13,7 @@ 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.clients.rest import AutoMarshallingRestClient
+from cafe.engine.http.client import AutoMarshallingHTTPClient
 from cloudcafe.meniscus.common.models.system \
     import SystemInfo, DiskUsage, LoadAverage
 from cloudcafe.meniscus.coordinator_api.models.pairing \
@@ -22,7 +22,7 @@ from cloudcafe.meniscus.coordinator_api.models.routing import AllRoutes
 from cloudcafe.meniscus.coordinator_api.models.status import UpdateStatus
 
 
-class PairingClient(AutoMarshallingRestClient):
+class PairingClient(AutoMarshallingHTTPClient):
     def __init__(self, url, api_version, auth_token, serialize_format=None,
                  deserialize_format=None):
         super(PairingClient, self).__init__(serialize_format,
diff --git a/cloudcafe/meniscus/correlator_api/client.py b/cloudcafe/meniscus/correlator_api/client.py
index 59d7da3a..b6996d58 100644
--- a/cloudcafe/meniscus/correlator_api/client.py
+++ b/cloudcafe/meniscus/correlator_api/client.py
@@ -15,10 +15,10 @@ limitations under the License.
 """
 from cloudcafe.meniscus.correlator_api.models.publish \
     import PublishMessage, JobInformation
-from cafe.engine.clients.rest import AutoMarshallingRestClient
+from cafe.engine.http.client import AutoMarshallingHTTPClient
 
 
-class PublishingClient(AutoMarshallingRestClient):
+class PublishingClient(AutoMarshallingHTTPClient):
 
     def __init__(self, url, api_version, serialize_format=None,
                  deserialize_format=None):
diff --git a/cloudcafe/meniscus/status_api/client.py b/cloudcafe/meniscus/status_api/client.py
index 56573465..492c2d09 100644
--- a/cloudcafe/meniscus/status_api/client.py
+++ b/cloudcafe/meniscus/status_api/client.py
@@ -13,14 +13,14 @@ 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.clients.rest import AutoMarshallingRestClient
+from cafe.engine.http.client import AutoMarshallingHTTPClient
 from cloudcafe.meniscus.common.models.system import SystemInfo
 from cloudcafe.meniscus.status_api.models.status \
     import (AllWorkersStatus, WorkerStatus, WorkerLoadAverage,
             WorkerDiskUsage, WorkerStatusUpdate)
 
 
-class WorkerStatusClient(AutoMarshallingRestClient):
+class WorkerStatusClient(AutoMarshallingHTTPClient):
 
     def __init__(self, url, api_version, serialize_format,
                  deserialize_format):
diff --git a/cloudcafe/meniscus/tenant_api/client.py b/cloudcafe/meniscus/tenant_api/client.py
index aa4a3ea4..bec86e9f 100644
--- a/cloudcafe/meniscus/tenant_api/client.py
+++ b/cloudcafe/meniscus/tenant_api/client.py
@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from cafe.engine.clients.rest import AutoMarshallingRestClient
+from cafe.engine.http.client import AutoMarshallingHTTPClient
 from cloudcafe.meniscus.tenant_api.models.tenant import \
     Tenant, CreateTenant, ResetToken
 from cloudcafe.meniscus.tenant_api.models.producer import \
     CreateProducer, UpdateProducer, AllProducers, Producer
 
 
-class MeniscusClient(AutoMarshallingRestClient):
+class MeniscusClient(AutoMarshallingHTTPClient):
 
     def __init__(self, url, api_version, use_alternate=False,
                  serialize_format=None, deserialize_format=None):
diff --git a/cloudcafe/meniscus/version_api/client.py b/cloudcafe/meniscus/version_api/client.py
index 9cb8eb22..01d74baf 100644
--- a/cloudcafe/meniscus/version_api/client.py
+++ b/cloudcafe/meniscus/version_api/client.py
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from cafe.engine.clients.rest import AutoMarshallingRestClient
+from cafe.engine.http.client import AutoMarshallingHTTPClient
 from cloudcafe.meniscus.version_api.models.version import Version
 
 
-class VersionClient(AutoMarshallingRestClient):
+class VersionClient(AutoMarshallingHTTPClient):
     def __init__(self, url, serialize_format=None, deserialize_format=None):
         """
         @param url: Base URL of meniscus api