diff --git a/neutronclient/neutron/v2_0/qos/policy.py b/neutronclient/neutron/v2_0/qos/policy.py
index ffea133..61ca09e 100755
--- a/neutronclient/neutron/v2_0/qos/policy.py
+++ b/neutronclient/neutron/v2_0/qos/policy.py
@@ -20,7 +20,7 @@ from neutronclient.neutron import v2_0 as neutronv20

 def get_qos_policy_id(client, policy_id_or_name):
     _policy_id = neutronv20.find_resourceid_by_name_or_id(client,
-                                                          'qos_policy',
+                                                          'policy',
                                                           policy_id_or_name)
     return _policy_id

diff --git a/neutronclient/neutron/v2_0/qos/rule.py b/neutronclient/neutron/v2_0/qos/rule.py
index 1b0a85f..62b52ad 100644
--- a/neutronclient/neutron/v2_0/qos/rule.py
+++ b/neutronclient/neutron/v2_0/qos/rule.py
@@ -54,7 +54,7 @@ class ListQoSRuleTypes(neutronv20.ListCommand):
 class ListQoSRules(neutronv20.ListCommand):
     """List all qos rules belonging to the specified policy."""

-    resource = 'qos_policy'
+    resource = 'policy'

     list_columns = ['id']
     _formatters = {}
@@ -74,13 +74,18 @@ class ListQoSRules(neutronv20.ListCommand):
         neutron_client.format = parsed_args.request_format
         _policy_id = qos_policy.get_qos_policy_id(neutron_client,
                                                   parsed_args.policy)
-        neutron_client.list_qos_rules(_policy_id)
+        return neutron_client.list_qos_rules(_policy_id)
+
+    def call_server(self, neutron_client, search_opts, parsed_args):
+        _policy_id = qos_policy.get_qos_policy_id(neutron_client,
+                                                  parsed_args.policy)
+        return neutron_client.list_qos_rules(_policy_id)


 class ShowQoSRule(neutronv20.ShowCommand):
     """Show information about the given qos rule."""

-    resource = 'qos_policy'
+    resource = 'policy'

     def add_known_arguments(self, parser):
         add_rule_argument(parser)
@@ -96,7 +101,13 @@ class ShowQoSRule(neutronv20.ShowCommand):
         self.args2body(parsed_args)
         _policy_id = qos_policy.get_qos_policy_id(neutron_client,
                                                   parsed_args.id)
-        neutron_client.show_qos_rule(_policy_id, parsed_args.rule)
+        return neutron_client.show_qos_rule(_policy_id, parsed_args.rule)
+
+    def call_server(self, neutron_client, search_opts, parsed_args):
+        self.args2body(parsed_args)
+        _policy_id = qos_policy.get_qos_policy_id(neutron_client,
+                                                  parsed_args.id)
+        return neutron_client.show_qos_rule(_policy_id, parsed_args.rule)


 class DeleteQoSRule(neutronv20.DeleteCommand):
diff --git a/neutronclient/v2_0/client.py b/neutronclient/v2_0/client.py
index 84c2b55..a09e6c1 100644
--- a/neutronclient/v2_0/client.py
+++ b/neutronclient/v2_0/client.py
@@ -429,12 +429,12 @@ class Client(ClientBase):
     net_partition_path = "/net-partitions/%s"
     qos_policies_path = "/qos/policies"
     qos_policy_path = "/qos/policies/%s"
-    qos_rules_path = "/qos/policies/%(policy)s/"
-    qos_rule_path = "/qos/policies/%(policy)s/%(rule)s"
+    qos_rules_path = "/qos/policies/%(policy)s"
+    qos_rule_path = "/qos/policies/%(policy)s/bandwidth_limit_rules/%(rule)s"
     qos_bandwidth_limit_rules_path = (qos_rules_path +
-                                      "bandwidth_limit_rules")
+                                      "/bandwidth_limit_rules")
     qos_bandwidth_limit_rule_path = (qos_rules_path +
-                                     "bandwidth_limit_rules/%(rule)s")
+                                     "/bandwidth_limit_rules/%(rule)s")
     qos_rule_types_path = "/qos/rule-types"
     qos_rule_type_path = "/qos/rule-types/%s"

@@ -1615,7 +1615,7 @@ class Client(ClientBase):
         return self.delete(self.packet_filter_path % packet_filter_id)

     @APIParamsCall
-    def list_qos_policies(self, retrieve_all=True, **_params):
+    def list_policies(self, retrieve_all=True, **_params):
         """Fetches a list of all qos policies for a tenant."""
         # Pass filters in "params" argument to do_request

@@ -1653,7 +1653,7 @@ class Client(ClientBase):
     @APIParamsCall
     def list_qos_rules(self, policy, retrieve_all=True, **_params):
         """Fetches a list of all qos rules for the given policy."""
-        return self.list('rules', self.qos_rules_path % {'policy': policy},
+        return self.list('policy', self.qos_rules_path % {'policy': policy},
                          retrieve_all, **_params)

     @APIParamsCall