diff --git a/core/block.js b/core/block.js
index 9ef639835..0982e3b39 100644
--- a/core/block.js
+++ b/core/block.js
@@ -12,7 +12,7 @@
 
 /**
  * The class representing one block.
- * @namespace Blockly.Block
+ * @class
  */
 goog.module('Blockly.Block');
 
diff --git a/core/block_drag_surface.js b/core/block_drag_surface.js
index 8876e9e2d..4ac282f61 100644
--- a/core/block_drag_surface.js
+++ b/core/block_drag_surface.js
@@ -23,7 +23,7 @@
  * blocks are put back in into the SVG they came from. This helps
  * performance by avoiding repainting the entire SVG on every mouse move
  * while dragging blocks.
- * @namespace Blockly.BlockDragSurfaceSvg
+ * @class
  */
 goog.module('Blockly.BlockDragSurfaceSvg');
 
diff --git a/core/block_dragger.js b/core/block_dragger.js
index 851189a1f..bc818fdf5 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -12,7 +12,7 @@
 
 /**
  * Methods for dragging a block visually.
- * @namespace Blockly.BlockDragger
+ * @class
  */
 goog.module('Blockly.BlockDragger');
 
diff --git a/core/block_svg.js b/core/block_svg.js
index 2d3045ad9..4896ada3d 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -12,7 +12,7 @@
 
 /**
  * Methods for graphically rendering a block as SVG.
- * @namespace Blockly.BlockSvg
+ * @class
  */
 goog.module('Blockly.BlockSvg');
 
diff --git a/core/bubble.js b/core/bubble.js
index 7519fdea2..2f41e15c2 100644
--- a/core/bubble.js
+++ b/core/bubble.js
@@ -12,7 +12,7 @@
 
 /**
  * Object representing a UI bubble.
- * @namespace Blockly.Bubble
+ * @class
  */
 goog.module('Blockly.Bubble');
 
diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js
index cd256c7ed..7f7864717 100644
--- a/core/bubble_dragger.js
+++ b/core/bubble_dragger.js
@@ -12,7 +12,7 @@
 
 /**
  * Methods for dragging a bubble visually.
- * @namespace Blockly.BubbleDragger
+ * @class
  */
 goog.module('Blockly.BubbleDragger');
 
diff --git a/core/comment.js b/core/comment.js
index c7d667b4c..0ed6b686e 100644
--- a/core/comment.js
+++ b/core/comment.js
@@ -12,7 +12,7 @@
 
 /**
  * Object representing a code comment.
- * @namespace Blockly.Comment
+ * @class
  */
 goog.module('Blockly.Comment');
 
diff --git a/core/component_manager.js b/core/component_manager.js
index f667f3685..23c7244b0 100644
--- a/core/component_manager.js
+++ b/core/component_manager.js
@@ -13,7 +13,7 @@
 
 /**
  * Manager for all items registered with the workspace.
- * @namespace Blockly.ComponentManager
+ * @class
  */
 goog.module('Blockly.ComponentManager');
 
diff --git a/core/connection.js b/core/connection.js
index 16af039a3..6b778cb1e 100644
--- a/core/connection.js
+++ b/core/connection.js
@@ -12,7 +12,7 @@
 
 /**
  * Components for creating connections between blocks.
- * @namespace Blockly.Connection
+ * @class
  */
 goog.module('Blockly.Connection');
 
diff --git a/core/connection_checker.js b/core/connection_checker.js
index 166d46e8a..ba8b788da 100644
--- a/core/connection_checker.js
+++ b/core/connection_checker.js
@@ -14,7 +14,7 @@
 /**
  * An object that encapsulates logic for checking whether a
  * potential connection is safe and valid.
- * @namespace Blockly.ConnectionChecker
+ * @class
  */
 goog.module('Blockly.ConnectionChecker');
 
diff --git a/core/connection_db.js b/core/connection_db.js
index 72e8c09ff..24c38e1b1 100644
--- a/core/connection_db.js
+++ b/core/connection_db.js
@@ -16,7 +16,7 @@
  * A database of all the rendered connections that could
  *    possibly be connected to (i.e. not collapsed, etc).
  *    Sorted by y coordinate.
- * @namespace Blockly.ConnectionDB
+ * @class
  */
 goog.module('Blockly.ConnectionDB');
 
diff --git a/core/contextmenu_registry.js b/core/contextmenu_registry.js
index a87492836..37733cbb6 100644
--- a/core/contextmenu_registry.js
+++ b/core/contextmenu_registry.js
@@ -12,7 +12,7 @@
 
 /**
  * Registry for context menu option items.
- * @namespace Blockly.ContextMenuRegistry
+ * @class
  */
 goog.module('Blockly.ContextMenuRegistry');
 
diff --git a/core/delete_area.js b/core/delete_area.js
index 78b26ad64..090b216ae 100644
--- a/core/delete_area.js
+++ b/core/delete_area.js
@@ -15,7 +15,7 @@
 /**
  * The abstract class for a component that can delete a block or
  * bubble that is dropped on top of it.
- * @namespace Blockly.DeleteArea
+ * @class
  */
 goog.module('Blockly.DeleteArea');
 
diff --git a/core/drag_target.js b/core/drag_target.js
index 33403c853..569575510 100644
--- a/core/drag_target.js
+++ b/core/drag_target.js
@@ -15,7 +15,7 @@
 /**
  * The abstract class for a component with custom behaviour when a
  * block or bubble is dragged over or dropped on top of it.
- * @namespace Blockly.DragTarget
+ * @class
  */
 goog.module('Blockly.DragTarget');
 
diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
index 25187abb4..7be966216 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -15,7 +15,7 @@
 
 /**
  * A div that floats on top of the workspace, for drop-down menus.
- * @namespace Blockly.DropDownDiv
+ * @class
  */
 goog.module('Blockly.DropDownDiv');
 
diff --git a/core/events/events_abstract.js b/core/events/events_abstract.js
index 3a0a9e006..b5d3de9e3 100644
--- a/core/events/events_abstract.js
+++ b/core/events/events_abstract.js
@@ -14,7 +14,7 @@
 /**
  * Abstract class for events fired as a result of actions in
  * Blockly's editor.
- * @namespace Blockly.Events.Abstract
+ * @class
  */
 goog.module('Blockly.Events.Abstract');
 
diff --git a/core/events/events_block_base.js b/core/events/events_block_base.js
index 7cbdd9634..44c317616 100644
--- a/core/events/events_block_base.js
+++ b/core/events/events_block_base.js
@@ -12,7 +12,7 @@
 
 /**
  * Base class for all types of block events.
- * @namespace Blockly.Events.BlockBase
+ * @class
  */
 goog.module('Blockly.Events.BlockBase');
 
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
index 922fe6fc5..2a3fe11d6 100644
--- a/core/events/events_block_change.js
+++ b/core/events/events_block_change.js
@@ -12,7 +12,7 @@
 
 /**
  * Class for a block change event.
- * @namespace Blockly.Events.BlockChange
+ * @class
  */
 goog.module('Blockly.Events.BlockChange');
 
diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js
index c384ea41d..bf702b020 100644
--- a/core/events/events_block_create.js
+++ b/core/events/events_block_create.js
@@ -12,7 +12,7 @@
 
 /**
  * Class for a block creation event.
- * @namespace Blockly.Events.BlockCreate
+ * @class
  */
 goog.module('Blockly.Events.BlockCreate');
 
diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js
index 09fc27d6d..69736b3cf 100644
--- a/core/events/events_block_delete.js
+++ b/core/events/events_block_delete.js
@@ -12,7 +12,7 @@
 
 /**
  * Class for a block delete event.
- * @namespace Blockly.Events.BlockDelete
+ * @class
  */
 goog.module('Blockly.Events.BlockDelete');
 
diff --git a/core/events/events_block_drag.js b/core/events/events_block_drag.js
index 938abeab0..aef6da4d0 100644
--- a/core/events/events_block_drag.js
+++ b/core/events/events_block_drag.js
@@ -12,7 +12,7 @@
 
 /**
  * Events fired as a block drag.
- * @namespace Blockly.Events.BlockDrag
+ * @class
  */
 goog.module('Blockly.Events.BlockDrag');
 
diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js
index 999f2eecc..ba20a984f 100644
--- a/core/events/events_block_move.js
+++ b/core/events/events_block_move.js
@@ -12,7 +12,7 @@
 
 /**
  * Class for a block move event.
- * @namespace Blockly.Events.BlockMove
+ * @class
  */
 goog.module('Blockly.Events.BlockMove');
 
