diff --git a/src/core/const.js b/src/core/const.js
index 6d09378..3425b41 100644
--- a/src/core/const.js
+++ b/src/core/const.js
@@ -4,6 +4,7 @@
  * @static
  * @constant
  * @memberof PIXI
+ * @name VERSION
  * @type {string}
  */
 export const VERSION = __VERSION__;
@@ -44,6 +45,7 @@
  * @static
  * @constant
  * @memberof PIXI
+ * @name RENDERER_TYPE
  * @type {object}
  * @property {number} UNKNOWN - Unknown render type.
  * @property {number} WEBGL - WebGL render type.
@@ -64,6 +66,7 @@
  * @static
  * @constant
  * @memberof PIXI
+ * @name BLEND_MODES
  * @type {object}
  * @property {number} NORMAL
  * @property {number} ADD
@@ -110,6 +113,7 @@
  * @static
  * @constant
  * @memberof PIXI
+ * @name DRAW_MODES
  * @type {object}
  * @property {number} POINTS
  * @property {number} LINES
@@ -132,12 +136,13 @@
 /**
  * The scale modes that are supported by pixi.
  *
- * The PIXI.settings.SCALE_MODE scale mode affects the default scaling mode of future operations.
+ * The {@link PIXI.settings.SCALE_MODE} scale mode affects the default scaling mode of future operations.
  * It can be re-assigned to either LINEAR or NEAREST, depending upon suitability.
  *
  * @static
  * @constant
  * @memberof PIXI
+ * @name SCALE_MODES
  * @type {object}
  * @property {number} LINEAR Smooth scaling
  * @property {number} NEAREST Pixelating scaling
@@ -150,7 +155,7 @@
 /**
  * The wrap modes that are supported by pixi.
  *
- * The PIXI.settings.WRAP_MODE wrap mode affects the default wraping mode of future operations.
+ * The {@link PIXI.settings.WRAP_MODE} wrap mode affects the default wraping mode of future operations.
  * It can be re-assigned to either CLAMP or REPEAT, depending upon suitability.
  * If the texture is non power of two then clamp will be used regardless as webGL can
  * only use REPEAT if the texture is po2.
@@ -159,6 +164,7 @@
  *
  * @static
  * @constant
+ * @name WRAP_MODES
  * @memberof PIXI
  * @type {object}
  * @property {number} CLAMP - The textures uvs are clamped
@@ -174,7 +180,7 @@
 /**
  * The gc modes that are supported by pixi.
  *
- * The PIXI.settings.GC_MODE Garbage Collection mode for pixi textures is AUTO
+ * The {@link PIXI.settings.GC_MODE} Garbage Collection mode for pixi textures is AUTO
  * If set to GC_MODE, the renderer will occasianally check textures usage. If they are not
  * used for a specified period of time they will be removed from the GPU. They will of course
  * be uploaded again when they are required. This is a silent behind the scenes process that
@@ -185,6 +191,7 @@
  *
  * @static
  * @constant
+ * @name GC_MODES
  * @memberof PIXI
  * @type {object}
  * @property {number} AUTO - Garbage collection will happen periodically automatically
@@ -208,13 +215,14 @@
 
 /**
  * Regexp for data URI.
- * Based on: https://github.com/ragingwind/data-uri-regex
+ * Based on: {@link https://github.com/ragingwind/data-uri-regex}
  *
  * @static
  * @constant
+ * @name DATA_URI
  * @memberof PIXI
  * @type {RegExp|string}
- * @example `data:image/png;base64`
+ * @example data:image/png;base64
  */
 export const DATA_URI = /^\s*data:(?:([\w-]+)\/([\w+.-]+))?(?:;(charset=[\w-]+|base64))?,(.*)/i;
 
@@ -223,9 +231,10 @@
  *
  * @static
  * @constant
+ * @name SVG_SIZE
  * @memberof PIXI
  * @type {RegExp|string}
