diff --git a/src/accessibility/AccessibilityManager.js b/src/accessibility/AccessibilityManager.js
index f86d301..df2716a 100644
--- a/src/accessibility/AccessibilityManager.js
+++ b/src/accessibility/AccessibilityManager.js
@@ -31,7 +31,7 @@
  * An instance of this class is automatically created by default, and can be found at renderer.plugins.accessibility
  *
  * @class
- * @memberof PIXI
+ * @memberof PIXI.accessibility
  */
 export default class AccessibilityManager
 {

diff --git a/src/accessibility/AccessibilityManager.js b/src/accessibility/AccessibilityManager.js
index f86d301..df2716a 100644
--- a/src/accessibility/AccessibilityManager.js
+++ b/src/accessibility/AccessibilityManager.js
@@ -31,7 +31,7 @@
  * An instance of this class is automatically created by default, and can be found at renderer.plugins.accessibility
  *
  * @class
- * @memberof PIXI
+ * @memberof PIXI.accessibility
  */
 export default class AccessibilityManager
 {
diff --git a/src/accessibility/accessibleTarget.js b/src/accessibility/accessibleTarget.js
index d79575e..4cda116 100644
--- a/src/accessibility/accessibleTarget.js
+++ b/src/accessibility/accessibleTarget.js
@@ -2,9 +2,8 @@
  * Default property values of accessible objects
  * used by {@link PIXI.accessibility.AccessibilityManager}.
  *
- * @mixin
- * @name accessibleTarget
- * @memberof PIXI
+ * @function accessibleTarget
+ * @memberof PIXI.accessibility
  * @example
  *      function MyObject() {}
  *

diff --git a/src/accessibility/AccessibilityManager.js b/src/accessibility/AccessibilityManager.js
index f86d301..df2716a 100644
--- a/src/accessibility/AccessibilityManager.js
+++ b/src/accessibility/AccessibilityManager.js
@@ -31,7 +31,7 @@
  * An instance of this class is automatically created by default, and can be found at renderer.plugins.accessibility
  *
  * @class
- * @memberof PIXI
+ * @memberof PIXI.accessibility
  */
 export default class AccessibilityManager
 {
diff --git a/src/accessibility/accessibleTarget.js b/src/accessibility/accessibleTarget.js
index d79575e..4cda116 100644
--- a/src/accessibility/accessibleTarget.js
+++ b/src/accessibility/accessibleTarget.js
@@ -2,9 +2,8 @@
  * Default property values of accessible objects
  * used by {@link PIXI.accessibility.AccessibilityManager}.
  *
- * @mixin
- * @name accessibleTarget
- * @memberof PIXI
+ * @function accessibleTarget
+ * @memberof PIXI.accessibility
  * @example
  *      function MyObject() {}
  *
diff --git a/src/accessibility/index.js b/src/accessibility/index.js
index c9c8718..568cfb1 100644
--- a/src/accessibility/index.js
+++ b/src/accessibility/index.js
@@ -1,5 +1,5 @@
 /**
- * @namespace PIXI.AccessibilityManager
+ * @namespace PIXI.accessibility
  */
 export { default as accessibleTarget } from './accessibleTarget';
 export { default as AccessibilityManager } from './AccessibilityManager';

diff --git a/src/accessibility/AccessibilityManager.js b/src/accessibility/AccessibilityManager.js
index f86d301..df2716a 100644
--- a/src/accessibility/AccessibilityManager.js
+++ b/src/accessibility/AccessibilityManager.js
@@ -31,7 +31,7 @@
  * An instance of this class is automatically created by default, and can be found at renderer.plugins.accessibility
  *
  * @class
- * @memberof PIXI
+ * @memberof PIXI.accessibility
  */
 export default class AccessibilityManager
 {
diff --git a/src/accessibility/accessibleTarget.js b/src/accessibility/accessibleTarget.js
index d79575e..4cda116 100644
--- a/src/accessibility/accessibleTarget.js
+++ b/src/accessibility/accessibleTarget.js
@@ -2,9 +2,8 @@
  * Default property values of accessible objects
  * used by {@link PIXI.accessibility.AccessibilityManager}.
  *
- * @mixin
- * @name accessibleTarget
- * @memberof PIXI
+ * @function accessibleTarget
+ * @memberof PIXI.accessibility
  * @example
  *      function MyObject() {}
  *
diff --git a/src/accessibility/index.js b/src/accessibility/index.js
index c9c8718..568cfb1 100644
--- a/src/accessibility/index.js
+++ b/src/accessibility/index.js
@@ -1,5 +1,5 @@
 /**
- * @namespace PIXI.AccessibilityManager
+ * @namespace PIXI.accessibility
  */
 export { default as accessibleTarget } from './accessibleTarget';
 export { default as AccessibilityManager } from './AccessibilityManager';
diff --git a/src/core/math/GroupD8.js b/src/core/math/GroupD8.js
index b86e23d..50c2f31 100644
--- a/src/core/math/GroupD8.js
+++ b/src/core/math/GroupD8.js
@@ -71,8 +71,8 @@
  * This is the small part of gameofbombs.com portal system. It works.
  *
  * @author Ivan @ivanpopelyshev
- *
- * @namespace PIXI.GroupD8
+ * @class
+ * @memberof PIXI
  */
 const GroupD8 = {
     E: 0,
@@ -104,7 +104,7 @@
     /**
      * Adds 180 degrees to rotation. Commutative operation.
      *
-     * @method
+     * @memberof PIXI.GroupD8
      * @param {number} rotation - The number to rotate.
      * @returns {number} rotated number
      */
@@ -113,12 +113,14 @@
     /**
      * I dont know why sometimes width and heights needs to be swapped. We'll fix it later.
      *
+     * @memberof PIXI.GroupD8
      * @param {number} rotation - The number to check.
      * @returns {boolean} Whether or not the width/height should be swapped.
      */
     isSwapWidthHeight: (rotation) => (rotation & 3) === 2,
 
     /**
+     * @memberof PIXI.GroupD8
      * @param {number} dx - TODO
      * @param {number} dy - TODO
      *
@@ -164,6 +166,7 @@
     /**
      * Helps sprite to compensate texture packer rotation.
      *
+     * @memberof PIXI.GroupD8
      * @param {PIXI.Matrix} matrix - sprite world matrix
      * @param {number} rotation - The rotation factor to use.
      * @param {number} tx - sprite anchoring

diff --git a/src/accessibility/AccessibilityManager.js b/src/accessibility/AccessibilityManager.js
index f86d301..df2716a 100644
--- a/src/accessibility/AccessibilityManager.js
+++ b/src/accessibility/AccessibilityManager.js
@@ -31,7 +31,7 @@
  * An instance of this class is automatically created by default, and can be found at renderer.plugins.accessibility
  *
  * @class
- * @memberof PIXI
+ * @memberof PIXI.accessibility
  */
 export default class AccessibilityManager
 {
diff --git a/src/accessibility/accessibleTarget.js b/src/accessibility/accessibleTarget.js
index d79575e..4cda116 100644
--- a/src/accessibility/accessibleTarget.js
+++ b/src/accessibility/accessibleTarget.js
@@ -2,9 +2,8 @@
  * Default property values of accessible objects
  * used by {@link PIXI.accessibility.AccessibilityManager}.
  *
- * @mixin
- * @name accessibleTarget
- * @memberof PIXI
+ * @function accessibleTarget
+ * @memberof PIXI.accessibility
  * @example
  *      function MyObject() {}
  *
diff --git a/src/accessibility/index.js b/src/accessibility/index.js
index c9c8718..568cfb1 100644
--- a/src/accessibility/index.js
+++ b/src/accessibility/index.js
@@ -1,5 +1,5 @@
 /**
- * @namespace PIXI.AccessibilityManager
+ * @namespace PIXI.accessibility
  */
 export { default as accessibleTarget } from './accessibleTarget';
 export { default as AccessibilityManager } from './AccessibilityManager';
diff --git a/src/core/math/GroupD8.js b/src/core/math/GroupD8.js
index b86e23d..50c2f31 100644
--- a/src/core/math/GroupD8.js
+++ b/src/core/math/GroupD8.js
@@ -71,8 +71,8 @@
  * This is the small part of gameofbombs.com portal system. It works.
  *
  * @author Ivan @ivanpopelyshev
- *
- * @namespace PIXI.GroupD8
+ * @class
+ * @memberof PIXI
  */
 const GroupD8 = {
     E: 0,
@@ -104,7 +104,7 @@
     /**
      * Adds 180 degrees to rotation. Commutative operation.
      *
-     * @method
+     * @memberof PIXI.GroupD8
      * @param {number} rotation - The number to rotate.
      * @returns {number} rotated number
      */
@@ -113,12 +113,14 @@
     /**
      * I dont know why sometimes width and heights needs to be swapped. We'll fix it later.
      *
+     * @memberof PIXI.GroupD8
      * @param {number} rotation - The number to check.
      * @returns {boolean} Whether or not the width/height should be swapped.
      */
     isSwapWidthHeight: (rotation) => (rotation & 3) === 2,
 
     /**
+     * @memberof PIXI.GroupD8
      * @param {number} dx - TODO
      * @param {number} dy - TODO
      *
@@ -164,6 +166,7 @@
     /**
      * Helps sprite to compensate texture packer rotation.
      *
+     * @memberof PIXI.GroupD8
      * @param {PIXI.Matrix} matrix - sprite world matrix
      * @param {number} rotation - The rotation factor to use.
      * @param {number} tx - sprite anchoring
diff --git a/src/core/sprites/canvas/CanvasTinter.js b/src/core/sprites/canvas/CanvasTinter.js
index 5dfc36f..1cf316b 100644
--- a/src/core/sprites/canvas/CanvasTinter.js
+++ b/src/core/sprites/canvas/CanvasTinter.js
@@ -4,7 +4,8 @@
 /**
  * Utility methods for Sprite/Texture tinting.
  *
- * @namespace PIXI.CanvasTinter
+ * @class
+ * @memberof PIXI
  */
 const CanvasTinter = {
     /**