diff --git a/src/gameobjects/bitmaptext/static/BitmapText.js b/src/gameobjects/bitmaptext/static/BitmapText.js
index bb8aac4b4..dec315743 100644
--- a/src/gameobjects/bitmaptext/static/BitmapText.js
+++ b/src/gameobjects/bitmaptext/static/BitmapText.js
@@ -645,6 +645,7 @@ BitmapText.ALIGN_RIGHT = 2;
  * Adds the parsed Bitmap Font data to the cache with the `fontName` key.
  *
  * @name Phaser.GameObjects.BitmapText.ParseFromAtlas
+ * @type {function}
  * @since 3.0.0
  *
  * @param {Phaser.Scene} scene - The Scene to parse the Bitmap Font for.
diff --git a/src/gameobjects/components/Alpha.js b/src/gameobjects/components/Alpha.js
index 467f3a00b..24cebc09f 100644
--- a/src/gameobjects/components/Alpha.js
+++ b/src/gameobjects/components/Alpha.js
@@ -13,7 +13,7 @@ var _FLAG = 2; // 0010
  * Provides methods used for setting the alpha properties of a Game Object.
  * Should be applied as a mixin and not used directly.
  *
- * @name Phaser.GameObjects.Components.Alpha
+ * @namespace Phaser.GameObjects.Components.Alpha
  * @since 3.0.0
  */
 
diff --git a/src/gameobjects/components/BlendMode.js b/src/gameobjects/components/BlendMode.js
index 08bad4b3d..6a80c6fdc 100644
--- a/src/gameobjects/components/BlendMode.js
+++ b/src/gameobjects/components/BlendMode.js
@@ -10,7 +10,7 @@ var BlendModes = require('../../renderer/BlendModes');
  * Provides methods used for setting the blend mode of a Game Object.
  * Should be applied as a mixin and not used directly.
  *
- * @name Phaser.GameObjects.Components.BlendMode
+ * @namespace Phaser.GameObjects.Components.BlendMode
  * @since 3.0.0
  */
 
diff --git a/src/gameobjects/components/ComputedSize.js b/src/gameobjects/components/ComputedSize.js
index 10fc63486..25ed5192a 100644
--- a/src/gameobjects/components/ComputedSize.js
+++ b/src/gameobjects/components/ComputedSize.js
@@ -8,7 +8,7 @@
  * Provides methods used for calculating and setting the size of a non-Frame based Game Object.
  * Should be applied as a mixin and not used directly.
  * 
- * @name Phaser.GameObjects.Components.ComputedSize
+ * @namespace Phaser.GameObjects.Components.ComputedSize
  * @since 3.0.0
  */
 
diff --git a/src/gameobjects/components/Crop.js b/src/gameobjects/components/Crop.js
index d7c10dfe3..9d2902625 100644
--- a/src/gameobjects/components/Crop.js
+++ b/src/gameobjects/components/Crop.js
@@ -7,7 +7,7 @@
 /**
  * Provides methods used for getting and setting the texture of a Game Object.
  *
- * @name Phaser.GameObjects.Components.Crop
+ * @namespace Phaser.GameObjects.Components.Crop
  * @since 3.12.0
  */
 
diff --git a/src/gameobjects/components/Depth.js b/src/gameobjects/components/Depth.js
index 1b9067be7..d816caffd 100644
--- a/src/gameobjects/components/Depth.js
+++ b/src/gameobjects/components/Depth.js
@@ -8,7 +8,7 @@
  * Provides methods used for setting the depth of a Game Object.
  * Should be applied as a mixin and not used directly.
  * 
- * @name Phaser.GameObjects.Components.Depth
+ * @namespace Phaser.GameObjects.Components.Depth
  * @since 3.0.0
  */
 
diff --git a/src/gameobjects/components/Flip.js b/src/gameobjects/components/Flip.js
index f6ee49c87..119d1a2e2 100644
--- a/src/gameobjects/components/Flip.js
+++ b/src/gameobjects/components/Flip.js
@@ -8,7 +8,7 @@
  * Provides methods used for visually flipping a Game Object.
  * Should be applied as a mixin and not used directly.
  * 
- * @name Phaser.GameObjects.Components.Flip
+ * @namespace Phaser.GameObjects.Components.Flip
  * @since 3.0.0
  */
 
diff --git a/src/gameobjects/components/GetBounds.js b/src/gameobjects/components/GetBounds.js
index 9b843afb0..23c4c0373 100644
--- a/src/gameobjects/components/GetBounds.js
+++ b/src/gameobjects/components/GetBounds.js
@@ -12,7 +12,7 @@ var Vector2 = require('../../math/Vector2');
  * Provides methods used for obtaining the bounds of a Game Object.
  * Should be applied as a mixin and not used directly.
  *
- * @name Phaser.GameObjects.Components.GetBounds
+ * @namespace Phaser.GameObjects.Components.GetBounds
  * @since 3.0.0
  */
 
diff --git a/src/gameobjects/components/Mask.js b/src/gameobjects/components/Mask.js
index c4b92eb91..d5b9c2230 100644
--- a/src/gameobjects/components/Mask.js
+++ b/src/gameobjects/components/Mask.js
@@ -10,7 +10,7 @@ var GeometryMask = require('../../display/mask/GeometryMask');
 /**
  * Provides methods used for getting and setting the mask of a Game Object.
  *
- * @name Phaser.GameObjects.Components.Mask
+ * @namespace Phaser.GameObjects.Components.Mask
  * @since 3.0.0
  */
 