diff --git a/core/events/events_bubble_open.js b/core/events/events_bubble_open.js
index 753d27298..54ede6aef 100644
--- a/core/events/events_bubble_open.js
+++ b/core/events/events_bubble_open.js
@@ -12,7 +12,7 @@
 
 /**
  * Events fired as a result of bubble open.
- * @namespace Blockly.Events.BubbleOpen
+ * @class
  */
 goog.module('Blockly.Events.BubbleOpen');
 
diff --git a/core/events/events_click.js b/core/events/events_click.js
index 8dabf1a49..abf375acd 100644
--- a/core/events/events_click.js
+++ b/core/events/events_click.js
@@ -12,7 +12,7 @@
 
 /**
  * Events fired as a result of UI click in Blockly's editor.
- * @namespace Blockly.Events.Click
+ * @class
  */
 goog.module('Blockly.Events.Click');
 
diff --git a/core/events/events_comment_base.js b/core/events/events_comment_base.js
index 8b2df24c3..a09836a7b 100644
--- a/core/events/events_comment_base.js
+++ b/core/events/events_comment_base.js
@@ -12,7 +12,7 @@
 
 /**
  * Base class for comment events.
- * @namespace Blockly.Events.CommentBase
+ * @class
  */
 goog.module('Blockly.Events.CommentBase');
 
diff --git a/core/events/events_comment_change.js b/core/events/events_comment_change.js
index 57c72ff87..ba32474ca 100644
--- a/core/events/events_comment_change.js
+++ b/core/events/events_comment_change.js
@@ -12,7 +12,7 @@
 
 /**
  * Class for comment change event.
- * @namespace Blockly.Events.CommentChange
+ * @class
  */
 goog.module('Blockly.Events.CommentChange');
 
diff --git a/core/events/events_comment_create.js b/core/events/events_comment_create.js
index 9bd4159ce..dcfd28e1f 100644
--- a/core/events/events_comment_create.js
+++ b/core/events/events_comment_create.js
@@ -12,7 +12,7 @@
 
 /**
  * Class for comment creation event.
- * @namespace Blockly.Events.CommentCreate
+ * @class
  */
 goog.module('Blockly.Events.CommentCreate');
 
diff --git a/core/events/events_comment_delete.js b/core/events/events_comment_delete.js
index 03b6f3f62..d00da2bbc 100644
--- a/core/events/events_comment_delete.js
+++ b/core/events/events_comment_delete.js
@@ -12,7 +12,7 @@
 
 /**
  * Class for comment deletion event.
- * @namespace Blockly.Events.CommentDelete
+ * @class
  */
 goog.module('Blockly.Events.CommentDelete');
 
diff --git a/core/events/events_comment_move.js b/core/events/events_comment_move.js
index 6ad249143..0f945e894 100644
--- a/core/events/events_comment_move.js
+++ b/core/events/events_comment_move.js
@@ -12,7 +12,7 @@
 
 /**
  * Class for comment move event.
- * @namespace Blockly.Events.CommentMove
+ * @class
  */
 goog.module('Blockly.Events.CommentMove');
 
diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js
index b8f041cf2..0721ed175 100644
--- a/core/events/events_marker_move.js
+++ b/core/events/events_marker_move.js
@@ -12,7 +12,7 @@
 
 /**
  * Events fired as a result of a marker move.
- * @namespace Blockly.Events.MarkerMove
+ * @class
  */
 goog.module('Blockly.Events.MarkerMove');
 
diff --git a/core/events/events_selected.js b/core/events/events_selected.js
index 315fb3899..916117822 100644
--- a/core/events/events_selected.js
+++ b/core/events/events_selected.js
@@ -12,7 +12,7 @@
 
 /**
  * Events fired as a result of element select action.
- * @namespace Blockly.Events.Selected
+ * @class
  */
 goog.module('Blockly.Events.Selected');
 
diff --git a/core/events/events_theme_change.js b/core/events/events_theme_change.js
index bf30d157a..4038f3254 100644
--- a/core/events/events_theme_change.js
+++ b/core/events/events_theme_change.js
@@ -12,7 +12,7 @@
 
 /**
  * Events fired as a result of a theme update.
- * @namespace Blockly.Events.ThemeChange
+ * @class
  */
 goog.module('Blockly.Events.ThemeChange');
 
diff --git a/core/events/events_toolbox_item_select.js b/core/events/events_toolbox_item_select.js
index 1c6d7f0c1..5c2bcbfe4 100644
--- a/core/events/events_toolbox_item_select.js
+++ b/core/events/events_toolbox_item_select.js
@@ -12,7 +12,7 @@
 
 /**
  * Events fired as a result of selecting an item on the toolbox.
- * @namespace Blockly.Events.ToolboxItemSelect
+ * @class
  */
 goog.module('Blockly.Events.ToolboxItemSelect');
 
diff --git a/core/events/events_trashcan_open.js b/core/events/events_trashcan_open.js
index ecfc9c4cb..2d6a91da3 100644
--- a/core/events/events_trashcan_open.js
+++ b/core/events/events_trashcan_open.js
@@ -12,7 +12,7 @@
 
 /**
  * Events fired as a result of trashcan flyout open and close.
- * @namespace Blockly.Events.TrashcanOpen
+ * @class
  */
 goog.module('Blockly.Events.TrashcanOpen');
 
diff --git a/core/events/events_ui.js b/core/events/events_ui.js
index e6e0a0c31..caae11f25 100644
--- a/core/events/events_ui.js
+++ b/core/events/events_ui.js
@@ -14,7 +14,7 @@
 /**
  * (Deprecated) Events fired as a result of UI actions in
  * Blockly's editor.
- * @namespace Blockly.Events.Ui
+ * @class
  */
 goog.module('Blockly.Events.Ui');
 
diff --git a/core/events/events_ui_base.js b/core/events/events_ui_base.js
index b18c75800..9ec457492 100644
--- a/core/events/events_ui_base.js
+++ b/core/events/events_ui_base.js
@@ -14,7 +14,7 @@
 /**
  * Base class for events fired as a result of UI actions in
  * Blockly's editor.
- * @namespace Blockly.Events.UiBase
+ * @class
  */
 goog.module('Blockly.Events.UiBase');
 
diff --git a/core/events/events_var_base.js b/core/events/events_var_base.js
index f26892b78..d4c42cb8d 100644
--- a/core/events/events_var_base.js
+++ b/core/events/events_var_base.js
@@ -12,7 +12,7 @@
 
 /**
  * Abstract class for a variable event.
- * @namespace Blockly.Events.VarBase
+ * @class
  */
 goog.module('Blockly.Events.VarBase');
 
diff --git a/core/events/events_var_create.js b/core/events/events_var_create.js
index 8c7558f2d..36fa9fe53 100644
--- a/core/events/events_var_create.js
+++ b/core/events/events_var_create.js
@@ -12,7 +12,7 @@
 
 /**
  * Class for a variable creation event.
- * @namespace Blockly.Events.VarCreate
+ * @class
  */
 goog.module('Blockly.Events.VarCreate');
 
diff --git a/core/events/events_var_delete.js b/core/events/events_var_delete.js
index 2540f0d10..45b747fb9 100644
--- a/core/events/events_var_delete.js
+++ b/core/events/events_var_delete.js
@@ -12,7 +12,7 @@
 
 /**
  * Classes for all types of variable events.
- * @namespace Blockly.Events.VarDelete
+ * @class
  */
 goog.module('Blockly.Events.VarDelete');
 
diff --git a/core/events/events_var_rename.js b/core/events/events_var_rename.js
index f9f4e59f9..79b1c3626 100644
--- a/core/events/events_var_rename.js
+++ b/core/events/events_var_rename.js
@@ -12,7 +12,7 @@
 
 /**
  * Class for a variable rename event.
- * @namespace Blockly.Events.VarRename
+ * @class
  */
 goog.module('Blockly.Events.VarRename');
 
diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js
index b02688db2..6c667ad25 100644
--- a/core/events/events_viewport.js
+++ b/core/events/events_viewport.js
@@ -12,7 +12,7 @@
 
 /**
  * Events fired as a result of a viewport change.
- * @namespace Blockly.Events.ViewportChange
+ * @class
  */
 goog.module('Blockly.Events.ViewportChange');
 
