diff --git a/README.rst b/README.rst
index 73b5db0..5b5782c 100644
--- a/README.rst
+++ b/README.rst
@@ -7,7 +7,6 @@ Evoque is a ticket service for OpenStack.
 * `Blueprints`_ - feature specifications
 * `Bugs`_ - issue tracking
 * `Source`_
-* `Specs`_
 * `How to Contribute`_
 
 .. _Launchpad project: https://launchpad.net/python-evoqueclient
diff --git a/evoqueclient/shell.py b/evoqueclient/shell.py
index 8635122..7952e8e 100644
--- a/evoqueclient/shell.py
+++ b/evoqueclient/shell.py
@@ -67,7 +67,7 @@ class EvoqueShell(object):
         parser.add_argument('-k', '--insecure',
                             default=False,
                             action='store_true',
-                            help="Explicitly allow muranoclient to perform "
+                            help="Explicitly allow evoqueclient to perform "
                                  "\"insecure\" SSL (https) requests. "
                                  "The server's certificate will "
                                  "not be verified against any certificate "
@@ -280,11 +280,11 @@ class EvoqueShell(object):
                                    " env[OS_AUTH_TOKEN]")
 
         if args.os_no_client_auth:
-            if not args.murano_url:
+            if not args.evoque_url:
                 raise exc.CommandError(
                     "If you specify --os-no-client-auth"
-                    " you must also specify a Murano API URL"
-                    " via either --murano-url or env[MURANO_URL]")
+                    " you must also specify a Evoque API URL"
+                    " via either --evoque-url or env[EVOQUE_URL]")
         else:
             # Tenant name or ID is needed to make keystoneclient retrieve a
             # service catalog, it's not required if os_no_client_auth is