diff --git a/etc/init.rc b/etc/init.rc
index dc186598..0a4c6e9d 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -46,8 +46,8 @@ on boot
     class_start default
 
 # Load properties from /system/ + /factory after fs mount.
-on load_system_props_action
-    load_system_props
+on load_all_props_action
+    load_all_props
 
 on firmware_mounts_complete
    rm /dev/.booting
@@ -62,7 +62,7 @@ on late-init
     # Load properties from /system/ + /factory after fs mount. Place
     # this in another action so that the load will be scheduled after the prior
     # issued fs triggers have completed.
-    trigger load_system_props_action
+    trigger load_all_props_action
 
     # Remove a file to wake up anything waiting for firmware
     trigger firmware_mounts_complete