diff --git a/lib/obmc_boot_test.py b/lib/obmc_boot_test.py
index 35aa86b..0c81a0b 100755
--- a/lib/obmc_boot_test.py
+++ b/lib/obmc_boot_test.py
@@ -350,7 +350,7 @@
 
     grp.rqprint_pgm_header()
 
-    grk.run_key("Set BMC Power Policy  RESTORE_LAST_STATE")
+    grk.run_key("Set BMC Power Policy  ALWAYS_POWER_OFF")
 
     initial_plug_in_setup()
 
diff --git a/lib/state_map.py b/lib/state_map.py
index 0b16d1d..191de65 100644
--- a/lib/state_map.py
+++ b/lib/state_map.py
@@ -32,7 +32,8 @@
         ('ALWAYS_POWER_ON', 'Ready', 'On', 'Off'),
         ('RESTORE_LAST_STATE', 'Ready', 'On', 'Running'),
         ('RESTORE_LAST_STATE', 'Ready', 'On', 'Off'),
-        ('RESTORE_LAST_STATE', 'Ready', 'Off', 'Off'),
+        ('ALWAYS_POWER_OFF', 'Ready', 'On', 'Running'),
+        ('ALWAYS_POWER_OFF', 'Ready', 'Off', 'Off'),
     },
 }
 
diff --git a/lib/utils.py b/lib/utils.py
index bd918c7..df0043b 100644
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -82,7 +82,7 @@
     Using old style functions, callers might call like this with a hard-
     code value for policy:
 
-    Set BMC Power Policy  RESTORE_LAST_STATE
+    Set BMC Power Policy  ALWAYS_POWER_OFF
 
     This function will get the value of the corresponding global variable (if
     it exists) and return it.
diff --git a/lib/utils.robot b/lib/utils.robot
index f25c82c..056e87a 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -877,7 +877,7 @@
     [Arguments]   ${policy}
 
     # Description of argument(s):
-    # policy    Power restore policy (e.g. ${RESTORE_LAST_STATE}).
+    # policy    Power restore policy (e.g. ${ALWAYS_POWER_OFF}).
 
     ${valueDict}=  Create Dictionary  data=${policy}
     Write Attribute
@@ -888,7 +888,7 @@
     [Arguments]   ${policy}
 
     # Description of argument(s):
-    # policy    Power restore policy (e.g. "RESTORE_LAST_STATE").
+    # policy    Power restore policy (e.g. "ALWAYS_POWER_OFF").
 
     ${valueDict}=     create dictionary  data=${policy}
     Write Attribute    ${HOST_SETTING}    power_policy   data=${valueDict}