diff --git a/sepolicy/vendor/hal_power_default.te b/sepolicy/vendor/hal_power_default.te
index 7d3275c..f174f04 100644
--- a/sepolicy/vendor/hal_power_default.te
+++ b/sepolicy/vendor/hal_power_default.te
@@ -31,4 +31,4 @@ allow hal_power_default vendor_latency_device:chr_file rw_file_perms;
 unix_socket_connect(hal_power_default, vendor_pps, hal_graphics_composer_default);
 
 # To get/set powerhal state property
-set_prop(hal_power_default, power_prop)
+set_prop(hal_power_default, vendor_power_prop)
diff --git a/sepolicy/vendor/mi_thermald.te b/sepolicy/vendor/mi_thermald.te
index c745595..c5e7026 100644
--- a/sepolicy/vendor/mi_thermald.te
+++ b/sepolicy/vendor/mi_thermald.te
@@ -27,4 +27,4 @@ allow mi_thermald {
   lnk_file
 } rw_file_perms;
 
-set_prop(mi_thermald, thermal_normal_prop)
+set_prop(mi_thermald, vendor_thermal_normal_prop)
diff --git a/sepolicy/vendor/property.te b/sepolicy/vendor/property.te
index 3d0b7ff..8b3e39a 100644
--- a/sepolicy/vendor/property.te
+++ b/sepolicy/vendor/property.te
@@ -1,6 +1,6 @@
-vendor_internal_prop(power_prop);
+vendor_internal_prop(vendor_power_prop);
 
-vendor_internal_prop(thermal_normal_prop);
+vendor_internal_prop(vendor_thermal_normal_prop);
 
 vendor_internal_prop(vendor_device_prop);
 
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 2c642cd..67eae7e 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -24,11 +24,11 @@ ro.boot.factorybuild                            u:object_r:vendor_public_vendor_
 ro.boot.hwversion                               u:object_r:vendor_public_vendor_default_prop:s0
 
 # Power
-vendor.powerhal.state                           u:object_r:power_prop:s0
-vendor.powerhal.audio                           u:object_r:power_prop:s0
-vendor.powerhal.lpm                             u:object_r:power_prop:s0
-vendor.powerhal.init                            u:object_r:power_prop:s0
-vendor.powerhal.rendering                       u:object_r:power_prop:s0
+vendor.powerhal.state                           u:object_r:vendor_power_prop:s0
+vendor.powerhal.audio                           u:object_r:vendor_power_prop:s0
+vendor.powerhal.lpm                             u:object_r:vendor_power_prop:s0
+vendor.powerhal.init                            u:object_r:vendor_power_prop:s0
+vendor.powerhal.rendering                       u:object_r:vendor_power_prop:s0
 
 # Mlipay
 persist.vendor.sys.pay                          u:object_r:vendor_tee_listener_prop:s0
@@ -37,4 +37,6 @@ persist.vendor.sys.pay                          u:object_r:vendor_tee_listener_p
 ro.vendor.ril                                   u:object_r:vendor_public_vendor_default_prop:s0
 
 # Thermal
-vendor.sys.thermal.                             u:object_r:thermal_normal_prop:s0
+sys.thermal.                                    u:object_r:vendor_thermal_normal_prop:s0
+vendor.sys.thermal.                             u:object_r:vendor_thermal_normal_prop:s0
+persist.sys.thermal.config                      u:object_r:vendor_thermal_normal_prop:s0
diff --git a/sepolicy/vendor/thermal-engine.te b/sepolicy/vendor/thermal-engine.te
index 1f76854..c9e7bce 100644
--- a/sepolicy/vendor/thermal-engine.te
+++ b/sepolicy/vendor/thermal-engine.te
@@ -9,4 +9,4 @@ allow vendor_thermal-engine vendor_sysfs_devfreq:file rw_file_perms;
 # Rule for vendor_thermal-engine to access init process
 unix_socket_connect(vendor_thermal-engine, property, init);
 
-set_prop(vendor_thermal-engine, thermal_normal_prop)
+set_prop(vendor_thermal-engine, vendor_thermal_normal_prop)
diff --git a/sepolicy/vendor/vendor_init.te b/sepolicy/vendor/vendor_init.te
index 90d7ddc..bb0e8f0 100644
--- a/sepolicy/vendor/vendor_init.te
+++ b/sepolicy/vendor/vendor_init.te
@@ -1,5 +1,6 @@
-set_prop(vendor_init, power_prop)
 set_prop(vendor_init, vendor_alarm_boot_prop)
+set_prop(vendor_init, vendor_fod_prop)
+set_prop(vendor_init, vendor_power_prop)
 set_prop(vendor_init, vendor_video_prop)
 
 allow vendor_init {