diff --git a/zunclient/shell.py b/zunclient/shell.py
index 19dc8828..a5b4ea4e 100644
--- a/zunclient/shell.py
+++ b/zunclient/shell.py
@@ -327,10 +327,10 @@ class OpenStackZunShell(object):
         parser.add_argument('--zun-api-version',
                             metavar='<zun-api-ver>',
                             default=cliutils.env(
-                                'MAGNUM_API_VERSION',
+                                'ZUN_API_VERSION',
                                 default=DEFAULT_API_VERSION),
                             help='Accepts "api", '
-                                 'defaults to env[MAGNUM_API_VERSION].')
+                                 'defaults to env[ZUN_API_VERSION].')
         parser.add_argument('--zun_api_version',
                             help=argparse.SUPPRESS)
 
@@ -351,7 +351,7 @@ class OpenStackZunShell(object):
                             help=argparse.SUPPRESS)
 
         parser.add_argument('--insecure',
-                            default=cliutils.env('MAGNUMCLIENT_INSECURE',
+                            default=cliutils.env('ZUNCLIENT_INSECURE',
                                                  default=False),
                             action='store_true',
                             help="Do not verify https connections")
diff --git a/zunclient/v1/containers.py b/zunclient/v1/containers.py
index 4ec52eb9..8ff3b505 100644
--- a/zunclient/v1/containers.py
+++ b/zunclient/v1/containers.py
@@ -52,8 +52,8 @@ class ContainerManager(base.Manager):
             1) limit > 0, the maximum number of containers to return.
             2) limit == 0, return the entire list of containers.
             3) limit param is NOT specified (None), the number of items
-               returned respect the maximum imposed by the Magnum API
-               (see Magnum's api.max_limit option).
+               returned respect the maximum imposed by the ZUN API
+               (see Zun's api.max_limit option).
 
         :param sort_key: Optional, field used for sorting.