diff --git a/main.html b/main.html
index 58e21be05a..29c74d8fbb 100644
--- a/main.html
+++ b/main.html
@@ -11,10 +11,10 @@
         <link type="text/css" rel="stylesheet" href="./tabs/configuration.css" media="all" />
         <link type="text/css" rel="stylesheet" href="./tabs/pid_tuning.css" media="all" />
         <link type="text/css" rel="stylesheet" href="./tabs/receiver.css" media="all" />
-        <link type="text/css" rel="stylesheet" href="./tabs/auxiliary_configuration.css" media="all" />
+        <link type="text/css" rel="stylesheet" href="./tabs/modes.css" media="all" />
         <link type="text/css" rel="stylesheet" href="./tabs/servos.css" media="all" />
         <link type="text/css" rel="stylesheet" href="./tabs/gps.css" media="all" />
-        <link type="text/css" rel="stylesheet" href="./tabs/motor_outputs.css" media="all" />
+        <link type="text/css" rel="stylesheet" href="./tabs/motors.css" media="all" />
         <link type="text/css" rel="stylesheet" href="./tabs/sensors.css" media="all" />
         <link type="text/css" rel="stylesheet" href="./tabs/cli.css" media="all" />
         <link type="text/css" rel="stylesheet" href="./tabs/logging.css" media="all" />
@@ -47,10 +47,10 @@
         <script type="text/javascript" src="./tabs/configuration.js"></script>
         <script type="text/javascript" src="./tabs/pid_tuning.js"></script>
         <script type="text/javascript" src="./tabs/receiver.js"></script>
-        <script type="text/javascript" src="./tabs/auxiliary_configuration.js"></script>
+        <script type="text/javascript" src="./tabs/modes.js"></script>
         <script type="text/javascript" src="./tabs/servos.js"></script>
         <script type="text/javascript" src="./tabs/gps.js"></script>
-        <script type="text/javascript" src="./tabs/motor_outputs.js"></script>
+        <script type="text/javascript" src="./tabs/motors.js"></script>
         <script type="text/javascript" src="./tabs/sensors.js"></script>
         <script type="text/javascript" src="./tabs/cli.js"></script>
         <script type="text/javascript" src="./tabs/logging.js"></script>
@@ -110,10 +110,10 @@
                     <li class="tab_configuration"><a href="#" i18n="tabConfiguration"></a></li>
                     <li class="tab_pid_tuning"><a href="#" i18n="tabPidTuning"></a></li>
                     <li class="tab_receiver"><a href="#" i18n="tabReceiver"></a></li>
-                    <li class="tab_auxiliary_configuration"><a href="#" i18n="tabModeSelection"></a></li>
+                    <li class="tab_modes"><a href="#" i18n="tabModeSelection"></a></li>
                     <li class="tab_servos"><a href="#" i18n="tabServos"></a></li>
                     <li class="tab_gps"><a href="#" i18n="tabGPS"></a></li>
-                    <li class="tab_motor_outputs"><a href="#" i18n="tabMotorTesting"></a></li>
+                    <li class="tab_motors"><a href="#" i18n="tabMotorTesting"></a></li>
                     <li class="tab_sensors"><a href="#" i18n="tabRawSensorData"></a></li>
                     <li class="tab_logging"><a href="#" i18n="tabLogging"></a></li>
                     <li class="tab_cli"><a href="#" i18n="tabCLI"></a></li>
