diff --git a/build.sbt b/build.sbt
index 9f8da9d..dae5696 100644
--- a/build.sbt
+++ b/build.sbt
@@ -5,16 +5,16 @@ name := "Scala.js CreateJS"
 
 normalizedName := "scalajs-createjs"
 
-version := "0.0.2-SNAPSHOT"
+version := "0.0.3-SNAPSHOT"
 
 organization := "com.scalawarrior"
 
-scalaVersion := "2.11.8"
+scalaVersion := "2.12.2"
 
 //crossScalaVersions := Seq("2.10.4", "2.11.5")
 
 libraryDependencies +=
-  "org.scala-js" %%% "scalajs-dom" % "0.9.1"
+  "org.scala-js" %%% "scalajs-dom" % "0.9.2"
 
 //jsDependencies +=
 //  "org.webjars" % "jquery" % "2.1.3" / "2.1.3/jquery.js"
diff --git a/project/build.properties b/project/build.properties
index a6e117b..64317fd 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=0.13.15
diff --git a/project/build.sbt b/project/build.sbt
index 5039056..9d76db4 100644
--- a/project/build.sbt
+++ b/project/build.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.14")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
diff --git a/src/main/scala/com/scalawarrior/scalajs/createjs/CreateJSLib.scala b/src/main/scala/com/scalawarrior/scalajs/createjs/CreateJSLib.scala
index 616a365..e1fb490 100644
--- a/src/main/scala/com/scalawarrior/scalajs/createjs/CreateJSLib.scala
+++ b/src/main/scala/com/scalawarrior/scalajs/createjs/CreateJSLib.scala
@@ -3,13 +3,13 @@ package com.scalawarrior.scalajs.createjs
 import scala.scalajs.js
 import js.annotation._
 
-//@JSName("createjs.EventDispatcher")
+//@JSGlobal("createjs.EventDispatcher")
 //object EventDispatcher extends js.Object {
 //  def initialize(target: Object): Unit = js.native
 //}
 
 @js.native
