diff --git a/sepolicy/private/file.te b/sepolicy/private/file.te
index ffab6d3..779c9e0 100644
--- a/sepolicy/private/file.te
+++ b/sepolicy/private/file.te
@@ -3,17 +3,17 @@ type bt_firmware_file, file_type;
 type firmware_file, file_type;
 type persist_file, file_type;
 type proc_touchpanel, fs_type, proc_type;
+type sysfs_graphics, sysfs_type, fs_type;
+type sysfs_devfreq, sysfs_type, fs_type;
+type pps_socket, file_type;
+type display_data_file, data_file_type, core_data_file_type, file_type;
+type vendor_firmware_file, vendor_file_type, file_type;
 type sysfs_msm_subsys, sysfs_type, fs_type;
 type sysfs_system_sleep_stats, sysfs_type, fs_type;
 type sysfs_rpm, sysfs_type, fs_type;
-type sysfs_graphics, sysfs_type, fs_type;
-type sysfs_devfreq, sysfs_type, fs_type;
 type sysfs_kgsl, sysfs_type, fs_type;
 type sysfs_scsi_devices, sysfs_type, fs_type;
 type debugfs_wlan, debugfs_type, fs_type;
 type debugfs_sched_features, debugfs_type, fs_type;
 type proc_sysctl_schedboost, proc_type, fs_type;
-type pps_socket, file_type;
-type display_data_file, data_file_type, core_data_file_type, file_type;
-type vendor_firmware_file, vendor_file_type, file_type;
 type sysfs_tp, fs_type, sysfs_type;
diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts
index 764750a..5209938 100644
--- a/sepolicy/private/file_contexts
+++ b/sepolicy/private/file_contexts
@@ -13,7 +13,7 @@
 /(product|system/product)/vendor_overlay/[0-9]+/bin/hw/android\.hardware\.light@2\.0-service u:object_r:hal_light_default_exec:s0
 
 # Touch
-/sys/devices/virtual/touch/tp_dev/gesture_on  u:object_r:sysfs_tp:s0
+/sys/class/touch/tp_dev/gesture_on  u:object_r:sysfs_tp:s0
 
 # Vendor overlay
 /(product|system/product)/vendor_overlay/[0-9]+/lib(64)?/hw                                      u:object_r:vendor_hal_file:s0
diff --git a/sepolicy/private/genfs_contexts b/sepolicy/private/genfs_contexts
index 0e64cd6..44ce6c8 100644
--- a/sepolicy/private/genfs_contexts
+++ b/sepolicy/private/genfs_contexts
@@ -1,14 +1,10 @@
 genfscon proc /touchpanel    u:object_r:proc_touchpanel:s0
 genfscon debugfs /wlan0                               u:object_r:debugfs_wlan:s0
 genfscon debugfs /sched_features                      u:object_r:debugfs_sched_features:s0
-
 genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_mdp/idle_state    u:object_r:sysfs_graphics:s0
-
 genfscon sysfs /devices/platform/soc/soc:qcom,l3-cdsp/devfreq                   u:object_r:sysfs_devfreq:s0
 genfscon sysfs /devices/platform/soc/1d84000.ufshc/clkgate_enable               u:object_r:sysfs_scsi_devices:s0
 genfscon sysfs /devices/platform/soc/1d84000.ufshc/hibern8_on_idle_enable       u:object_r:sysfs_scsi_devices:s0
-
 genfscon sysfs /power/rpmh_stats/master_stats         u:object_r:sysfs_rpm:s0
 genfscon sysfs /power/system_sleep/stats              u:object_r:sysfs_system_sleep_stats:s0
-
 genfscon proc /sys/kernel/sched_boost                 u:object_r:proc_sysctl_schedboost:s0
diff --git a/sepolicy/private/hal_fingerprint_sdm710.te b/sepolicy/private/hal_fingerprint_sdm710.te
deleted file mode 100644
index e20276e..0000000
--- a/sepolicy/private/hal_fingerprint_sdm710.te
+++ /dev/null
@@ -1,6 +0,0 @@
-type hal_fingerprint_sdm710, coredomain, domain;
-hal_client_domain(hal_fingerprint_sdm710, hal_fingerprint)
-hal_server_domain(hal_fingerprint_sdm710, hal_fingerprint)
-
-type hal_fingerprint_sdm710_exec, system_file_type, exec_type, file_type;
-init_daemon_domain(hal_fingerprint_sdm710)
diff --git a/sepolicy/private/hal_sensors_default.te b/sepolicy/private/hal_sensors.te
similarity index 100%
rename from sepolicy/private/hal_sensors_default.te
rename to sepolicy/private/hal_sensors.te
diff --git a/sepolicy/private/property.te b/sepolicy/private/property.te
index 888f742..1489eeb 100644
--- a/sepolicy/private/property.te
+++ b/sepolicy/private/property.te
@@ -1,3 +1,3 @@
 type vendor_camera_prop, property_type;
-type vendor_power_prop, property_type;
 type vendor_display_prop, property_type;
+type vendor_power_prop, property_type;
diff --git a/sepolicy/private/property_contexts b/sepolicy/private/property_contexts
index d4ec336..e8f3ba2 100644
--- a/sepolicy/private/property_contexts
+++ b/sepolicy/private/property_contexts
@@ -1,4 +1,3 @@
-# Powerhal
 vendor.powerhal.state      u:object_r:vendor_power_prop:s0
 vendor.powerhal.audio      u:object_r:vendor_power_prop:s0
 vendor.powerhal.init       u:object_r:vendor_power_prop:s0