diff --git a/babel.config.js b/babel.config.js
index 90242cab..f9514913 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -42,9 +42,11 @@ const plugins = () => {
           Integrations: path.join(__dirname, 'packages/netlify-cms-core/src/integrations/'),
           Lib: path.join(__dirname, 'packages/netlify-cms-core/src/lib/'),
           Reducers: path.join(__dirname, 'packages/netlify-cms-core/src/reducers/'),
-          Redux: path.join(__dirname, 'packages/netlify-cms-core/src/redux/'),
+          ReduxStore: path.join(__dirname, 'packages/netlify-cms-core/src/redux/'),
           Routing: path.join(__dirname, 'packages/netlify-cms-core/src/routing/'),
           ValueObjects: path.join(__dirname, 'packages/netlify-cms-core/src/valueObjects/'),
+          redux: 'redux',
+          localforage: 'localforage',
         },
       },
     ],
diff --git a/packages/netlify-cms-backend-bitbucket/src/index.js b/packages/netlify-cms-backend-bitbucket/src/index.js
index 45139e5c..ca064610 100644
--- a/packages/netlify-cms-backend-bitbucket/src/index.js
+++ b/packages/netlify-cms-backend-bitbucket/src/index.js
@@ -1,10 +1,10 @@
-import Control from './implementation';
+import BitbucketBackend from './implementation';
 import API from './API';
 import AuthenticationPage from './AuthenticationPage';
 
 export const NetlifyCmsBackendBitbucket = {
-  Control,
+  BitbucketBackend,
   API,
   AuthenticationPage,
 };
-export { Control, API, AuthenticationPage };
+export { BitbucketBackend, API, AuthenticationPage };
diff --git a/packages/netlify-cms-backend-git-gateway/src/index.js b/packages/netlify-cms-backend-git-gateway/src/index.js
index 20d203e7..d2eeecbf 100644
--- a/packages/netlify-cms-backend-git-gateway/src/index.js
+++ b/packages/netlify-cms-backend-git-gateway/src/index.js
@@ -1,8 +1,8 @@
-import Control from './implementation';
+import GitGatewayBackend from './implementation';
 import AuthenticationPage from './AuthenticationPage';
 
 export const NetlifyCmsBackendGitGateway = {
-  Control,
+  GitGatewayBackend,
   AuthenticationPage,
 };
-export { Control, AuthenticationPage };
+export { GitGatewayBackend, AuthenticationPage };
diff --git a/packages/netlify-cms-backend-github/src/index.js b/packages/netlify-cms-backend-github/src/index.js
index 16d2b858..490f2ea4 100644
--- a/packages/netlify-cms-backend-github/src/index.js
+++ b/packages/netlify-cms-backend-github/src/index.js
@@ -1,10 +1,10 @@
-import Control from './implementation';
+import GitHubBackend from './implementation';
 import API from './API';
 import AuthenticationPage from './AuthenticationPage';
 
 export const NetlifyCmsBackendGithub = {
-  Control,
+  GitHubBackend,
   API,
   AuthenticationPage,
 };
-export { Control, API, AuthenticationPage };
+export { GitHubBackend, API, AuthenticationPage };
diff --git a/packages/netlify-cms-backend-gitlab/src/index.js b/packages/netlify-cms-backend-gitlab/src/index.js
index 30b047e7..1c5d73d9 100644
--- a/packages/netlify-cms-backend-gitlab/src/index.js
+++ b/packages/netlify-cms-backend-gitlab/src/index.js
@@ -1,10 +1,10 @@
-import Control from './implementation';
+import GitLabBackend from './implementation';
 import API from './API';
 import AuthenticationPage from './AuthenticationPage';
 
 export const NetlifyCmsBackendGitlab = {
-  Control,
+  GitLabBackend,
   API,
   AuthenticationPage,
 };
-export { Control, API, AuthenticationPage };
+export { GitLabBackend, API, AuthenticationPage };
diff --git a/packages/netlify-cms-backend-test/src/index.js b/packages/netlify-cms-backend-test/src/index.js
index 5d35d8cb..a25a22fb 100644
--- a/packages/netlify-cms-backend-test/src/index.js
+++ b/packages/netlify-cms-backend-test/src/index.js
@@ -1,8 +1,8 @@
-import Control from './implementation';
+import TestBackend from './implementation';
 import AuthenticationPage from './AuthenticationPage';
 
 export const NetlifyCmsBackendTest = {
-  Control,
+  TestBackend,
   AuthenticationPage,
 };
-export { Control, AuthenticationPage };
+export { TestBackend, AuthenticationPage };
diff --git a/packages/netlify-cms-core/src/bootstrap.js b/packages/netlify-cms-core/src/bootstrap.js
index e35a8afb..9c232e58 100644
--- a/packages/netlify-cms-core/src/bootstrap.js
+++ b/packages/netlify-cms-core/src/bootstrap.js
@@ -4,7 +4,7 @@ import { Provider } from 'react-redux';
 import { Route } from 'react-router-dom';
 import { ConnectedRouter } from 'react-router-redux';
 import history from 'Routing/history';
-import store from 'Redux';
+import store from 'ReduxStore';
 import { mergeConfig } from 'Actions/config';
 import { getPhrases } from 'Constants/defaultPhrases';
 import { I18n } from 'react-polyglot';
diff --git a/packages/netlify-cms-core/src/mediaLibrary.js b/packages/netlify-cms-core/src/mediaLibrary.js
index 29c660da..63cdf7a2 100644
--- a/packages/netlify-cms-core/src/mediaLibrary.js
+++ b/packages/netlify-cms-core/src/mediaLibrary.js
@@ -4,7 +4,7 @@
  */
 import { once } from 'lodash';
 import { getMediaLibrary } from 'Lib/registry';
-import store from 'Redux';
+import store from 'ReduxStore';
 import { createMediaLibrary, insertMedia } from 'Actions/mediaLibrary';
 
 const initializeMediaLibrary = once(async function initializeMediaLibrary(name, options) {
diff --git a/packages/netlify-cms-core/src/reducers/combinedReducer.js b/packages/netlify-cms-core/src/reducers/combinedReducer.js
index 23be34b6..9fcbb60f 100644
--- a/packages/netlify-cms-core/src/reducers/combinedReducer.js
+++ b/packages/netlify-cms-core/src/reducers/combinedReducer.js
@@ -2,7 +2,7 @@ import { combineReducers } from 'redux';
 import { routerReducer } from 'react-router-redux';
 import { reducer as notifReducer } from 'redux-notifications';
 import optimist from 'redux-optimist';
-import reducers from '.';
+import reducers from './index';
 
 export default optimist(
   combineReducers({
diff --git a/packages/netlify-cms-core/src/valueObjects/AssetProxy.js b/packages/netlify-cms-core/src/valueObjects/AssetProxy.js
index 98b86ec1..9fb592c4 100644
--- a/packages/netlify-cms-core/src/valueObjects/AssetProxy.js
+++ b/packages/netlify-cms-core/src/valueObjects/AssetProxy.js
@@ -1,6 +1,6 @@
 import { resolvePath } from 'netlify-cms-lib-util';
 import { currentBackend } from 'coreSrc/backend';
-import store from 'Redux';
+import store from 'ReduxStore';
 import { getIntegrationProvider } from 'Integrations';
 import { selectIntegration } from 'Reducers';
 
diff --git a/packages/netlify-cms/src/backends.js b/packages/netlify-cms/src/backends.js
index fc4bf96c..5a3424b0 100644
--- a/packages/netlify-cms/src/backends.js
+++ b/packages/netlify-cms/src/backends.js
@@ -1,12 +1,12 @@
 import { registerBackend } from 'netlify-cms-core/src';
-import { Control as NetlifyCmsBackendGithub } from 'netlify-cms-backend-github/src';
-import { Control as NetlifyCmsBackendGitlab } from 'netlify-cms-backend-gitlab/src';
-import { Control as NetlifyCmsBackendGitGateway } from 'netlify-cms-backend-git-gateway/src';
-import { Control as NetlifyCmsBackendBitbucket } from 'netlify-cms-backend-bitbucket/src';
-import { Control as NetlifyCmsBackendTest } from 'netlify-cms-backend-test/src';
+import { GitHubBackend } from 'netlify-cms-backend-github/src';
+import { GitLabBackend } from 'netlify-cms-backend-gitlab/src';
+import { GitGatewayBackend } from 'netlify-cms-backend-git-gateway/src';
+import { BitbucketBackend } from 'netlify-cms-backend-bitbucket/src';
+import { TestBackend } from 'netlify-cms-backend-test/src';
 
-registerBackend('git-gateway', NetlifyCmsBackendGitGateway);
-registerBackend('github', NetlifyCmsBackendGithub);
-registerBackend('gitlab', NetlifyCmsBackendGitlab);
-registerBackend('bitbucket', NetlifyCmsBackendBitbucket);
-registerBackend('test-repo', NetlifyCmsBackendTest);
+registerBackend('git-gateway', GitGatewayBackend);
+registerBackend('github', GitHubBackend);
+registerBackend('gitlab', GitLabBackend);
+registerBackend('bitbucket', BitbucketBackend);
+registerBackend('test-repo', TestBackend);