diff --git a/monitoring-for-openstack/oschecks/cinder.py b/monitoring-for-openstack/oschecks/cinder.py
index 58ce45b..9f11d0d 100644
--- a/monitoring-for-openstack/oschecks/cinder.py
+++ b/monitoring-for-openstack/oschecks/cinder.py
@@ -41,7 +41,11 @@ def _check_cinder_api():
 
     def quotas_list():
         try:
-            return client.quotas.get(options.os_tenant_name)
+            return client.quotas.get(
+                getattr(options, 'os_project_name',
+                    getattr(options, 'os_tenant_name', None)
+                )
+            )
         except Exception as ex:
             utils.critical(str(ex))
 
@@ -95,8 +99,7 @@ class CinderUtils(object):
         if not self.connection_done or force:
             try:
                 # force a connection to the server
-                self.connection_done = self.client.limits.get(
-                                            tenant_id=self.project)
+                self.connection_done = self.client.limits.get()
             except Exception as e:
                 utils.critical("Cannot connect to cinder: %s" % e)
 
diff --git a/monitoring-for-openstack/oschecks/utils.py b/monitoring-for-openstack/oschecks/utils.py
index 3c579a9..bbc949d 100644
--- a/monitoring-for-openstack/oschecks/utils.py
+++ b/monitoring-for-openstack/oschecks/utils.py
@@ -238,8 +238,16 @@ class Cinder(object):
             client = client.get_client_class(api_version)(
                 options.os_username,
                 options.os_password,
-                options.os_tenant_name,
-                tenant_id=options.os_tenant_id,
+                tenant_name=getattr(
+                    options, 'os_project_name', getattr(
+                        options, 'os_tenant_name', None
+                    )
+                ),
+                tenant_id=getattr(
+                    options, 'os_project_id', getattr(
+                        options, 'os_tenant_id', None
+                    )
+                ),
                 auth_url=options.os_auth_url,
                 region_name=options.os_region_name,
                 cacert=options.os_cacert,