diff --git a/refpolicy/policy/modules/kernel/bootloader.if b/refpolicy/policy/modules/kernel/bootloader.if
index c4a5933a..f18a9d7b 100644
--- a/refpolicy/policy/modules/kernel/bootloader.if
+++ b/refpolicy/policy/modules/kernel/bootloader.if
@@ -2,7 +2,7 @@
 ## <summary>Policy for the kernel modules, kernel image, and bootloader.</summary>
 
 ########################################
-## <interface name="bootloader_transition">
+## <interface name="bootloader_domtrans">
 ##	<description>
 ##		Execute bootloader in the bootloader domain.
 ##	</description>
@@ -12,7 +12,7 @@
 ##	<infoflow type="write" weight="10"/>
 ## </interface>
 #
-define(`bootloader_transition',`
+define(`bootloader_domtrans',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 bootloader_exec_t:file { getattr read execute };
@@ -26,7 +26,7 @@ define(`bootloader_transition',`
 	allow bootloader_t $1:process sigchld;
 ')
 
-define(`bootloader_transition_depend',`
+define(`bootloader_domtrans_depend',`
 	type bootloader_t;
 
 	class file { getattr read execute };
@@ -36,7 +36,7 @@ define(`bootloader_transition_depend',`
 ')
 
 ########################################
-## <interface name="bootloader_transition_add_role_use_terminal">
+## <interface name="bootloader_run">
 ##	<description>
 ##		Execute bootloader in the bootloader domain, and
 ##		allow the specified role the bootloader domain,
@@ -54,7 +54,7 @@ define(`bootloader_transition_depend',`
 ##	<infoflow type="write" weight="10"/>
 ## </interface>
 #
-define(`bootloader_transition_add_role_use_terminal',`
+define(`bootloader_run',`
 	requires_block_template(`$0'_depend)
 
 	bootloader_transition($1)
@@ -63,7 +63,7 @@ define(`bootloader_transition_add_role_use_terminal',`
 	allow bootloader_t $3:chr_file { getattr read write ioctl };
 ')
 
-define(`bootloader_transition_add_role_use_terminal_depend',`
+define(`bootloader_run_depend',`
 	type bootloader_t;
 	class chr_file { getattr read write ioctl };
 ')
@@ -247,15 +247,15 @@ define(`bootloader_read_config_depend',`
 
 ########################################
 #
-# bootloader_modify_config(domain)
+# bootloader_rw_config(domain)
 #
-define(`bootloader_modify_bootloader_config',`
+define(`bootloader_rw_bootloader_config',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 bootloader_etc_t:file { getattr read write append };
 ')
 
-define(`bootloader_modify_bootloader_config_depend',`
+define(`bootloader_rw_bootloader_config_depend',`
 	type bootloader_etc_t;
 
 	class file { getattr read write append };
@@ -263,16 +263,16 @@ define(`bootloader_modify_bootloader_config_depend',`
 
 ########################################
 #
-# bootloader_modify_temporary_data(domain)
+# bootloader_rw_temp_data(domain)
 #
-define(`bootloader_modify_temporary_data',`
+define(`bootloader_rw_temp_data',`
 	requires_block_template(`$0'_depend)
 
 	# FIXME: read tmp_t
 	allow $1 bootloader_tmp_t:file { getattr read write };
 ')
 
-define(`bootloader_modify_temporary_data_depend',`
+define(`bootloader_rw_temp_data_depend',`
 	type bootloader_tmp_t;
 
 	class file { getattr read write setattr };
diff --git a/refpolicy/policy/modules/kernel/corenetwork.if b/refpolicy/policy/modules/kernel/corenetwork.if
index 48ea59f4..885d0a36 100644
--- a/refpolicy/policy/modules/kernel/corenetwork.if
+++ b/refpolicy/policy/modules/kernel/corenetwork.if
@@ -3,7 +3,7 @@
 
 ifdef(`interface_pass',`',`
 ########################################
-## <interface name="corenetwork_sendrecv_tcp_on_general_interface">
+## <interface name="corenet_tcp_sendrecv_generic_if">
 ##	<description>
 ##		Send and receive TCP network traffic on the general interfaces.
 ##	</description>
@@ -13,13 +13,13 @@ ifdef(`interface_pass',`',`
 ##	<infoflow type="both" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_sendrecv_tcp_on_general_interface',`
+define(`corenet_tcp_sendrecv_generic_if',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 netif_t:netif { tcp_send tcp_recv };
 ')
 
-define(`corenetwork_sendrecv_tcp_on_general_interface_depend',`
+define(`corenet_tcp_sendrecv_generic_if_depend',`
 	type netif_t;
 
 	class netif { tcp_send tcp_recv };
@@ -27,15 +27,15 @@ define(`corenetwork_sendrecv_tcp_on_general_interface_depend',`
 
 #######################################
 #
-# corenetwork_send_udp_on_general_interface(domain)
+# corenet_udp_send_generic_if(domain)
 #
-define(`corenetwork_send_udp_on_general_interface',`
+define(`corenet_udp_send_generic_if',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 netif_t:netif udp_send;
 ')
 
-define(`corenetwork_send_udp_on_general_interface_depend',`
+define(`corenet_udp_send_generic_if_depend',`
 	type netif_t;
 
 	class netif udp_send;
@@ -43,15 +43,15 @@ define(`corenetwork_send_udp_on_general_interface_depend',`
 
 #######################################
 #
-# corenetwork_receive_udp_on_general_interface(domain)
+# corenet_udp_receive_generic_if(domain)
 #
-define(`corenetwork_receive_udp_on_general_interface',`
+define(`corenet_udp_receive_generic_if',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 netif_t:netif udp_recv;
 ')
 
-define(`corenetwork_receive_udp_on_general_interface_depend',`
+define(`corenet_udp_receive_generic_if_depend',`
 	type netif_t;
 
 	class netif udp_recv;
@@ -59,25 +59,25 @@ define(`corenetwork_receive_udp_on_general_interface_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_udp_on_general_interface(domain)
+# corenet_udp_sendrecv_generic_if(domain)
 #
-define(`corenetwork_sendrecv_udp_on_general_interface',`
-	corenetwork_send_udp_on_general_interface($1)
-	corenetwork_receive_udp_on_general_interface($1)
+define(`corenet_udp_sendrecv_generic_if',`
+	corenet_udp_send_generic_if($1)
+	corenet_udp_receive_generic_if($1)
 ')
 
 #######################################
 #
-# corenetwork_send_raw_on_general_interface(domain)
+# corenet_raw_send_generic_if(domain)
 #
-define(`corenetwork_send_raw_on_general_interface',`
+define(`corenet_raw_send_generic_if',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 netif_t:netif rawip_send;
 	allow $1 self:capability net_raw;
 ')
 
-define(`corenetwork_send_raw_on_general_interface_depend',`
+define(`corenet_raw_send_generic_if_depend',`
 	type netif_t;
 
 	class netif rawip_send;
@@ -86,15 +86,15 @@ define(`corenetwork_send_raw_on_general_interface_depend',`
 
 #######################################
 #
-# corenetwork_receive_raw_on_general_interface(domain)
+# corenet_raw_receive_generic_if(domain)
 #
-define(`corenetwork_receive_raw_on_general_interface',`
+define(`corenet_raw_receive_generic_if',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 netif_t:netif rawip_recv;
 ')
 
-define(`corenetwork_receive_raw_on_general_interface_depend',`
+define(`corenet_raw_receive_generic_if_depend',`
 	type netif_t;
 
 	class netif rawip_recv;
@@ -102,24 +102,24 @@ define(`corenetwork_receive_raw_on_general_interface_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_raw_on_general_interface(domain)
+# corenet_raw_sendrecv_generic_if(domain)
 #
-define(`corenetwork_sendrecv_raw_on_general_interface',`
-	corenetwork_send_raw_on_general_interface($1)
-	corenetwork_receive_raw_on_general_interface($1)
+define(`corenet_raw_sendrecv_generic_if',`
+	corenet_raw_send_generic_if($1)
+	corenet_raw_receive_generic_if($1)
 ')
 
 #######################################
 #
-# corenetwork_sendrecv_tcp_on_all_interfaces(domain)
+# corenet_tcp_sendrecv_all_if(domain)
 #
-define(`corenetwork_sendrecv_tcp_on_all_interfaces',`
+define(`corenet_tcp_sendrecv_all_if',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 netif_type:netif { tcp_send tcp_recv };
 ')
 
-define(`corenetwork_sendrecv_tcp_on_all_interfaces_depend',`
+define(`corenet_tcp_sendrecv_all_if_depend',`
 	attribute netif_type;
 
 	class netif { tcp_send tcp_recv };
@@ -127,15 +127,15 @@ define(`corenetwork_sendrecv_tcp_on_all_interfaces_depend',`
 
 #######################################
 #
-# corenetwork_send_udp_on_all_interfaces(domain)
+# corenet_udp_send_all_if(domain)
 #
-define(`corenetwork_send_udp_on_all_interfaces',`
+define(`corenet_udp_send_all_if',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 netif_type:netif udp_send;
 ')
 
-define(`corenetwork_send_udp_on_all_interfaces_depend',`
+define(`corenet_udp_send_all_if_depend',`
 	attribute netif_type;
 
 	class netif udp_send;
@@ -143,15 +143,15 @@ define(`corenetwork_send_udp_on_all_interfaces_depend',`
 
 #######################################
 #
-# corenetwork_receive_udp_on_all_interfaces(domain)
+# corenet_udp_receive_all_if(domain)
 #
-define(`corenetwork_receive_udp_on_all_interfaces',`
+define(`corenet_udp_receive_all_if',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 netif_type:netif udp_recv;
 ')
 
-define(`corenetwork_receive_udp_on_all_interfaces_depend',`
+define(`corenet_udp_receive_all_if_depend',`
 	attribute netif_type;
 
 	class netif udp_recv;
@@ -159,25 +159,25 @@ define(`corenetwork_receive_udp_on_all_interfaces_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_udp_on_all_interfaces(domain)
+# corenet_udp_sendrecv_all_if(domain)
 #
-define(`corenetwork_sendrecv_udp_on_all_interfaces',`
-	corenetwork_send_udp_on_all_interfaces($1)
-	corenetwork_receive_udp_on_all_interfaces($1)
+define(`corenet_udp_sendrecv_all_if',`
+	corenet_udp_send_all_if($1)
+	corenet_udp_receive_all_if($1)
 ')
 
 #######################################
 #
-# corenetwork_send_raw_on_all_interfaces(domain)
+# corenet_raw_send_all_if(domain)
 #
-define(`corenetwork_send_raw_on_all_interfaces',`
+define(`corenet_raw_send_all_if',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 netif_type:netif rawip_send;
 	allow $1 self:capability net_raw;
 ')
 
-define(`corenetwork_send_raw_on_all_interfaces_depend',`
+define(`corenet_raw_send_all_if_depend',`
 	attribute netif_type;
 
 	class netif rawip_send;
@@ -186,15 +186,15 @@ define(`corenetwork_send_raw_on_all_interfaces_depend',`
 
 #######################################
 #
-# corenetwork_receive_raw_on_all_interfaces(domain)
+# corenet_raw_receive_all_if(domain)
 #
-define(`corenetwork_receive_raw_on_all_interfaces',`
+define(`corenet_raw_receive_all_if',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 netif_type:netif rawip_recv;
 ')
 
-define(`corenetwork_receive_raw_on_all_interfaces_depend',`
+define(`corenet_raw_receive_all_if_depend',`
 	attribute netif_type;
 
 	class netif rawip_recv;
@@ -202,24 +202,24 @@ define(`corenetwork_receive_raw_on_all_interfaces_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_raw_on_all_interfaces(domain)
+# corenet_raw_sendrecv_all_if(domain)
 #
-define(`corenetwork_sendrecv_raw_on_all_interfaces',`
-	corenetwork_send_raw_on_all_interfaces($1)
-	corenetwork_receive_raw_on_all_interfaces($1)
+define(`corenet_raw_sendrecv_all_if',`
+	corenet_raw_send_all_if($1)
+	corenet_raw_receive_all_if($1)
 ')
 
 #######################################
 #
-# corenetwork_sendrecv_tcp_on_general_node(domain)
+# corenet_tcp_sendrecv_generic_node(domain)
 #
-define(`corenetwork_sendrecv_tcp_on_general_node',`
+define(`corenet_tcp_sendrecv_generic_node',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 node_t:node { tcp_send tcp_recv };
 ')
 
-define(`corenetwork_sendrecv_tcp_on_general_node_depend',`
+define(`corenet_tcp_sendrecv_generic_node_depend',`
 	type node_t;
 
 	class node { tcp_send tcp_recv };
@@ -227,15 +227,15 @@ define(`corenetwork_sendrecv_tcp_on_general_node_depend',`
 
 #######################################
 #
-# corenetwork_send_udp_on_general_node(domain)
+# corenet_udp_send_generic_node(domain)
 #
-define(`corenetwork_send_udp_on_general_node',`
+define(`corenet_udp_send_generic_node',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 node_t:node udp_send;
 ')
 
-define(`corenetwork_send_udp_on_general_node_depend',`
+define(`corenet_udp_send_generic_node_depend',`
 	type node_t;
 
 	class node udp_send;
@@ -243,15 +243,15 @@ define(`corenetwork_send_udp_on_general_node_depend',`
 
 #######################################
 #
-# corenetwork_receive_udp_on_general_node(domain)
+# corenet_udp_receive_generic_node(domain)
 #
-define(`corenetwork_receive_udp_on_general_node',`
+define(`corenet_udp_receive_generic_node',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 node_t:node udp_recv;
 ')
 
-define(`corenetwork_receive_udp_on_general_node_depend',`
+define(`corenet_udp_receive_generic_node_depend',`
 	type node_t;
 
 	class node udp_recv;
@@ -259,25 +259,25 @@ define(`corenetwork_receive_udp_on_general_node_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_udp_on_general_node(domain)
+# corenet_udp_sendrecv_generic_node(domain)
 #
-define(`corenetwork_sendrecv_udp_on_general_node',`
-	corenetwork_send_udp_on_general_node($1,$2)
-	corenetwork_receive_udp_on_general_node($1,$2)
+define(`corenet_udp_sendrecv_generic_node',`
+	corenet_udp_send_generic_node($1)
+	corenet_udp_receive_generic_node($1)
 ')
 
 #######################################
 #
-# corenetwork_send_raw_on_general_node(domain)
+# corenet_raw_send_generic_node(domain)
 #
-define(`corenetwork_send_raw_on_general_node',`
+define(`corenet_raw_send_generic_node',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 node_t:node rawip_send;
 	allow $1 self:capability net_raw;
 ')
 
-define(`corenetwork_send_raw_on_general_node_depend',`
+define(`corenet_raw_send_generic_node_depend',`
 	type node_t;
 
 	class node rawip_send;
@@ -286,15 +286,15 @@ define(`corenetwork_send_raw_on_general_node_depend',`
 
 #######################################
 #
-# corenetwork_receive_raw_on_general_node(domain)
+# corenet_raw_receive_generic_node(domain)
 #
-define(`corenetwork_receive_raw_on_general_node',`
+define(`corenet_raw_receive_generic_node',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 node_t:node rawip_recv;
 ')
 
-define(`corenetwork_receive_raw_on_general_node_depend',`
+define(`corenet_raw_receive_generic_node_depend',`
 	type node_t;
 
 	class node rawip_recv;
@@ -302,24 +302,24 @@ define(`corenetwork_receive_raw_on_general_node_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_raw_on_general_node(domain)
+# corenet_raw_sendrecv_generic_node(domain)
 #
-define(`corenetwork_sendrecv_raw_on_general_node',`
-	corenetwork_send_raw_on_general_node($1,$2)
-	corenetwork_receive_raw_on_general_node($1,$2)
+define(`corenet_raw_sendrecv_generic_node',`
+	corenet_raw_send_generic_node($1)
+	corenet_raw_receive_generic_node($1)
 ')
 
 #######################################
 #
-# corenetwork_bind_tcp_on_general_node(domain)
+# corenet_tcp_bind_generic_node(domain)
 #
-define(`corenetwork_bind_tcp_on_general_node',`
+define(`corenet_tcp_bind_generic_node',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 node_t:tcp_socket node_bind;
 ')
 
-define(`corenetwork_bind_udp_on_general_node_depend',`
+define(`corenet_tcp_bind_generic_node_depend',`
 	type node_t;
 
 	class tcp_socket node_bind;
@@ -327,15 +327,15 @@ define(`corenetwork_bind_udp_on_general_node_depend',`
 
 #######################################
 #
-# corenetwork_bind_udp_on_general_node(domain)
+# corenet_udp_bind_generic_node(domain)
 #
-define(`corenetwork_bind_udp_on_general_node',`
+define(`corenet_udp_bind_generic_node',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 node_t:udp_socket node_bind;
 ')
 
-define(`corenetwork_bind_udp_on_general_node_depend',`
+define(`corenet_udp_bind_generic_node_depend',`
 	type node_t;
 
 	class udp_socket node_bind;
@@ -343,15 +343,15 @@ define(`corenetwork_bind_udp_on_general_node_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_tcp_on_all_nodes(domain)
+# corenet_tcp_sendrecv_all_nodes(domain)
 #
-define(`corenetwork_sendrecv_tcp_on_all_nodes',`
+define(`corenet_tcp_sendrecv_all_nodes',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 node_type:node { tcp_send tcp_recv };
 ')
 
-define(`corenetwork_sendrecv_tcp_on_all_nodes_depend',`
+define(`corenet_tcp_sendrecv_all_nodes_depend',`
 	attribute node_type;
 
 	class node { tcp_send tcp_recv };
@@ -359,15 +359,15 @@ define(`corenetwork_sendrecv_tcp_on_all_nodes_depend',`
 
 #######################################
 #
-# corenetwork_send_udp_on_all_nodes(domain)
+# corenet_udp_send_all_nodes(domain)
 #
-define(`corenetwork_send_udp_on_all_nodes',`
+define(`corenet_udp_send_all_nodes',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 node_type:node udp_send;
 ')
 
-define(`corenetwork_send_udp_on_all_nodes_depend',`
+define(`corenet_udp_send_all_nodes_depend',`
 	attribute node_type;
 
 	class node udp_send;
@@ -375,15 +375,15 @@ define(`corenetwork_send_udp_on_all_nodes_depend',`
 
 #######################################
 #
-# corenetwork_receive_udp_on_all_nodes(domain)
+# corenet_udp_receive_all_nodes(domain)
 #
-define(`corenetwork_receive_udp_on_all_nodes',`
+define(`corenet_udp_receive_all_nodes',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 node_type:node udp_recv;
 ')
 
-define(`corenetwork_receive_udp_on_all_nodes_depend',`
+define(`corenet_udp_receive_all_nodes_depend',`
 	attribute node_type;
 
 	class node udp_recv;
@@ -391,25 +391,25 @@ define(`corenetwork_receive_udp_on_all_nodes_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_udp_on_all_nodes(domain)
+# corenet_udp_sendrecv_all_nodes(domain)
 #
-define(`corenetwork_sendrecv_udp_on_all_nodes',`
-	corenetwork_send_udp_on_all_nodes($1)
-	corenetwork_receive_udp_on_all_nodes($1)
+define(`corenet_udp_sendrecv_all_nodes',`
+	corenet_udp_send_all_nodes($1)
+	corenet_udp_receive_all_nodes($1)
 ')
 
 #######################################
 #
-# corenetwork_send_raw_on_all_nodes(domain)
+# corenet_raw_send_all_nodes(domain)
 #
-define(`corenetwork_send_raw_on_all_nodes',`
+define(`corenet_raw_send_all_nodes',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 node_type:node rawip_send;
 	allow $1 self:capability net_raw;
 ')
 
-define(`corenetwork_send_raw_on_all_nodes_depend',`
+define(`corenet_raw_send_all_nodes_depend',`
 	attribute node_type;
 
 	class node rawip_send;
@@ -418,15 +418,15 @@ define(`corenetwork_send_raw_on_all_nodes_depend',`
 
 #######################################
 #
-# corenetwork_receive_raw_on_all_nodes(domain)
+# corenet_raw_receive_all_nodes(domain)
 #
-define(`corenetwork_receive_raw_on_all_nodes',`
+define(`corenet_raw_receive_all_nodes',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 node_type:node rawip_recv;
 ')
 
-define(`corenetwork_receive_raw_on_all_nodes_depend',`
+define(`corenet_raw_receive_all_nodes_depend',`
 	attribute node_type;
 
 	class node rawip_recv;
@@ -434,24 +434,24 @@ define(`corenetwork_receive_raw_on_all_nodes_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_raw_on_all_nodes(domain)
+# corenet_raw_sendrecv_all_nodes(domain)
 #
-define(`corenetwork_sendrecv_raw_on_all_nodes',`
-	corenetwork_send_raw_on_all_nodes($1)
-	corenetwork_receive_raw_on_all_nodes($1)
+define(`corenet_raw_sendrecv_all_nodes',`
+	corenet_raw_send_all_nodes($1)
+	corenet_raw_receive_all_nodes($1)
 ')
 
 #######################################
 #
-# corenetwork_bind_tcp_on_all_nodes(domain)
+# corenet_tcp_bind_all_nodes(domain)
 #
-define(`corenetwork_bind_tcp_on_all_nodes',`
+define(`corenet_tcp_bind_all_nodes',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 node_type:tcp_socket node_bind;
 ')
 
-define(`corenetwork_bind_tcp_on_all_nodes_depend',`
+define(`corenet_tcp_bind_all_nodes_depend',`
 	attribute node_type;
 
 	class tcp_socket node_bind;
@@ -459,15 +459,15 @@ define(`corenetwork_bind_tcp_on_all_nodes_depend',`
 
 #######################################
 #
-# corenetwork_bind_udp_on_all_nodes(domain)
+# corenet_udp_bind_all_nodes(domain)
 #
-define(`corenetwork_bind_udp_on_all_nodes',`
+define(`corenet_udp_bind_all_nodes',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 node_type:udp_socket node_bind;
 ')
 
-define(`corenetwork_bind_udp_on_all_nodes_depend',`
+define(`corenet_udp_bind_all_nodes_depend',`
 	attribute node_type;
 
 	class udp_socket node_bind;
@@ -475,15 +475,15 @@ define(`corenetwork_bind_udp_on_all_nodes_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_tcp_on_general_port(domain)
+# corenet_tcp_sendrecv_generic_port(domain)
 #
-define(`corenetwork_sendrecv_tcp_on_general_port',`
+define(`corenet_tcp_sendrecv_generic_port',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 port_t:tcp_socket { send_msg recv_msg };
 ')
 
-define(`corenetwork_sendrecv_tcp_on_general_port_depend',`
+define(`corenet_tcp_sendrecv_generic_port_depend',`
 	type port_t;
 
 	class tcp_socket { send_msg recv_msg };
@@ -491,15 +491,15 @@ define(`corenetwork_sendrecv_tcp_on_general_port_depend',`
 
 #######################################
 #
-# corenetwork_send_udp_on_general_port(domain)
+# corenet_udp_send_generic_port(domain)
 #
-define(`corenetwork_send_udp_on_general_port',`
+define(`corenet_udp_send_generic_port',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 port_t:udp_socket send_msg;
 ')
 
-define(`corenetwork_send_udp_on_general_port_depend',`
+define(`corenet_udp_send_generic_port_depend',`
 	type port_t;
 
 	class udp_socket send_msg;
@@ -507,15 +507,15 @@ define(`corenetwork_send_udp_on_general_port_depend',`
 
 #######################################
 #
-# corenetwork_receive_udp_on_general_port(domain)
+# corenet_udp_receive_generic_port(domain)
 #
-define(`corenetwork_receive_udp_on_general_port',`
+define(`corenet_udp_receive_generic_port',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 port_t:udp_socket recv_msg;
 ')
 
-define(`corenetwork_receive_udp_on_general_port_depend',`
+define(`corenet_udp_receive_generic_port_depend',`
 	type port_t;
 
 	class udp_socket recv_msg;
@@ -523,24 +523,24 @@ define(`corenetwork_receive_udp_on_general_port_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_udp_on_general_port(domain)
+# corenet_udp_sendrecv_generic_port(domain)
 #
-define(`corenetwork_sendrecv_udp_on_general_port',`
-	corenetwork_send_udp_on_general_port($1)
-	corenetwork_receive_udp_on_general_port($1)
+define(`corenet_udp_sendrecv_generic_port',`
+	corenet_udp_send_generic_port($1)
+	corenet_udp_receive_generic_port($1)
 ')
 
 #######################################
 #
-# corenetwork_bind_tcp_on_general_port(domain)
+# corenet_tcp_bind_generic_port(domain)
 #
-define(`corenetwork_bind_tcp_on_general_port',`
+define(`corenet_tcp_bind_generic_port',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 port_t:tcp_socket name_bind;
 ')
 
-define(`corenetwork_bind_udp_on_general_port_depend',`
+define(`corenet_tcp_bind_generic_port_depend',`
 	type port_t;
 
 	class tcp_socket name_bind;
@@ -548,15 +548,15 @@ define(`corenetwork_bind_udp_on_general_port_depend',`
 
 #######################################
 #
-# corenetwork_bind_udp_on_general_port(domain)
+# corenet_udp_bind_generic_port(domain)
 #
-define(`corenetwork_bind_udp_on_general_port',`
+define(`corenet_udp_bind_generic_port',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 port_t:udp_socket name_bind;
 ')
 
-define(`corenetwork_bind_udp_on_general_port_depend',`
+define(`corenet_udp_bind_generic_port_depend',`
 	type port_t;
 
 	class udp_socket name_bind;
@@ -564,15 +564,15 @@ define(`corenetwork_bind_udp_on_general_port_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_tcp_on_all_ports(domain)
+# corenet_tcp_sendrecv_all_ports(domain)
 #
-define(`corenetwork_sendrecv_tcp_on_all_ports',`
+define(`corenet_tcp_sendrecv_all_ports',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 port_type:tcp_socket { send_msg recv_msg };
 ')
 
-define(`corenetwork_sendrecv_tcp_on_all_ports_depend',`
+define(`corenet_tcp_sendrecv_all_ports_depend',`
 	attribute port_type;
 
 	class tcp_socket { send_msg recv_msg };
@@ -580,15 +580,15 @@ define(`corenetwork_sendrecv_tcp_on_all_ports_depend',`
 
 #######################################
 #
-# corenetwork_send_udp_on_all_ports(domain)
+# corenet_udp_send_all_ports(domain)
 #
-define(`corenetwork_send_udp_on_all_ports',`
+define(`corenet_udp_send_all_ports',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 port_type:udp_socket send_msg;
 ')
 
-define(`corenetwork_send_udp_on_all_ports_depend',`
+define(`corenet_udp_send_all_ports_depend',`
 	attribute port_type;
 
 	class udp_socket send_msg;
@@ -596,15 +596,15 @@ define(`corenetwork_send_udp_on_all_ports_depend',`
 
 #######################################
 #
-# corenetwork_receive_udp_on_all_ports(domain)
+# corenet_udp_receive_all_ports(domain)
 #
-define(`corenetwork_receive_udp_on_all_ports',`
+define(`corenet_udp_receive_all_ports',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 port_type:udp_socket recv_msg;
 ')
 
-define(`corenetwork_receive_udp_on_all_ports_depend',`
+define(`corenet_udp_receive_all_ports_depend',`
 	attribute port_type;
 
 	class udp_socket recv_msg;
@@ -612,24 +612,24 @@ define(`corenetwork_receive_udp_on_all_ports_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_udp_on_all_ports(domain)
+# corenet_udp_sendrecv_all_ports(domain)
 #
-define(`corenetwork_sendrecv_udp_on_all_ports',`
-	corenetwork_send_udp_on_all_ports($1)
-	corenetwork_receive_udp_on_all_ports($1)
+define(`corenet_udp_sendrecv_all_ports',`
+	corenet_udp_send_all_ports($1)
+	corenet_udp_receive_all_ports($1)
 ')
 
 #######################################
 #
-# corenetwork_bind_tcp_on_all_ports(domain,[`optional'])
+# corenet_tcp_bind_all_ports(domain)
 #
-define(`corenetwork_bind_tcp_on_all_ports',`
+define(`corenet_tcp_bind_all_ports',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 port_type:tcp_socket name_bind;
 ')
 
-define(`corenetwork_bind_tcp_on_all_ports_depend',`
+define(`corenet_tcp_bind_all_ports_depend',`
 	attribute port_type;
 
 	class tcp_socket name_bind;
@@ -637,15 +637,15 @@ define(`corenetwork_bind_tcp_on_all_ports_depend',`
 
 #######################################
 #
-# corenetwork_bind_udp_on_all_ports(domain)
+# corenet_udp_bind_all_ports(domain)
 #
-define(`corenetwork_bind_udp_on_all_ports',`
+define(`corenet_udp_bind_all_ports',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 port_type:udp_socket name_bind;
 ')
 
-define(`corenetwork_bind_udp_on_all_ports_depend',`
+define(`corenet_udp_bind_all_ports_depend',`
 	attribute port_type;
 
 	class udp_socket name_bind;
@@ -653,15 +653,15 @@ define(`corenetwork_bind_udp_on_all_ports_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_tcp_on_reserved_port(domain)
+# corenet_tcp_sendrecv_reserved_port(domain)
 #
-define(`corenetwork_sendrecv_tcp_on_reserved_port',`
+define(`corenet_tcp_sendrecv_reserved_port',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 reserved_port_t:tcp_socket { send_msg recv_msg };
 ')
 
-define(`corenetwork_sendrecv_tcp_on_reserved_port_depend',`
+define(`corenet_tcp_sendrecv_reserved_port_depend',`
 	type reserved_port_t;
 
 	class tcp_socket { send_msg recv_msg };
@@ -669,15 +669,15 @@ define(`corenetwork_sendrecv_tcp_on_reserved_port_depend',`
 
 #######################################
 #
-# corenetwork_send_udp_on_reserved_port(domain)
+# corenet_udp_send_reserved_port(domain)
 #
-define(`corenetwork_send_udp_on_reserved_port',`
+define(`corenet_udp_send_reserved_port',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 reserved_port_t:udp_socket send_msg;
 ')
 
-define(`corenetwork_send_udp_on_reserved_port_depend',`
+define(`corenet_udp_send_reserved_port_depend',`
 	type reserved_port_t;
 
 	class udp_socket send_msg;
@@ -685,15 +685,15 @@ define(`corenetwork_send_udp_on_reserved_port_depend',`
 
 #######################################
 #
-# corenetwork_receive_udp_on_reserved_port(domain)
+# corenet_udp_receive_reserved_port(domain)
 #
-define(`corenetwork_receive_udp_on_reserved_port',`
+define(`corenet_udp_receive_reserved_port',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 reserved_port_t:udp_socket recv_msg;
 ')
 
-define(`corenetwork_receive_udp_on_reserved_port_depend',`
+define(`corenet_udp_receive_reserved_port_depend',`
 	type reserved_port_t;
 
 	class udp_socket recv_msg;
@@ -701,25 +701,25 @@ define(`corenetwork_receive_udp_on_reserved_port_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_udp_on_reserved_port(domain)
+# corenet_udp_sendrecv_reserved_port(domain)
 #
-define(`corenetwork_sendrecv_udp_on_reserved_port',`
-	corenetwork_send_udp_on_reserved_port($1)
-	corenetwork_receive_udp_on_reserved_port($1)
+define(`corenet_udp_sendrecv_reserved_port',`
+	corenet_udp_send_reserved_port($1)
+	corenet_udp_receive_reserved_port($1)
 ')
 
 #######################################
 #
-# corenetwork_bind_tcp_on_reserved_port(domain)
+# corenet_tcp_bind_reserved_port(domain)
 #
-define(`corenetwork_bind_tcp_on_reserved_port',`
+define(`corenet_tcp_bind_reserved_port',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 reserved_port_t:tcp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
-define(`corenetwork_bind_udp_on_reserved_port_depend',`
+define(`corenet_tcp_bind_reserved_port_depend',`
 	type reserved_port_t;
 
 	class tcp_socket name_bind;
@@ -728,16 +728,16 @@ define(`corenetwork_bind_udp_on_reserved_port_depend',`
 
 #######################################
 #
-# corenetwork_bind_udp_on_reserved_port(domain)
+# corenet_udp_bind_reserved_port(domain)
 #
-define(`corenetwork_bind_udp_on_reserved_port',`
+define(`corenet_udp_bind_reserved_port',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 reserved_port_t:udp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
-define(`corenetwork_bind_udp_on_reserved_port_depend',`
+define(`corenet_udp_bind_reserved_port_depend',`
 	type reserved_port_t;
 
 	class udp_socket name_bind;
@@ -746,15 +746,15 @@ define(`corenetwork_bind_udp_on_reserved_port_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_tcp_on_all_reserved_ports(domain)
+# corenet_tcp_sendrecv_all_reserved_ports(domain)
 #
-define(`corenetwork_sendrecv_tcp_on_all_reserved_ports',`
+define(`corenet_tcp_sendrecv_all_reserved_ports',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 reserved_port_type:tcp_socket { send_msg recv_msg };
 ')
 
-define(`corenetwork_sendrecv_tcp_on_all_reserved_ports_depend',`
+define(`corenet_tcp_sendrecv_all_reserved_ports_depend',`
 	attribute reserved_port_type;
 
 	class tcp_socket { send_msg recv_msg };
@@ -762,15 +762,15 @@ define(`corenetwork_sendrecv_tcp_on_all_reserved_ports_depend',`
 
 #######################################
 #
-# corenetwork_send_udp_on_all_reserved_ports(domain)
+# corenet_udp_send_all_reserved_ports(domain)
 #
-define(`corenetwork_send_udp_on_all_reserved_ports',`
+define(`corenet_udp_send_all_reserved_ports',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 reserved_port_type:udp_socket send_msg;
 ')
 
-define(`corenetwork_send_udp_on_all_reserved_ports_depend',`
+define(`corenet_udp_send_all_reserved_ports_depend',`
 	attribute reserved_port_type;
 
 	class udp_socket send_msg;
@@ -778,15 +778,15 @@ define(`corenetwork_send_udp_on_all_reserved_ports_depend',`
 
 #######################################
 #
-# corenetwork_receive_udp_on_all_reserved_ports(domain)
+# corenet_udp_receive_all_reserved_ports(domain)
 #
-define(`corenetwork_receive_udp_on_all_reserved_ports',`
+define(`corenet_udp_receive_all_reserved_ports',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 reserved_port_type:udp_socket recv_msg;
 ')
 
-define(`corenetwork_receive_udp_on_all_reserved_ports_depend',`
+define(`corenet_udp_receive_all_reserved_ports_depend',`
 	attribute reserved_port_type;
 
 	class udp_socket recv_msg;
@@ -794,25 +794,25 @@ define(`corenetwork_receive_udp_on_all_reserved_ports_depend',`
 
 #######################################
 #
-# corenetwork_sendrecv_udp_on_all_reserved_ports(domain)
+# corenet_udp_sendrecv_all_reserved_ports(domain)
 #
-define(`corenetwork_sendrecv_udp_on_all_reserved_ports',`
-	corenetwork_send_udp_on_all_reserved_ports($1)
-	corenetwork_receive_udp_on_all_reserved_ports($1)
+define(`corenet_udp_sendrecv_all_reserved_ports',`
+	corenet_udp_send_all_reserved_ports($1)
+	corenet_udp_receive_all_reserved_ports($1)
 ')
 
 #######################################
 #
-# corenetwork_bind_tcp_on_all_reserved_ports(domain)
+# corenet_tcp_bind_all_reserved_ports(domain)
 #
-define(`corenetwork_bind_tcp_on_all_reserved_ports',`
+define(`corenet_tcp_bind_all_reserved_ports',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 reserved_port_type:tcp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
-define(`corenetwork_bind_tcp_on_all_reserved_ports_depend',`
+define(`corenet_tcp_bind_all_reserved_ports_depend',`
 	attribute reserved_port_type;
 
 	class tcp_socket name_bind;
@@ -821,15 +821,15 @@ define(`corenetwork_bind_tcp_on_all_reserved_ports_depend',`
 
 #######################################
 #
-# corenetwork_ignore_bind_tcp_on_all_reserved_ports(domain)
+# corenet_dontaudit_tcp_bind_all_reserved_ports(domain)
 #
-define(`corenetwork_ignore_bind_tcp_on_all_reserved_ports',`
+define(`corenet_dontaudit_tcp_bind_all_reserved_ports',`
 	requires_block_template(`$0'_depend)
 
 	dontaudit $1 reserved_port_type:tcp_socket name_bind;
 ')
 
-define(`corenetwork_ignore_bind_tcp_on_all_reserved_ports_depend',`
+define(`corenet_dontaudit_tcp_bind_all_reserved_ports_depend',`
 	attribute reserved_port_type;
 
 	class tcp_socket name_bind;
@@ -837,32 +837,16 @@ define(`corenetwork_ignore_bind_tcp_on_all_reserved_ports_depend',`
 
 #######################################
 #
-# corenetwork_ignore_bind_tcp_on_all_reserved_ports(domain)
+# corenet_udp_bind_all_reserved_ports(domain)
 #
-define(`corenetwork_ignore_bind_tcp_on_all_reserved_ports',`
-	requires_block_template(`$0'_depend)
-
-	dontaudit $1 reserved_port_type:tcp_socket name_bind;
-')
-
-define(`corenetwork_ignore_bind_udp_on_all_reserved_ports_depend',`
-	attribute reserved_port_type;
-
-	class tcp_socket name_bind;
-')
-
-#######################################
-#
-# corenetwork_bind_udp_on_all_reserved_ports(domain)
-#
-define(`corenetwork_bind_udp_on_all_reserved_ports',`
+define(`corenet_udp_bind_all_reserved_ports',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 reserved_port_type:udp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
-define(`corenetwork_bind_udp_on_all_reserved_ports_depend',`
+define(`corenet_udp_bind_all_reserved_ports_depend',`
 	attribute reserved_port_type;
 
 	class udp_socket name_bind;
@@ -871,15 +855,15 @@ define(`corenetwork_bind_udp_on_all_reserved_ports_depend',`
 
 #######################################
 #
-# corenetwork_ignore_bind_udp_on_all_reserved_ports(domain)
+# corenet_dontaudit_udp_bind_all_reserved_ports(domain)
 #
-define(`corenetwork_ignore_bind_udp_on_all_reserved_ports',`
+define(`corenet_dontaudit_udp_bind_all_reserved_ports',`
 	requires_block_template(`$0'_depend)
 
 	dontaudit $1 reserved_port_type:udp_socket name_bind;
 ')
 
-define(`corenetwork_ignore_bind_udp_on_all_reserved_ports_depend',`
+define(`corenet_dontaudit_udp_bind_all_reserved_ports_depend',`
 	attribute reserved_port_type;
 
 	class udp_socket name_bind;
@@ -900,7 +884,7 @@ define(`corenetwork_ignore_bind_udp_on_all_reserved_ports_depend',`
 
 define(`create_netif_interfaces',``
 ########################################
-## <interface name="corenetwork_sendrecv_tcp_on_$1_interface">
+## <interface name="corenet_tcp_sendrecv_$1">
 ##	<description>
 ##		Send and receive TCP network traffic on the $1 interface.
 ##	</description>
@@ -910,20 +894,20 @@ define(`create_netif_interfaces',``
 ##	<infoflow type="both" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_sendrecv_tcp_on_$1_interface',`
+define(`corenet_tcp_sendrecv_$1',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_netif_t:netif { tcp_send tcp_recv };
 ')
 
-define(`corenetwork_sendrecv_tcp_on_$1_interface_depend',`
+define(`corenet_tcp_sendrecv_$1_depend',`
 	type $1_netif_t;
 
 	class netif { tcp_send tcp_recv };
 ')
 
 ########################################
-## <interface name="corenetwork_send_udp_on_$1_interface">
+## <interface name="corenet_udp_send_$1">
 ##	<description>
 ##		Send UDP network traffic on the $1 interface.
 ##	</description>
@@ -933,20 +917,20 @@ define(`corenetwork_sendrecv_tcp_on_$1_interface_depend',`
 ##	<infoflow type="write" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_send_udp_on_$1_interface',`
+define(`corenet_udp_send_$1',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_netif_t:netif udp_send;
 ')
 
-define(`corenetwork_send_udp_on_$1_interface_depend',`
+define(`corenet_udp_send_$1_depend',`
 	type $1_netif_t;
 
 	class netif udp_send;
 ')
 
 ########################################
-## <interface name="corenetwork_receive_udp_on_$1_interface">
+## <interface name="corenet_udp_receive_$1">
 ##	<description>
 ##		Receive UDP network traffic on the $1 interface.
 ##	</description>
@@ -956,13 +940,13 @@ define(`corenetwork_send_udp_on_$1_interface_depend',`
 ##	<infoflow type="read" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_receive_udp_on_$1_interface',`
+define(`corenet_udp_receive_$1',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_netif_t:netif udp_recv;
 ')
 
-define(`corenetwork_receive_udp_on_$1_interface_depend',`
+define(`corenet_udp_receive_$1_depend',`
 	type $1_netif_t;
 
 	class netif udp_recv;
@@ -979,13 +963,13 @@ define(`corenetwork_receive_udp_on_$1_interface_depend',`
 ##	<infoflow type="both" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_sendrecv_udp_on_$1_interface',`
-	corenetwork_send_udp_on_$1_interface(dollarsone)
-	corenetwork_receive_udp_on_$1_interface(dollarsone)
+define(`corenet_udp_sendrecv_$1',`
+	corenet_udp_send_$1(dollarsone)
+	corenet_udp_receive_$1(dollarsone)
 ')
 
 ########################################
-## <interface name="corenetwork_send_raw_on_$1_interface">
+## <interface name="corenet_raw_send_$1">
 ##	<description>
 ##		Send raw IP packets on the $1 interface.
 ##	</description>
@@ -995,14 +979,14 @@ define(`corenetwork_sendrecv_udp_on_$1_interface',`
 ##	<infoflow type="write" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_send_raw_on_$1_interface',`
+define(`corenet_raw_send_$1',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_netif_t:netif rawip_send;
 	allow dollarsone self:capability net_raw;
 ')
 
-define(`corenetwork_send_raw_on_$1_interface_depend',`
+define(`corenet_raw_send_$1_depend',`
 	type $1_netif_t;
 
 	class netif rawip_send;
@@ -1010,7 +994,7 @@ define(`corenetwork_send_raw_on_$1_interface_depend',`
 ')
 
 ########################################
-## <interface name="corenetwork_receive_raw_on_$1_interface">
+## <interface name="corenet_raw_receive_$1">
 ##	<description>
 ##		Receive raw IP packets on the $1 interface.
 ##	</description>
@@ -1020,20 +1004,20 @@ define(`corenetwork_send_raw_on_$1_interface_depend',`
 ##	<infoflow type="read" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_receive_raw_on_$1_interface',`
+define(`corenet_raw_receive_$1',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_netif_t:netif rawip_recv;
 ')
 
-define(`corenetwork_receive_raw_on_$1_interface_depend',`
+define(`corenet_raw_receive_$1_depend',`
 	type $1_netif_t;
 
 	class netif rawip_recv;
 ')
 
 ########################################
-## <interface name="corenetwork_sendrecv_raw_on_$1_interface">
+## <interface name="corenet_raw_sendrecv_$1">
 ##	<description>
 ##		Send and receive raw IP packets on the $1 interface.
 ##	</description>
@@ -1043,9 +1027,9 @@ define(`corenetwork_receive_raw_on_$1_interface_depend',`
 ##	<infoflow type="both" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_sendrecv_raw_on_$1_interface',`
-	corenetwork_send_raw_on_$1_interface(dollarsone)
-	corenetwork_receive_raw_on_$1_interface(dollarsone)
+define(`corenet_raw_sendrecv_$1',`
+	corenet_raw_send_$1(dollarsone)
+	corenet_raw_receive_$1(dollarsone)
 ')
 '') dnl end create_netif_interfaces
 
@@ -1057,7 +1041,7 @@ define(`corenetwork_sendrecv_raw_on_$1_interface',`
 
 define(`create_node_interfaces',``
 ########################################
-## <interface name="corenetwork_sendrecv_tcp_on_$1_node">
+## <interface name="corenet_tcp_sendrecv_$1_node">
 ##	<description>
 ##		Send and receive TCP traffic on the $1 node.
 ##	</description>
@@ -1067,20 +1051,20 @@ define(`create_node_interfaces',``
 ##	<infoflow type="both" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_sendrecv_tcp_on_$1_node',`
+define(`corenet_tcp_sendrecv_$1_node',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_node_t:node { tcp_send tcp_recv };
 ')
 
-define(`corenetwork_sendrecv_tcp_on_$1_node_depend',`
+define(`corenet_tcp_sendrecv_$1_node_depend',`
 	type $1_node_t;
 
 	class node { tcp_send tcp_recv };
 ')
 
 ########################################
-## <interface name="corenetwork_send_udp_on_$1_node">
+## <interface name="corenet_udp_send_$1_node">
 ##	<description>
 ##		Send UDP traffic on the $1 node.
 ##	</description>
@@ -1090,20 +1074,20 @@ define(`corenetwork_sendrecv_tcp_on_$1_node_depend',`
 ##	<infoflow type="write" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_send_udp_on_$1_node',`
+define(`corenet_udp_send_$1_node',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_node_t:node udp_send;
 ')
 
-define(`corenetwork_send_udp_on_$1_node_depend',`
+define(`corenet_udp_send_$1_node_depend',`
 	type $1_node_t;
 
 	class node udp_send;
 ')
 
 ########################################
-## <interface name="corenetwork_receive_udp_on_$1_node">
+## <interface name="corenet_udp_receive_$1_node">
 ##	<description>
 ##		Receive UDP traffic on the $1 node.
 ##	</description>
@@ -1113,20 +1097,20 @@ define(`corenetwork_send_udp_on_$1_node_depend',`
 ##	<infoflow type="read" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_receive_udp_on_$1_node',`
+define(`corenet_udp_receive_$1_node',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_node_t:node udp_recv;
 ')
 
-define(`corenetwork_receive_udp_on_$1_node_depend',`
+define(`corenet_udp_receive_$1_node_depend',`
 	type $1_node_t;
 
 	class node udp_recv;
 ')
 
 ########################################
-## <interface name="corenetwork_sendrecv_udp_on_$1_node">
+## <interface name="corenet_udp_sendrecv_$1_node">
 ##	<description>
 ##		Send and receive UDP traffic on the $1 node.
 ##	</description>
@@ -1136,13 +1120,13 @@ define(`corenetwork_receive_udp_on_$1_node_depend',`
 ##	<infoflow type="both" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_sendrecv_udp_on_$1_node',`
-	corenetwork_send_udp_on_$1_node(dollarsone)
-	corenetwork_receive_udp_on_$1_node(dollarsone)
+define(`corenet_udp_sendrecv_$1_node',`
+	corenet_udp_send_$1_node(dollarsone)
+	corenet_udp_receive_$1_node(dollarsone)
 ')
 
 ########################################
-## <interface name="corenetwork_send_raw_on_$1_node">
+## <interface name="corenet_raw_send_$1_node">
 ##	<description>
 ##		Send raw IP packets on the $1 node.
 ##	</description>
@@ -1152,14 +1136,14 @@ define(`corenetwork_sendrecv_udp_on_$1_node',`
 ##	<infoflow type="write" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_send_raw_on_$1_node',`
+define(`corenet_raw_send_$1_node',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_node_t:node rawip_send;
 	allow dollarsone self:capability net_raw;
 ')
 
-define(`corenetwork_send_raw_on_$1_node_depend',`
+define(`corenet_raw_send_$1_node_depend',`
 	type $1_node_t;
 
 	class node rawip_send;
@@ -1167,7 +1151,7 @@ define(`corenetwork_send_raw_on_$1_node_depend',`
 ')
 
 ########################################
-## <interface name="corenetwork_receive_raw_on_$1_node">
+## <interface name="corenet_raw_receive_$1_node">
 ##	<description>
 ##		Receive raw IP packets on the $1 node.
 ##	</description>
@@ -1177,20 +1161,20 @@ define(`corenetwork_send_raw_on_$1_node_depend',`
 ##	<infoflow type="write" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_receive_raw_on_$1_node',`
+define(`corenet_raw_receive_$1_node',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_node_t:node rawip_recv;
 ')
 
-define(`corenetwork_receive_raw_on_$1_node_depend',`
+define(`corenet_raw_receive_$1_node_depend',`
 	type $1_node_t;
 
 	class node rawip_recv;
 ')
 
 ########################################
-## <interface name="corenetwork_sendrecv_raw_on_$1_node">
+## <interface name="corenet_raw_sendrecv_$1_node">
 ##	<description>
 ##		Send and receive raw IP packets on the $1 node.
 ##	</description>
@@ -1200,13 +1184,13 @@ define(`corenetwork_receive_raw_on_$1_node_depend',`
 ##	<infoflow type="both" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_sendrecv_raw_on_$1_node',`
-	corenetwork_send_raw_on_$1_node(dollarsone)
-	corenetwork_receive_raw_on_$1_node(dollarsone)
+define(`corenet_raw_sendrecv_$1_node',`
+	corenet_raw_send_$1_node(dollarsone)
+	corenet_raw_receive_$1_node(dollarsone)
 ')
 
 ########################################
-## <interface name="corenetwork_bind_tcp_on_$1_node">
+## <interface name="corenet_tcp_bind_$1_node">
 ##	<description>
 ##		Bind TCP sockets to node $1.
 ##	</description>
@@ -1216,20 +1200,20 @@ define(`corenetwork_sendrecv_raw_on_$1_node',`
 ##	<infoflow type="none"/>
 ## </interface>
 #
-define(`corenetwork_bind_tcp_on_$1_node',`
+define(`corenet_tcp_bind_$1_node',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_node_t:tcp_socket node_bind;
 ')
 
-define(`corenetwork_bind_tcp_on_$1_node_depend',`
+define(`corenet_tcp_bind_$1_node_depend',`
 	type $1_node_t;
 
 	class tcp_socket node_bind;
 ')
 
 ########################################
-## <interface name="corenetwork_bind_udp_on_$1_node">
+## <interface name="corenet_udp_bind_$1_node">
 ##	<description>
 ##		Bind UDP sockets to the $1 node.
 ##	</description>
@@ -1239,13 +1223,13 @@ define(`corenetwork_bind_tcp_on_$1_node_depend',`
 ##	<infoflow type="none"/>
 ## </interface>
 #
-define(`corenetwork_bind_udp_on_$1_node',`
+define(`corenet_udp_bind_$1_node',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_node_t:udp_socket node_bind;
 ')
 
-define(`corenetwork_bind_udp_on_$1_node_depend',`
+define(`corenet_udp_bind_$1_node_depend',`
 	type $1_node_t;
 
 	class udp_socket node_bind;
@@ -1260,7 +1244,7 @@ define(`corenetwork_bind_udp_on_$1_node_depend',`
 
 define(`create_port_interfaces',``
 ########################################
-## <interface name="corenetwork_sendrecv_tcp_on_$1_port">
+## <interface name="corenet_tcp_sendrecv_$1_port">
 ##	<description>
 ##		Send and receive TCP traffic on the $1 port.
 ##	</description>
@@ -1270,20 +1254,20 @@ define(`create_port_interfaces',``
 ##	<infoflow type="both" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_sendrecv_tcp_on_$1_port',`
+define(`corenet_tcp_sendrecv_$1_port',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_port_t:tcp_socket { send_msg recv_msg };
 ')
 
-define(`corenetwork_sendrecv_tcp_on_$1_port_depend',`
+define(`corenet_tcp_sendrecv_$1_port_depend',`
 	type $1_port_t;
 
 	class tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
-## <interface name="corenetwork_send_udp_on_$1_port">
+## <interface name="corenet_udp_send_$1_port">
 ##	<description>
 ##		Send UDP traffic on the $1 port.
 ##	</description>
@@ -1293,20 +1277,20 @@ define(`corenetwork_sendrecv_tcp_on_$1_port_depend',`
 ##	<infoflow type="write" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_send_udp_on_$1_port',`
+define(`corenet_udp_send_$1_port',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_port_t:udp_socket send_msg;
 ')
 
-define(`corenetwork_send_udp_on_$1_port_depend',`
+define(`corenet_udp_send_$1_port_depend',`
 	type $1_port_t;
 
 	class udp_socket send_msg;
 ')
 
 ########################################
-## <interface name="corenetwork_receive_udp_on_$1_port">
+## <interface name="corenet_udp_receive_$1_port">
 ##	<description>
 ##		Receive UDP traffic on the $1 port.
 ##	</description>
@@ -1316,13 +1300,13 @@ define(`corenetwork_send_udp_on_$1_port_depend',`
 ##	<infoflow type="read" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_receive_udp_on_$1_port',`
+define(`corenet_udp_receive_$1_port',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_port_t:udp_socket recv_msg;
 ')
 
-define(`corenetwork_receive_udp_on_$1_port_depend',`
+define(`corenet_udp_receive_$1_port_depend',`
 	type $1_port_t;
 
 	class udp_socket recv_msg;
@@ -1339,13 +1323,13 @@ define(`corenetwork_receive_udp_on_$1_port_depend',`
 ##	<infoflow type="both" weight="10"/>
 ## </interface>
 #
-define(`corenetwork_sendrecv_udp_on_$1_port',`
-	corenetwork_send_udp_on_$1_port(dollarsone)
-	corenetwork_receive_udp_on_$1_port(dollarsone)
+define(`corenet_udp_sendrecv_$1_port',`
+	corenet_udp_send_$1_port(dollarsone)
+	corenet_udp_receive_$1_port(dollarsone)
 ')
 
 ########################################
-## <interface name="corenetwork_bind_tcp_on_$1_port">
+## <interface name="corenet_tcp_bind_$1_port">
 ##	<description>
 ##		Bind TCP sockets to the $1 port.
 ##	</description>
@@ -1355,13 +1339,13 @@ define(`corenetwork_sendrecv_udp_on_$1_port',`
 ##	<infoflow type="none"/>
 ## </interface>
 #
-define(`corenetwork_bind_tcp_on_$1_port',`
+define(`corenet_tcp_bind_$1_port',`
 	requires_block_template(`dollarszero'_depend)
 	allow dollarsone $1_port_t:tcp_socket name_bind;
 	$2
 ')
 
-define(`corenetwork_bind_tcp_on_$1_port_depend',`
+define(`corenet_tcp_bind_$1_port_depend',`
 	type $1_port_t;
 
 	class tcp_socket name_bind;
@@ -1369,7 +1353,7 @@ define(`corenetwork_bind_tcp_on_$1_port_depend',`
 ')
 
 ########################################
-## <interface name="corenetwork_bind_udp_on_$1_port">
+## <interface name="corenet_udp_bind_$1_port">
 ##	<description>
 ##		Bind UDP sockets to the $1 port.
 ##	</description>
@@ -1379,14 +1363,14 @@ define(`corenetwork_bind_tcp_on_$1_port_depend',`
 ##	<infoflow type="none"/>
 ## </interface>
 #
-define(`corenetwork_bind_udp_on_$1_port',`
+define(`corenet_udp_bind_$1_port',`
 	requires_block_template(`dollarszero'_depend)
 
 	allow dollarsone $1_port_t:udp_socket name_bind;
 	$2
 ')
 
-define(`corenetwork_bind_udp_on_$1_port_depend',`
+define(`corenet_udp_bind_$1_port_depend',`
 	type $1_port_t;
 
 	class udp_socket name_bind;