4 files changed, 27 insertions, 27 deletions
diff --git a/web/src/js/components/Header/FileMenu.jsx b/web/src/js/components/Header/FileMenu.jsx
index a4466784..d3786475 100644
--- a/web/src/js/components/Header/FileMenu.jsx
+++ b/web/src/js/components/Header/FileMenu.jsx
@@ -36,7 +36,7 @@ class FileMenu extends Component {
     onNewClick(e) {
         e.preventDefault()
         if (confirm('Delete all flows?')) {
-            this.props.onClear()
+            this.props.clearFlows()
         }
     }
 
@@ -48,14 +48,14 @@ class FileMenu extends Component {
     onOpenFile(e) {
         e.preventDefault()
         if (e.target.files.length > 0) {
-            this.props.onUpload(e.target.files[0])
+            this.props.loadFlows(e.target.files[0])
             this.fileInput.value = ''
         }
     }
 
     onSaveClick(e) {
         e.preventDefault()
-        this.props.onDownload()
+        this.props.saveFlows()
     }
 
     render() {
@@ -103,8 +103,8 @@ class FileMenu extends Component {
 export default connect(
     null,
     {
-        onClear: flowsActions.clear,
-        onUpload: flowsActions.upload,
-        onDownload: flowsActions.download,
+        clearFlows: flowsActions.clear,
+        loadFlows: flowsActions.upload,
+        saveFlows: flowsActions.download,
     }
 )(FileMenu)
diff --git a/web/src/js/components/Header/FlowMenu.jsx b/web/src/js/components/Header/FlowMenu.jsx
index ba1dcbcb..8d13dd6a 100644
--- a/web/src/js/components/Header/FlowMenu.jsx
+++ b/web/src/js/components/Header/FlowMenu.jsx
@@ -10,16 +10,16 @@ FlowMenu.propTypes = {
     flow: PropTypes.object.isRequired,
 }
 
-function FlowMenu({ flow, onAccept, onReplay, onDuplicate, onRemove, onRevert }) {
+function FlowMenu({ flow, acceptFlow, replayFlow, duplicateFlow, removeFlow, revertFlow }) {
 
     return (
         <div>
             <div className="menu-row">
-                <Button disabled={!flow.intercepted} title="[a]ccept intercepted flow" text="Accept" icon="fa-play" onClick={() => onAccept(flow)} />
-                <Button title="[r]eplay flow" text="Replay" icon="fa-repeat" onClick={() => onReplay(flow)} />
-                <Button title="[D]uplicate flow" text="Duplicate" icon="fa-copy" onClick={() => onDuplicate(flow)} />
-                <Button title="[d]elete flow" text="Delete" icon="fa-trash" onClick={() => onRemove(flow)}/>
-                <Button disabled={!flow.modified} title="revert changes to flow [V]" text="Revert" icon="fa-history" onClick={() => onRevert(flow)} />
+                <Button disabled={!flow.intercepted} title="[a]ccept intercepted flow" text="Accept" icon="fa-play" onClick={() => acceptFlow(flow)} />
+                <Button title="[r]eplay flow" text="Replay" icon="fa-repeat" onClick={() => replayFlow(flow)} />
+                <Button title="[D]uplicate flow" text="Duplicate" icon="fa-copy" onClick={() => duplicateFlow(flow)} />
+                <Button title="[d]elete flow" text="Delete" icon="fa-trash" onClick={() => removeFlow(flow)}/>
+                <Button disabled={!flow.modified} title="revert changes to flow [V]" text="Revert" icon="fa-history" onClick={() => revertFlow(flow)} />
                 <Button title="download" text="Download" icon="fa-download" onClick={() => window.location = MessageUtils.getContentURL(flow, flow.response)}/>
             </div>
             <div className="clearfix"/>
@@ -32,10 +32,10 @@ export default connect(
         flow: state.flows.list.byId[state.flows.views.main.selected[0]],
     }),
     {
-        onAccept: flowsActions.accept,
-        onReplay: flowsActions.replay,
-        onDuplicate: flowsActions.duplicate,
-        onRemove: flowsActions.remove,
-        onRevert: flowsActions.revert,
+        acceptFlow: flowsActions.accept,
+        replayFlow: flowsActions.replay,
+        duplicateFlow: flowsActions.duplicate,
+        removeFlow: flowsActions.remove,
+        revertFlow: flowsActions.revert,
     }
 )(FlowMenu)
diff --git a/web/src/js/components/Header/MainMenu.jsx b/web/src/js/components/Header/MainMenu.jsx
index 1eb0acf2..48fea5a2 100644
--- a/web/src/js/components/Header/MainMenu.jsx
+++ b/web/src/js/components/Header/MainMenu.jsx
@@ -13,7 +13,7 @@ class MainMenu extends Component {
         query: PropTypes.object.isRequired,
         settings: PropTypes.object.isRequired,
         updateLocation: PropTypes.func.isRequired,
-        onSettingsChange: PropTypes.func.isRequired,
+        updateSettings: PropTypes.func.isRequired,
     }
 
     constructor(props, context) {
@@ -31,7 +31,7 @@ class MainMenu extends Component {
     }
 
     render() {
-        const { query, settings, onSettingsChange } = this.props
+        const { query, settings, updateSettings } = this.props
 
         return (
             <div>
@@ -58,7 +58,7 @@ class MainMenu extends Component {
                         type="pause"
                         color="hsl(208, 56%, 53%)"
                         value={settings.intercept || ''}
-                        onChange={intercept => onSettingsChange({ intercept })}
+                        onChange={intercept => updateSettings({ intercept })}
                     />
                 </div>
                 <div className="clearfix"></div>
@@ -72,7 +72,7 @@ export default connect(
         settings: state.settings.settings,
     }),
     {
-        onSettingsChange: updateSettings,
+        updateSettings,
     },
     null,
     {
diff --git a/web/src/js/components/Header/ViewMenu.jsx b/web/src/js/components/Header/ViewMenu.jsx
index 894fa71a..22b370d1 100644
--- a/web/src/js/components/Header/ViewMenu.jsx
+++ b/web/src/js/components/Header/ViewMenu.jsx
@@ -7,15 +7,15 @@ ViewMenu.title = 'View'
 ViewMenu.route = 'flows'
 
 ViewMenu.propTypes = {
-    visible: PropTypes.bool.isRequired,
-    onToggle: PropTypes.func.isRequired,
+    eventLogVisible: PropTypes.bool.isRequired,
+    toggleEventLog: PropTypes.func.isRequired,
 }
 
-function ViewMenu({ visible, onToggle }) {
+function ViewMenu({ eventLogVisible, toggleEventLog }) {
     return (
         <div>
             <div className="menu-row">
-                <ToggleButton text="Show Event Log" checked={visible} onToggle={onToggle} />
+                <ToggleButton text="Show Event Log" checked={eventLogVisible} onToggle={toggleEventLog} />
             </div>
             <div className="clearfix"></div>
         </div>
@@ -24,9 +24,9 @@ function ViewMenu({ visible, onToggle }) {
 
 export default connect(
     state => ({
-        visible: state.eventLog.visible,
+        eventLogVisible: state.eventLog.visible,
     }),
     {
-        onToggle: toggleVisibility,
+        toggleEventLog: toggleVisibility,
     }
 )(ViewMenu)