-@JSName("createjs.Event")
+@JSGlobal("createjs.Event")
 class Event protected () extends js.Object {
   def this(`type`: String, bubbles: Boolean, cancelable: Boolean) = this()
   var bubbles: Boolean = js.native
@@ -50,7 +50,7 @@ class Event protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.EventDispatcher")
+@JSGlobal("createjs.EventDispatcher")
 class EventDispatcher extends js.Object {
  def addEventListener(`type`: String, listener: js.Function1[Object, Boolean], useCapture: Boolean = ???): js.Function = js.native
  //def addEventListener(`type`: String, listener: js.Any, useCapture: Boolean = ???): Object = js.native
@@ -65,8 +65,8 @@ class EventDispatcher extends js.Object {
  def willTrigger(`type`: String): Boolean = js.native
 }
 
-// //@JSName("createjs")
-// @JSName("createjs.EventDispatcher")
+// //@JSGlobal("createjs")
+// @JSGlobal("createjs.EventDispatcher")
 // class EventDispatcher extends js.Object {
 //   def initialize(target: Object): Unit = js.native
 // }
diff --git a/src/main/scala/com/scalawarrior/scalajs/createjs/EaselJS.scala b/src/main/scala/com/scalawarrior/scalajs/createjs/EaselJS.scala
index ca412e1..43c0920 100644
--- a/src/main/scala/com/scalawarrior/scalajs/createjs/EaselJS.scala
+++ b/src/main/scala/com/scalawarrior/scalajs/createjs/EaselJS.scala
@@ -6,11 +6,12 @@ import js.|
 import js.annotation._
 
 @js.native
+@JSGlobal("createjs.NativeMouseEvent")
 class NativeMouseEvent extends MouseEvent {
 }
 
 @js.native
-@JSName("createjs.AlphaMapFilter")
+@JSGlobal("createjs.AlphaMapFilter")
 class AlphaMapFilter protected () extends Filter {
   def this(alphaMap: HTMLImageElement) = this()
   var alphaMap: HTMLImageElement = js.native // TODO or HTMLCanvasElement
@@ -18,7 +19,7 @@ class AlphaMapFilter protected () extends Filter {
 }
 
 @js.native
-@JSName("createjs.AlphaMaskFilter")
+@JSGlobal("createjs.AlphaMaskFilter")
 class AlphaMaskFilter protected () extends Filter {
   def this(mask: HTMLImageElement) = this()
   def this(mask: HTMLCanvasElement) = this()
@@ -27,7 +28,7 @@ class AlphaMaskFilter protected () extends Filter {
 }
 
 @js.native
-@JSName("createjs.Bitmap")
+@JSGlobal("createjs.Bitmap")
 class Bitmap protected () extends DisplayObject {
   def this(imageOrUrl: HTMLImageElement) = this()
   def this(imageOrUrl: HTMLCanvasElement) = this()
@@ -39,7 +40,7 @@ class Bitmap protected () extends DisplayObject {
 }
 
 @js.native
-@JSName("createjs.BitmapText")
+@JSGlobal("createjs.BitmapText")
 class BitmapText protected () extends DisplayObject {
   def this(text: String = ???, spriteSheet: SpriteSheet = ???) = this()
   var letterSpacing: Double = js.native
@@ -50,13 +51,13 @@ class BitmapText protected () extends DisplayObject {
 }
 
 @js.native
-@JSName("createjs.BitmapText")
+@JSGlobal("createjs.BitmapText")
 object BitmapText extends js.Object {
   var maxPoolSize: Double = js.native
 }
 
 @js.native
-@JSName("createjs.BlurFilter")
+@JSGlobal("createjs.BlurFilter")
 class BlurFilter protected () extends Filter {
   def this(blurX: Double = ???, blurY: Double = ???, quality: Double = ???) = this()
   var blurX: Double = js.native
@@ -66,7 +67,7 @@ class BlurFilter protected () extends Filter {
 }
 
 @js.native
-@JSName("createjs.ButtonHelper")
+@JSGlobal("createjs.ButtonHelper")
 class ButtonHelper protected () extends js.Object {
   def this(target: Sprite, outLabel: String = ???, overLabel: String = ???, downLabel: String = ???, play: Boolean = ???, hitArea: DisplayObject = ???, hitLabel: String = ???) = this()
   var downLabel: String = js.native // TODO or Double
@@ -81,7 +82,7 @@ class ButtonHelper protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.ColorFilter")
+@JSGlobal("createjs.ColorFilter")
 class ColorFilter protected () extends Filter {
   def this(redMultiplier: Double = ???, greenMultiplier: Double = ???, blueMultiplier: Double = ???, alphaMultiplier: Double = ???, redOffset: Double = ???, greenOffset: Double = ???, blueOffset: Double = ???, alphaOffset: Double = ???) = this()
   var alphaMultiplier: Double = js.native
@@ -96,7 +97,7 @@ class ColorFilter protected () extends Filter {
 }
 
 @js.native
-@JSName("createjs.ColorMatrix")
+@JSGlobal("createjs.ColorMatrix")
 class ColorMatrix protected () extends js.Object {
   def this(brightness: Double = ???, contrast: Double = ???, saturation: Double = ???, hue: Double = ???) = this()
   def adjustBrightness(value: Double): ColorMatrix = js.native
@@ -114,7 +115,7 @@ class ColorMatrix protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.ColorMatrixFilter")
+@JSGlobal("createjs.ColorMatrixFilter")
 class ColorMatrixFilter protected () extends Filter {
   def this(matrix: js.Array[Double]) = this()
   def this(matrix: ColorMatrix) = this()
@@ -123,7 +124,7 @@ class ColorMatrixFilter protected () extends Filter {
 }
 
 @js.native
-@JSName("createjs.Container")
+@JSGlobal("createjs.Container")
 class Container extends DisplayObject {
   var children: js.Array[DisplayObject] = js.native
   var mouseChildren: Boolean = js.native
@@ -150,7 +151,7 @@ class Container extends DisplayObject {
 }
 
 @js.native
-@JSName("createjs.DisplayObject")
+@JSGlobal("createjs.DisplayObject")
 class DisplayObject extends EventDispatcher {
   var alpha: Double = js.native
   var cacheCanvas: HTMLCanvasElement = js.native // TODO or Object
@@ -203,13 +204,13 @@ class DisplayObject extends EventDispatcher {
 }
 
 @js.native
-@JSName("createjs.DisplayObject")
+@JSGlobal("createjs.DisplayObject")
 object DisplayObject extends js.Object {
   var suppressCrossDomainErrors: Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.DisplayProps")
+@JSGlobal("createjs.DisplayProps")
 class DisplayProps protected () extends js.Object {
   def this(visible: Double = ???, alpha: Double = ???, shadow: Double = ???, compositeOperation: Double = ???, matrix: Double = ???) = this()
   var alpha: Double = js.native
@@ -225,7 +226,7 @@ class DisplayProps protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.DOMElement")
+@JSGlobal("createjs.DOMElement")
 class DOMElement protected () extends DisplayObject {
   def this(htmlElement: HTMLElement) = this()
   var htmlElement: HTMLElement = js.native
@@ -235,19 +236,19 @@ class DOMElement protected () extends DisplayObject {
 }
 
 @js.native
-@JSName("createjs.EaselJS")
+@JSGlobal("createjs.EaselJS")
 class EaselJS extends js.Object {
 }
 
 @js.native
-@JSName("createjs.EaselJS")
+@JSGlobal("createjs.EaselJS")
 object EaselJS extends js.Object {
   var buildDate: String = js.native
   var version: String = js.native
 }
 
 @js.native
-@JSName("createjs.Filter")
+@JSGlobal("createjs.Filter")
 class Filter extends js.Object {
   def applyFilter(ctx: CanvasRenderingContext2D, x: Double, y: Double, width: Double, height: Double, targetCtx: CanvasRenderingContext2D = ???, targetX: Double = ???, targetY: Double = ???): Boolean = js.native
   override def clone(): Filter = js.native
@@ -256,7 +257,7 @@ class Filter extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics")
+@JSGlobal("createjs.Graphics")
 class Graphics extends js.Object {
   var command: Object = js.native
   var instructions: js.Array[AnyRef] = js.native
@@ -328,7 +329,7 @@ class Graphics extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics")
+@JSGlobal("createjs.Graphics")
 object Graphics extends js.Object {
   var BASE_64: AnyRef = js.native
   //var beginCmd: Graphics.BeginPath = js.native
@@ -339,7 +340,7 @@ object Graphics extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Matrix2D")
+@JSGlobal("createjs.Matrix2D")
 class Matrix2D protected () extends js.Object {
   def this(a: Double = ???, b: Double = ???, c: Double = ???, d: Double = ???, tx: Double = ???, ty: Double = ???) = this()
   var a: Double = js.native
@@ -372,14 +373,14 @@ class Matrix2D protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Matrix2D")
+@JSGlobal("createjs.Matrix2D")
 object Matrix2D extends js.Object {
   var DEG_TO_RAD: Double = js.native
   var identity: Matrix2D = js.native
 }
 
 @js.native
-@JSName("createjs.MouseEvent")
+@JSGlobal("createjs.MouseEvent")
 class MouseEvent protected () extends Event {
   def this(`type`: String, bubbles: Boolean, cancelable: Boolean, stageX: Double, stageY: Double, nativeEvent: NativeMouseEvent, pointerID: Double, primary: Boolean, rawX: Double, rawY: Double) = this()
   var isTouch: Boolean = js.native
@@ -407,7 +408,7 @@ class MouseEvent protected () extends Event {
 }
 
 @js.native
-@JSName("createjs.MovieClip")
+@JSGlobal("createjs.MovieClip")
 class MovieClip protected () extends Container {
   def this(mode: String = ???, startPosition: Double = ???, loop: Boolean = ???, labels: AnyRef = ???) = this()
   var actionsEnabled: Boolean = js.native
@@ -433,7 +434,7 @@ class MovieClip protected () extends Container {
 }
 
 @js.native
-@JSName("createjs.MovieClip")
+@JSGlobal("createjs.MovieClip")
 object MovieClip extends js.Object {
   var buildDate: String = js.native
   var INDEPENDENT: String = js.native
@@ -443,13 +444,13 @@ object MovieClip extends js.Object {
 }
 
 @js.native
-@JSName("createjs.MovieClipPlugin")
+@JSGlobal("createjs.MovieClipPlugin")
 class MovieClipPlugin extends js.Object {
   def tween(tween: Tween, prop: String, value: String, startValues: js.Array[js.Any], endValues: js.Array[js.Any], ratio: Double, wait: AnyRef, end: AnyRef): Unit = js.native
 }
 
 @js.native
-@JSName("createjs.Point")
+@JSGlobal("createjs.Point")
 class Point protected () extends js.Object {
   def this(x: Double = ???, y: Double = ???) = this()
   var x: Double = js.native
@@ -461,7 +462,7 @@ class Point protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Rectangle")
+@JSGlobal("createjs.Rectangle")
 class Rectangle protected () extends js.Object {
   def this(x: Double = ???, y: Double = ???, width: Double = ???, height: Double = ???) = this()
   var height: Double = js.native
@@ -481,7 +482,7 @@ class Rectangle protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Shadow")
+@JSGlobal("createjs.Shadow")
 class Shadow protected () extends js.Object {
   def this(color: String, offsetX: Double, offsetY: Double, blur: Double) = this()
   var blur: Double = js.native
@@ -493,13 +494,13 @@ class Shadow protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Shadow")
+@JSGlobal("createjs.Shadow")
 object Shadow extends js.Object {
   var identity: Shadow = js.native
 }
 
 @js.native
-@JSName("createjs.Shape")
+@JSGlobal("createjs.Shape")
 class Shape protected () extends DisplayObject {
   def this(graphics: Graphics = ???) = this()
   var graphics: Graphics = js.native
@@ -509,7 +510,7 @@ class Shape protected () extends DisplayObject {
 }
 
 @js.native
-@JSName("createjs.Sprite")
+@JSGlobal("createjs.Sprite")
 class Sprite protected () extends DisplayObject {
   def this(spriteSheet: SpriteSheet, frameOrAnimation: String = ???) = this()
   var currentAnimation: String = js.native
@@ -531,7 +532,7 @@ class Sprite protected () extends DisplayObject {
 }
 
 @js.native
-@JSName("createjs.SpriteContainer")
+@JSGlobal("createjs.SpriteContainer")
 class SpriteContainer protected () extends Container {
   def this(spriteSheet: SpriteSheet = ???) = this()
   var spriteSheet: SpriteSheet = js.native
@@ -552,7 +553,7 @@ trait SpriteSheetFrame extends js.Object {
 }
 
 @js.native
-@JSName("createjs.SpriteSheet")
+@JSGlobal("createjs.SpriteSheet")
 class SpriteSheet protected () extends EventDispatcher {
   def this(data: AnyRef) = this()
   var animations: js.Array[String] = js.native
@@ -567,7 +568,7 @@ class SpriteSheet protected () extends EventDispatcher {
 }
 
 @js.native
-@JSName("createjs.SpriteSheetBuilder")
+@JSGlobal("createjs.SpriteSheetBuilder")
 class SpriteSheetBuilder extends EventDispatcher {
   var maxHeight: Double = js.native
   var maxWidth: Double = js.native
@@ -586,12 +587,12 @@ class SpriteSheetBuilder extends EventDispatcher {
 }
 
 @js.native
-@JSName("createjs.SpriteSheetUtils")
+@JSGlobal("createjs.SpriteSheetUtils")
 class SpriteSheetUtils extends js.Object {
 }
 
 @js.native
-@JSName("createjs.SpriteSheetUtils")
+@JSGlobal("createjs.SpriteSheetUtils")
 object SpriteSheetUtils extends js.Object {
   def addFlippedFrames(spriteSheet: SpriteSheet, horizontal: Boolean = ???, vertical: Boolean = ???, both: Boolean = ???): Unit = js.native
   def extractFrame(spriteSheet: SpriteSheet, frameOrAnimation: Double): HTMLImageElement = js.native
@@ -600,7 +601,7 @@ object SpriteSheetUtils extends js.Object {
 }
 
 @js.native
-@JSName("createjs.SpriteStage")
+@JSGlobal("createjs.SpriteStage")
 class SpriteStage protected () extends Stage {
   def this(canvas: HTMLCanvasElement, preserveDrawingBuffer: Boolean = ???, antialias: Boolean = ???) = this()
   //def this(canvas: String, preserveDrawingBuffer: Boolean = ???, antialias: Boolean = ???) = this()
@@ -610,7 +611,7 @@ class SpriteStage protected () extends Stage {
 }
 
 @js.native
-@JSName("createjs.SpriteStage")
+@JSGlobal("createjs.SpriteStage")
 object SpriteStage extends js.Object {
   var INDICES_PER_BOX: Double = js.native
   var MAX_BOXES_POINTS_INCREMENT: Double = js.native
@@ -621,7 +622,7 @@ object SpriteStage extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Stage")
+@JSGlobal("createjs.Stage")
 class Stage protected () extends Container {
   def this(canvas: HTMLCanvasElement) = this()
   def this(canvas: String) = this()
@@ -647,7 +648,7 @@ class Stage protected () extends Container {
 }
 
 @js.native
-@JSName("createjs.Text")
+@JSGlobal("createjs.Text")
 class Text protected () extends DisplayObject {
   def this(text: String = ???, font: String = ???, color: String = ???) = this()
   var color: String = js.native
@@ -669,12 +670,12 @@ class Text protected () extends DisplayObject {
 }
 
 @js.native
-@JSName("createjs.Ticker")
+@JSGlobal("createjs.Ticker")
 class Ticker extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Ticker")
+@JSGlobal("createjs.Ticker")
 object Ticker extends js.Object {
   var framerate: Double = js.native
   var interval: Double = js.native
@@ -713,7 +714,7 @@ object Ticker extends js.Object {
 }
 
 @js.native
-@JSName("createjs.TickerEvent")
+@JSGlobal("createjs.TickerEvent")
 class TickerEvent extends js.Object {
   var target: AnyRef = js.native
   var `type`: String = js.native
@@ -724,12 +725,12 @@ class TickerEvent extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Touch")
+@JSGlobal("createjs.Touch")
 class Touch extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Touch")
+@JSGlobal("createjs.Touch")
 object Touch extends js.Object {
   def disable(stage: Stage): Unit = js.native
   def enable(stage: Stage, singleTouch: Boolean = ???, allowDefault: Boolean = ???): Boolean = js.native
@@ -737,18 +738,18 @@ object Touch extends js.Object {
 }
 
 @js.native
-@JSName("createjs.UID")
+@JSGlobal("createjs.UID")
 class UID extends js.Object {
 }
 
 @js.native
-@JSName("createjs.UID")
+@JSGlobal("createjs.UID")
 object UID extends js.Object {
   def get(): Double = js.native
 }
 
 @js.native
-@JSName("createjs.Graphics.Arc")
+@JSGlobal("createjs.Graphics.Arc")
 class Arc protected () extends js.Object {
   def this(x: Double, y: Double, radius: Double, startAngle: Double, endAngle: Double, anticlockwise: Double) = this()
   var anticlockwise: Double = js.native
@@ -760,7 +761,7 @@ class Arc protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics.ArcTo")
+@JSGlobal("createjs.Graphics.ArcTo")
 class ArcTo protected () extends js.Object {
   def this(x1: Double, y1: Double, x2: Double, y2: Double, radius: Double) = this()
   var x1: Double = js.native
@@ -771,12 +772,12 @@ class ArcTo protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics.BeginPath")
+@JSGlobal("createjs.Graphics.BeginPath")
 class BeginPath extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics.BezierCurveTo")
+@JSGlobal("createjs.Graphics.BezierCurveTo")
 class BezierCurveTo protected () extends js.Object {
   def this(cp1x: Double, cp1y: Double, cp2x: Double, cp2y: Double, x: Double, y: Double) = this()
   var cp1x: Double = js.native
@@ -788,7 +789,7 @@ class BezierCurveTo protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics.Circle")
+@JSGlobal("createjs.Graphics.Circle")
 class Circle protected () extends js.Object {
   def this(x: Double, y: Double, radius: Double) = this()
   var x: Double = js.native
@@ -797,12 +798,12 @@ class Circle protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics.ClosePath")
+@JSGlobal("createjs.Graphics.ClosePath")
 class ClosePath extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics.Fill")
+@JSGlobal("createjs.Graphics.Fill")
 class Fill protected () extends js.Object {
   def this(style: AnyRef, matrix: Matrix2D = ???) = this()
   var style: AnyRef = js.native
@@ -813,7 +814,7 @@ class Fill protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics.LineTo")
+@JSGlobal("createjs.Graphics.LineTo")
 class LineTo protected () extends js.Object {
   def this(x: Double, y: Double) = this()
   var x: Double = js.native
@@ -821,7 +822,7 @@ class LineTo protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics.MoveTo")
+@JSGlobal("createjs.Graphics.MoveTo")
 class MoveTo protected () extends js.Object {
   def this(x: Double, y: Double) = this()
   var x: Double = js.native
@@ -829,7 +830,7 @@ class MoveTo protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics.PolyStar")
+@JSGlobal("createjs.Graphics.PolyStar")
 class PolyStar protected () extends js.Object {
   def this(x: Double, y: Double, radius: Double, sides: Double, pointSize: Double, angle: Double) = this()
   var angle: Double = js.native
@@ -841,7 +842,7 @@ class PolyStar protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics.QuadraticCurveTo")
+@JSGlobal("createjs.Graphics.QuadraticCurveTo")
 class QuadraticCurveTo protected () extends js.Object {
   def this(cpx: Double, cpy: Double, x: Double, y: Double) = this()
   var cpx: Double = js.native
@@ -851,7 +852,7 @@ class QuadraticCurveTo protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics.Rect")
+@JSGlobal("createjs.Graphics.Rect")
 class Rect protected () extends js.Object {
   def this(x: Double, y: Double, w: Double, h: Double) = this()
   var x: Double = js.native
@@ -861,7 +862,7 @@ class Rect protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics.RoundRect")
+@JSGlobal("createjs.Graphics.RoundRect")
 class RoundRect protected () extends js.Object {
   def this(x: Double, y: Double, w: Double, h: Double, radiusTL: Double, radiusTR: Double, radiusBR: Double, radiusBL: Double) = this()
   var x: Double = js.native
@@ -875,7 +876,7 @@ class RoundRect protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics.Stroke")
+@JSGlobal("createjs.Graphics.Stroke")
 class Stroke protected () extends js.Object {
   def this(style: AnyRef, ignoreScale: Boolean) = this()
   var style: AnyRef = js.native
@@ -886,7 +887,7 @@ class Stroke protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Graphics.StrokeStyle")
+@JSGlobal("createjs.Graphics.StrokeStyle")
 class StrokeStyle protected () extends js.Object {
   def this(width: Double, caps: String, joints: Double, miterLimit: Double) = this()
   var caps: String = js.native
diff --git a/src/main/scala/com/scalawarrior/scalajs/createjs/PreloadJS.scala b/src/main/scala/com/scalawarrior/scalajs/createjs/PreloadJS.scala
index dc3f8a3..ba818f4 100644
--- a/src/main/scala/com/scalawarrior/scalajs/createjs/PreloadJS.scala
+++ b/src/main/scala/com/scalawarrior/scalajs/createjs/PreloadJS.scala
@@ -6,7 +6,7 @@ import scala.scalajs.js
 import js.annotation._
 
 @js.native
-@JSName("createjs.AbstractLoader")
+@JSGlobal("createjs.AbstractLoader")
 class AbstractLoader extends EventDispatcher {
   var canceled: Boolean = js.native
   var GET: String = js.native
@@ -27,7 +27,7 @@ class AbstractLoader extends EventDispatcher {
 }
 
 @js.native
-@JSName("createjs.AbstractLoader")
+@JSGlobal("createjs.AbstractLoader")
 object AbstractLoader extends js.Object {
   var BINARY: String = js.native
   var CSS: String = js.native
@@ -45,13 +45,13 @@ object AbstractLoader extends js.Object {
 }
 
 @js.native
-@JSName("createjs.AbstractMediaLoader")
+@JSGlobal("createjs.AbstractMediaLoader")
 class AbstractMediaLoader protected () extends js.Object {
   def this(loadItem: Object, preferXHR: Boolean, `type`: String) = this()
 }
 
 @js.native
-@JSName("createjs.AbstractRequest")
+@JSGlobal("createjs.AbstractRequest")
 class AbstractRequest protected () extends js.Object {
   def this(item: LoadItem) = this()
   def cancel(): Unit = js.native
@@ -60,32 +60,32 @@ class AbstractRequest protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.BinaryLoader")
+@JSGlobal("createjs.BinaryLoader")
 class BinaryLoader protected () extends js.Object {
   def this(loadItem: Object) = this()
 }
 
 @js.native
-@JSName("createjs.BinaryLoader")
+@JSGlobal("createjs.BinaryLoader")
 object BinaryLoader extends js.Object {
   def canLoadItem(item: Object): Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.CSSLoader")
+@JSGlobal("createjs.CSSLoader")
 class CSSLoader protected () extends js.Object {
   def this(loadItem: Object, preferXHR: Boolean) = this()
   def canLoadItem(item: Object): Boolean = js.native
 }
 
-//@JSName("createjs.DataUtils")
+//@JSGlobal("createjs.DataUtils")
 //package object DataUtils extends js.Object {
 //  def parseJSON(value: String): Object = js.native
 //  def parseXML(text: String, `type`: String): XMLDocument = js.native
 //}
 
 @js.native
-@JSName("createjs.ErrorEvent")
+@JSGlobal("createjs.ErrorEvent")
 class ErrorEvent protected () extends js.Object {
   def this(title: String = ???, message: String = ???, data: Object = ???) = this()
   var data: Object = js.native
@@ -94,55 +94,55 @@ class ErrorEvent protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.ImageLoader")
+@JSGlobal("createjs.ImageLoader")
 class ImageLoader protected () extends js.Object {
   def this(loadItem: Object, preferXHR: Boolean) = this()
 }
 
 @js.native
-@JSName("createjs.ImageLoader")
+@JSGlobal("createjs.ImageLoader")
 object ImageLoader extends js.Object {
   def canLoadItem(item: Object): Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.JavaScriptLoader")
+@JSGlobal("createjs.JavaScriptLoader")
 class JavaScriptLoader protected () extends js.Object {
   def this(loadItem: Object, preferXHR: Boolean) = this()
 }
 
 @js.native
-@JSName("createjs.JavaScriptLoader")
+@JSGlobal("createjs.JavaScriptLoader")
 object JavaScriptLoader extends js.Object {
   def canLoadItem(item: Object): Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.JSONLoader")
+@JSGlobal("createjs.JSONLoader")
 class JSONLoader protected () extends js.Object {
   def this(loadItem: Object) = this()
 }
 
 @js.native
-@JSName("createjs.JSONLoader")
+@JSGlobal("createjs.JSONLoader")
 object JSONLoader extends js.Object {
   def canLoadItem(item: Object): Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.JSONPLoader")
+@JSGlobal("createjs.JSONPLoader")
 class JSONPLoader protected () extends js.Object {
   def this(loadItem: Object) = this()
 }
 
 @js.native
-@JSName("createjs.JSONPLoader")
+@JSGlobal("createjs.JSONPLoader")
 object JSONPLoader extends js.Object {
   def canLoadItem(item: Object): Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.LoadItem")
+@JSGlobal("createjs.LoadItem")
 class LoadItem extends js.Object {
   var callback: String = js.native
   var crossOrigin: Boolean = js.native
@@ -161,13 +161,13 @@ class LoadItem extends js.Object {
 }
 
 @js.native
-@JSName("createjs.LoadItem")
+@JSGlobal("createjs.LoadItem")
 object LoadItem extends js.Object {
   def create(value: Object): Object = js.native
 }
 
 @js.native
-@JSName("createjs.LoadQueue")
+@JSGlobal("createjs.LoadQueue")
 class LoadQueue protected () extends AbstractLoader {
   def this(preferXHR: Boolean = ???, basePath: String = ???, crossOrigin: String = ???) = this()
   var maintainScriptOrder: Boolean = js.native
@@ -190,37 +190,37 @@ class LoadQueue protected () extends AbstractLoader {
 }
 
 @js.native
-@JSName("createjs.ManifestLoader")
+@JSGlobal("createjs.ManifestLoader")
 class ManifestLoader protected () extends js.Object {
   def this(loadItem: LoadItem) = this()
 }
 
 @js.native
-@JSName("createjs.ManifestLoader")
+@JSGlobal("createjs.ManifestLoader")
 object ManifestLoader extends js.Object {
   def canLoadItem(item: LoadItem): Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.MediaTagRequest")
+@JSGlobal("createjs.MediaTagRequest")
 class MediaTagRequest protected () extends js.Object {
   def this(loadItem: LoadItem, tag: HTMLAudioElement, srcAttribute: String) = this()
 }
 
 @js.native
-@JSName("createjs.PreloadJS")
+@JSGlobal("createjs.PreloadJS")
 class PreloadJS extends js.Object {
 }
 
 @js.native
-@JSName("createjs.PreloadJS")
+@JSGlobal("createjs.PreloadJS")
 object PreloadJS extends js.Object {
   var buildDate: String = js.native
   var version: String = js.native
 }
 
 @js.native
-@JSName("createjs.ProgressEvent")
+@JSGlobal("createjs.ProgressEvent")
 class ProgressEvent protected () extends js.Object {
   def this(loaded: Double, total: Double = ???) = this()
   var loaded: Double = js.native
@@ -230,12 +230,12 @@ class ProgressEvent protected () extends js.Object {
 }
 
 @js.native
-@JSName("createjs.RequestUtils")
+@JSGlobal("createjs.RequestUtils")
 class RequestUtils extends js.Object {
 }
 
 @js.native
-@JSName("createjs.RequestUtils")
+@JSGlobal("createjs.RequestUtils")
 object RequestUtils extends js.Object {
   var ABSOLUTE_PATH: js.RegExp = js.native
   var EXTENSION_PATT: js.RegExp = js.native
@@ -254,72 +254,72 @@ object RequestUtils extends js.Object {
 }
 
 @js.native
-@JSName("createjs.SoundLoader")
+@JSGlobal("createjs.SoundLoader")
 class SoundLoader protected () extends js.Object {
   def this(loadItem: Object, preferXHR: Boolean) = this()
 }
 
 @js.native
-@JSName("createjs.SoundLoader")
+@JSGlobal("createjs.SoundLoader")
 object SoundLoader extends js.Object {
   def canLoadItem(item: Object): Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.SpriteSheetLoader")
+@JSGlobal("createjs.SpriteSheetLoader")
 class SpriteSheetLoader protected () extends js.Object {
   def this(loadItem: Object) = this()
 }
 
 @js.native
-@JSName("createjs.SpriteSheetLoader")
+@JSGlobal("createjs.SpriteSheetLoader")
 object SpriteSheetLoader extends js.Object {
   def canLoadItem(item: Object): Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.SVGLoader")
+@JSGlobal("createjs.SVGLoader")
 class SVGLoader protected () extends js.Object {
   def this(loadItem: Object, preferXHR: Boolean) = this()
 }
 
 @js.native
-@JSName("createjs.SVGLoader")
+@JSGlobal("createjs.SVGLoader")
 object SVGLoader extends js.Object {
   def canLoadItem(item: Object): Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.TagRequest")
+@JSGlobal("createjs.TagRequest")
 class TagRequest extends js.Object {
 }
 
 @js.native
-@JSName("createjs.TextLoader")
+@JSGlobal("createjs.TextLoader")
 class TextLoader protected () extends js.Object {
   def this(loadItem: Object) = this()
 }
 
 @js.native
-@JSName("createjs.TextLoader")
+@JSGlobal("createjs.TextLoader")
 object TextLoader extends js.Object {
   def canLoadItem(item: Object): Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.VideoLoader")
+@JSGlobal("createjs.VideoLoader")
 class VideoLoader protected () extends js.Object {
   def this(loadItem: Object, preferXHR: Boolean) = this()
 }
 
 @js.native
-@JSName("createjs.VideoLoader")
+@JSGlobal("createjs.VideoLoader")
 object VideoLoader extends js.Object {
   def canLoadItem(item: Object): Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.XHRRequest")
+@JSGlobal("createjs.XHRRequest")
 class XHRRequest protected () extends AbstractLoader {
   def this(item: Object) = this()
   def getAllResponseHeaders(): String = js.native
@@ -327,13 +327,13 @@ class XHRRequest protected () extends AbstractLoader {
 }
 
 @js.native
-@JSName("createjs.XMLLoader")
+@JSGlobal("createjs.XMLLoader")
 class XMLLoader protected () extends js.Object {
   def this(loadItem: Object) = this()
 }
 
 @js.native
-@JSName("createjs.XMLLoader")
+@JSGlobal("createjs.XMLLoader")
 object XMLLoader extends js.Object {
   def canLoadItem(item: Object): Boolean = js.native
 }
diff --git a/src/main/scala/com/scalawarrior/scalajs/createjs/SoundJS.scala b/src/main/scala/com/scalawarrior/scalajs/createjs/SoundJS.scala
index f5e6aaf..932635f 100644
--- a/src/main/scala/com/scalawarrior/scalajs/createjs/SoundJS.scala
+++ b/src/main/scala/com/scalawarrior/scalajs/createjs/SoundJS.scala
@@ -5,7 +5,7 @@ import js.annotation._
 import org.scalajs.dom.raw._
 
 @js.native
-@JSName("createjs.AbstractPlugin")
+@JSGlobal("createjs.AbstractPlugin")
 class AbstractPlugin extends js.Object {
   def create(src: String, startTime: Double, duration: Double): AbstractSoundInstance = js.native
   def getVolume(): Double = js.native
@@ -21,7 +21,7 @@ class AbstractPlugin extends js.Object {
 }
 
 @js.native
-@JSName("createjs.AbstractSoundInstance")
+@JSGlobal("createjs.AbstractSoundInstance")
 class AbstractSoundInstance protected () extends EventDispatcher {
   def this(src: String, startTime: Double, duration: Double, playbackResource: Object) = this()
   var duration: Double = js.native
@@ -55,34 +55,34 @@ class AbstractSoundInstance protected () extends EventDispatcher {
 }
 
 @js.native
-@JSName("createjs.FlashAudioLoader")
+@JSGlobal("createjs.FlashAudioLoader")
 class FlashAudioLoader extends AbstractLoader {
   var flashId: String = js.native
   def setFlash(flash: Object): Unit = js.native
 }
 
 @js.native
-@JSName("createjs.FlashAudioPlugin")
+@JSGlobal("createjs.FlashAudioPlugin")
 class FlashAudioPlugin extends AbstractPlugin {
   var flashReady: Boolean = js.native
   var showOutput: Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.FlashAudioPlugin")
+@JSGlobal("createjs.FlashAudioPlugin")
 object FlashAudioPlugin extends js.Object {
   var swfPath: String = js.native
   def isSupported(): Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.FlashAudioSoundInstance")
+@JSGlobal("createjs.FlashAudioSoundInstance")
 class FlashAudioSoundInstance protected () extends AbstractSoundInstance {
   def this(src: String, startTime: Double, duration: Double, playbackResource: Object) = this()
 }
 
 @js.native
-@JSName("createjs.FlashPlugin")
+@JSGlobal("createjs.FlashPlugin")
 class FlashPlugin extends js.Object {
   var flashReady: Boolean = js.native
   var showOutput: Boolean = js.native
@@ -98,7 +98,7 @@ class FlashPlugin extends js.Object {
 }
 
 @js.native
-@JSName("createjs.FlashPlugin")
+@JSGlobal("createjs.FlashPlugin")
 object FlashPlugin extends js.Object {
   var buildDate: String = js.native
   var swfPath: String = js.native
@@ -107,37 +107,37 @@ object FlashPlugin extends js.Object {
 }
 
 @js.native
-@JSName("createjs.HTMLAudioPlugin")
+@JSGlobal("createjs.HTMLAudioPlugin")
 class HTMLAudioPlugin extends AbstractPlugin {
   var defaultNumChannels: Double = js.native
   var enableIOS: Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.HTMLAudioPlugin")
+@JSGlobal("createjs.HTMLAudioPlugin")
 object HTMLAudioPlugin extends js.Object {
   var MAX_INSTANCES: Double = js.native
   def isSupported(): Boolean = js.native
 }
 
 @js.native
-@JSName("createjs.HTMLAudioSoundInstance")
+@JSGlobal("createjs.HTMLAudioSoundInstance")
 class HTMLAudioSoundInstance protected () extends AbstractSoundInstance {
   def this(src: String, startTime: Double, duration: Double, playbackResource: Object) = this()
 }
 
 @js.native
-@JSName("createjs.HTMLAudioTagPool")
+@JSGlobal("createjs.HTMLAudioTagPool")
 class HTMLAudioTagPool extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Sound")
+@JSGlobal("createjs.Sound")
 class Sound extends EventDispatcher {
 }
 
 @js.native
-@JSName("createjs.Sound")
+@JSGlobal("createjs.Sound")
 object Sound extends js.Object {
   var activePlugin: Object = js.native
   var alternateExtensions: js.Array[js.Any] = js.native
@@ -186,30 +186,30 @@ object Sound extends js.Object {
 }
 
 @js.native
-@JSName("createjs.SoundJS")
+@JSGlobal("createjs.SoundJS")
 class SoundJS extends js.Object {
 }
 
 @js.native
-@JSName("createjs.SoundJS")
+@JSGlobal("createjs.SoundJS")
 object SoundJS extends js.Object {
   var buildDate: String = js.native
   var version: String = js.native
 }
 
 @js.native
-@JSName("createjs.WebAudioLoader")
+@JSGlobal("createjs.WebAudioLoader")
 class WebAudioLoader extends js.Object {
 }
 
 @js.native
-@JSName("createjs.WebAudioLoader")
+@JSGlobal("createjs.WebAudioLoader")
 object WebAudioLoader extends js.Object {
   var context: AudioContext = js.native
 }
 
 @js.native
-@JSName("createjs.WebAudioPlugin")
+@JSGlobal("createjs.WebAudioPlugin")
 class WebAudioPlugin extends AbstractPlugin {
   var context: AudioContext = js.native
   var dynamicsCompressorNode: DynamicsCompressorNode = js.native
@@ -217,7 +217,7 @@ class WebAudioPlugin extends AbstractPlugin {
 }
 
 @js.native
-@JSName("createjs.WebAudioPlugin")
+@JSGlobal("createjs.WebAudioPlugin")
 object WebAudioPlugin extends js.Object {
   var context: AudioContext = js.native
   def isSupported(): Boolean = js.native
@@ -225,7 +225,7 @@ object WebAudioPlugin extends js.Object {
 }
 
 @js.native
-@JSName("createjs.WebAudioSoundInstance")
+@JSGlobal("createjs.WebAudioSoundInstance")
 class WebAudioSoundInstance protected () extends AbstractSoundInstance {
   def this(src: String, startTime: Double, duration: Double, playbackResource: Object) = this()
   var gainNode: GainNode = js.native
@@ -234,7 +234,7 @@ class WebAudioSoundInstance protected () extends AbstractSoundInstance {
 }
 
 @js.native
-@JSName("createjs.WebAudioSoundInstance")
+@JSGlobal("createjs.WebAudioSoundInstance")
 object WebAudioSoundInstance extends js.Object {
   var context: AudioContext = js.native
   var destinationNode: AudioNode = js.native
diff --git a/src/main/scala/com/scalawarrior/scalajs/createjs/TweenJS.scala b/src/main/scala/com/scalawarrior/scalajs/createjs/TweenJS.scala
index 9f01289..a942ba3 100644
--- a/src/main/scala/com/scalawarrior/scalajs/createjs/TweenJS.scala
+++ b/src/main/scala/com/scalawarrior/scalajs/createjs/TweenJS.scala
@@ -5,24 +5,24 @@ import js.`|`
 import js.annotation._
 
 @js.native
-@JSName("createjs.CSSPlugin")
+@JSGlobal("createjs.CSSPlugin")
 class CSSPlugin extends js.Object {
 }
 
 @js.native
-@JSName("createjs.CSSPlugin")
+@JSGlobal("createjs.CSSPlugin")
 object CSSPlugin extends js.Object {
   var cssSuffixMap: Object = js.native
   def install(): Unit = js.native
 }
 
 @js.native
-@JSName("createjs.Ease")
+@JSGlobal("createjs.Ease")
 class Ease extends js.Object {
 }
 
 @js.native
-@JSName("createjs.Ease")
+@JSGlobal("createjs.Ease")
 object Ease extends js.Object {
   var backIn: js.Function1[Double, Double] = js.native
   var backInOut: js.Function1[Double, Double] = js.native
@@ -66,18 +66,18 @@ object Ease extends js.Object {
 }
 
 @js.native
-@JSName("createjs.MotionGuidePlugin")
+@JSGlobal("createjs.MotionGuidePlugin")
 class MotionGuidePlugin extends js.Object {
 }
 
 @js.native
-@JSName("createjs.MotionGuidePlugin")
+@JSGlobal("createjs.MotionGuidePlugin")
 object MotionGuidePlugin extends js.Object {
   def install(): Object = js.native
 }
 
 @js.native
-@JSName("createjs.Timeline")
+@JSGlobal("createjs.Timeline")
 class Timeline protected () extends EventDispatcher {
   def this(tweens: js.Array[Tween], labels: Object, props: Object) = this()
   var duration: Double = js.native
@@ -100,7 +100,7 @@ class Timeline protected () extends EventDispatcher {
 }
 
 @js.native
-@JSName("createjs.Tween")
+@JSGlobal("createjs.Tween")
 class Tween protected () extends EventDispatcher {
   def this(target: Object, props: Object = ???, pluginData: Object = ???) = this()
   var duration: Double = js.native
@@ -123,7 +123,7 @@ class Tween protected () extends EventDispatcher {
 }
 
 @js.native
-@JSName("createjs.Tween")
+@JSGlobal("createjs.Tween")
 object Tween extends js.Object {
   var IGNORE: Object = js.native
   var LOOP: Double = js.native
@@ -138,12 +138,12 @@ object Tween extends js.Object {
 }
 
 @js.native
-@JSName("createjs.TweenJS")
+@JSGlobal("createjs.TweenJS")
 class TweenJS extends js.Object {
 }
 
 @js.native
-@JSName("createjs.TweenJS")
+@JSGlobal("createjs.TweenJS")
 object TweenJS extends js.Object {
   var buildDate: String = js.native
   var version: String = js.native