- * @example `<svg width="100" height="100"></svg>`
+ * @example &lt;svg width="100" height="100"&gt;&lt;/svg&gt;
  */
 export const SVG_SIZE = /<svg[^>]*(?:\s(width|height)=('|")(\d*(?:\.\d+)?)(?:px)?('|"))[^>]*(?:\s(width|height)=('|")(\d*(?:\.\d+)?)(?:px)?('|"))[^>]*>/i; // eslint-disable-line max-len
 
@@ -234,13 +243,14 @@
  *
  * @static
  * @constant
+ * @name SHAPES
  * @memberof PIXI
  * @type {object}
- * @property {number} POLY
- * @property {number} RECT
- * @property {number} CIRC
- * @property {number} ELIP
- * @property {number} RREC
+ * @property {number} POLY Polygon
+ * @property {number} RECT Rectangle
+ * @property {number} CIRC Circle
+ * @property {number} ELIP Ellipse
+ * @property {number} RREC Rounded Rectangle
  */
 export const SHAPES = {
     POLY: 0,
@@ -255,6 +265,7 @@
  *
  * @static
  * @constant
+ * @name PRECISION
  * @memberof PIXI
  * @type {object}
  * @property {string} LOW='lowp'
@@ -272,6 +283,7 @@
  *
  * @static
  * @constant
+ * @name TRANSFORM_MODE
  * @memberof PIXI
  * @type {object}
  * @property {number} STATIC
@@ -287,10 +299,11 @@
  *
  * @static
  * @constant
+ * @name TEXT_GRADIENT
  * @memberof PIXI
  * @type {object}
- * @property {number} LINEAR_VERTICAL
- * @property {number} LINEAR_HORIZONTAL
+ * @property {number} LINEAR_VERTICAL Vertical gradient
+ * @property {number} LINEAR_HORIZONTAL Linear gradient
  */
 export const TEXT_GRADIENT = {
     LINEAR_VERTICAL: 0,

diff --git a/src/core/const.js b/src/core/const.js
index 6d09378..3425b41 100644
--- a/src/core/const.js
+++ b/src/core/const.js
@@ -4,6 +4,7 @@
  * @static
  * @constant
  * @memberof PIXI
+ * @name VERSION
  * @type {string}
  */
 export const VERSION = __VERSION__;
@@ -44,6 +45,7 @@
  * @static
  * @constant
  * @memberof PIXI
+ * @name RENDERER_TYPE
  * @type {object}
  * @property {number} UNKNOWN - Unknown render type.
  * @property {number} WEBGL - WebGL render type.
@@ -64,6 +66,7 @@
  * @static
  * @constant
  * @memberof PIXI
+ * @name BLEND_MODES
  * @type {object}
  * @property {number} NORMAL
  * @property {number} ADD
@@ -110,6 +113,7 @@
  * @static
  * @constant
  * @memberof PIXI
+ * @name DRAW_MODES
  * @type {object}
  * @property {number} POINTS
  * @property {number} LINES
@@ -132,12 +136,13 @@
 /**
  * The scale modes that are supported by pixi.
  *
- * The PIXI.settings.SCALE_MODE scale mode affects the default scaling mode of future operations.
+ * The {@link PIXI.settings.SCALE_MODE} scale mode affects the default scaling mode of future operations.
  * It can be re-assigned to either LINEAR or NEAREST, depending upon suitability.
  *
  * @static
  * @constant
  * @memberof PIXI
+ * @name SCALE_MODES
  * @type {object}
  * @property {number} LINEAR Smooth scaling
  * @property {number} NEAREST Pixelating scaling
@@ -150,7 +155,7 @@
 /**
  * The wrap modes that are supported by pixi.
  *
- * The PIXI.settings.WRAP_MODE wrap mode affects the default wraping mode of future operations.
+ * The {@link PIXI.settings.WRAP_MODE} wrap mode affects the default wraping mode of future operations.
  * It can be re-assigned to either CLAMP or REPEAT, depending upon suitability.
  * If the texture is non power of two then clamp will be used regardless as webGL can
  * only use REPEAT if the texture is po2.
@@ -159,6 +164,7 @@
  *
  * @static
  * @constant
+ * @name WRAP_MODES
  * @memberof PIXI
  * @type {object}
  * @property {number} CLAMP - The textures uvs are clamped
@@ -174,7 +180,7 @@
 /**
  * The gc modes that are supported by pixi.
  *
- * The PIXI.settings.GC_MODE Garbage Collection mode for pixi textures is AUTO
+ * The {@link PIXI.settings.GC_MODE} Garbage Collection mode for pixi textures is AUTO
  * If set to GC_MODE, the renderer will occasianally check textures usage. If they are not
  * used for a specified period of time they will be removed from the GPU. They will of course
  * be uploaded again when they are required. This is a silent behind the scenes process that
@@ -185,6 +191,7 @@
  *
  * @static
  * @constant
+ * @name GC_MODES
  * @memberof PIXI
  * @type {object}
  * @property {number} AUTO - Garbage collection will happen periodically automatically
@@ -208,13 +215,14 @@
 
 /**
  * Regexp for data URI.
- * Based on: https://github.com/ragingwind/data-uri-regex
+ * Based on: {@link https://github.com/ragingwind/data-uri-regex}
  *
  * @static
  * @constant
+ * @name DATA_URI
  * @memberof PIXI
  * @type {RegExp|string}
- * @example `data:image/png;base64`
+ * @example data:image/png;base64
  */
 export const DATA_URI = /^\s*data:(?:([\w-]+)\/([\w+.-]+))?(?:;(charset=[\w-]+|base64))?,(.*)/i;
 
@@ -223,9 +231,10 @@
  *
  * @static
  * @constant
+ * @name SVG_SIZE
  * @memberof PIXI
  * @type {RegExp|string}
- * @example `<svg width="100" height="100"></svg>`
+ * @example &lt;svg width="100" height="100"&gt;&lt;/svg&gt;
  */
 export const SVG_SIZE = /<svg[^>]*(?:\s(width|height)=('|")(\d*(?:\.\d+)?)(?:px)?('|"))[^>]*(?:\s(width|height)=('|")(\d*(?:\.\d+)?)(?:px)?('|"))[^>]*>/i; // eslint-disable-line max-len
 
@@ -234,13 +243,14 @@
  *
  * @static
  * @constant
+ * @name SHAPES
  * @memberof PIXI
  * @type {object}
- * @property {number} POLY
- * @property {number} RECT
- * @property {number} CIRC
- * @property {number} ELIP
- * @property {number} RREC
+ * @property {number} POLY Polygon
+ * @property {number} RECT Rectangle
+ * @property {number} CIRC Circle
+ * @property {number} ELIP Ellipse
+ * @property {number} RREC Rounded Rectangle
  */
 export const SHAPES = {
     POLY: 0,
@@ -255,6 +265,7 @@
  *
  * @static
  * @constant
+ * @name PRECISION
  * @memberof PIXI
  * @type {object}
  * @property {string} LOW='lowp'
@@ -272,6 +283,7 @@
  *
  * @static
  * @constant
+ * @name TRANSFORM_MODE
  * @memberof PIXI
  * @type {object}
  * @property {number} STATIC
@@ -287,10 +299,11 @@
  *
  * @static
  * @constant
+ * @name TEXT_GRADIENT
  * @memberof PIXI
  * @type {object}
- * @property {number} LINEAR_VERTICAL
- * @property {number} LINEAR_HORIZONTAL
+ * @property {number} LINEAR_VERTICAL Vertical gradient
+ * @property {number} LINEAR_HORIZONTAL Linear gradient
  */
 export const TEXT_GRADIENT = {
     LINEAR_VERTICAL: 0,
diff --git a/src/core/settings.js b/src/core/settings.js
index ac5df51..bb08cb0 100644
--- a/src/core/settings.js
+++ b/src/core/settings.js
@@ -119,7 +119,7 @@
      *
      * @static
      * @memberof PIXI.settings
-     * @type {number}
+     * @type {PIXI.TRANSFORM_MODE}
      * @default PIXI.TRANSFORM_MODE.STATIC
      */
     TRANSFORM_MODE: 0,
@@ -129,7 +129,7 @@
      *
      * @static
      * @memberof PIXI.settings
-     * @type {number}
+     * @type {PIXI.GC_MODES}
      * @default PIXI.GC_MODES.AUTO
      */
     GC_MODE: 0,
@@ -159,7 +159,7 @@
      *
      * @static
      * @memberof PIXI.settings
-     * @type {number}
+     * @type {PIXI.WRAP_MODES}
      * @default PIXI.WRAP_MODES.CLAMP
      */
     WRAP_MODE: 0,
@@ -169,7 +169,7 @@
      *
      * @static
      * @memberof PIXI.settings
-     * @type {number}
+     * @type {PIXI.SCALE_MODES}
      * @default PIXI.SCALE_MODES.LINEAR
      */
     SCALE_MODE: 0,
@@ -179,7 +179,7 @@
      *
      * @static
      * @memberof PIXI.settings
-     * @type {string}
+     * @type {PIXI.PRECISION}
      * @default PIXI.PRECISION.MEDIUM
      */
     PRECISION: 'mediump',