diff --git a/core/events/workspace_events.js b/core/events/workspace_events.js
index f1f43abeb..5da3de913 100644
--- a/core/events/workspace_events.js
+++ b/core/events/workspace_events.js
@@ -12,7 +12,7 @@
 
 /**
  * Class for a finished loading workspace event.
- * @namespace Blockly.Events.FinishedLoading
+ * @class
  */
 goog.module('Blockly.Events.FinishedLoading');
 
diff --git a/core/field.js b/core/field.js
index 8f14cce0b..2313bb16a 100644
--- a/core/field.js
+++ b/core/field.js
@@ -16,7 +16,7 @@
  * Field.  Used for editable titles, variables, etc.
  * This is an abstract class that defines the UI on the block.  Actual
  * instances would be FieldTextInput, FieldDropdown, etc.
- * @namespace Blockly.Field
+ * @class
  */
 goog.module('Blockly.Field');
 
diff --git a/core/field_angle.js b/core/field_angle.js
index 6b1ade13f..b61917533 100644
--- a/core/field_angle.js
+++ b/core/field_angle.js
@@ -12,7 +12,7 @@
 
 /**
  * Angle input field.
- * @namespace Blockly.FieldAngle
+ * @class
  */
 goog.module('Blockly.FieldAngle');
 
diff --git a/core/field_checkbox.js b/core/field_checkbox.js
index 62330800d..bafd7c1fc 100644
--- a/core/field_checkbox.js
+++ b/core/field_checkbox.js
@@ -12,7 +12,7 @@
 
 /**
  * Checkbox field.  Checked or not checked.
- * @namespace Blockly.FieldCheckbox
+ * @class
  */
 goog.module('Blockly.FieldCheckbox');
 
diff --git a/core/field_colour.js b/core/field_colour.js
index 3aef42c75..d5f2c2d50 100644
--- a/core/field_colour.js
+++ b/core/field_colour.js
@@ -12,7 +12,7 @@
 
 /**
  * Colour input field.
- * @namespace Blockly.FieldColour
+ * @class
  */
 goog.module('Blockly.FieldColour');
 
diff --git a/core/field_dropdown.js b/core/field_dropdown.js
index d80a581f5..ea760d90b 100644
--- a/core/field_dropdown.js
+++ b/core/field_dropdown.js
@@ -16,7 +16,7 @@
  * Dropdown input field.  Used for editable titles and variables.
  * In the interests of a consistent UI, the toolbox shares some functions and
  * properties with the context menu.
- * @namespace Blockly.FieldDropdown
+ * @class
  */
 goog.module('Blockly.FieldDropdown');
 
diff --git a/core/field_image.js b/core/field_image.js
index 8e71d1548..1983a6956 100644
--- a/core/field_image.js
+++ b/core/field_image.js
@@ -12,7 +12,7 @@
 
 /**
  * Image field.  Used for pictures, icons, etc.
- * @namespace Blockly.FieldImage
+ * @class
  */
 goog.module('Blockly.FieldImage');
 
diff --git a/core/field_label.js b/core/field_label.js
index dc798f8e3..643116822 100644
--- a/core/field_label.js
+++ b/core/field_label.js
@@ -14,7 +14,7 @@
 /**
  * Non-editable, non-serializable text field.  Used for titles,
  *    labels, etc.
- * @namespace Blockly.FieldLabel
+ * @class
  */
 goog.module('Blockly.FieldLabel');
 
diff --git a/core/field_label_serializable.js b/core/field_label_serializable.js
index ff42f3887..e70117bac 100644
--- a/core/field_label_serializable.js
+++ b/core/field_label_serializable.js
@@ -15,7 +15,7 @@
  * Non-editable, serializable text field. Behaves like a
  *    normal label but is serialized to XML. It may only be
  *    edited programmatically.
- * @namespace Blockly.FieldLabelSerializable
+ * @class
  */
 goog.module('Blockly.FieldLabelSerializable');
 
diff --git a/core/field_multilineinput.js b/core/field_multilineinput.js
index 04d98dad4..fa308ae74 100644
--- a/core/field_multilineinput.js
+++ b/core/field_multilineinput.js
@@ -14,7 +14,7 @@
 
 /**
  * Text Area field.
- * @namespace Blockly.FieldMultilineInput
+ * @class
  */
 goog.module('Blockly.FieldMultilineInput');
 
diff --git a/core/field_number.js b/core/field_number.js
index c052340dd..fdd603874 100644
--- a/core/field_number.js
+++ b/core/field_number.js
@@ -12,7 +12,7 @@
 
 /**
  * Number input field
- * @namespace Blockly.FieldNumber
+ * @class
  */
 goog.module('Blockly.FieldNumber');
 
diff --git a/core/field_textinput.js b/core/field_textinput.js
index 4997790b8..bbf7ad506 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -12,7 +12,7 @@
 
 /**
  * Text input field.
- * @namespace Blockly.FieldTextInput
+ * @class
  */
 goog.module('Blockly.FieldTextInput');
 
diff --git a/core/field_variable.js b/core/field_variable.js
index 6348a1a49..ed71db79c 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -12,7 +12,7 @@
 
 /**
  * Variable input field.
- * @namespace Blockly.FieldVariable
+ * @class
  */
 goog.module('Blockly.FieldVariable');
 
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 5a2268395..0136f7e96 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -12,7 +12,7 @@
 
 /**
  * Flyout tray containing blocks which may be created.
- * @namespace Blockly.Flyout
+ * @class
  */
 goog.module('Blockly.Flyout');
 
diff --git a/core/flyout_button.js b/core/flyout_button.js
index 345950318..6acc02500 100644
--- a/core/flyout_button.js
+++ b/core/flyout_button.js
@@ -12,7 +12,7 @@
 
 /**
  * Class for a button in the flyout.
- * @namespace Blockly.FlyoutButton
+ * @class
  */
 goog.module('Blockly.FlyoutButton');
 
diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js
index 4c7dc8800..6a5fe0f0b 100644
--- a/core/flyout_horizontal.js
+++ b/core/flyout_horizontal.js
@@ -12,7 +12,7 @@
 
 /**
  * Horizontal flyout tray containing blocks which may be created.
- * @namespace Blockly.HorizontalFlyout
+ * @class
  */
 goog.module('Blockly.HorizontalFlyout');
 
diff --git a/core/flyout_metrics_manager.js b/core/flyout_metrics_manager.js
index 6a56a10f1..0a3ac2e2d 100644
--- a/core/flyout_metrics_manager.js
+++ b/core/flyout_metrics_manager.js
@@ -12,7 +12,7 @@
 
 /**
  * Calculates and reports flyout workspace metrics.
- * @namespace Blockly.FlyoutMetricsManager
+ * @class
  */
 goog.module('Blockly.FlyoutMetricsManager');
 
diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js
index 92f1c686a..3f275003e 100644
--- a/core/flyout_vertical.js
+++ b/core/flyout_vertical.js
@@ -12,7 +12,7 @@
 
 /**
  * Layout code for a vertical variant of the flyout.
- * @namespace Blockly.VerticalFlyout
+ * @class
  */
 goog.module('Blockly.VerticalFlyout');
 
diff --git a/core/generator.js b/core/generator.js
index 376ace2f8..fabbc6984 100644
--- a/core/generator.js
+++ b/core/generator.js
@@ -14,7 +14,7 @@
 /**
  * Utility functions for generating executable code from
  * Blockly code.
- * @namespace Blockly.Generator
+ * @class
  */
 goog.module('Blockly.Generator');
 
diff --git a/core/gesture.js b/core/gesture.js
index 5a7444737..42cadabd5 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -14,7 +14,7 @@
 /**
  * The class representing an in-progress gesture, usually a drag
  * or a tap.
- * @namespace Blockly.Gesture
+ * @class
  */
 goog.module('Blockly.Gesture');
 
diff --git a/core/grid.js b/core/grid.js
index 894fdac25..025600326 100644
--- a/core/grid.js
+++ b/core/grid.js
@@ -14,7 +14,7 @@
 /**
  * Object for configuring and updating a workspace grid in
  * Blockly.
- * @namespace Blockly.Grid
+ * @class
  */
 goog.module('Blockly.Grid');
 
diff --git a/core/icon.js b/core/icon.js
index ae87330b0..c9f4da324 100644
--- a/core/icon.js
+++ b/core/icon.js
@@ -12,7 +12,7 @@
 
 /**
  * Object representing an icon on a block.
- * @namespace Blockly.Icon
+ * @class
  */
 goog.module('Blockly.Icon');
 
