diff --git a/src/lib/schematics/collection.json b/src/lib/schematics/collection.json
index 58ef352854a9..e12c574a0493 100644
--- a/src/lib/schematics/collection.json
+++ b/src/lib/schematics/collection.json
@@ -5,8 +5,8 @@
     // Adds Angular Material to an application without changing any templates
     "ng-add": {
       "description": "Adds Angular Material to the application without affecting any templates",
-      "factory": "./install",
-      "schema": "./install/schema.json",
+      "factory": "./ng-add/index",
+      "schema": "./ng-add/schema.json",
       "aliases": ["material-shell", "install"]
     },
     // Create a dashboard component
diff --git a/src/lib/schematics/install/fonts/head-element.ts b/src/lib/schematics/ng-add/fonts/head-element.ts
similarity index 100%
rename from src/lib/schematics/install/fonts/head-element.ts
rename to src/lib/schematics/ng-add/fonts/head-element.ts
diff --git a/src/lib/schematics/install/fonts/material-fonts.ts b/src/lib/schematics/ng-add/fonts/material-fonts.ts
similarity index 100%
rename from src/lib/schematics/install/fonts/material-fonts.ts
rename to src/lib/schematics/ng-add/fonts/material-fonts.ts
diff --git a/src/lib/schematics/install/fonts/project-index-html.ts b/src/lib/schematics/ng-add/fonts/project-index-html.ts
similarity index 100%
rename from src/lib/schematics/install/fonts/project-index-html.ts
rename to src/lib/schematics/ng-add/fonts/project-index-html.ts
diff --git a/src/lib/schematics/install/gestures/hammerjs-import.ts b/src/lib/schematics/ng-add/gestures/hammerjs-import.ts
similarity index 100%
rename from src/lib/schematics/install/gestures/hammerjs-import.ts
rename to src/lib/schematics/ng-add/gestures/hammerjs-import.ts
diff --git a/src/lib/schematics/install/index.spec.ts b/src/lib/schematics/ng-add/index.spec.ts
similarity index 99%
rename from src/lib/schematics/install/index.spec.ts
rename to src/lib/schematics/ng-add/index.spec.ts
index bb82c1883c64..2330a901eaab 100644
--- a/src/lib/schematics/install/index.spec.ts
+++ b/src/lib/schematics/ng-add/index.spec.ts
@@ -9,7 +9,7 @@ import {collectionPath, createTestApp} from '../test-setup/test-app';
 import {getWorkspace, WorkspaceProject} from '@schematics/angular/utility/config';
 import {normalize} from '@angular-devkit/core';
 
-describe('material-install-schematic', () => {
+describe('ng-add schematic', () => {
   let runner: SchematicTestRunner;
   let appTree: Tree;
 
diff --git a/src/lib/schematics/install/index.ts b/src/lib/schematics/ng-add/index.ts
similarity index 100%
rename from src/lib/schematics/install/index.ts
rename to src/lib/schematics/ng-add/index.ts
diff --git a/src/lib/schematics/install/schema.json b/src/lib/schematics/ng-add/schema.json
similarity index 72%
rename from src/lib/schematics/install/schema.json
rename to src/lib/schematics/ng-add/schema.json
index 4188ae29dac3..5a3dcbd66529 100644
--- a/src/lib/schematics/install/schema.json
+++ b/src/lib/schematics/ng-add/schema.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsMaterialInstall",
-  "title": "Material Install Options Schema",
+  "id": "angular-material-ng-add",
+  "title": "Angular Material ng-add schematic",
   "type": "object",
   "properties": {
     "project": {
@@ -19,12 +19,14 @@
     "theme": {
       "enum": ["indigo-pink", "deeppurple-amber", "pink-bluegrey", "purple-green", "custom"],
       "default": "indigo-pink",
-      "description": "The theme to apply"
+      "description": "The theme to apply",
+      "x-prompt": "Enter a prebuilt theme name, or \"custom\" for a custom theme:"
     },
     "gestures": {
       "type": "boolean",
       "default": true,
-      "description": "Whether gesture support should be set up or not."
+      "description": "Whether gesture support should be set up or not.",
+      "x-prompt": "Set up HammerJS for gesture recognition?"
     }
   },
   "required": []
diff --git a/src/lib/schematics/install/schema.ts b/src/lib/schematics/ng-add/schema.ts
similarity index 100%
rename from src/lib/schematics/install/schema.ts
rename to src/lib/schematics/ng-add/schema.ts
diff --git a/src/lib/schematics/install/theming/custom-theme.ts b/src/lib/schematics/ng-add/theming/custom-theme.ts
similarity index 100%
rename from src/lib/schematics/install/theming/custom-theme.ts
rename to src/lib/schematics/ng-add/theming/custom-theme.ts
diff --git a/src/lib/schematics/install/theming/theming.ts b/src/lib/schematics/ng-add/theming/theming.ts
similarity index 100%
rename from src/lib/schematics/install/theming/theming.ts
rename to src/lib/schematics/ng-add/theming/theming.ts
diff --git a/src/lib/schematics/install/version-names.ts b/src/lib/schematics/ng-add/version-names.ts
similarity index 100%
rename from src/lib/schematics/install/version-names.ts
rename to src/lib/schematics/ng-add/version-names.ts