diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
index e46eca429b..6c6f6f0b90 100644
--- a/packages/angular/cli/commands/definitions.json
+++ b/packages/angular/cli/commands/definitions.json
@@ -42,15 +42,13 @@
           "type": "boolean",
           "default": false,
           "aliases": [ "d" ],
-          "description": "When true, runs through and reports activity without writing out results.",
-          "x-user-analytics": 1
+          "description": "When true, runs through and reports activity without writing out results."
         },
         "force": {
           "type": "boolean",
           "default": false,
           "aliases": [ "f" ],
-          "description": "When true, forces overwriting of existing files.",
-          "x-user-analytics": 2
+          "description": "When true, forces overwriting of existing files."
         }
       }
     },
@@ -59,8 +57,7 @@
         "interactive": {
           "type": "boolean",
           "default": "true",
-          "description": "When false, disables interactive input prompts.",
-          "x-user-analytics": 3
+          "description": "When false, disables interactive input prompts."
         },
         "defaults": {
           "type": "boolean",
diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index 39b9272d2b..c9ae0dde69 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -242,6 +242,7 @@ export class UniversalAnalytics implements analytics.Analytics {
   private _ua: ua.Visitor;
   private _dirty = false;
   private _metrics: (string | number)[] = [];
+  private _dimensions: (string | number)[] = [];
 
   /**
    * @param trackingId The Google Analytics ID.
@@ -267,10 +268,10 @@ export class UniversalAnalytics implements analytics.Analytics {
     this._ua.set('aid', _getNodeVersion());
 
     // We set custom metrics for values we care about.
-    this._metrics[analytics.NgCliAnalyticsMetrics.CpuCount] = _getCpuCount();
-    this._metrics[analytics.NgCliAnalyticsMetrics.CpuSpeed] = _getCpuSpeed();
-    this._metrics[analytics.NgCliAnalyticsMetrics.RamInMegabytes] = _getRamSize();
-    this._metrics[analytics.NgCliAnalyticsMetrics.NodeVersion] = _getNumericNodeVersion();
+    this._dimensions[analytics.NgCliAnalyticsDimensions.CpuCount] = _getCpuCount();
+    this._dimensions[analytics.NgCliAnalyticsDimensions.CpuSpeed] = _getCpuSpeed();
+    this._dimensions[analytics.NgCliAnalyticsDimensions.RamInMegabytes] = _getRamSize();
+    this._dimensions[analytics.NgCliAnalyticsDimensions.NodeVersion] = _getNumericNodeVersion();
   }
 
   /**
@@ -279,8 +280,9 @@ export class UniversalAnalytics implements analytics.Analytics {
    */
   private _customVariables(options: analytics.CustomDimensionsAndMetricsOptions) {
     const additionals: { [key: string]: boolean | number | string } = {};
-    this._metrics.forEach((v, i) => additionals['cm' + i] = v);
+    this._dimensions.forEach((v, i) => additionals['cd' + i] = v);
     (options.dimensions || []).forEach((v, i) => additionals['cd' + i] = v);
+    this._metrics.forEach((v, i) => additionals['cm' + i] = v);
     (options.metrics || []).forEach((v, i) => additionals['cm' + i] = v);
 
     return additionals;
diff --git a/packages/angular_devkit/core/src/analytics/index.ts b/packages/angular_devkit/core/src/analytics/index.ts
index eb3b842c0d..a525cd1337 100644
--- a/packages/angular_devkit/core/src/analytics/index.ts
+++ b/packages/angular_devkit/core/src/analytics/index.ts
@@ -17,16 +17,20 @@ export * from './noop';
  * WE LIST THOSE DIMENSIONS (AND MORE).
  */
 export enum NgCliAnalyticsDimensions {
+  CpuCount = 1,
+  CpuSpeed = 2,
+  RamInMegabytes = 3,
+  NodeVersion = 4,
   NgAddCollection = 6,
   NgBuildBuildEventLog = 7,
   BuildErrors = 20,
 }
 
 export enum NgCliAnalyticsMetrics {
-  CpuCount = 1,
-  CpuSpeed = 2,
-  RamInMegabytes = 3,
-  NodeVersion = 4,
+  UNUSED_1 = 1,
+  UNUSED_2 = 2,
+  UNUSED_3 = 3,
+  UNUSED_4 = 4,
   BuildTime = 5,
   NgOnInitCount = 6,
   InitialChunkSize = 7,
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index c8eba6787b..3c0157953a 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -92,8 +92,7 @@
     "skipInstall": {
       "description": "Skip installing dependency packages.",
       "type": "boolean",
-      "default": false,
-      "x-user-analytics": 4
+      "default": false
     },
     "lintFix": {
       "type": "boolean",
diff --git a/packages/schematics/angular/library/schema.json b/packages/schematics/angular/library/schema.json
index e826508ed2..05cb720306 100644
--- a/packages/schematics/angular/library/schema.json
+++ b/packages/schematics/angular/library/schema.json
@@ -37,8 +37,7 @@
     "skipInstall": {
       "description": "When true, does not install dependency packages.",
       "type": "boolean",
-      "default": false,
-      "x-user-analytics": 4
+      "default": false
     },
     "skipTsConfig": {
       "type": "boolean",
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index fa80e95507..3dd03342a5 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -26,8 +26,7 @@
     "skipInstall": {
       "description": "When true, does not install dependency packages.",
       "type": "boolean",
-      "default": false,
-      "x-user-analytics": 4
+      "default": false
     },
     "linkCli": {
       "description": "When true, links the CLI to the global version (internal development only).",
diff --git a/packages/schematics/angular/universal/schema.json b/packages/schematics/angular/universal/schema.json
index 8beed998d7..da5b760b98 100644
--- a/packages/schematics/angular/universal/schema.json
+++ b/packages/schematics/angular/universal/schema.json
@@ -57,8 +57,7 @@
     "skipInstall": {
       "description": "When true, does not install packages for dependencies.",
       "type": "boolean",
-      "default": false,
-      "x-user-analytics": 4
+      "default": false
     }
   },
   "required": [
diff --git a/packages/schematics/angular/workspace/schema.json b/packages/schematics/angular/workspace/schema.json
index 007e097bbf..5869aa967d 100644
--- a/packages/schematics/angular/workspace/schema.json
+++ b/packages/schematics/angular/workspace/schema.json
@@ -21,8 +21,7 @@
     "skipInstall": {
       "description": "When true, does not install packages for dependencies.",
       "type": "boolean",
-      "default": false,
-      "x-user-analytics": 4
+      "default": false
     },
     "linkCli": {
       "description": "When true, links the CLI to the global version (internal development only).",