diff --git a/core/input.js b/core/input.js
index ef416a444..0561de18b 100644
--- a/core/input.js
+++ b/core/input.js
@@ -12,7 +12,7 @@
 
 /**
  * Object representing an input (value, statement, or dummy).
- * @namespace Blockly.Input
+ * @class
  */
 goog.module('Blockly.Input');
 
diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js
index ec1d1dcb8..274278f04 100644
--- a/core/insertion_marker_manager.js
+++ b/core/insertion_marker_manager.js
@@ -12,7 +12,7 @@
 
 /**
  * Class that controls updates to connections during drags.
- * @namespace Blockly.InsertionMarkerManager
+ * @class
  */
 goog.module('Blockly.InsertionMarkerManager');
 
diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js
index 68225944b..a3db5b34c 100644
--- a/core/keyboard_nav/ast_node.js
+++ b/core/keyboard_nav/ast_node.js
@@ -13,7 +13,7 @@
 /**
  * The class representing an AST node.
  * Used to traverse the Blockly AST.
- * @namespace Blockly.ASTNode
+ * @class
  */
 goog.module('Blockly.ASTNode');
 
diff --git a/core/keyboard_nav/basic_cursor.js b/core/keyboard_nav/basic_cursor.js
index 24fd87468..a953b1b16 100644
--- a/core/keyboard_nav/basic_cursor.js
+++ b/core/keyboard_nav/basic_cursor.js
@@ -14,7 +14,7 @@
 /**
  * The class representing a basic cursor.
  * Used to demo switching between different cursors.
- * @namespace Blockly.BasicCursor
+ * @class
  */
 goog.module('Blockly.BasicCursor');
 
diff --git a/core/keyboard_nav/cursor.js b/core/keyboard_nav/cursor.js
index 900353e46..11895bb83 100644
--- a/core/keyboard_nav/cursor.js
+++ b/core/keyboard_nav/cursor.js
@@ -14,7 +14,7 @@
 /**
  * The class representing a cursor.
  * Used primarily for keyboard navigation.
- * @namespace Blockly.Cursor
+ * @class
  */
 goog.module('Blockly.Cursor');
 
diff --git a/core/keyboard_nav/marker.js b/core/keyboard_nav/marker.js
index 6bac4606b..53971ac82 100644
--- a/core/keyboard_nav/marker.js
+++ b/core/keyboard_nav/marker.js
@@ -14,7 +14,7 @@
 /**
  * The class representing a marker.
  * Used primarily for keyboard navigation to show a marked location.
- * @namespace Blockly.Marker
+ * @class
  */
 goog.module('Blockly.Marker');
 
diff --git a/core/keyboard_nav/tab_navigate_cursor.js b/core/keyboard_nav/tab_navigate_cursor.js
index 91757f464..58463ead4 100644
--- a/core/keyboard_nav/tab_navigate_cursor.js
+++ b/core/keyboard_nav/tab_navigate_cursor.js
@@ -14,7 +14,7 @@
 /**
  * The class representing a cursor that is used to navigate
  * between tab navigable fields.
- * @namespace Blockly.TabNavigateCursor
+ * @class
  */
 goog.module('Blockly.TabNavigateCursor');
 
diff --git a/core/marker_manager.js b/core/marker_manager.js
index 61734d10b..2a198f0c6 100644
--- a/core/marker_manager.js
+++ b/core/marker_manager.js
@@ -12,7 +12,7 @@
 
 /**
  * Object in charge of managing markers and the cursor.
- * @namespace Blockly.MarkerManager
+ * @class
  */
 goog.module('Blockly.MarkerManager');
 
diff --git a/core/menu.js b/core/menu.js
index b6e2ba8f5..fa820a4ee 100644
--- a/core/menu.js
+++ b/core/menu.js
@@ -12,7 +12,7 @@
 
 /**
  * Blockly menu similar to Closure's goog.ui.Menu
- * @namespace Blockly.Menu
+ * @class
  */
 goog.module('Blockly.Menu');
 
diff --git a/core/menuitem.js b/core/menuitem.js
index 2baa75e85..05239babd 100644
--- a/core/menuitem.js
+++ b/core/menuitem.js
@@ -12,7 +12,7 @@
 
 /**
  * Blockly menu item similar to Closure's goog.ui.MenuItem
- * @namespace Blockly.MenuItem
+ * @class
  */
 goog.module('Blockly.MenuItem');
 
diff --git a/core/metrics_manager.js b/core/metrics_manager.js
index b13ae3767..0393c1aa5 100644
--- a/core/metrics_manager.js
+++ b/core/metrics_manager.js
@@ -12,7 +12,7 @@
 
 /**
  * Calculates and reports workspace metrics.
- * @namespace Blockly.MetricsManager
+ * @class
  */
 goog.module('Blockly.MetricsManager');
 
diff --git a/core/mutator.js b/core/mutator.js
index c4d1c5443..aab4dbede 100644
--- a/core/mutator.js
+++ b/core/mutator.js
@@ -14,7 +14,7 @@
 /**
  * Object representing a mutator dialog.  A mutator allows the
  * user to change the shape of a block using a nested blocks editor.
- * @namespace Blockly.Mutator
+ * @class
  */
 goog.module('Blockly.Mutator');
 
diff --git a/core/names.js b/core/names.js
index ad567f4a5..aafba1396 100644
--- a/core/names.js
+++ b/core/names.js
@@ -12,7 +12,7 @@
 
 /**
  * Utility functions for handling variable and procedure names.
- * @namespace Blockly.Names
+ * @class
  */
 goog.module('Blockly.Names');
 
diff --git a/core/options.js b/core/options.js
index d4fe2dc79..724bbf88c 100644
--- a/core/options.js
+++ b/core/options.js
@@ -12,7 +12,7 @@
 
 /**
  * Object that controls settings for the workspace.
- * @namespace Blockly.Options
+ * @class
  */
 goog.module('Blockly.Options');
 
diff --git a/core/rendered_connection.js b/core/rendered_connection.js
index f04dcd02f..62f778a2f 100644
--- a/core/rendered_connection.js
+++ b/core/rendered_connection.js
@@ -12,7 +12,7 @@
 
 /**
  * Components for creating connections between blocks.
- * @namespace Blockly.RenderedConnection
+ * @class
  */
 goog.module('Blockly.RenderedConnection');
 
diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
index c65f6a38a..ad49475e9 100644
--- a/core/renderers/common/constants.js
+++ b/core/renderers/common/constants.js
@@ -12,7 +12,7 @@
 
 /**
  * An object that provides constants for rendering blocks.
- * @namespace Blockly.blockRendering.ConstantProvider
+ * @class
  */
 goog.module('Blockly.blockRendering.ConstantProvider');
 
diff --git a/core/renderers/common/debugger.js b/core/renderers/common/debugger.js
index 03fc7cba9..0458c5241 100644
--- a/core/renderers/common/debugger.js
+++ b/core/renderers/common/debugger.js
@@ -12,7 +12,7 @@
 
 /**
  * Methods for rendering debug graphics.
- * @namespace Blockly.blockRendering.Debug
+ * @class
  */
 goog.module('Blockly.blockRendering.Debug');
 
diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js
index f1e4db189..c9ecdb2fa 100644
--- a/core/renderers/common/drawer.js
+++ b/core/renderers/common/drawer.js
@@ -12,7 +12,7 @@
 
 /**
  * Methods for graphically rendering a block as SVG.
- * @namespace Blockly.blockRendering.Drawer
+ * @class
  */
 goog.module('Blockly.blockRendering.Drawer');
 
diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index b9e595f73..15ec49feb 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -12,7 +12,7 @@
 
 /**
  * Methods for graphically rendering a block as SVG.
- * @namespace Blockly.blockRendering.RenderInfo
+ * @class
  */
 goog.module('Blockly.blockRendering.RenderInfo');
 
diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js
index afcffe7a4..6e62ac9f7 100644
--- a/core/renderers/common/marker_svg.js
+++ b/core/renderers/common/marker_svg.js
@@ -13,7 +13,7 @@
 
 /**
  * Methods for graphically rendering a marker as SVG.
- * @namespace Blockly.blockRendering.MarkerSvg
+ * @class
  */
 goog.module('Blockly.blockRendering.MarkerSvg');
 
diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js
index 3d4345005..711e62491 100644
--- a/core/renderers/common/path_object.js
+++ b/core/renderers/common/path_object.js
@@ -13,7 +13,7 @@
 
 /**
  * An object that owns a block's rendering SVG elements.
- * @namespace Blockly.blockRendering.PathObject
+ * @class
  */
 goog.module('Blockly.blockRendering.PathObject');
 
diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js
index 11d1beb5a..d0ed8efca 100644
--- a/core/renderers/common/renderer.js
+++ b/core/renderers/common/renderer.js
@@ -12,7 +12,7 @@
 
 /**
  * Base renderer.
- * @namespace Blockly.blockRendering.Renderer
+ * @class
  */
 goog.module('Blockly.blockRendering.Renderer');
 
diff --git a/core/renderers/geras/constants.js b/core/renderers/geras/constants.js
index f781d0031..baa369aec 100644
--- a/core/renderers/geras/constants.js
+++ b/core/renderers/geras/constants.js
@@ -14,7 +14,7 @@
 /**
  * An object that provides constants for rendering blocks in Geras
  * mode.
- * @namespace Blockly.geras.ConstantProvider
+ * @class
  */
 goog.module('Blockly.geras.ConstantProvider');
 
diff --git a/core/renderers/geras/drawer.js b/core/renderers/geras/drawer.js
index 32dd0ef72..299334014 100644
--- a/core/renderers/geras/drawer.js
+++ b/core/renderers/geras/drawer.js
@@ -12,7 +12,7 @@
 
 /**
  * Renderer that preserves the look and feel of Blockly pre-2019.
- * @namespace Blockly.geras.Drawer
+ * @class
  */
 goog.module('Blockly.geras.Drawer');
 
diff --git a/core/renderers/geras/highlight_constants.js b/core/renderers/geras/highlight_constants.js
index a472cad44..d8e154c51 100644
--- a/core/renderers/geras/highlight_constants.js
+++ b/core/renderers/geras/highlight_constants.js
@@ -12,7 +12,7 @@
 
 /**
  * Objects for rendering highlights on blocks.
- * @namespace Blockly.geras.HighlightConstantProvider
+ * @class
  */
 goog.module('Blockly.geras.HighlightConstantProvider');
 
diff --git a/core/renderers/geras/highlighter.js b/core/renderers/geras/highlighter.js
index 8280c36fd..f218c1fbd 100644
--- a/core/renderers/geras/highlighter.js
+++ b/core/renderers/geras/highlighter.js
@@ -14,7 +14,7 @@
 /**
  * Methods for adding highlights on block, for rendering in
  * compatibility mode.
- * @namespace Blockly.geras.Highlighter
+ * @class
  */
 goog.module('Blockly.geras.Highlighter');
 
diff --git a/core/renderers/geras/info.js b/core/renderers/geras/info.js
index 8c861bde6..012555d6f 100644
--- a/core/renderers/geras/info.js
+++ b/core/renderers/geras/info.js
@@ -14,7 +14,7 @@
 /**
  * Old (compatibility) renderer.
  * Geras: spirit of old age.
- * @namespace Blockly.geras.RenderInfo
+ * @class
  */
 goog.module('Blockly.geras.RenderInfo');
 
diff --git a/core/renderers/geras/measurables/inline_input.js b/core/renderers/geras/measurables/inline_input.js
index 8367fd274..cd97456a2 100644
--- a/core/renderers/geras/measurables/inline_input.js
+++ b/core/renderers/geras/measurables/inline_input.js
@@ -14,7 +14,7 @@
 /**
  * Objects representing inline inputs with connections on a
  * rendered block.
- * @namespace Blockly.geras.InlineInput
+ * @class
  */
 goog.module('Blockly.geras.InlineInput');
 
diff --git a/core/renderers/geras/measurables/statement_input.js b/core/renderers/geras/measurables/statement_input.js
index adb950b3c..dc49275cd 100644
--- a/core/renderers/geras/measurables/statement_input.js
+++ b/core/renderers/geras/measurables/statement_input.js
@@ -14,7 +14,7 @@
 /**
  * Objects representing statement inputs with connections on a
  * rendered block.
- * @namespace Blockly.geras.StatementInput
+ * @class
  */
 goog.module('Blockly.geras.StatementInput');
 
diff --git a/core/renderers/geras/path_object.js b/core/renderers/geras/path_object.js
index 4830d01a5..75eee776e 100644
--- a/core/renderers/geras/path_object.js
+++ b/core/renderers/geras/path_object.js
@@ -13,7 +13,7 @@
 
 /**
  * An object that owns a block's rendering SVG elements.
- * @namespace Blockly.geras.PathObject
+ * @class
  */
 goog.module('Blockly.geras.PathObject');
 
diff --git a/core/renderers/geras/renderer.js b/core/renderers/geras/renderer.js
index f76140b06..13e624f9e 100644
--- a/core/renderers/geras/renderer.js
+++ b/core/renderers/geras/renderer.js
@@ -12,7 +12,7 @@
 
 /**
  * Geras renderer.
- * @namespace Blockly.geras.Renderer
+ * @class
  */
 goog.module('Blockly.geras.Renderer');
 
diff --git a/core/renderers/measurables/base.js b/core/renderers/measurables/base.js
index 45f254833..87897227c 100644
--- a/core/renderers/measurables/base.js
+++ b/core/renderers/measurables/base.js
@@ -13,7 +13,7 @@
 
 /**
  * Methods for graphically rendering a block as SVG.
- * @namespace Blockly.blockRendering.Measurable
+ * @class
  */
 goog.module('Blockly.blockRendering.Measurable');
 
diff --git a/core/renderers/measurables/bottom_row.js b/core/renderers/measurables/bottom_row.js
index 5e1bfd807..de3277004 100644
--- a/core/renderers/measurables/bottom_row.js
+++ b/core/renderers/measurables/bottom_row.js
@@ -13,7 +13,7 @@
 /**
  * Object representing a bottom row on a rendered block.
  * of its subcomponents.
- * @namespace Blockly.blockRendering.BottomRow
+ * @class
  */
 goog.module('Blockly.blockRendering.BottomRow');
 
diff --git a/core/renderers/measurables/connection.js b/core/renderers/measurables/connection.js
index b97e72ff2..d0a903e12 100644
--- a/core/renderers/measurables/connection.js
+++ b/core/renderers/measurables/connection.js
@@ -13,7 +13,7 @@
 /**
  * Base class representing the space a connection takes up during
  * rendering.
- * @namespace Blockly.blockRendering.Connection
+ * @class
  */
 goog.module('Blockly.blockRendering.Connection');
 
diff --git a/core/renderers/measurables/external_value_input.js b/core/renderers/measurables/external_value_input.js
index 737d61c06..8b9d5b120 100644
--- a/core/renderers/measurables/external_value_input.js
+++ b/core/renderers/measurables/external_value_input.js
@@ -13,7 +13,7 @@
 /**
  * Class representing external value inputs with connections on a
  * rendered block.
- * @namespace Blockly.blockRendering.ExternalValueInput
+ * @class
  */
 goog.module('Blockly.blockRendering.ExternalValueInput');
 
diff --git a/core/renderers/measurables/field.js b/core/renderers/measurables/field.js
index d34df815d..502fbb8a7 100644
--- a/core/renderers/measurables/field.js
+++ b/core/renderers/measurables/field.js
@@ -13,7 +13,7 @@
 /**
  * Objects representing a field in a row of a rendered
  * block.
- * @namespace Blockly.blockRendering.Field
+ * @class
  */
 goog.module('Blockly.blockRendering.Field');
 
diff --git a/core/renderers/measurables/hat.js b/core/renderers/measurables/hat.js
index 288dcc0de..fe159f61e 100644
--- a/core/renderers/measurables/hat.js
+++ b/core/renderers/measurables/hat.js
@@ -13,7 +13,7 @@
 /**
  * Objects representing a hat in a row of a rendered
  * block.
- * @namespace Blockly.blockRendering.Hat
+ * @class
  */
 goog.module('Blockly.blockRendering.Hat');
 
diff --git a/core/renderers/measurables/icon.js b/core/renderers/measurables/icon.js
index e023d0cfc..913a0f706 100644
--- a/core/renderers/measurables/icon.js
+++ b/core/renderers/measurables/icon.js
@@ -13,7 +13,7 @@
 /**
  * Objects representing an icon in a row of a rendered
  * block.
- * @namespace Blockly.blockRendering.Icon
+ * @class
  */
 goog.module('Blockly.blockRendering.Icon');
 
