diff --git a/src/uiRouterNgModule.ts b/src/uiRouterNgModule.ts
index c08ed6a1a..477e1e5b7 100644
--- a/src/uiRouterNgModule.ts
+++ b/src/uiRouterNgModule.ts
@@ -2,7 +2,7 @@
 /** */
 import { Ng2StateDeclaration } from "./interface";
 import {
-  NgModule, OpaqueToken, ModuleWithProviders, ANALYZE_FOR_ENTRY_COMPONENTS, Provider, Injector
+  NgModule, ModuleWithProviders, ANALYZE_FOR_ENTRY_COMPONENTS, Provider, Injector, InjectionToken
 } from "@angular/core";
 import { CommonModule, LocationStrategy, HashLocationStrategy, PathLocationStrategy } from "@angular/common";
 import { _UIROUTER_DIRECTIVES } from "./directives/directives";
@@ -11,9 +11,9 @@ import { UrlRuleHandlerFn, TargetState, TargetStateDef, UIRouter } from "@uirout
 import { _UIROUTER_INSTANCE_PROVIDERS, _UIROUTER_SERVICE_PROVIDERS } from "./providers";
 
 import { ROUTES } from "@angular/router";
-/** @hidden */ export const UIROUTER_ROOT_MODULE  = new OpaqueToken("UIRouter Root Module");
-/** @hidden */ export const UIROUTER_MODULE_TOKEN = new OpaqueToken("UIRouter Module");
-/** @hidden */ export const UIROUTER_STATES       = new OpaqueToken("UIRouter States");
+/** @hidden */ export const UIROUTER_ROOT_MODULE  = new InjectionToken("UIRouter Root Module");
+/** @hidden */ export const UIROUTER_MODULE_TOKEN = new InjectionToken("UIRouter Module");
+/** @hidden */ export const UIROUTER_STATES       = new InjectionToken("UIRouter States");
 // /** @hidden */ export const ROUTES = UIROUTER_STATES;
 
 export function makeRootProviders(module: StatesModule): Provider[] {
diff --git a/yarn.lock b/yarn.lock
index 7fabe07a1..d62b00d4d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -95,7 +95,7 @@
   version "5.0.6"
   resolved "https://registry.yarnpkg.com/@uirouter/core/-/core-5.0.6.tgz#251e1fc4d6ce8fe47e374bb86971e68a2ef1b323"
 
-"@uirouter/publish-scripts@^1.0.4":
+"@uirouter/publish-scripts@^1.0.7":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@uirouter/publish-scripts/-/publish-scripts-1.0.7.tgz#99ffd6aeced41e96b92ccb007342eee5d14b0a9a"
   dependencies: