diff --git a/assets/js/src/form_editor/store/reducer.jsx b/assets/js/src/form_editor/store/reducer.jsx
index 17cc25aeb5..1dc582ae31 100644
--- a/assets/js/src/form_editor/store/reducer.jsx
+++ b/assets/js/src/form_editor/store/reducer.jsx
@@ -1,25 +1,25 @@
-import addNotice from './reducers/addNotice.jsx';
-import toggleSidebar from './reducers/toggleSidebar.jsx';
-import changeFormName from './reducers/changeFormName.jsx';
-import changeFormStyles from './reducers/changeFormStyles.jsx';
-import saveFormStarted from './reducers/saveFormStarted.jsx';
-import saveFormDone from './reducers/saveFormDone.jsx';
-import removeNotice from './reducers/removeNotice.jsx';
-import changeFormSettings from './reducers/changeFormSettings.jsx';
-import switchSidebarTab from './reducers/switchSidebarTab.jsx';
-import toggleSidebarPanel from './reducers/toggleSidebarPanel.jsx';
+import addNotice from './reducers/add_notice.jsx';
+import changeFormName from './reducers/change_form_name.jsx';
+import changeFormSettings from './reducers/change_form_settings.jsx';
+import changeFormStyles from './reducers/change_form_styles.jsx';
+import removeNotice from './reducers/remove_notice.jsx';
+import saveFormStarted from './reducers/save_form_started.jsx';
+import saveFormDone from './reducers/save_form_done.jsx';
+import switchSidebarTab from './reducers/switch_sidebar_tab.jsx';
+import toggleSidebar from './reducers/toggle_sidebar.jsx';
+import toggleSidebarPanel from './reducers/toggle_sidebar_panel.jsx';
 
 export default (defaultState) => (state = defaultState, action) => {
   switch (action.type) {
     case 'ADD_NOTICE': return addNotice(state, action);
     case 'CHANGE_FORM_NAME': return changeFormName(state, action);
+    case 'CHANGE_FORM_SETTINGS': return changeFormSettings(state, action);
     case 'CHANGE_FORM_STYLES': return changeFormStyles(state, action);
     case 'REMOVE_NOTICE': return removeNotice(state, action);
     case 'SAVE_FORM_DONE': return saveFormDone(state);
     case 'SAVE_FORM_STARTED': return saveFormStarted(state);
-    case 'TOGGLE_SIDEBAR': return toggleSidebar(state, action);
-    case 'CHANGE_FORM_SETTINGS': return changeFormSettings(state, action);
     case 'SWITCH_SIDEBAR_TAB': return switchSidebarTab(state, action);
+    case 'TOGGLE_SIDEBAR': return toggleSidebar(state, action);
     case 'TOGGLE_SIDEBAR_PANEL': return toggleSidebarPanel(state, action);
     default:
       return state;
diff --git a/assets/js/src/form_editor/store/reducers/addNotice.jsx b/assets/js/src/form_editor/store/reducers/add_notice.jsx
similarity index 100%
rename from assets/js/src/form_editor/store/reducers/addNotice.jsx
rename to assets/js/src/form_editor/store/reducers/add_notice.jsx
diff --git a/assets/js/src/form_editor/store/reducers/changeFormName.jsx b/assets/js/src/form_editor/store/reducers/change_form_name.jsx
similarity index 100%
rename from assets/js/src/form_editor/store/reducers/changeFormName.jsx
rename to assets/js/src/form_editor/store/reducers/change_form_name.jsx
diff --git a/assets/js/src/form_editor/store/reducers/changeFormSettings.jsx b/assets/js/src/form_editor/store/reducers/change_form_settings.jsx
similarity index 100%
rename from assets/js/src/form_editor/store/reducers/changeFormSettings.jsx
rename to assets/js/src/form_editor/store/reducers/change_form_settings.jsx
diff --git a/assets/js/src/form_editor/store/reducers/changeFormStyles.jsx b/assets/js/src/form_editor/store/reducers/change_form_styles.jsx
similarity index 100%
rename from assets/js/src/form_editor/store/reducers/changeFormStyles.jsx
rename to assets/js/src/form_editor/store/reducers/change_form_styles.jsx
diff --git a/assets/js/src/form_editor/store/reducers/removeNotice.jsx b/assets/js/src/form_editor/store/reducers/remove_notice.jsx
similarity index 100%
rename from assets/js/src/form_editor/store/reducers/removeNotice.jsx
rename to assets/js/src/form_editor/store/reducers/remove_notice.jsx
diff --git a/assets/js/src/form_editor/store/reducers/saveFormDone.jsx b/assets/js/src/form_editor/store/reducers/save_form_done.jsx
similarity index 100%
rename from assets/js/src/form_editor/store/reducers/saveFormDone.jsx
rename to assets/js/src/form_editor/store/reducers/save_form_done.jsx
diff --git a/assets/js/src/form_editor/store/reducers/saveFormStarted.jsx b/assets/js/src/form_editor/store/reducers/save_form_started.jsx
similarity index 100%
rename from assets/js/src/form_editor/store/reducers/saveFormStarted.jsx
rename to assets/js/src/form_editor/store/reducers/save_form_started.jsx
diff --git a/assets/js/src/form_editor/store/reducers/switchSidebarTab.jsx b/assets/js/src/form_editor/store/reducers/switch_sidebar_tab.jsx
similarity index 100%
rename from assets/js/src/form_editor/store/reducers/switchSidebarTab.jsx
rename to assets/js/src/form_editor/store/reducers/switch_sidebar_tab.jsx
diff --git a/assets/js/src/form_editor/store/reducers/toggleSidebar.jsx b/assets/js/src/form_editor/store/reducers/toggle_sidebar.jsx
similarity index 100%
rename from assets/js/src/form_editor/store/reducers/toggleSidebar.jsx
rename to assets/js/src/form_editor/store/reducers/toggle_sidebar.jsx
diff --git a/assets/js/src/form_editor/store/reducers/toggleSidebarPanel.jsx b/assets/js/src/form_editor/store/reducers/toggle_sidebar_panel.jsx
similarity index 100%
rename from assets/js/src/form_editor/store/reducers/toggleSidebarPanel.jsx
rename to assets/js/src/form_editor/store/reducers/toggle_sidebar_panel.jsx