diff --git a/core/renderers/measurables/in_row_spacer.js b/core/renderers/measurables/in_row_spacer.js
index a8bcc9afb..22e0441d0 100644
--- a/core/renderers/measurables/in_row_spacer.js
+++ b/core/renderers/measurables/in_row_spacer.js
@@ -13,7 +13,7 @@
 /**
  * Objects representing a spacer in a row of a rendered
  * block.
- * @namespace Blockly.blockRendering.InRowSpacer
+ * @class
  */
 goog.module('Blockly.blockRendering.InRowSpacer');
 
diff --git a/core/renderers/measurables/inline_input.js b/core/renderers/measurables/inline_input.js
index 0741684bf..0c624dc02 100644
--- a/core/renderers/measurables/inline_input.js
+++ b/core/renderers/measurables/inline_input.js
@@ -13,7 +13,7 @@
 /**
  * Class representing inline inputs with connections on a rendered
  * block.
- * @namespace Blockly.blockRendering.InlineInput
+ * @class
  */
 goog.module('Blockly.blockRendering.InlineInput');
 
diff --git a/core/renderers/measurables/input_connection.js b/core/renderers/measurables/input_connection.js
index 3126ccfcf..242080662 100644
--- a/core/renderers/measurables/input_connection.js
+++ b/core/renderers/measurables/input_connection.js
@@ -11,7 +11,7 @@
 
 /**
  * Class representing inputs with connections on a rendered block.
- * @namespace Blockly.blockRendering.InputConnection
+ * @class
  */
 goog.module('Blockly.blockRendering.InputConnection');
 
diff --git a/core/renderers/measurables/input_row.js b/core/renderers/measurables/input_row.js
index 338bbf0c6..7131c0285 100644
--- a/core/renderers/measurables/input_row.js
+++ b/core/renderers/measurables/input_row.js
@@ -13,7 +13,7 @@
 /**
  * Object representing a row that holds one or more inputs on a
  * rendered block.
- * @namespace Blockly.blockRendering.InputRow
+ * @class
  */
 goog.module('Blockly.blockRendering.InputRow');
 
diff --git a/core/renderers/measurables/jagged_edge.js b/core/renderers/measurables/jagged_edge.js
index 7f5b0c06a..97c383d86 100644
--- a/core/renderers/measurables/jagged_edge.js
+++ b/core/renderers/measurables/jagged_edge.js
@@ -13,7 +13,7 @@
 /**
  * Objects representing a jagged edge in a row of a rendered
  * block.
- * @namespace Blockly.blockRendering.JaggedEdge
+ * @class
  */
 goog.module('Blockly.blockRendering.JaggedEdge');
 
diff --git a/core/renderers/measurables/next_connection.js b/core/renderers/measurables/next_connection.js
index ac14fc97a..f402725a4 100644
--- a/core/renderers/measurables/next_connection.js
+++ b/core/renderers/measurables/next_connection.js
@@ -13,7 +13,7 @@
 /**
  * Class representing the space a next connection takes up during
  * rendering.
- * @namespace Blockly.blockRendering.NextConnection
+ * @class
  */
 goog.module('Blockly.blockRendering.NextConnection');
 
diff --git a/core/renderers/measurables/output_connection.js b/core/renderers/measurables/output_connection.js
index e3ef96396..bba7f1edb 100644
--- a/core/renderers/measurables/output_connection.js
+++ b/core/renderers/measurables/output_connection.js
@@ -14,7 +14,7 @@
 /**
  * Class representing the space a output connection takes up
  * during rendering.
- * @namespace Blockly.blockRendering.OutputConnection
+ * @class
  */
 goog.module('Blockly.blockRendering.OutputConnection');
 
diff --git a/core/renderers/measurables/previous_connection.js b/core/renderers/measurables/previous_connection.js
index 02c31fd2f..1da3f690c 100644
--- a/core/renderers/measurables/previous_connection.js
+++ b/core/renderers/measurables/previous_connection.js
@@ -13,7 +13,7 @@
 /**
  * Class representing the space a previous connection takes up
  * during rendering.
- * @namespace Blockly.blockRendering.PreviousConnection
+ * @class
  */
 goog.module('Blockly.blockRendering.PreviousConnection');
 
diff --git a/core/renderers/measurables/round_corner.js b/core/renderers/measurables/round_corner.js
index b6d0dcaea..a01372b1a 100644
--- a/core/renderers/measurables/round_corner.js
+++ b/core/renderers/measurables/round_corner.js
@@ -13,7 +13,7 @@
 /**
  * Objects representing a round corner in a row of a rendered
  * block.
- * @namespace Blockly.blockRendering.RoundCorner
+ * @class
  */
 goog.module('Blockly.blockRendering.RoundCorner');
 
diff --git a/core/renderers/measurables/row.js b/core/renderers/measurables/row.js
index b81f9a92e..26c15232f 100644
--- a/core/renderers/measurables/row.js
+++ b/core/renderers/measurables/row.js
@@ -11,7 +11,7 @@
 
 /**
  * Object representing a single row on a rendered block.
- * @namespace Blockly.blockRendering.Row
+ * @class
  */
 goog.module('Blockly.blockRendering.Row');
 
diff --git a/core/renderers/measurables/spacer_row.js b/core/renderers/measurables/spacer_row.js
index bf0016d12..12bf4f148 100644
--- a/core/renderers/measurables/spacer_row.js
+++ b/core/renderers/measurables/spacer_row.js
@@ -11,7 +11,7 @@
 
 /**
  * Object representing a spacer between two rows.
- * @namespace Blockly.blockRendering.SpacerRow
+ * @class
  */
 goog.module('Blockly.blockRendering.SpacerRow');
 
diff --git a/core/renderers/measurables/square_corner.js b/core/renderers/measurables/square_corner.js
index b38ab6b66..f75ea830b 100644
--- a/core/renderers/measurables/square_corner.js
+++ b/core/renderers/measurables/square_corner.js
@@ -13,7 +13,7 @@
 /**
  * Objects representing a square corner in a row of a rendered
  * block.
- * @namespace Blockly.blockRendering.SquareCorner
+ * @class
  */
 goog.module('Blockly.blockRendering.SquareCorner');
 
diff --git a/core/renderers/measurables/statement_input.js b/core/renderers/measurables/statement_input.js
index 5d73f4862..93fcd6284 100644
--- a/core/renderers/measurables/statement_input.js
+++ b/core/renderers/measurables/statement_input.js
@@ -13,7 +13,7 @@
 /**
  * Class representing statement inputs with connections on a
  * rendered block.
- * @namespace Blockly.blockRendering.StatementInput
+ * @class
  */
 goog.module('Blockly.blockRendering.StatementInput');
 
diff --git a/core/renderers/measurables/top_row.js b/core/renderers/measurables/top_row.js
index 702f2c6ae..62172aaf8 100644
--- a/core/renderers/measurables/top_row.js
+++ b/core/renderers/measurables/top_row.js
@@ -11,7 +11,7 @@
 
 /**
  * Object representing a top row on a rendered block.
- * @namespace Blockly.blockRendering.TopRow
+ * @class
  */
 goog.module('Blockly.blockRendering.TopRow');
 
diff --git a/core/renderers/minimalist/constants.js b/core/renderers/minimalist/constants.js
index 99a71a2fe..497f3cb52 100644
--- a/core/renderers/minimalist/constants.js
+++ b/core/renderers/minimalist/constants.js
@@ -13,7 +13,7 @@
 /**
  * An object that provides constants for rendering blocks in the
  * minimalist renderer.
- * @namespace Blockly.minimalist.ConstantProvider
+ * @class
  */
 goog.module('Blockly.minimalist.ConstantProvider');
 
diff --git a/core/renderers/minimalist/drawer.js b/core/renderers/minimalist/drawer.js
index 1a920eabd..4ff210bdb 100644
--- a/core/renderers/minimalist/drawer.js
+++ b/core/renderers/minimalist/drawer.js
@@ -11,7 +11,7 @@
 
 /**
  * Minimalist rendering drawer.
- * @namespace Blockly.minimalist.Drawer
+ * @class
  */
 goog.module('Blockly.minimalist.Drawer');
 
diff --git a/core/renderers/minimalist/info.js b/core/renderers/minimalist/info.js
index e2adce195..39a74702a 100644
--- a/core/renderers/minimalist/info.js
+++ b/core/renderers/minimalist/info.js
@@ -11,7 +11,7 @@
 
 /**
  * Minimalist render info object.
- * @namespace Blockly.minimalist.RenderInfo
+ * @class
  */
 goog.module('Blockly.minimalist.RenderInfo');
 
