diff --git a/app/js/modules/ironic/controller/enroll_modal_controller.js b/app/js/modules/ironic/controller/enroll_modal_controller.js
index c0dd553..e57cd31 100644
--- a/app/js/modules/ironic/controller/enroll_modal_controller.js
+++ b/app/js/modules/ironic/controller/enroll_modal_controller.js
@@ -43,6 +43,7 @@ angular.module('ironic').controller('EnrollModalController',
       vm.driverProperties = null;
       vm.errorMessage = null;
       vm.node = {
+        name: vm.node ? vm.node.name : '', // Preserve previously entered names.
         driver: driverName,
         driver_info: {}
       };
diff --git a/app/view/ironic/detail.html b/app/view/ironic/detail.html
index 632e4e5..e329a50 100644
--- a/app/view/ironic/detail.html
+++ b/app/view/ironic/detail.html
@@ -2,7 +2,7 @@
      ng-if="!nodeCtrl.errorMessage">
   <div class="row">
     <div class="col-xs-12">
-      <h1>Node: {{nodeCtrl.node.uuid}}</h1>
+      <h1>Node: {{nodeCtrl.node.name || nodeCtrl.node.uuid}}</h1>
     </div>
   </div>
   <div class="row">
diff --git a/app/view/ironic/enroll/index.html b/app/view/ironic/enroll/index.html
index 67daa57..72435af 100644
--- a/app/view/ironic/enroll/index.html
+++ b/app/view/ironic/enroll/index.html
@@ -8,6 +8,15 @@
   <div class="row">
     <div class="col-xs-12">
       <form class="form-horizontal">
+        <div class="form-group">
+          <label for="name" class="col-xs-3 control-label">Node Name</label>
+
+          <div class="col-sm-9">
+            <input type="text" class="form-control" ng-model="ctrl.node.name"
+                   id="name" name="name"
+                   placeholder="A descriptive node name (optional)"/>
+          </div>
+        </div>
         <div class="form-group">
           <label for="driver" class="col-xs-3 control-label">Node Driver</label>
 
@@ -40,7 +49,7 @@
           </div>
         </div>
       </form>
-   </div>
+    </div>
   </div>
 </div>
 <div class="modal-footer ng-scope">
diff --git a/app/view/ironic/node_list.html b/app/view/ironic/node_list.html
index 069988f..0161391 100644
--- a/app/view/ironic/node_list.html
+++ b/app/view/ironic/node_list.html
@@ -13,7 +13,7 @@
       <thead>
       <tr>
         <th>Power State</th>
-        <th>UUID</th>
+        <th>Name (UUID)</th>
         <th>Instance</th>
         <th>Provision State</th>
         <th>Maintenance</th>
@@ -27,7 +27,7 @@
         <td>{{nodeCtrl.node.power_state}}</td>
         <td>
           <a href="#/ironic/nodes/{{nodeCtrl.node.uuid}}/node">
-            {{nodeCtrl.node.uuid}}
+            {{nodeCtrl.node.name || nodeCtrl.node.uuid}}
           </a>
         </td>
         <td>{{nodeCtrl.node.instance_uuid || 'None'}}</td>
diff --git a/test/spec/ironic/controller/enroll_modal_controller.js b/test/spec/ironic/controller/enroll_modal_controller.js
index a3ca6f8..fc5c379 100644
--- a/test/spec/ironic/controller/enroll_modal_controller.js
+++ b/test/spec/ironic/controller/enroll_modal_controller.js
@@ -122,14 +122,34 @@ describe('Unit: Ironic-webclient enroll-node modal controller',
           $httpBackend.flush();
           var firstNode = controller.node;
           expect(firstNode.driver).toBe('test_driver_1');
+          expect(firstNode.name).toBe('');
 
           controller.loadDriverProperties('test_driver_2');
           $httpBackend.flush();
           var secondNode = controller.node;
           expect(secondNode.driver).toBe('test_driver_2');
+          expect(secondNode.name).toBe('');
           expect(firstNode).not.toBe(secondNode);
         });
 
+      it('preserves names between driver loads if one has been entered.',
+        function() {
+          var controller = $controller('EnrollModalController', mockInjectionProperties);
+          expect(controller.node).toBeNull();
+
+          controller.loadDriverProperties('test_driver_1');
+          $httpBackend.flush();
+          var firstNode = controller.node;
+          expect(firstNode.driver).toBe('test_driver_1');
+          controller.node.name = 'test';
+
+          controller.loadDriverProperties('test_driver_2');
+          $httpBackend.flush();
+          var secondNode = controller.node;
+          expect(secondNode.driver).toBe('test_driver_2');
+          expect(firstNode.name).toBe(secondNode.name);
+        });
+
       it('should display an error invalid driver is selected.',
         function() {
           var controller = $controller('EnrollModalController', mockInjectionProperties);