diff --git a/app/index.js b/app/index.js
index 1dd622d..f0032bc 100644
--- a/app/index.js
+++ b/app/index.js
@@ -61,7 +61,7 @@
 import power_operations_controller from './server-control/controllers/power-operations-controller.js';
 import remote_console_controller from './server-control/controllers/remote-console-controller.js';
 import remote_console_window_controller from './server-control/controllers/remote-console-window-controller.js';
-import unit_id_controller from './server-control/controllers/unit-id-controller.js';
+import server_led_controller from './server-control/controllers/server-led-controller.js';
 
 import server_health_index from './server-health/index.js';
 import diagnostics_controller from './server-health/controllers/diagnostics-controller.js';
diff --git a/app/overview/controllers/system-overview-controller.html b/app/overview/controllers/system-overview-controller.html
index a21b0d4..a6a4563 100644
--- a/app/overview/controllers/system-overview-controller.html
+++ b/app/overview/controllers/system-overview-controller.html
@@ -97,7 +97,7 @@
 								ng-click="toggleLED()"
 								ng-checked="dataService.LED_state == 'on'"
 								ng-disabled="dataService.server_unreachable">
-						<label for="toggle__switch-round" tabindex="0">Server LED is <span class="uid-switch__status">{{dataService.LED_state}}</span></label>
+						<label for="toggle__switch-round" tabindex="0">Server LED is <span class="led-switch__status">{{dataService.LED_state}}</span></label>
 					</div>
 				</div>
 				<a href="#/server-control/remote-console" class="no-icon quick-links__item">
diff --git a/app/server-control/controllers/unit-id-controller.html b/app/server-control/controllers/server-led-controller.html
similarity index 84%
rename from app/server-control/controllers/unit-id-controller.html
rename to app/server-control/controllers/server-led-controller.html
index bc9c345..dba6923 100644
--- a/app/server-control/controllers/unit-id-controller.html
+++ b/app/server-control/controllers/server-led-controller.html
@@ -1,4 +1,4 @@
-<div id="uid-switch">
+<div id="led-switch">
     <div class="row column">
         <h1>Server LED</h1>
         <div class="page-header">
@@ -17,12 +17,12 @@
                        ng-checked="dataService.LED_state == 'on'"
                        ng-disabled="dataService.server_unreachable"
                        >
-                <label for="toggle__switch-round" tabindex="0">Server indicator is <span class="uid-switch__status">{{dataService.LED_state}}</span></label>
+                <label for="toggle__switch-round" tabindex="0">Server indicator is <span class="led-switch__status">{{dataService.LED_state}}</span></label>
             </div>
-            <div class="uid-switch__label inline">
-                <p>Server LED light is <span class="uid-switch__status">{{dataService.LED_state}}</span></p>
+            <div class="led-switch__label inline">
+                <p>Server LED light is <span class="led-switch__status">{{dataService.LED_state}}</span></p>
                 <p>Turn the LED light on or off. If the server has an LCD, use this control to display text (on) or not to display text (off) on the LCD.</p>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/server-control/controllers/unit-id-controller.js b/app/server-control/controllers/server-led-controller.js
similarity index 86%
rename from app/server-control/controllers/unit-id-controller.js
rename to app/server-control/controllers/server-led-controller.js
index 3648acd..e804606 100644
--- a/app/server-control/controllers/unit-id-controller.js
+++ b/app/server-control/controllers/server-led-controller.js
@@ -1,15 +1,15 @@
 /**
- * Controller for unit Id
+ * Controller for server LED
  *
  * @module app/serverControl
- * @exports unitIdController
- * @name unitIdController
+ * @exports serverLEDController
+ * @name serverLEDController
  */
 
 window.angular && (function(angular) {
   'use strict';
 
-  angular.module('app.serverControl').controller('unitIdController', [
+  angular.module('app.serverControl').controller('serverLEDController', [
     '$scope', '$window', 'APIUtils', 'dataService',
     function($scope, $window, APIUtils, dataService) {
       $scope.dataService = dataService;
diff --git a/app/server-control/index.js b/app/server-control/index.js
index f9aaba9..3b3600f 100644
--- a/app/server-control/index.js
+++ b/app/server-control/index.js
@@ -21,8 +21,8 @@
                 authenticated: true
               })
               .when('/server-control/server-led', {
-                'template': require('./controllers/unit-id-controller.html'),
-                'controller': 'unitIdController',
+                'template': require('./controllers/server-led-controller.html'),
+                'controller': 'serverLEDController',
                 authenticated: true
               })
               .when('/server-control/power-operations', {
diff --git a/app/server-control/styles/index.scss b/app/server-control/styles/index.scss
index d469ecf..cc69a87 100644
--- a/app/server-control/styles/index.scss
+++ b/app/server-control/styles/index.scss
@@ -1,4 +1,4 @@
 @import "./bmc-reboot.scss";
 @import "./power-operations.scss";
 @import "./remote-console.scss";
-@import "./unit-id.scss";
+@import "./server-led.scss";
diff --git a/app/server-control/styles/unit-id.scss b/app/server-control/styles/server-led.scss
similarity index 61%
rename from app/server-control/styles/unit-id.scss
rename to app/server-control/styles/server-led.scss
index 4b59437..9807c74 100644
--- a/app/server-control/styles/unit-id.scss
+++ b/app/server-control/styles/server-led.scss
@@ -1,12 +1,12 @@
-// UI Light
+// Server LED
 
-#uid-switch {
+#led-switch {
   .switch {margin-left: 1.7em;}
-  .uid-switch__label {
+  .led-switch__label {
     padding-bottom: 1.5em;
   }
-  .uid-switch__label p {
+  .led-switch__label p {
     margin: 0;
     &:first-child {font-weight: 700;}
   }
-}
\ No newline at end of file
+}