diff --git a/app/configuration/controllers/date-time-controller.html b/app/configuration/controllers/date-time-controller.html
index 8ead4c8..23a93d2 100644
--- a/app/configuration/controllers/date-time-controller.html
+++ b/app/configuration/controllers/date-time-controller.html
@@ -11,7 +11,7 @@
       <div class="column large-8">
         <div class="row column">
           <label class="control-radio" for="ntp-time">Obtain Automatically from a Network Time Protocol (NTP) Server
-            <input type="radio" id="ntp-time" ng-model="time_mode" value="NTP">
+            <input type="radio" id="ntp-time" ng-model="time.mode" value="NTP">
             <span class="control__indicator control__indicator-on"></span>
           </label>
         </div>
@@ -19,7 +19,7 @@
           <fieldset class="date-time__ntp-servers" ng-repeat="server in ntp.servers track by $index">
             <label for="ntp-server{{$index+1}}">NTP Server Address {{$index+1}} <span ng-if="$first">(Primary)</span></label>
             <div class="inline">
-              <input id="ntp-server{{$index+1}}" type="text" ng-readonly="time_mode != 'NTP'" ng-model="server" ng-blur="ntp.servers[$index] = server" set-focus-on-new-input/>
+              <input id="ntp-server{{$index+1}}" type="text" ng-readonly="time.mode != 'NTP'" ng-model="server" ng-blur="ntp.servers[$index] = server" set-focus-on-new-input/>
             </div>
             <button class="date-time__dns-remove inline" ng-click="removeNTPField($index)">Remove</button>
           </fieldset>
@@ -29,20 +29,20 @@
         </div>
         <div class="row column">
           <label class="control-radio" for="manual-time">Manually set date and time
-            <input type="radio" id="manual-time" ng-model="time_mode" value="Manual"/>
+            <input type="radio" id="manual-time" ng-model="time.mode" value="Manual"/>
             <span class="control__indicator control__indicator-on"></span>
           </label>
         </div>
         <ul class="date-time__metadata-wrapper">
           <li class="date-time__metadata-block">
-            <p class="content-label">BMC <span ng-if="time_owner != 'Split'">and Host</span> Time</p>
+            <p class="content-label">BMC <span ng-if="time.owner != 'Split'">and Host</span> Time</p>
             <div class="inline">
-              <input type="date" ng-model="bmc.date" ng-readonly="time_mode == 'NTP'" min="2018-01-01" max="2099-12-31"/>
-              <input type="time" ng-model="bmc.date" ng-readonly="time_mode == 'NTP'" />
+              <input type="date" ng-model="bmc.date" ng-readonly="time.mode == 'NTP'" min="2018-01-01" max="2099-12-31"/>
+              <input type="time" ng-model="bmc.date" ng-readonly="time.mode == 'NTP'" />
               <p class="courier-bold">{{bmc.timezone}}</p>
             </div>
           </li>
-          <li class="date-time__metadata-block" ng-if="time_owner == 'Split'">
+          <li class="date-time__metadata-block" ng-if="time.owner == 'Split'">
             <p class="content-label">Host Time</p>
             <div class="inline">
               <!--- Ideally, would just use one input, datetime-local, but datetime-local is not supported on Firefox.--->
@@ -53,8 +53,8 @@
           </li>
           <li class="date-time__metadata-block">
           <label class="content-label">Time Owner</label>
-          <select ng-model="time_owner" class="date-time__owner-dropdown">
-            <option class="courier-bold" ng-repeat="owner in time_owners">{{owner}}</option>
+          <select ng-model="time.owner" class="date-time__owner-dropdown">
+            <option class="courier-bold" ng-repeat="owner in timeOwners">{{owner}}</option>
           </select>
           </li>
         </ul>
@@ -64,7 +64,7 @@
       <button type="button" class="btn-primary inline" ng-click="setTime()">Save settings</button>
       <button type="button" class="btn-secondary inline" ng-click="refresh()">Cancel</button>
     </div>
-    <p class="success-msg" ng-show="set_time_success" role="alert">Success! Time changed!</p>
-    <p class="set_time_error error-msg" ng-show="set_time_error" role="alert">Error setting time!</p>
+    <p class="success-msg" ng-show="success" role="alert">Success! Time changed!</p>
+    <p class="set_time_error error-msg" ng-show="error" role="alert">Error setting time!</p>
   </form>
 </div>