diff --git a/modules/History.js b/modules/History.js
index ecfb843347..fa0542e557 100644
--- a/modules/History.js
+++ b/modules/History.js
@@ -1,4 +1,4 @@
-import warning from './warning'
+import warning from './routerWarning'
 import { history } from './PropTypes'
 
 /**
diff --git a/modules/IndexRedirect.js b/modules/IndexRedirect.js
index 8f215c8350..299f3aa4a4 100644
--- a/modules/IndexRedirect.js
+++ b/modules/IndexRedirect.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import warning from './warning'
+import warning from './routerWarning'
 import invariant from 'invariant'
 import Redirect from './Redirect'
 import { falsy } from './PropTypes'
diff --git a/modules/IndexRoute.js b/modules/IndexRoute.js
index b5a3e9d832..0a884eb5ec 100644
--- a/modules/IndexRoute.js
+++ b/modules/IndexRoute.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import warning from './warning'
+import warning from './routerWarning'
 import invariant from 'invariant'
 import { createRouteFromReactElement } from './RouteUtils'
 import { component, components, falsy } from './PropTypes'
diff --git a/modules/Lifecycle.js b/modules/Lifecycle.js
index 66b5051b53..7d01f17dee 100644
--- a/modules/Lifecycle.js
+++ b/modules/Lifecycle.js
@@ -1,4 +1,4 @@
-import warning from './warning'
+import warning from './routerWarning'
 import React from 'react'
 import invariant from 'invariant'
 
diff --git a/modules/Link.js b/modules/Link.js
index a1ccac4b56..45047537e1 100644
--- a/modules/Link.js
+++ b/modules/Link.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import warning from './warning'
+import warning from './routerWarning'
 
 const { bool, object, string, func, oneOfType } = React.PropTypes
 
diff --git a/modules/RouteContext.js b/modules/RouteContext.js
index a6ea8cc14f..3336722a11 100644
--- a/modules/RouteContext.js
+++ b/modules/RouteContext.js
@@ -1,4 +1,4 @@
-import warning from './warning'
+import warning from './routerWarning'
 import React from 'react'
 
 const { object } = React.PropTypes
diff --git a/modules/RouteUtils.js b/modules/RouteUtils.js
index f3a6c907f4..501b68ca5b 100644
--- a/modules/RouteUtils.js
+++ b/modules/RouteUtils.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import warning from './warning'
+import warning from './routerWarning'
 
 function isValidChild(object) {
   return object == null || React.isValidElement(object)
diff --git a/modules/Router.js b/modules/Router.js
index 89c341883a..8a4091f8e8 100644
--- a/modules/Router.js
+++ b/modules/Router.js
@@ -7,7 +7,7 @@ import { routes } from './PropTypes'
 import RouterContext from './RouterContext'
 import { createRoutes } from './RouteUtils'
 import { createRouterObject, createRoutingHistory } from './RouterUtils'
-import warning from './warning'
+import warning from './routerWarning'
 
 function isDeprecatedHistory(history) {
   return !history || !history.__v2_compatible__
diff --git a/modules/RouterContext.js b/modules/RouterContext.js
index bad39950a9..ed1230db0d 100644
--- a/modules/RouterContext.js
+++ b/modules/RouterContext.js
@@ -4,7 +4,7 @@ import React from 'react'
 import deprecateObjectProperties from './deprecateObjectProperties'
 import getRouteParams from './getRouteParams'
 import { isReactChildren } from './RouteUtils'
-import warning from './warning'
+import warning from './routerWarning'
 
 const { array, func, object } = React.PropTypes
 
diff --git a/modules/RoutingContext.js b/modules/RoutingContext.js
index 2e73270360..d6e712ce65 100644
--- a/modules/RoutingContext.js
+++ b/modules/RoutingContext.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import RouterContext from './RouterContext'
-import warning from './warning'
+import warning from './routerWarning'
 
 const RoutingContext = React.createClass({
   componentWillMount() {
diff --git a/modules/TransitionUtils.js b/modules/TransitionUtils.js
index 30331ba3ed..ef73814a52 100644
--- a/modules/TransitionUtils.js
+++ b/modules/TransitionUtils.js
@@ -1,5 +1,5 @@
 import { loopAsync } from './AsyncUtils'
-import warning from './warning'
+import warning from './routerWarning'
 
 function createEnterHook(hook, route) {
   return function (a, b, callback) {
diff --git a/modules/createTransitionManager.js b/modules/createTransitionManager.js
index 847cfaea03..7bb5fe7726 100644
--- a/modules/createTransitionManager.js
+++ b/modules/createTransitionManager.js
@@ -1,4 +1,4 @@
-import warning from './warning'
+import warning from './routerWarning'
 import { REPLACE } from 'history/lib/Actions'
 import computeChangedRoutes from './computeChangedRoutes'
 import { runEnterHooks, runLeaveHooks } from './TransitionUtils'
diff --git a/modules/deprecateObjectProperties.js b/modules/deprecateObjectProperties.js
index b2180425c9..2e152f74b0 100644
--- a/modules/deprecateObjectProperties.js
+++ b/modules/deprecateObjectProperties.js
@@ -1,5 +1,5 @@
 /*eslint no-empty: 0*/
-import warning from './warning'
+import warning from './routerWarning'
 
 let useMembrane = false
 
diff --git a/modules/matchRoutes.js b/modules/matchRoutes.js
index 88c0cf52f3..e3e2a83328 100644
--- a/modules/matchRoutes.js
+++ b/modules/matchRoutes.js
@@ -1,4 +1,4 @@
-import warning from './warning'
+import warning from './routerWarning'
 import { loopAsync } from './AsyncUtils'
 import { matchPattern } from './PatternUtils'
 import { createRoutes } from './RouteUtils'
diff --git a/modules/warning.js b/modules/routerWarning.js
similarity index 100%
rename from modules/warning.js
rename to modules/routerWarning.js
diff --git a/modules/useRoutes.js b/modules/useRoutes.js
index 7ec84ae7ce..e6de86b8b2 100644
--- a/modules/useRoutes.js
+++ b/modules/useRoutes.js
@@ -1,7 +1,7 @@
 import useQueries from 'history/lib/useQueries'
 
 import createTransitionManager from './createTransitionManager'
-import warning from './warning'
+import warning from './routerWarning'
 
 /**
  * Returns a new createHistory function that may be used to create