diff --git a/packages/cli/bin/inquiries/edition.js b/packages/cli/bin/inquiries/edition.js
index 117fc92caa..f62dba232f 100644
--- a/packages/cli/bin/inquiries/edition.js
+++ b/packages/cli/bin/inquiries/edition.js
@@ -12,20 +12,16 @@ const editionSetup = [
   {
     type: 'list',
     name: 'edition',
-    message: 'Which edition do you want to use (defaults to edition-node)?',
+    message: 'What templating language do you want to use with Pattern Lab?',
     choices: [
       {
-        name: 'edition-node (handlebars engine)',
+        name: 'Handlebars',
         value: '@pattern-lab/edition-node',
       },
       {
-        name: 'edition-twig (php engine)',
+        name: 'Twig (PHP)',
         value: '@pattern-lab/edition-twig',
       },
-      {
-        name: 'edition-node-gulp (legacy)',
-        value: '@pattern-lab/edition-node-gulp',
-      },
       new inquirer.Separator(),
       {
         name: 'None',
@@ -34,7 +30,7 @@ const editionSetup = [
     ],
     default: function() {
       return {
-        name: 'edition-node',
+        name: 'Handlebars',
         value: '@pattern-lab/edition-node',
       };
     },
diff --git a/packages/cli/bin/inquiries/starterkit.js b/packages/cli/bin/inquiries/starterkit.js
index abbdc24696..523eb64bc9 100644
--- a/packages/cli/bin/inquiries/starterkit.js
+++ b/packages/cli/bin/inquiries/starterkit.js
@@ -7,41 +7,21 @@ const starterkitSetup = [
   {
     type: 'list',
     name: 'starterkit',
-    message: 'Which starterkit do you want to use?',
+    message: 'What initial patterns do you want included in your project?',
     choices: [
       {
-        name: 'starterkit-handlebars-demo (Recommended)',
-        value: '@pattern-lab/starterkit-handlebars-demo',
-      },
-      {
-        name: 'starterkit-handlebars-vanilla (Recommended)',
+        name:
+          'Handlebars base patterns (some basic patterns to get started with)',
         value: '@pattern-lab/starterkit-handlebars-vanilla',
       },
       {
-        name: 'starterkit-twig-demo (Recommended)',
-        value: '@pattern-lab/starterkit-twig-demo',
-      },
-      {
-        name: 'starterkit-mustache-bootstrap',
-        value: 'starterkit-mustache-bootstrap',
-      },
-      {
-        name: 'starterkit-mustache-demo',
-        value: '@pattern-lab/starterkit-mustache-demo',
-      },
-      {
-        name: 'starterkit-mustache-foundation',
-        value: 'starterkit-mustache-foundation',
-      },
-      {
-        name: 'starterkit-mustache-materialdesign',
-        value: 'starterkit-mustache-materialdesign',
+        name: 'Handlebars demo patterns (full demo website and patterns)',
+        value: '@pattern-lab/starterkit-handlebars-demo',
       },
       {
-        name: 'starterkit-mustache-base',
-        value: '@pattern-lab/starterkit-mustache-base',
+        name: 'Twig (PHP) demo patterns (full demo website and patterns)',
+        value: '@pattern-lab/starterkit-twig-demo',
       },
-
       new inquirer.Separator(),
       {
         name: 'Custom starterkit',
@@ -49,12 +29,12 @@ const starterkitSetup = [
       },
       new inquirer.Separator(),
       {
-        name: 'None (Start a blank project)',
+        name: 'Blank project (no patterns)',
         value: false,
       },
     ],
     default: {
-      name: 'starterkit-handlebars-demo',
+      name: 'Handlebars demo patterns (full demo website and patterns)',
       value: 'starterkit-handlebars-demo',
     },
   },