diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py
index 1ac2f1067..0288b5e7c 100644
--- a/novaclient/v2/shell.py
+++ b/novaclient/v2/shell.py
@@ -907,8 +907,8 @@ def _print_flavor_list(flavors, show_extra_specs=False):
     type=int,
     default=None,
     help=_("Maximum number of flavors to display. If limit is bigger than "
-           "'osapi_max_limit' option of Nova API, limit 'osapi_max_limit' "
-           "will be used instead."))
+           "'CONF.api.max_limit' option of Nova API, limit "
+           "'CONF.api.max_limit' will be used instead."))
 @utils.arg(
     '--sort-key',
     dest='sort_key',
@@ -1599,8 +1599,8 @@ def do_image_delete(cs, args):
     type=int,
     default=None,
     help=_("Maximum number of servers to display. If limit == -1, all servers "
-           "will be displayed. If limit is bigger than 'osapi_max_limit' "
-           "option of Nova API, limit 'osapi_max_limit' will be used "
+           "will be displayed. If limit is bigger than 'CONF.api.max_limit' "
+           "option of Nova API, limit 'CONF.api.max_limit' will be used "
            "instead."))
 @utils.arg(
     '--changes-since',
@@ -3323,8 +3323,8 @@ def do_keypair_list(cs, args):
     type=int,
     default=None,
     help=_("Maximum number of keypairs to display. If limit is bigger than "
-           "'osapi_max_limit' option of Nova API, limit 'osapi_max_limit' "
-           "will be used instead."))
+           "'CONF.api.max_limit' option of Nova API, limit "
+           "'CONF.api.max_limit' will be used instead."))
 def do_keypair_list(cs, args):
     """Print a list of keypairs for a user"""
     keypairs = cs.keypairs.list(args.user, args.marker, args.limit)
@@ -4194,8 +4194,8 @@ def do_hypervisor_list(cs, args):
     type=int,
     default=None,
     help=_("Maximum number of hypervisors to display. If limit is bigger than "
-           "'osapi_max_limit' option of Nova API, limit 'osapi_max_limit' "
-           "will be used instead."))
+           "'CONF.api.max_limit' option of Nova API, limit "
+           "'CONF.api.max_limit' will be used instead."))
 def do_hypervisor_list(cs, args):
     """List hypervisors."""
     _do_hypervisor_list(