diff --git a/data/boot_lists/All b/data/boot_lists/All
index c0b7908..3bc25c4 100755
--- a/data/boot_lists/All
+++ b/data/boot_lists/All
@@ -1,28 +1,14 @@
-BMC oob hpm
-BMC ib hpm
-BMC oob update
-BMC ib update
-BMC pflash
-BMC Power On
-BMC Power On (mfg)
-BMC Golden PNOR
-BMC Golden PNOR (mfg)
-BMC Golden BMC
-BMC APOR
-BMC APOR (mfg)
-BMC Host Reboot
-BMC Host Reboot (mfg)
-BMC Power Reset
-BMC Power Reset (mfg)
-BMC Power Cycle
-BMC Power Cycle (mfg)
-BMC Power Off
-BMC Power Off (mfg)
-BMC Power Soft
-BMC Power Soft (mfg)
-BMC Host Off
-BMC Host Off (mfg)
-BMC MC Reset Warm
-BMC MC Reset Warm (mfg)
-BMC AC Cycle
-BMC AC Cycle (mfg)
+pflash
+Out of Band Code Update
+REST Power On
+REST Power On (mfg)
+Host Reboot
+Host Reboot (mfg)
+Auto Reboot
+Auto Reboot (mfg)
+REST Power Off
+REST Power Off (mfg)
+Host Power Off
+Host Power Off (mfg)
+OBMC Reboot
+OBMC Reboot (mfg)
diff --git a/data/boot_lists/Code_update b/data/boot_lists/Code_update
index 2fdfa9a..ffbd2f2 100755
--- a/data/boot_lists/Code_update
+++ b/data/boot_lists/Code_update
@@ -1,5 +1,2 @@
-BMC oob hpm
-BMC ib hpm
-BMC oob update
-BMC ib update
-BMC pflash
+pflash
+Out of Band Code Update
diff --git a/data/boot_lists/Manufacturing b/data/boot_lists/Manufacturing
index b8862a3..de522ae 100755
--- a/data/boot_lists/Manufacturing
+++ b/data/boot_lists/Manufacturing
@@ -1,11 +1,6 @@
-BMC Power On (mfg)
-BMC Golden PNOR (mfg)
-BMC APOR (mfg)
-BMC Host Reboot (mfg)
-BMC Power Reset (mfg)
-BMC Power Cycle (mfg)
-BMC Power Off (mfg)
-BMC Power Soft (mfg)
-BMC Host Off (mfg)
-BMC MC Reset Warm (mfg)
-BMC AC Cycle (mfg)
+REST Power On (mfg)
+REST Power Off (mfg)
+OBMC Reboot (mfg)
+Host Reboot (mfg)
+Host Power Off (mfg)
+Auto Reboot (mfg)
diff --git a/data/boot_lists/Power_off b/data/boot_lists/Power_off
index 0c3907d..e5f9193 100755
--- a/data/boot_lists/Power_off
+++ b/data/boot_lists/Power_off
@@ -1,7 +1,2 @@
-BMC Golden BMC
-BMC Power Off
-BMC Power Off (mfg)
-BMC Power Soft
-BMC Power Soft (mfg)
-BMC Host Off
-BMC Host Off (mfg)
+REST Power Off
+Host Power Off
diff --git a/data/boot_lists/Power_on b/data/boot_lists/Power_on
index 70b0da2..ab99f2e 100755
--- a/data/boot_lists/Power_on
+++ b/data/boot_lists/Power_on
@@ -1,7 +1 @@
-BMC Power On
-BMC Power On (mfg)
-BMC Golden PNOR
-BMC Golden PNOR (mfg)
-BMC Golden BMC
-BMC APOR
-BMC APOR (mfg)
+REST Power On
diff --git a/data/boot_table.json b/data/boot_table.json
index 1feea0b..4f988ba 100644
--- a/data/boot_table.json
+++ b/data/boot_table.json
@@ -1,15 +1,17 @@
 # 2017/02/20 Note: Commenting out 'boot_progress' requirements until they are working in product code.
 # TODO:  Uncomment the boot_progress lines when support is re-introduced.
 {
-    "BMC Power On": {
+    # Note: "IPMI Power On" will be added soon.
+    # Initiate a power on using the REST API interface.
+    "REST Power On": {
         "start": {
             "chassis": "^Off$",
-            # "boot_progress": "^Off$",
+            "boot_progress": "^Off$",
             "host": "^Off$"
         },
         "end": {
             "chassis": "^On$",
-            # "boot_progress": "^FW Progress, Starting OS$",
+            "boot_progress": "^FW Progress, Starting OS$",
             "host": "^Running$",
             "os_ping": "^1$",
             "os_login": "^1$",
@@ -19,15 +21,16 @@
         "method_type": "keyword",
         "method": "Initiate Power On  wait=${0}"
     },
-    "BMC Power Off": {
+    # Initiate a power off using the REST API interface.
+    "REST Power Off": {
         "start": {
             "chassis": "^On$",
-            # "boot_progress": "^FW Progress, Starting OS$",
+            "boot_progress": "^FW Progress, Starting OS$",
             "host": "^Running$"
         },
         "end": {
             "chassis": "^Off$",
-            # "boot_progress": "^Off$",
+            "boot_progress": "^Off$",
             "host": "^Off$",
             "os_ping": "^0$",
             "os_login": "^0$",
@@ -37,17 +40,87 @@
         "method_type": "keyword",
         "method": "Initiate Power Off"
     },
-    "BMC MC Reset Warm": {
+    # Run a "reboot" on the OBMC..
+    "OBMC Reboot": {
         "start": {
             "chassis": "^Off|On$"
         },
         "end": {
             "chassis": "^Off$",
-            # "boot_progress": "^Off$",
+            "boot_progress": "^Off$",
             "host": "^Off$"
         },
         "bmc_reboot": 1,
         "method_type": "keyword",
-        "method": "Start Command  /sbin/reboot"
+        "method": "Open Connection And Log In ; Start Command  /sbin/reboot"
+    },
+    # Run a "reboot" command on the OS_HOST.
+    "Host Reboot": {
+        "start": {
+            "chassis": "^On$",
+            "boot_progress": "^FW Progress, Starting OS$",
+            "host": "^Running$",
+            "os_ping": "^1$",
+            "os_login": "^1$",
+            "os_run_cmd": "^1$"
+        },
+        "end": {
+            "chassis": "^On$",
+            "boot_progress": "^FW Progress, Starting OS$",
+            "host": "^Running$",
+            "os_ping": "^1$",
+            "os_login": "^1$",
+            "os_run_cmd": "^1$"
+        },
+        "bmc_reboot": 0,
+        "method_type": "keyword",
+        "method": "utils.Initiate OS Host Reboot",
+        "lib_file_path": "utils.robot"
+    },
+    # Run a "shutdown" command on the OS_HOST.
+    "Host Power Off": {
+        "start": {
+            "chassis": "^On$",
+            "boot_progress": "^FW Progress, Starting OS$",
+            "host": "^Running$",
+            "os_ping": "^1$",
+            "os_login": "^1$",
+            "os_run_cmd": "^1$"
+        },
+        "end": {
+            "chassis": "^Off$",
+            "boot_progress": "^Off$",
+            "host": "^Off$",
+            "os_ping": "^0$",
+            "os_login": "^0$",
+            "os_run_cmd": "^0$"
+        },
+        "bmc_reboot": 0,
+        "method_type": "keyword",
+        "method": "utils.Initiate OS Host Power Off",
+        "lib_file_path": "utils.robot"
+    },
+    # Do an auto reboot by setting auto reboot to "yes" and going to quiesce state.
+    "Auto Reboot": {
+        "start": {
+            "chassis": "^On$",
+            "boot_progress": "^FW Progress, Starting OS$",
+            "host": "^Running$",
+            "os_ping": "^1$",
+            "os_login": "^1$",
+            "os_run_cmd": "^1$"
+        },
+        "end": {
+            "chassis": "^On$",
+            "boot_progress": "^FW Progress, Starting OS$",
+            "host": "^Running$",
+            "os_ping": "^1$",
+            "os_login": "^1$",
+            "os_run_cmd": "^1$"
+        },
+        "bmc_reboot": 0,
+        "method_type": "keyword",
+        "method": "utils.Initiate Auto Reboot",
+        "lib_file_path": "utils.robot"
     }
 }