diff --git a/src/gameobjects/components/Origin.js b/src/gameobjects/components/Origin.js
index e5695cd9e..9a01669be 100644
--- a/src/gameobjects/components/Origin.js
+++ b/src/gameobjects/components/Origin.js
@@ -10,7 +10,7 @@
  * Display values contain the calculated pixel values.
  * Should be applied as a mixin and not used directly.
  *
- * @name Phaser.GameObjects.Components.Origin
+ * @namespace Phaser.GameObjects.Components.Origin
  * @since 3.0.0
  */
 
diff --git a/src/gameobjects/components/Pipeline.js b/src/gameobjects/components/Pipeline.js
index ca0b4a976..2eda90a7f 100644
--- a/src/gameobjects/components/Pipeline.js
+++ b/src/gameobjects/components/Pipeline.js
@@ -7,7 +7,7 @@
 /**
  * Provides methods used for setting the WebGL rendering pipeline of a Game Object.
  *
- * @name Phaser.GameObjects.Components.Pipeline
+ * @namespace Phaser.GameObjects.Components.Pipeline
  * @webglOnly
  * @since 3.0.0
  */
diff --git a/src/gameobjects/components/ScaleMode.js b/src/gameobjects/components/ScaleMode.js
index 4c4cbecc3..70c046f85 100644
--- a/src/gameobjects/components/ScaleMode.js
+++ b/src/gameobjects/components/ScaleMode.js
@@ -9,7 +9,7 @@ var ScaleModes = require('../../renderer/ScaleModes');
 /**
  * Provides methods used for getting and setting the scale of a Game Object.
  *
- * @name Phaser.GameObjects.Components.ScaleMode
+ * @namespace Phaser.GameObjects.Components.ScaleMode
  * @since 3.0.0
  */
 
diff --git a/src/gameobjects/components/ScrollFactor.js b/src/gameobjects/components/ScrollFactor.js
index 9c558b1af..a7ff7cee5 100644
--- a/src/gameobjects/components/ScrollFactor.js
+++ b/src/gameobjects/components/ScrollFactor.js
@@ -7,7 +7,7 @@
 /**
  * Provides methods used for getting and setting the Scroll Factor of a Game Object.
  *
- * @name Phaser.GameObjects.Components.ScrollFactor
+ * @namespace Phaser.GameObjects.Components.ScrollFactor
  * @since 3.0.0
  */
 
diff --git a/src/gameobjects/components/Size.js b/src/gameobjects/components/Size.js
index e745d2a58..7356da809 100644
--- a/src/gameobjects/components/Size.js
+++ b/src/gameobjects/components/Size.js
@@ -7,7 +7,7 @@
 /**
  * Provides methods used for getting and setting the size of a Game Object.
  * 
- * @name Phaser.GameObjects.Components.Size
+ * @namespace Phaser.GameObjects.Components.Size
  * @since 3.0.0
  */
 
diff --git a/src/gameobjects/components/Texture.js b/src/gameobjects/components/Texture.js
index d83da632b..3ec271eac 100644
--- a/src/gameobjects/components/Texture.js
+++ b/src/gameobjects/components/Texture.js
@@ -10,7 +10,7 @@ var _FLAG = 8; // 1000
 /**
  * Provides methods used for getting and setting the texture of a Game Object.
  *
- * @name Phaser.GameObjects.Components.Texture
+ * @namespace Phaser.GameObjects.Components.Texture
  * @since 3.0.0
  */
 
diff --git a/src/gameobjects/components/TextureCrop.js b/src/gameobjects/components/TextureCrop.js
index 611ba5ee8..aa1748dd7 100644
--- a/src/gameobjects/components/TextureCrop.js
+++ b/src/gameobjects/components/TextureCrop.js
@@ -10,7 +10,7 @@ var _FLAG = 8; // 1000
 /**
  * Provides methods used for getting and setting the texture of a Game Object.
  *
- * @name Phaser.GameObjects.Components.TextureCrop
+ * @namespace Phaser.GameObjects.Components.TextureCrop
  * @since 3.0.0
  */
 
diff --git a/src/gameobjects/components/Transform.js b/src/gameobjects/components/Transform.js
index b478de1da..683432656 100644
--- a/src/gameobjects/components/Transform.js
+++ b/src/gameobjects/components/Transform.js
@@ -15,7 +15,7 @@ var _FLAG = 4; // 0100
 /**
  * Provides methods used for getting and setting the position, scale and rotation of a Game Object.
  *
- * @name Phaser.GameObjects.Components.Transform
+ * @namespace Phaser.GameObjects.Components.Transform
  * @since 3.0.0
  */
 
diff --git a/src/gameobjects/components/Visible.js b/src/gameobjects/components/Visible.js
index b7ef12bb9..5df0ff96c 100644
--- a/src/gameobjects/components/Visible.js
+++ b/src/gameobjects/components/Visible.js
@@ -11,7 +11,7 @@ var _FLAG = 1; // 0001
  * Provides methods used for setting the visibility of a Game Object.
  * Should be applied as a mixin and not used directly.
  * 
- * @name Phaser.GameObjects.Components.Visible
+ * @namespace Phaser.GameObjects.Components.Visible
  * @since 3.0.0
  */