diff --git a/sepolicy/bluetooth_loader.te b/sepolicy/bluetooth_loader.te
index 8ac52ba..4449d9c 100644
--- a/sepolicy/bluetooth_loader.te
+++ b/sepolicy/bluetooth_loader.te
@@ -4,5 +4,4 @@
 # Started by init
 init_daemon_domain(bluetooth_loader)
 
-unix_socket_connect(bluetooth_loader, property, init)
-allow bluetooth_loader bluetooth_prop:property_service set;
+set_prop(bluetooth_loader, bluetooth_prop)
diff --git a/sepolicy/ims.te b/sepolicy/ims.te
index 06464ed..e2a27aa 100644
--- a/sepolicy/ims.te
+++ b/sepolicy/ims.te
@@ -38,8 +38,5 @@
 # Runs /system/bin/ndc
 allow ims system_file:file rx_file_perms;
 
-# Talks to init via property socket.
-unix_socket_connect(ims, property, init)
-
 # Allow ims to tell init to start the ims data service via property=sys.ims.QMI_DAEMON_STATUS
-allow ims qcom_ims_prop:property_service set;
+set_prop(ims, qcom_ims_prop)
diff --git a/sepolicy/mdm_helper.te b/sepolicy/mdm_helper.te
index 45c2a7c..ee636ee 100644
--- a/sepolicy/mdm_helper.te
+++ b/sepolicy/mdm_helper.te
@@ -60,5 +60,4 @@
 allow mdm_helper dropbox_data_file:file create_file_perms;
 
 # write radio properties
-unix_socket_connect(mdm_helper, property, init)
-allow mdm_helper radio_prop:property_service set;
+set_prop(mdm_helper, radio_prop)
diff --git a/sepolicy/netmgrd.te b/sepolicy/netmgrd.te
index 943941f..862f137 100644
--- a/sepolicy/netmgrd.te
+++ b/sepolicy/netmgrd.te
@@ -37,8 +37,7 @@
 dontaudit netmgrd self:capability sys_module;
 
 # Set net_radio properties
-unix_socket_connect(netmgrd, property, init)
-allow netmgrd net_radio_prop:property_service set;
+set_prop(netmgrd, net_radio_prop)
 
 # Permission to run netd commands
 allow netmgrd netd_socket:sock_file write;
diff --git a/sepolicy/tcmd.te b/sepolicy/tcmd.te
index 0a00c85..cc9f6f1 100644
--- a/sepolicy/tcmd.te
+++ b/sepolicy/tcmd.te
@@ -7,11 +7,8 @@
 # Uses network sockets.
 net_domain(tcmd)
 
-# Set property.
-unix_socket_connect(tcmd, property, init)
-
 # Allow restart, fastboot, power off
-allow tcmd powerctl_prop:property_service set;
+set_prop(tcmd, powerctl_prop)
 
 # Uses /dev/ttydiag2
 allow tcmd diag_device:chr_file rw_file_perms;