diff --git a/main.js b/main.js
index 628f897a53..d3a05c20e5 100644
--- a/main.js
+++ b/main.js
@@ -101,8 +101,8 @@ $(document).ready(function () {
                     case 'tab_receiver':
                         TABS.receiver.initialize(content_ready);
                         break;
-                    case 'tab_auxiliary_configuration':
-                        TABS.auxiliary_configuration.initialize(content_ready);
+                    case 'tab_modes':
+                        TABS.modes.initialize(content_ready);
                         break;
                     case 'tab_servos':
                         TABS.servos.initialize(content_ready);
@@ -110,8 +110,8 @@ $(document).ready(function () {
                     case 'tab_gps':
                         TABS.gps.initialize(content_ready);
                         break;
-                    case 'tab_motor_outputs':
-                        TABS.motor_outputs.initialize(content_ready);
+                    case 'tab_motors':
+                        TABS.motors.initialize(content_ready);
                         break;
                     case 'tab_sensors':
                         TABS.sensors.initialize(content_ready);
diff --git a/tabs/auxiliary_configuration.css b/tabs/modes.css
similarity index 100%
rename from tabs/auxiliary_configuration.css
rename to tabs/modes.css
diff --git a/tabs/auxiliary_configuration.html b/tabs/modes.html
similarity index 100%
rename from tabs/auxiliary_configuration.html
rename to tabs/modes.html
diff --git a/tabs/auxiliary_configuration.js b/tabs/modes.js
similarity index 91%
rename from tabs/auxiliary_configuration.js
rename to tabs/modes.js
index 90a252495d..fe85fec5a3 100644
--- a/tabs/auxiliary_configuration.js
+++ b/tabs/modes.js
@@ -1,13 +1,12 @@
 'use strict';
 
-// TODO: rework box_highlight & update_ui to accept flexible amount of aux channels
-TABS.auxiliary_configuration = {};
-TABS.auxiliary_configuration.initialize = function (callback) {
+TABS.modes = {};
+TABS.modes.initialize = function (callback) {
     var self = this;
 
-    if (GUI.active_tab != 'auxiliary_configuration') {
-        GUI.active_tab = 'auxiliary_configuration';
-        googleAnalytics.sendAppView('Auxiliary Configuration');
+    if (GUI.active_tab != 'modes') {
+        GUI.active_tab = 'modes';
+        googleAnalytics.sendAppView('Modes');
     }
 
     function get_box_data() {
@@ -23,7 +22,7 @@ TABS.auxiliary_configuration.initialize = function (callback) {
     }
 
     function load_html() {
-        $('#content').load("./tabs/auxiliary_configuration.html", process_html);
+        $('#content').load("./tabs/modes.html", process_html);
     }
 
     MSP.send_message(MSP_codes.MSP_BOXNAMES, false, false, get_box_data);
@@ -152,6 +151,6 @@ TABS.auxiliary_configuration.initialize = function (callback) {
     }
 };
 
-TABS.auxiliary_configuration.cleanup = function (callback) {
+TABS.modes.cleanup = function (callback) {
     if (callback) callback();
 };
\ No newline at end of file
diff --git a/tabs/motor_outputs.css b/tabs/motors.css
similarity index 100%
rename from tabs/motor_outputs.css
rename to tabs/motors.css
diff --git a/tabs/motor_outputs.html b/tabs/motors.html
similarity index 100%
rename from tabs/motor_outputs.html
rename to tabs/motors.html
diff --git a/tabs/motor_outputs.js b/tabs/motors.js
similarity index 98%
rename from tabs/motor_outputs.js
rename to tabs/motors.js
index 5d19a82ac6..9bcb53baa2 100644
--- a/tabs/motor_outputs.js
+++ b/tabs/motors.js
@@ -1,11 +1,11 @@
 'use strict';
 
-TABS.motor_outputs = {};
-TABS.motor_outputs.initialize = function (callback) {
+TABS.motors = {};
+TABS.motors.initialize = function (callback) {
     var self = this;
 
-    if (GUI.active_tab != 'motor_outputs') {
-        GUI.active_tab = 'motor_outputs';
+    if (GUI.active_tab != 'motors') {
+        GUI.active_tab = 'motors';
         googleAnalytics.sendAppView('Motors');
     }
 
@@ -14,7 +14,7 @@ TABS.motor_outputs.initialize = function (callback) {
     }
 
     function load_html() {
-        $('#content').load("./tabs/motor_outputs.html", process_html);
+        $('#content').load("./tabs/motors.html", process_html);
     }
 
     MSP.send_message(MSP_codes.MSP_MISC, false, false, get_motor_data);
@@ -413,6 +413,6 @@ TABS.motor_outputs.initialize = function (callback) {
     }
 };
 
-TABS.motor_outputs.cleanup = function (callback) {
+TABS.motors.cleanup = function (callback) {
     if (callback) callback();
 };
\ No newline at end of file