diff --git a/manilaclient/tests/unit/test_shell.py b/manilaclient/tests/unit/test_shell.py
index ed3480708..f82b5e50a 100644
--- a/manilaclient/tests/unit/test_shell.py
+++ b/manilaclient/tests/unit/test_shell.py
@@ -60,8 +60,8 @@ class ShellTest(utils.TestCase):
     def test_help(self):
         required = [
             '.*?^usage: ',
-            '.*?^\s+create\s+Creates new NAS storage '
-            '\(NFS, CIFS or GlusterFS\).',
+            '.*?^\s+create\s+Creates a new share '
+            '\(NFS, CIFS, GlusterFS or HDFS\).',
             '.*?(?m)^See "manila help COMMAND" for help '
             'on a specific command.',
         ]
diff --git a/manilaclient/v1/shares.py b/manilaclient/v1/shares.py
index 8a19476d8..a3e473035 100644
--- a/manilaclient/v1/shares.py
+++ b/manilaclient/v1/shares.py
@@ -136,7 +136,7 @@ class ShareManager(base.ManagerWithFind):
         :param snapshot_id: ID of the snapshot
         :param name: Name of the NAS
         :param description: Short description of a share
-        :param share_proto: Type of NAS (NFS or CIFS)
+        :param share_proto: Type of NAS (NFS, CIFS, GlusterFS or HDFS)
         :param metadata: Optional metadata to set on volume creation
         :rtype: :class:`Share`
         """
diff --git a/manilaclient/v1/shell.py b/manilaclient/v1/shell.py
index d99e155b5..3ce7c8ad9 100644
--- a/manilaclient/v1/shell.py
+++ b/manilaclient/v1/shell.py
@@ -335,7 +335,7 @@ def do_rate_limits(cs, args):
     'share_protocol',
     metavar='<share_protocol>',
     type=str,
-    help='Share type (NFS, CIFS or GlusterFS).')
+    help='Share type (NFS, CIFS, GlusterFS or HDFS).')
 @cliutils.arg(
     'size',
     metavar='<size>',
@@ -375,7 +375,7 @@ def do_rate_limits(cs, args):
     default=None)
 @cliutils.service_type('share')
 def do_create(cs, args):
-    """Creates new NAS storage (NFS, CIFS or GlusterFS)."""
+    """Creates a new share (NFS, CIFS, GlusterFS or HDFS)."""
 
     share_metadata = None
     if args.metadata is not None: