diff --git a/pywb/manager/manager.py b/pywb/manager/manager.py
index 6a1e83fb..04114250 100644
--- a/pywb/manager/manager.py
+++ b/pywb/manager/manager.py
@@ -302,10 +302,10 @@ directory structure expected by pywb
         migrate = MigrateCDX(path)
         count = migrate.count_cdx()
         if count == 0:
-            print('Index files up-to-date, nothing to migrate')
+            print('Index files up-to-date, nothing to convert')
             return
 
-        msg = 'Migrate {0} index files? (y/n)'.format(count)
+        msg = 'Convert {0} index files? (y/n)'.format(count)
         if not force:
             res = get_input(msg)
             try:
@@ -449,7 +449,7 @@ Create manage file based web archive collections
         m.migrate_cdxj(r.path, r.force)
 
     migrate_help = 'Convert any existing archive indexes to new json format'
-    migrate = subparsers.add_parser('migrate', help=migrate_help)
+    migrate = subparsers.add_parser('convert-cdx', help=migrate_help)
     migrate.add_argument('path', default='./', nargs='?')
     migrate.add_argument('-f', '--force', action='store_true')
     migrate.set_defaults(func=do_migrate)
diff --git a/tests/test_auto_colls.py b/tests/test_auto_colls.py
index ff81b3f1..d261c3aa 100644
--- a/tests/test_auto_colls.py
+++ b/tests/test_auto_colls.py
@@ -419,7 +419,7 @@ class TestManagedColls(object):
         assert '- nested' in output
         assert '- test' in output
 
-    def test_migrate(self):
+    def test_convert_cdx(self):
         """ Create non-surt cdx, then convert to cdxj
         """
         migrate_dir = os.path.join(self.root_dir, '_migrate')
@@ -436,14 +436,14 @@ class TestManagedColls(object):
 
         @patch('pywb.manager.manager.get_input', lambda x: 'blah')
         def do_migrate_no():
-            main(['migrate', migrate_dir])
+            main(['convert-cdx', migrate_dir])
 
         do_migrate_no()
         assert os.listdir(migrate_dir) == cdxs
 
         @patch('pywb.manager.manager.get_input', lambda x: 'y')
         def do_migrate_yes():
-            main(['migrate', migrate_dir])
+            main(['convert-cdx', migrate_dir])
 
         do_migrate_yes()
         cdxjs = os.listdir(migrate_dir)
@@ -455,7 +455,7 @@ class TestManagedColls(object):
             assert fh.readline().startswith('org,iana)/ 20140126200624 {"url": "http://www.iana.org/",')
 
         # Nothing else to migrate
-        main(['migrate', migrate_dir])
+        main(['convert-cdx', migrate_dir])
 
     def test_auto_index(self):
         main(['init', 'auto'])