diff --git a/core/flyout_base.js b/core/flyout_base.js
index 43ea6da1d..84d6d3870 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -72,7 +72,8 @@ Blockly.Flyout = function(workspaceOptions) {
   this.workspace_.setVisible(this.isVisible_);
 
   /**
-   * The unique id for this component.
+   * The unique id for this component that is used to register with the
+   * ComponentManager.
    * @type {string}
    */
   this.id = Blockly.utils.genUid();
diff --git a/core/interfaces/i_component.js b/core/interfaces/i_component.js
index 983c07962..efb195966 100644
--- a/core/interfaces/i_component.js
+++ b/core/interfaces/i_component.js
@@ -23,7 +23,8 @@ goog.provide('Blockly.IComponent');
 Blockly.IComponent = function() {};
 
 /**
- * The unique id for this component.
+ * The unique id for this component that is used to register with the
+ * ComponentManager.
  * @type {string}
  */
 Blockly.IComponent.id;
diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index c3e32b94f..a2e76ef70 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -67,10 +67,11 @@ Blockly.Toolbox = function(workspace) {
   this.workspace_ = workspace;
 
   /**
-   * The unique id for this component.
+   * The unique id for this component that is used to register with the
+   * ComponentManager.
    * @type {string}
    */
-  this.id = Blockly.utils.genUid();
+  this.id = 'toolbox';
 
   /**
    * The JSON describing the contents of this toolbox.
diff --git a/core/trashcan.js b/core/trashcan.js
index f6ad48ba4..831a26ba4 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -57,10 +57,11 @@ Blockly.Trashcan = function(workspace) {
   this.workspace_ = workspace;
 
   /**
-   * The unique id for this component.
+   * The unique id for this component that is used to register with the
+   * ComponentManager.
    * @type {string}
    */
-  this.id = Blockly.utils.genUid();
+  this.id = 'trashcan';
 
   /**
    * A list of XML (stored as strings) representing blocks in the trashcan.
diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index 07c63e904..96ff41ac4 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -45,10 +45,11 @@ Blockly.ZoomControls = function(workspace) {
   this.workspace_ = workspace;
 
   /**
-   * The unique id for this component.
+   * The unique id for this component that is used to register with the
+   * ComponentManager.
    * @type {string}
    */
-  this.id = Blockly.utils.genUid();
+  this.id = 'zoomControls';
 
   /**
    * A handle to use to unbind the mouse down event handler for zoom reset