diff --git a/jupyter_client/kernelspecapp.py b/jupyter_client/kernelspecapp.py
index a4b8aa357..4ed7ba17e 100644
--- a/jupyter_client/kernelspecapp.py
+++ b/jupyter_client/kernelspecapp.py
@@ -52,7 +52,7 @@ def _kernel_name_default(self):
     replace = Bool(False, config=True,
         help="Replace any existing kernel spec with this name."
     )
-    
+
     aliases = {'name': 'InstallKernelSpec.kernel_name'}
     aliases.update(base_aliases)
 
@@ -119,8 +119,8 @@ def start(self):
             self.exit(e)
 
 class KernelSpecApp(Application):
-    name = "ipython kernelspec"
-    description = """Manage IPython kernel specifications."""
+    name = "jupyter kernelspec"
+    description = """Manage Jupyter kernel specifications."""
 
     subcommands = Dict({
         'list': (ListKernelSpecs, ListKernelSpecs.description.splitlines()[0]),
diff --git a/jupyter_client/tests/test_adapter.py b/jupyter_client/tests/test_adapter.py
index e6f531f01..663a9f895 100644
--- a/jupyter_client/tests/test_adapter.py
+++ b/jupyter_client/tests/test_adapter.py
@@ -1,4 +1,4 @@
-"""Tests for adapting IPython msg spec versions"""
+"""Tests for adapting Jupyter msg spec versions"""
 
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.