diff --git a/src/dashboard/dashboard.js b/src/dashboard/dashboard.js
index c6d3922..d627c77 100644
--- a/src/dashboard/dashboard.js
+++ b/src/dashboard/dashboard.js
@@ -22,7 +22,7 @@ import classNames from 'classnames';
 
 import EditWidget from '../widget/edit-widget/edit-widget';
 import EditFiles from '../file/edit-files';
-import EditSignalMapping from "../signal/edit-signal-mapping";
+import EditSignalMappingDialog from "../signal/edit-signal-mapping";
 import WidgetContextMenu from '../widget/widget-context-menu';
 import WidgetToolbox from '../widget/widget-toolbox';
 import WidgetArea from '../widget/widget-area';
@@ -569,7 +569,7 @@ class Dashboard extends Component {
           scenarioID={this.state.dashboard.scenarioID}
         />
 
-        <EditSignalMapping
+        <EditSignalMappingDialog
           show={this.state.editOutputSignalsModal}
           onCloseEdit={(direction) => this.closeEditSignalsModal(direction)}
           direction="Output"
@@ -578,7 +578,7 @@ class Dashboard extends Component {
           configs={this.state.configs}
           sessionToken={this.state.sessionToken}
         />
-        <EditSignalMapping
+        <EditSignalMappingDialog
           show={this.state.editInputSignalsModal}
           onCloseEdit={(direction) => this.closeEditSignalsModal(direction)}
           direction="Input"
diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index cf86fee..f8842df 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -45,7 +45,7 @@ import ResultConfigDialog from '../result/result-configs-dialog';
 import ICAction from '../ic/ic-action';
 import DeleteDialog from '../common/dialogs/delete-dialog';
 import EditConfigDialog from "../componentconfig/edit-config";
-import EditSignalMapping from "../signal/edit-signal-mapping";
+import EditSignalMappingDialog from "../signal/edit-signal-mapping";
 import FileStore from "../file/file-store"
 import WidgetStore from "../widget/widget-store";
 import ResultStore from "../result/result-store"
@@ -855,11 +855,18 @@ class Scenario extends React.Component {
         files={this.state.files}
         sessionToken={this.state.sessionToken}
       />
-
-      <ImportConfigDialog show={this.state.importConfigModal} onClose={data => this.importConfig(data)} ics={this.state.ics} />
-      <DeleteDialog title="component configuration" name={this.state.modalConfigData.name} show={this.state.deleteConfigModal} onClose={(c) => this.closeDeleteConfigModal(c)} />
-
-      <EditSignalMapping
+      <ImportConfigDialog
+        show={this.state.importConfigModal}
+        onClose={data => this.importConfig(data)}
+        ics={this.state.ics}
+      />
+      <DeleteDialog
+        title="component configuration"
+        name={this.state.modalConfigData.name}
+        show={this.state.deleteConfigModal}
+        onClose={(c) => this.closeDeleteConfigModal(c)}
+      />
+      <EditSignalMappingDialog
         show={this.state.editOutputSignalsModal}
         onCloseEdit={(direction) => this.closeEditSignalsModal(direction)}
         direction="Output"
@@ -867,7 +874,7 @@ class Scenario extends React.Component {
         configID={this.state.modalConfigData.id}
         sessionToken={this.state.sessionToken}
       />
-      <EditSignalMapping
+      <EditSignalMappingDialog
         show={this.state.editInputSignalsModal}
         onCloseEdit={(direction) => this.closeEditSignalsModal(direction)}
         direction="Input"
diff --git a/src/signal/edit-signal-mapping.js b/src/signal/edit-signal-mapping.js
index 9c5cb6e..a9fd7a4 100644
--- a/src/signal/edit-signal-mapping.js
+++ b/src/signal/edit-signal-mapping.js
@@ -25,7 +25,7 @@ import Dialog from "../common/dialogs/dialog";
 import Icon from "../common/icon";
 import AppDispatcher from "../common/app-dispatcher";
 
-class EditSignalMapping extends React.Component {
+class EditSignalMappingDialog extends React.Component {
 
   constructor(props) {
     super(props);
@@ -320,7 +320,7 @@ class EditSignalMapping extends React.Component {
   }
 }
 
-EditSignalMapping.propTypes = {
+EditSignalMappingDialog.propTypes = {
     name: PropTypes.string,
     length: PropTypes.number,
     signals: PropTypes.arrayOf(
@@ -336,4 +336,4 @@ EditSignalMapping.propTypes = {
     onChange: PropTypes.func
 };
 
-export default EditSignalMapping;
+export default EditSignalMappingDialog;