diff --git a/core/renderers/minimalist/renderer.js b/core/renderers/minimalist/renderer.js
index e878cd810..22f9a00c4 100644
--- a/core/renderers/minimalist/renderer.js
+++ b/core/renderers/minimalist/renderer.js
@@ -11,7 +11,7 @@
 
 /**
  * Minimalist renderer.
- * @namespace Blockly.minimalist.Renderer
+ * @class
  */
 goog.module('Blockly.minimalist.Renderer');
 
diff --git a/core/renderers/thrasos/info.js b/core/renderers/thrasos/info.js
index 0d65d4294..fbcf130e2 100644
--- a/core/renderers/thrasos/info.js
+++ b/core/renderers/thrasos/info.js
@@ -14,7 +14,7 @@
 /**
  * New (evolving) renderer.
  * Thrasos: spirit of boldness.
- * @namespace Blockly.thrasos.RenderInfo
+ * @class
  */
 goog.module('Blockly.thrasos.RenderInfo');
 
diff --git a/core/renderers/thrasos/renderer.js b/core/renderers/thrasos/renderer.js
index 650eeb287..da4b89f3a 100644
--- a/core/renderers/thrasos/renderer.js
+++ b/core/renderers/thrasos/renderer.js
@@ -12,7 +12,7 @@
 
 /**
  * Thrasos renderer.
- * @namespace Blockly.thrasos.Renderer
+ * @class
  */
 goog.module('Blockly.thrasos.Renderer');
 
diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js
index 1fc6052b3..8b8fe75b8 100644
--- a/core/renderers/zelos/constants.js
+++ b/core/renderers/zelos/constants.js
@@ -14,7 +14,7 @@
 /**
  * An object that provides constants for rendering blocks in Zelos
  * mode.
- * @namespace Blockly.zelos.ConstantProvider
+ * @class
  */
 goog.module('Blockly.zelos.ConstantProvider');
 
diff --git a/core/renderers/zelos/drawer.js b/core/renderers/zelos/drawer.js
index d71761f84..f0ec9d01d 100644
--- a/core/renderers/zelos/drawer.js
+++ b/core/renderers/zelos/drawer.js
@@ -12,7 +12,7 @@
 
 /**
  * Zelos renderer.
- * @namespace Blockly.zelos.Drawer
+ * @class
  */
 goog.module('Blockly.zelos.Drawer');
 
diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js
index 84ba84469..397100aa7 100644
--- a/core/renderers/zelos/info.js
+++ b/core/renderers/zelos/info.js
@@ -13,7 +13,7 @@
 
 /**
  * Makecode/scratch-style renderer.
- * @namespace Blockly.zelos.RenderInfo
+ * @class
  */
 goog.module('Blockly.zelos.RenderInfo');
 
diff --git a/core/renderers/zelos/marker_svg.js b/core/renderers/zelos/marker_svg.js
index 6ce73bd06..e0b425b03 100644
--- a/core/renderers/zelos/marker_svg.js
+++ b/core/renderers/zelos/marker_svg.js
@@ -12,7 +12,7 @@
 
 /**
  * Methods for graphically rendering a marker as SVG.
- * @namespace Blockly.zelos.MarkerSvg
+ * @class
  */
 goog.module('Blockly.zelos.MarkerSvg');
 
diff --git a/core/renderers/zelos/measurables/bottom_row.js b/core/renderers/zelos/measurables/bottom_row.js
index 61ce68092..1350a09be 100644
--- a/core/renderers/zelos/measurables/bottom_row.js
+++ b/core/renderers/zelos/measurables/bottom_row.js
@@ -12,7 +12,7 @@
 
 /**
  * An object representing the bottom row of a rendered block.
- * @namespace Blockly.zelos.BottomRow
+ * @class
  */
 goog.module('Blockly.zelos.BottomRow');
 
diff --git a/core/renderers/zelos/measurables/inputs.js b/core/renderers/zelos/measurables/inputs.js
index f3a588bc9..32050720e 100644
--- a/core/renderers/zelos/measurables/inputs.js
+++ b/core/renderers/zelos/measurables/inputs.js
@@ -13,7 +13,7 @@
 /**
  * Zelos specific objects representing inputs with connections on
  * a rendered block.
- * @namespace Blockly.zelos.StatementInput
+ * @class
  */
 goog.module('Blockly.zelos.StatementInput');
 
diff --git a/core/renderers/zelos/measurables/row_elements.js b/core/renderers/zelos/measurables/row_elements.js
index 80ad8ee90..592b4249f 100644
--- a/core/renderers/zelos/measurables/row_elements.js
+++ b/core/renderers/zelos/measurables/row_elements.js
@@ -13,7 +13,7 @@
 /**
  * Zelos specific objects representing elements in a row of a
  * rendered block.
- * @namespace Blockly.zelos.RightConnectionShape
+ * @class
  */
 goog.module('Blockly.zelos.RightConnectionShape');
 
diff --git a/core/renderers/zelos/measurables/top_row.js b/core/renderers/zelos/measurables/top_row.js
index 9ca852d61..e18425298 100644
--- a/core/renderers/zelos/measurables/top_row.js
+++ b/core/renderers/zelos/measurables/top_row.js
@@ -12,7 +12,7 @@
 
 /**
  * An object representing the top row of a rendered block.
- * @namespace Blockly.zelos.TopRow
+ * @class
  */
 goog.module('Blockly.zelos.TopRow');
 
diff --git a/core/renderers/zelos/path_object.js b/core/renderers/zelos/path_object.js
index a8248fee3..a1056840c 100644
--- a/core/renderers/zelos/path_object.js
+++ b/core/renderers/zelos/path_object.js
@@ -13,7 +13,7 @@
 
 /**
  * An object that owns a block's rendering SVG elements.
- * @namespace Blockly.zelos.PathObject
+ * @class
  */
 goog.module('Blockly.zelos.PathObject');
 
diff --git a/core/renderers/zelos/renderer.js b/core/renderers/zelos/renderer.js
index 14983c5d0..a51461ce8 100644
--- a/core/renderers/zelos/renderer.js
+++ b/core/renderers/zelos/renderer.js
@@ -12,7 +12,7 @@
 
 /**
  * Zelos renderer.
- * @namespace Blockly.zelos.Renderer
+ * @class
  */
 goog.module('Blockly.zelos.Renderer');
 
diff --git a/core/scrollbar.js b/core/scrollbar.js
index eadddcfee..85ce1cec2 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -12,7 +12,7 @@
 
 /**
  * Object representing a scrollbar.
- * @namespace Blockly.Scrollbar
+ * @class
  */
 goog.module('Blockly.Scrollbar');
 
diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js
index 880f7880c..2b5bb5c86 100644
--- a/core/scrollbar_pair.js
+++ b/core/scrollbar_pair.js
@@ -12,7 +12,7 @@
 
 /**
  * Object representing a pair of scrollbars.
- * @namespace Blockly.ScrollbarPair
+ * @class
  */
 goog.module('Blockly.ScrollbarPair');
 
diff --git a/core/shortcut_registry.js b/core/shortcut_registry.js
index 50008ea8f..bafe184f4 100644
--- a/core/shortcut_registry.js
+++ b/core/shortcut_registry.js
@@ -14,7 +14,7 @@
 /**
  * The namespace used to keep track of keyboard shortcuts and the
  * key codes used to execute those shortcuts.
- * @namespace Blockly.ShortcutRegistry
+ * @class
  */
 goog.module('Blockly.ShortcutRegistry');
 
diff --git a/core/theme.js b/core/theme.js
index f8d3d3a65..a60099be8 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -11,7 +11,7 @@
 
 /**
  * The class representing a theme.
- * @namespace Blockly.Theme
+ * @class
  */
 goog.module('Blockly.Theme');
 
diff --git a/core/theme_manager.js b/core/theme_manager.js
index 739b26c22..8f4e7d70f 100644
--- a/core/theme_manager.js
+++ b/core/theme_manager.js
@@ -15,7 +15,7 @@
 /**
  * Object in charge of storing and updating a workspace theme
  *     and UI components.
- * @namespace Blockly.ThemeManager
+ * @class
  */
 goog.module('Blockly.ThemeManager');
 
diff --git a/core/toolbox/category.js b/core/toolbox/category.js
index cf0bd52af..7d990f7dc 100644
--- a/core/toolbox/category.js
+++ b/core/toolbox/category.js
@@ -12,7 +12,7 @@
 
 /**
  * A toolbox category used to organize blocks in the toolbox.
- * @namespace Blockly.ToolboxCategory
+ * @class
  */
 goog.module('Blockly.ToolboxCategory');
 
diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js
index 37ec63a60..ef6499923 100644
--- a/core/toolbox/collapsible_category.js
+++ b/core/toolbox/collapsible_category.js
@@ -12,7 +12,7 @@
 
 /**
  * A toolbox category used to organize blocks in the toolbox.
- * @namespace Blockly.CollapsibleToolboxCategory
+ * @class
  */
 goog.module('Blockly.CollapsibleToolboxCategory');
 
diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
index 92f63438b..d920578cd 100644
--- a/core/toolbox/separator.js
+++ b/core/toolbox/separator.js
@@ -13,7 +13,7 @@
 
 /**
  * A separator used for separating toolbox categories.
- * @namespace Blockly.ToolboxSeparator
+ * @class
  */
 goog.module('Blockly.ToolboxSeparator');
 
diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js
index 713d15936..49f435509 100644
--- a/core/toolbox/toolbox.js
+++ b/core/toolbox/toolbox.js
@@ -12,7 +12,7 @@
 
 /**
  * Toolbox from whence to create blocks.
- * @namespace Blockly.Toolbox
+ * @class
  */
 goog.module('Blockly.Toolbox');
 
diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js
index 02ca46b21..1a4441f4b 100644
--- a/core/toolbox/toolbox_item.js
+++ b/core/toolbox/toolbox_item.js
@@ -12,7 +12,7 @@
 
 /**
  * An item in the toolbox.
- * @namespace Blockly.ToolboxItem
+ * @class
  */
 goog.module('Blockly.ToolboxItem');
 
diff --git a/core/touch_gesture.js b/core/touch_gesture.js
index 8e7f995fd..f81a92497 100644
--- a/core/touch_gesture.js
+++ b/core/touch_gesture.js
@@ -14,7 +14,7 @@
 /**
  * The class extends Gesture to support pinch to zoom
  * for both pointer and touch events.
- * @namespace Blockly.TouchGesture
+ * @class
  */
 goog.module('Blockly.TouchGesture');
 
diff --git a/core/trashcan.js b/core/trashcan.js
index 915c7a001..ef6e6562f 100644
--- a/core/trashcan.js
+++ b/core/trashcan.js
@@ -12,7 +12,7 @@
 
 /**
  * Object representing a trash can icon.
- * @namespace Blockly.Trashcan
+ * @class
  */
 goog.module('Blockly.Trashcan');
 
diff --git a/core/utils/coordinate.js b/core/utils/coordinate.js
index 5e5f979cc..9abef7214 100644
--- a/core/utils/coordinate.js
+++ b/core/utils/coordinate.js
@@ -16,7 +16,7 @@
  * Utility methods for coordinate manipulation.
  * These methods are not specific to Blockly, and could be factored out into
  * a JavaScript framework such as Closure.
- * @namespace Blockly.utils.Coordinate
+ * @class
  */
 goog.module('Blockly.utils.Coordinate');
 
diff --git a/core/utils/rect.js b/core/utils/rect.js
index 63c3e19a7..58a21570b 100644
--- a/core/utils/rect.js
+++ b/core/utils/rect.js
@@ -16,7 +16,7 @@
  * Utility methods for rectangle manipulation.
  * These methods are not specific to Blockly, and could be factored out into
  * a JavaScript framework such as Closure.
- * @namespace Blockly.utils.Rect
+ * @class
  */
 goog.module('Blockly.utils.Rect');
 
diff --git a/core/utils/size.js b/core/utils/size.js
index f5aa4df82..4857d76d8 100644
--- a/core/utils/size.js
+++ b/core/utils/size.js
@@ -16,7 +16,7 @@
  * Utility methods for size calculation.
  * These methods are not specific to Blockly, and could be factored out into
  * a JavaScript framework such as Closure.
- * @namespace Blockly.utils.Size
+ * @class
  */
 goog.module('Blockly.utils.Size');
 
diff --git a/core/utils/svg.js b/core/utils/svg.js
index 7896509dd..0575e1dad 100644
--- a/core/utils/svg.js
+++ b/core/utils/svg.js
@@ -14,7 +14,7 @@
 /**
  * Defines the Svg class. Its constants enumerate
  * all SVG tag names used by Blockly.
- * @namespace Blockly.utils.Svg
+ * @class
  */
 goog.module('Blockly.utils.Svg');
 
diff --git a/core/variable_map.js b/core/variable_map.js
index 29fd548f0..1d008f1ae 100644
--- a/core/variable_map.js
+++ b/core/variable_map.js
@@ -12,7 +12,7 @@
 
 /**
  * Object representing a map of variables and their types.
- * @namespace Blockly.VariableMap
+ * @class
  */
 goog.module('Blockly.VariableMap');
 
diff --git a/core/variable_model.js b/core/variable_model.js
index 220ae0a45..849c62515 100644
--- a/core/variable_model.js
+++ b/core/variable_model.js
@@ -12,7 +12,7 @@
 
 /**
  * Components for the variable model.
- * @namespace Blockly.VariableModel
+ * @class
  */
 goog.module('Blockly.VariableModel');
 
diff --git a/core/warning.js b/core/warning.js
index 337916b70..2aeade9cf 100644
--- a/core/warning.js
+++ b/core/warning.js
@@ -12,7 +12,7 @@
 
 /**
  * Object representing a warning.
- * @namespace Blockly.Warning
+ * @class
  */
 goog.module('Blockly.Warning');
 
diff --git a/core/workspace.js b/core/workspace.js
index 1fa546c1d..6cbed279a 100644
--- a/core/workspace.js
+++ b/core/workspace.js
@@ -12,7 +12,7 @@
 
 /**
  * Object representing a workspace.
- * @namespace Blockly.Workspace
+ * @class
  */
 goog.module('Blockly.Workspace');
 
diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index 6de9b6f68..7093505ef 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -14,7 +14,7 @@
 /**
  * Object in charge of loading, storing, and playing audio for a
  *     workspace.
- * @namespace Blockly.WorkspaceAudio
+ * @class
  */
 goog.module('Blockly.WorkspaceAudio');
 
diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index 67811b508..9fe436100 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -12,7 +12,7 @@
 
 /**
  * Object representing a code comment on the workspace.
- * @namespace Blockly.WorkspaceComment
+ * @class
  */
 goog.module('Blockly.WorkspaceComment');
 
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index 9c5d1869d..7c3c93c43 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -12,7 +12,7 @@
 
 /**
  * Object representing a code comment on a rendered workspace.
- * @namespace Blockly.WorkspaceCommentSvg
+ * @class
  */
 goog.module('Blockly.WorkspaceCommentSvg');
 
diff --git a/core/workspace_drag_surface_svg.js b/core/workspace_drag_surface_svg.js
index 8e6f772ca..14afdc9b8 100644
--- a/core/workspace_drag_surface_svg.js
+++ b/core/workspace_drag_surface_svg.js
@@ -19,7 +19,7 @@
  * Blocks are moved into this SVG during a drag, improving performance.
  * The entire SVG is translated using CSS translation instead of SVG so the
  * blocks are never repainted during drag improving performance.
- * @namespace Blockly.WorkspaceDragSurfaceSvg
+ * @class
  */
 goog.module('Blockly.WorkspaceDragSurfaceSvg');
 
diff --git a/core/workspace_dragger.js b/core/workspace_dragger.js
index dacb28cf7..eb8c037b0 100644
--- a/core/workspace_dragger.js
+++ b/core/workspace_dragger.js
@@ -12,7 +12,7 @@
 
 /**
  * Methods for dragging a workspace visually.
- * @namespace Blockly.WorkspaceDragger
+ * @class
  */
 goog.module('Blockly.WorkspaceDragger');
 
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index d3c01b95d..87ab141e7 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -12,7 +12,7 @@
 
 /**
  * Object representing a workspace rendered as SVG.
- * @namespace Blockly.WorkspaceSvg
+ * @class
  */
 goog.module('Blockly.WorkspaceSvg');
 
diff --git a/core/zoom_controls.js b/core/zoom_controls.js
index b5b69c259..cdf97ab6b 100644
--- a/core/zoom_controls.js
+++ b/core/zoom_controls.js
@@ -12,7 +12,7 @@
 
 /**
  * Object representing a zoom icons.
- * @namespace Blockly.ZoomControls
+ * @class
  */
 goog.module('Blockly.ZoomControls');