diff --git a/packages/core/src/views/NavigationConsumer.js b/packages/core/src/views/NavigationConsumer.js
index a04c4edd..3cf48cd2 100644
--- a/packages/core/src/views/NavigationConsumer.js
+++ b/packages/core/src/views/NavigationConsumer.js
@@ -1,3 +1,5 @@
-import { NavigationConsumer } from './NavigationContext';
+import NavigationContext from './NavigationContext';
 
-export default NavigationConsumer;
+const { Consumer } = NavigationContext;
+
+export default Consumer;
diff --git a/packages/core/src/views/NavigationProvider.js b/packages/core/src/views/NavigationProvider.js
index 94c17bac..842681cc 100644
--- a/packages/core/src/views/NavigationProvider.js
+++ b/packages/core/src/views/NavigationProvider.js
@@ -1,3 +1,5 @@
-import { NavigationProvider } from './NavigationContext';
+import NavigationContext from './NavigationContext';
 
-export default NavigationProvider;
+const { Provider } = NavigationContext;
+
+export default Provider;
diff --git a/packages/core/src/views/SceneView.js b/packages/core/src/views/SceneView.js
index 248f61a3..d6aa8cf4 100644
--- a/packages/core/src/views/SceneView.js
+++ b/packages/core/src/views/SceneView.js
@@ -1,13 +1,13 @@
 import React from 'react';
-import { NavigationProvider } from './NavigationContext';
+import NavigationContext from './NavigationContext';
 
 export default class SceneView extends React.PureComponent {
   render() {
     const { screenProps, component: Component, navigation } = this.props;
     return (
-      <NavigationProvider value={navigation}>
+      <NavigationContext.Provider value={navigation}>
         <Component screenProps={screenProps} navigation={navigation} />
-      </NavigationProvider>
+      </NavigationContext.Provider>
     );
   }
 }
diff --git a/packages/core/src/views/__tests__/NavigationEvents-test.js b/packages/core/src/views/__tests__/NavigationEvents-test.js
index 7b5bc0fb..6108447f 100644
--- a/packages/core/src/views/__tests__/NavigationEvents-test.js
+++ b/packages/core/src/views/__tests__/NavigationEvents-test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import renderer from 'react-test-renderer';
 import NavigationEvents from '../NavigationEvents';
-import { NavigationProvider } from '../NavigationContext';
+import NavigationContext from '../NavigationContext';
 
 const createListener = () => () => {};
 
@@ -72,9 +72,9 @@ const NavigationEventsTestComp = ({
 }) => {
   if (withContext) {
     return (
-      <NavigationProvider value={navigation}>
+      <NavigationContext.Provider value={navigation}>
         <NavigationEvents {...props} />
-      </NavigationProvider>
+      </NavigationContext.Provider>
     );
   } else {
     return <NavigationEvents navigation={navigation} {...props} />;
diff --git a/packages/core/src/views/withNavigation.js b/packages/core/src/views/withNavigation.js
index 2a580a4c..f3095e05 100644
--- a/packages/core/src/views/withNavigation.js
+++ b/packages/core/src/views/withNavigation.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import hoistStatics from 'hoist-non-react-statics';
 import invariant from '../utils/invariant';
-import { NavigationConsumer } from './NavigationContext';
+import NavigationContext from './NavigationContext';
 
 export default function withNavigation(Component) {
   class ComponentWithNavigation extends React.Component {
@@ -11,7 +11,7 @@ export default function withNavigation(Component) {
     render() {
       const navigationProp = this.props.navigation;
       return (
-        <NavigationConsumer>
+        <NavigationContext.Consumer>
           {navigationContext => {
             const navigation = navigationProp || navigationContext;
             invariant(
@@ -26,7 +26,7 @@ export default function withNavigation(Component) {
               />
             );
           }}
-        </NavigationConsumer>
+        </NavigationContext.Consumer>
       );
     }
   }