diff --git a/novaclient/v1_1/quotas.py b/novaclient/v1_1/quotas.py
index a03c6c9f0..884f3a25b 100644
--- a/novaclient/v1_1/quotas.py
+++ b/novaclient/v1_1/quotas.py
@@ -17,12 +17,10 @@ from novaclient import base
 
 
 class QuotaSet(base.Resource):
+
     def get(self):
         self.manager.get(self)
 
-    def delete(self):
-        self.manager.delete(self)
-
     def update(self, *args, **kwargs):
         self.manager.update(self.tenant_id, *args, **kwargs)
 
@@ -30,44 +28,34 @@ class QuotaSet(base.Resource):
 class QuotaSetManager(base.ManagerWithFind):
     resource_class = QuotaSet
 
-    def list(self, defaults=False):
-        if defaults == True:
-            return self._list('/os-quotas?defaults=True',
-                              'quota_set_list')
-        else:
-            return self._list("/os-quotas", "quota_set_list")
-
     def get(self, tenant_id):
         if hasattr(tenant_id, 'tenant_id'):
-          tenant_id = tenant_id.tenant_id
-        return self._get("/os-quotas/%s" % (tenant_id), "quota_set")
+            tenant_id = tenant_id.tenant_id
+        return self._get("/os-quota-sets/%s" % (tenant_id), "quota_set")
 
     def update(self, tenant_id, metadata_items=None,
                injected_file_content_bytes=None, volumes=None, gigabytes=None,
-               ram=None, floating_ips=None, instances=None, injected_files=None,
-               cores=None):
+               ram=None, floating_ips=None, instances=None,
+               injected_files=None, cores=None):
 
         body = {'quota_set': {
-            'tenant_id': tenant_id,
-            'metadata_items': metadata_items,
-            'injected_file_content_bytes': injected_file_content_bytes,
-            'volumes': volumes,
-            'gigabytes': gigabytes,
-            'ram': ram,
-            'floating_ips': floating_ips,
-            'instances': instances,
-            'injected_files': injected_files,
-            'cores': cores,
-        }}
+                'tenant_id': tenant_id,
+                'metadata_items': metadata_items,
+                'injected_file_content_bytes': injected_file_content_bytes,
+                'volumes': volumes,
+                'gigabytes': gigabytes,
+                'ram': ram,
+                'floating_ips': floating_ips,
+                'instances': instances,
+                'injected_files': injected_files,
+                'cores': cores}}
 
         for key in body['quota_set'].keys():
             if body['quota_set'][key] == None:
                 body['quota_set'].pop(key)
 
-        return self._update('/os-quotas/%s' % (tenant_id), body)
-
-    def delete(self, tenant_id):
-        if hasattr(tenant_id, 'tenant_id'):
-          tenant_id = tenant_id.tenant_id
-        self._delete("/os-quotas/%s" % (tenant_id))
+        return self._update('/os-quota-sets/%s' % (tenant_id), body)
 
+    def defaults(self, tenant_id):
+        return self._get('/os-quota-sets/%s/defaults' % tenant_id,
+                         'quota_set_list')