[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/kernel/

[Jason Zaman]

commit:     25add4e46adc491ea4a753fc9177db349b9d8959
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Thu Mar 30 15:25:06 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 15:25:06 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=25add4e4

corenetwork: regenerate files

 policy/modules/kernel/corenetwork.if | 18981 +++++++++++++++++++--------------
 policy/modules/kernel/corenetwork.te |    61 +-
 2 files changed, 11101 insertions(+), 7941 deletions(-)

diff --git a/policy/modules/kernel/corenetwork.if b/policy/modules/kernel/corenetwork.if
index ee210d40..d7473484 100644
--- a/policy/modules/kernel/corenetwork.if
+++ b/policy/modules/kernel/corenetwork.if
@@ -859,7 +859,7 @@ interface(`corenet_udp_bind_generic_node',`
 
 ########################################
 ## <summary>
-##	Bind raw sockets to genric nodes.
+##	Bind raw sockets to generic nodes.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -2757,12 +2757,12 @@ interface(`corenet_all_recvfrom_labeled',`
 
 ########################################
 ## <summary>
-##	Make the specified type usable
-##	for labeled ipsec.
+##	Allow specified type to set the context of
+##	a SPD entry for labeled ipsec associations.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
-##	Type to be used for labeled ipsec.
+##	Domain allowed access.
 ##	</summary>
 ## </param>
 #
@@ -43917,6 +43917,449 @@ interface(`corenet_relabelto_kismet_server_packets',`
 
 ########################################
 ## <summary>
+##	Send and receive TCP traffic on the kdeconnect port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_tcp_sendrecv_kdeconnect_port',`
+	gen_require(`
+		type kdeconnect_port_t;
+	')
+
+	allow $1 kdeconnect_port_t:tcp_socket { send_msg recv_msg };
+')
+
+########################################
+## <summary>
+##	Send UDP traffic on the kdeconnect port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_udp_send_kdeconnect_port',`
+	gen_require(`
+		type kdeconnect_port_t;
+	')
+
+	allow $1 kdeconnect_port_t:udp_socket send_msg;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send UDP traffic on the kdeconnect port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_send_kdeconnect_port',`
+	gen_require(`
+		type kdeconnect_port_t;
+	')
+
+	dontaudit $1 kdeconnect_port_t:udp_socket send_msg;
+')
+
+########################################
+## <summary>
+##	Receive UDP traffic on the kdeconnect port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_udp_receive_kdeconnect_port',`
+	gen_require(`
+		type kdeconnect_port_t;
+	')
+
+	allow $1 kdeconnect_port_t:udp_socket recv_msg;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive UDP traffic on the kdeconnect port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_receive_kdeconnect_port',`
+	gen_require(`
+		type kdeconnect_port_t;
+	')
+
+	dontaudit $1 kdeconnect_port_t:udp_socket recv_msg;
+')
+
+########################################
+## <summary>
+##	Send and receive UDP traffic on the kdeconnect port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_udp_sendrecv_kdeconnect_port',`
+	corenet_udp_send_kdeconnect_port($1)
+	corenet_udp_receive_kdeconnect_port($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive
+##	UDP traffic on the kdeconnect port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_sendrecv_kdeconnect_port',`
+	corenet_dontaudit_udp_send_kdeconnect_port($1)
+	corenet_dontaudit_udp_receive_kdeconnect_port($1)
+')
+
+########################################
+## <summary>
+##	Bind TCP sockets to the kdeconnect port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_tcp_bind_kdeconnect_port',`
+	gen_require(`
+		type kdeconnect_port_t;
+	')
+
+	allow $1 kdeconnect_port_t:tcp_socket name_bind;
+	
+')
+
+########################################
+## <summary>
+##	Bind UDP sockets to the kdeconnect port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_udp_bind_kdeconnect_port',`
+	gen_require(`
+		type kdeconnect_port_t;
+	')
+
+	allow $1 kdeconnect_port_t:udp_socket name_bind;
+	
+')
+
+########################################
+## <summary>
+##	Make a TCP connection to the kdeconnect port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_tcp_connect_kdeconnect_port',`
+	gen_require(`
+		type kdeconnect_port_t;
+	')
+
+	allow $1 kdeconnect_port_t:tcp_socket name_connect;
+')
+
+
+########################################
+## <summary>
+##	Send kdeconnect_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_send_kdeconnect_client_packets',`
+	gen_require(`
+		type kdeconnect_client_packet_t;
+	')
+
+	allow $1 kdeconnect_client_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send kdeconnect_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_send_kdeconnect_client_packets',`
+	gen_require(`
+		type kdeconnect_client_packet_t;
+	')
+
+	dontaudit $1 kdeconnect_client_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Receive kdeconnect_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_receive_kdeconnect_client_packets',`
+	gen_require(`
+		type kdeconnect_client_packet_t;
+	')
+
+	allow $1 kdeconnect_client_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive kdeconnect_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_receive_kdeconnect_client_packets',`
+	gen_require(`
+		type kdeconnect_client_packet_t;
+	')
+
+	dontaudit $1 kdeconnect_client_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Send and receive kdeconnect_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_sendrecv_kdeconnect_client_packets',`
+	corenet_send_kdeconnect_client_packets($1)
+	corenet_receive_kdeconnect_client_packets($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive kdeconnect_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_sendrecv_kdeconnect_client_packets',`
+	corenet_dontaudit_send_kdeconnect_client_packets($1)
+	corenet_dontaudit_receive_kdeconnect_client_packets($1)
+')
+
+########################################
+## <summary>
+##	Relabel packets to kdeconnect_client the packet type.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_relabelto_kdeconnect_client_packets',`
+	gen_require(`
+		type kdeconnect_client_packet_t;
+	')
+
+	allow $1 kdeconnect_client_packet_t:packet relabelto;
+')
+
+
+########################################
+## <summary>
+##	Send kdeconnect_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_send_kdeconnect_server_packets',`
+	gen_require(`
+		type kdeconnect_server_packet_t;
+	')
+
+	allow $1 kdeconnect_server_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send kdeconnect_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_send_kdeconnect_server_packets',`
+	gen_require(`
+		type kdeconnect_server_packet_t;
+	')
+
+	dontaudit $1 kdeconnect_server_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Receive kdeconnect_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_receive_kdeconnect_server_packets',`
+	gen_require(`
+		type kdeconnect_server_packet_t;
+	')
+
+	allow $1 kdeconnect_server_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive kdeconnect_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_receive_kdeconnect_server_packets',`
+	gen_require(`
+		type kdeconnect_server_packet_t;
+	')
+
+	dontaudit $1 kdeconnect_server_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Send and receive kdeconnect_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_sendrecv_kdeconnect_server_packets',`
+	corenet_send_kdeconnect_server_packets($1)
+	corenet_receive_kdeconnect_server_packets($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive kdeconnect_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_sendrecv_kdeconnect_server_packets',`
+	corenet_dontaudit_send_kdeconnect_server_packets($1)
+	corenet_dontaudit_receive_kdeconnect_server_packets($1)
+')
+
+########################################
+## <summary>
+##	Relabel packets to kdeconnect_server the packet type.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_relabelto_kdeconnect_server_packets',`
+	gen_require(`
+		type kdeconnect_server_packet_t;
+	')
+
+	allow $1 kdeconnect_server_packet_t:packet relabelto;
+')
+
+
+
+
+########################################
+## <summary>
 ##	Send and receive TCP traffic on the kprop port.
 ## </summary>
 ## <param name="domain">
@@ -46132,6 +46575,449 @@ interface(`corenet_relabelto_lirc_server_packets',`
 
 ########################################
 ## <summary>
+##	Send and receive TCP traffic on the llmnr port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_tcp_sendrecv_llmnr_port',`
+	gen_require(`
+		type llmnr_port_t;
+	')
+
+	allow $1 llmnr_port_t:tcp_socket { send_msg recv_msg };
+')
+
+########################################
+## <summary>
+##	Send UDP traffic on the llmnr port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_udp_send_llmnr_port',`
+	gen_require(`
+		type llmnr_port_t;
+	')
+
+	allow $1 llmnr_port_t:udp_socket send_msg;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send UDP traffic on the llmnr port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_send_llmnr_port',`
+	gen_require(`
+		type llmnr_port_t;
+	')
+
+	dontaudit $1 llmnr_port_t:udp_socket send_msg;
+')
+
+########################################
+## <summary>
+##	Receive UDP traffic on the llmnr port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_udp_receive_llmnr_port',`
+	gen_require(`
+		type llmnr_port_t;
+	')
+
+	allow $1 llmnr_port_t:udp_socket recv_msg;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive UDP traffic on the llmnr port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_receive_llmnr_port',`
+	gen_require(`
+		type llmnr_port_t;
+	')
+
+	dontaudit $1 llmnr_port_t:udp_socket recv_msg;
+')
+
+########################################
+## <summary>
+##	Send and receive UDP traffic on the llmnr port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_udp_sendrecv_llmnr_port',`
+	corenet_udp_send_llmnr_port($1)
+	corenet_udp_receive_llmnr_port($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive
+##	UDP traffic on the llmnr port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_sendrecv_llmnr_port',`
+	corenet_dontaudit_udp_send_llmnr_port($1)
+	corenet_dontaudit_udp_receive_llmnr_port($1)
+')
+
+########################################
+## <summary>
+##	Bind TCP sockets to the llmnr port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_tcp_bind_llmnr_port',`
+	gen_require(`
+		type llmnr_port_t;
+	')
+
+	allow $1 llmnr_port_t:tcp_socket name_bind;
+	
+')
+
+########################################
+## <summary>
+##	Bind UDP sockets to the llmnr port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_udp_bind_llmnr_port',`
+	gen_require(`
+		type llmnr_port_t;
+	')
+
+	allow $1 llmnr_port_t:udp_socket name_bind;
+	
+')
+
+########################################
+## <summary>
+##	Make a TCP connection to the llmnr port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_tcp_connect_llmnr_port',`
+	gen_require(`
+		type llmnr_port_t;
+	')
+
+	allow $1 llmnr_port_t:tcp_socket name_connect;
+')
+
+
+########################################
+## <summary>
+##	Send llmnr_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_send_llmnr_client_packets',`
+	gen_require(`
+		type llmnr_client_packet_t;
+	')
+
+	allow $1 llmnr_client_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send llmnr_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_send_llmnr_client_packets',`
+	gen_require(`
+		type llmnr_client_packet_t;
+	')
+
+	dontaudit $1 llmnr_client_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Receive llmnr_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_receive_llmnr_client_packets',`
+	gen_require(`
+		type llmnr_client_packet_t;
+	')
+
+	allow $1 llmnr_client_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive llmnr_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_receive_llmnr_client_packets',`
+	gen_require(`
+		type llmnr_client_packet_t;
+	')
+
+	dontaudit $1 llmnr_client_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Send and receive llmnr_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_sendrecv_llmnr_client_packets',`
+	corenet_send_llmnr_client_packets($1)
+	corenet_receive_llmnr_client_packets($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive llmnr_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_sendrecv_llmnr_client_packets',`
+	corenet_dontaudit_send_llmnr_client_packets($1)
+	corenet_dontaudit_receive_llmnr_client_packets($1)
+')
+
+########################################
+## <summary>
+##	Relabel packets to llmnr_client the packet type.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_relabelto_llmnr_client_packets',`
+	gen_require(`
+		type llmnr_client_packet_t;
+	')
+
+	allow $1 llmnr_client_packet_t:packet relabelto;
+')
+
+
+########################################
+## <summary>
+##	Send llmnr_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_send_llmnr_server_packets',`
+	gen_require(`
+		type llmnr_server_packet_t;
+	')
+
+	allow $1 llmnr_server_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send llmnr_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_send_llmnr_server_packets',`
+	gen_require(`
+		type llmnr_server_packet_t;
+	')
+
+	dontaudit $1 llmnr_server_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Receive llmnr_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_receive_llmnr_server_packets',`
+	gen_require(`
+		type llmnr_server_packet_t;
+	')
+
+	allow $1 llmnr_server_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive llmnr_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_receive_llmnr_server_packets',`
+	gen_require(`
+		type llmnr_server_packet_t;
+	')
+
+	dontaudit $1 llmnr_server_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Send and receive llmnr_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_sendrecv_llmnr_server_packets',`
+	corenet_send_llmnr_server_packets($1)
+	corenet_receive_llmnr_server_packets($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive llmnr_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_sendrecv_llmnr_server_packets',`
+	corenet_dontaudit_send_llmnr_server_packets($1)
+	corenet_dontaudit_receive_llmnr_server_packets($1)
+')
+
+########################################
+## <summary>
+##	Relabel packets to llmnr_server the packet type.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_relabelto_llmnr_server_packets',`
+	gen_require(`
+		type llmnr_server_packet_t;
+	')
+
+	allow $1 llmnr_server_packet_t:packet relabelto;
+')
+
+
+
+
+########################################
+## <summary>
 ##	Send and receive TCP traffic on the lmtp port.
 ## </summary>
 ## <param name="domain">
@@ -49233,7 +50119,7 @@ interface(`corenet_relabelto_mmcc_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the monopd port.
+##	Send and receive TCP traffic on the mon port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49242,17 +50128,17 @@ interface(`corenet_relabelto_mmcc_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_monopd_port',`
+interface(`corenet_tcp_sendrecv_mon_port',`
 	gen_require(`
-		type monopd_port_t;
+		type mon_port_t;
 	')
 
-	allow $1 monopd_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 mon_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the monopd port.
+##	Send UDP traffic on the mon port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49261,17 +50147,17 @@ interface(`corenet_tcp_sendrecv_monopd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_monopd_port',`
+interface(`corenet_udp_send_mon_port',`
 	gen_require(`
-		type monopd_port_t;
+		type mon_port_t;
 	')
 
-	allow $1 monopd_port_t:udp_socket send_msg;
+	allow $1 mon_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the monopd port.
+##	Do not audit attempts to send UDP traffic on the mon port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49280,17 +50166,17 @@ interface(`corenet_udp_send_monopd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_monopd_port',`
+interface(`corenet_dontaudit_udp_send_mon_port',`
 	gen_require(`
-		type monopd_port_t;
+		type mon_port_t;
 	')
 
-	dontaudit $1 monopd_port_t:udp_socket send_msg;
+	dontaudit $1 mon_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the monopd port.
+##	Receive UDP traffic on the mon port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49299,17 +50185,17 @@ interface(`corenet_dontaudit_udp_send_monopd_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_monopd_port',`
+interface(`corenet_udp_receive_mon_port',`
 	gen_require(`
-		type monopd_port_t;
+		type mon_port_t;
 	')
 
-	allow $1 monopd_port_t:udp_socket recv_msg;
+	allow $1 mon_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the monopd port.
+##	Do not audit attempts to receive UDP traffic on the mon port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49318,17 +50204,17 @@ interface(`corenet_udp_receive_monopd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_monopd_port',`
+interface(`corenet_dontaudit_udp_receive_mon_port',`
 	gen_require(`
-		type monopd_port_t;
+		type mon_port_t;
 	')
 
-	dontaudit $1 monopd_port_t:udp_socket recv_msg;
+	dontaudit $1 mon_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the monopd port.
+##	Send and receive UDP traffic on the mon port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49337,15 +50223,15 @@ interface(`corenet_dontaudit_udp_receive_monopd_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_monopd_port',`
-	corenet_udp_send_monopd_port($1)
-	corenet_udp_receive_monopd_port($1)
+interface(`corenet_udp_sendrecv_mon_port',`
+	corenet_udp_send_mon_port($1)
+	corenet_udp_receive_mon_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the monopd port.
+##	UDP traffic on the mon port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49354,14 +50240,14 @@ interface(`corenet_udp_sendrecv_monopd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_monopd_port',`
-	corenet_dontaudit_udp_send_monopd_port($1)
-	corenet_dontaudit_udp_receive_monopd_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_mon_port',`
+	corenet_dontaudit_udp_send_mon_port($1)
+	corenet_dontaudit_udp_receive_mon_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the monopd port.
+##	Bind TCP sockets to the mon port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49370,18 +50256,18 @@ interface(`corenet_dontaudit_udp_sendrecv_monopd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_monopd_port',`
+interface(`corenet_tcp_bind_mon_port',`
 	gen_require(`
-		type monopd_port_t;
+		type mon_port_t;
 	')
 
-	allow $1 monopd_port_t:tcp_socket name_bind;
+	allow $1 mon_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the monopd port.
+##	Bind UDP sockets to the mon port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49390,18 +50276,18 @@ interface(`corenet_tcp_bind_monopd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_monopd_port',`
+interface(`corenet_udp_bind_mon_port',`
 	gen_require(`
-		type monopd_port_t;
+		type mon_port_t;
 	')
 
-	allow $1 monopd_port_t:udp_socket name_bind;
+	allow $1 mon_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the monopd port.
+##	Make a TCP connection to the mon port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49409,18 +50295,18 @@ interface(`corenet_udp_bind_monopd_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_monopd_port',`
+interface(`corenet_tcp_connect_mon_port',`
 	gen_require(`
-		type monopd_port_t;
+		type mon_port_t;
 	')
 
-	allow $1 monopd_port_t:tcp_socket name_connect;
+	allow $1 mon_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send monopd_client packets.
+##	Send mon_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49429,17 +50315,17 @@ interface(`corenet_tcp_connect_monopd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_monopd_client_packets',`
+interface(`corenet_send_mon_client_packets',`
 	gen_require(`
-		type monopd_client_packet_t;
+		type mon_client_packet_t;
 	')
 
-	allow $1 monopd_client_packet_t:packet send;
+	allow $1 mon_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send monopd_client packets.
+##	Do not audit attempts to send mon_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49448,17 +50334,17 @@ interface(`corenet_send_monopd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_monopd_client_packets',`
+interface(`corenet_dontaudit_send_mon_client_packets',`
 	gen_require(`
-		type monopd_client_packet_t;
+		type mon_client_packet_t;
 	')
 
-	dontaudit $1 monopd_client_packet_t:packet send;
+	dontaudit $1 mon_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive monopd_client packets.
+##	Receive mon_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49467,17 +50353,17 @@ interface(`corenet_dontaudit_send_monopd_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_monopd_client_packets',`
+interface(`corenet_receive_mon_client_packets',`
 	gen_require(`
-		type monopd_client_packet_t;
+		type mon_client_packet_t;
 	')
 
-	allow $1 monopd_client_packet_t:packet recv;
+	allow $1 mon_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive monopd_client packets.
+##	Do not audit attempts to receive mon_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49486,17 +50372,17 @@ interface(`corenet_receive_monopd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_monopd_client_packets',`
+interface(`corenet_dontaudit_receive_mon_client_packets',`
 	gen_require(`
-		type monopd_client_packet_t;
+		type mon_client_packet_t;
 	')
 
-	dontaudit $1 monopd_client_packet_t:packet recv;
+	dontaudit $1 mon_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive monopd_client packets.
+##	Send and receive mon_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49505,14 +50391,14 @@ interface(`corenet_dontaudit_receive_monopd_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_monopd_client_packets',`
-	corenet_send_monopd_client_packets($1)
-	corenet_receive_monopd_client_packets($1)
+interface(`corenet_sendrecv_mon_client_packets',`
+	corenet_send_mon_client_packets($1)
+	corenet_receive_mon_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive monopd_client packets.
+##	Do not audit attempts to send and receive mon_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49521,14 +50407,14 @@ interface(`corenet_sendrecv_monopd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_monopd_client_packets',`
-	corenet_dontaudit_send_monopd_client_packets($1)
-	corenet_dontaudit_receive_monopd_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_mon_client_packets',`
+	corenet_dontaudit_send_mon_client_packets($1)
+	corenet_dontaudit_receive_mon_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to monopd_client the packet type.
+##	Relabel packets to mon_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49536,18 +50422,18 @@ interface(`corenet_dontaudit_sendrecv_monopd_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_monopd_client_packets',`
+interface(`corenet_relabelto_mon_client_packets',`
 	gen_require(`
-		type monopd_client_packet_t;
+		type mon_client_packet_t;
 	')
 
-	allow $1 monopd_client_packet_t:packet relabelto;
+	allow $1 mon_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send monopd_server packets.
+##	Send mon_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49556,17 +50442,17 @@ interface(`corenet_relabelto_monopd_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_monopd_server_packets',`
+interface(`corenet_send_mon_server_packets',`
 	gen_require(`
-		type monopd_server_packet_t;
+		type mon_server_packet_t;
 	')
 
-	allow $1 monopd_server_packet_t:packet send;
+	allow $1 mon_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send monopd_server packets.
+##	Do not audit attempts to send mon_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49575,17 +50461,17 @@ interface(`corenet_send_monopd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_monopd_server_packets',`
+interface(`corenet_dontaudit_send_mon_server_packets',`
 	gen_require(`
-		type monopd_server_packet_t;
+		type mon_server_packet_t;
 	')
 
-	dontaudit $1 monopd_server_packet_t:packet send;
+	dontaudit $1 mon_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive monopd_server packets.
+##	Receive mon_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49594,17 +50480,17 @@ interface(`corenet_dontaudit_send_monopd_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_monopd_server_packets',`
+interface(`corenet_receive_mon_server_packets',`
 	gen_require(`
-		type monopd_server_packet_t;
+		type mon_server_packet_t;
 	')
 
-	allow $1 monopd_server_packet_t:packet recv;
+	allow $1 mon_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive monopd_server packets.
+##	Do not audit attempts to receive mon_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49613,17 +50499,17 @@ interface(`corenet_receive_monopd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_monopd_server_packets',`
+interface(`corenet_dontaudit_receive_mon_server_packets',`
 	gen_require(`
-		type monopd_server_packet_t;
+		type mon_server_packet_t;
 	')
 
-	dontaudit $1 monopd_server_packet_t:packet recv;
+	dontaudit $1 mon_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive monopd_server packets.
+##	Send and receive mon_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49632,14 +50518,14 @@ interface(`corenet_dontaudit_receive_monopd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_monopd_server_packets',`
-	corenet_send_monopd_server_packets($1)
-	corenet_receive_monopd_server_packets($1)
+interface(`corenet_sendrecv_mon_server_packets',`
+	corenet_send_mon_server_packets($1)
+	corenet_receive_mon_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive monopd_server packets.
+##	Do not audit attempts to send and receive mon_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49648,14 +50534,14 @@ interface(`corenet_sendrecv_monopd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_monopd_server_packets',`
-	corenet_dontaudit_send_monopd_server_packets($1)
-	corenet_dontaudit_receive_monopd_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_mon_server_packets',`
+	corenet_dontaudit_send_mon_server_packets($1)
+	corenet_dontaudit_receive_mon_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to monopd_server the packet type.
+##	Relabel packets to mon_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49663,12 +50549,12 @@ interface(`corenet_dontaudit_sendrecv_monopd_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_monopd_server_packets',`
+interface(`corenet_relabelto_mon_server_packets',`
 	gen_require(`
-		type monopd_server_packet_t;
+		type mon_server_packet_t;
 	')
 
-	allow $1 monopd_server_packet_t:packet relabelto;
+	allow $1 mon_server_packet_t:packet relabelto;
 ')
 
 
@@ -49676,7 +50562,7 @@ interface(`corenet_relabelto_monopd_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the mountd port.
+##	Send and receive TCP traffic on the monit port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49685,17 +50571,17 @@ interface(`corenet_relabelto_monopd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_mountd_port',`
+interface(`corenet_tcp_sendrecv_monit_port',`
 	gen_require(`
-		type mountd_port_t;
+		type monit_port_t;
 	')
 
-	allow $1 mountd_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 monit_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the mountd port.
+##	Send UDP traffic on the monit port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49704,17 +50590,17 @@ interface(`corenet_tcp_sendrecv_mountd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_mountd_port',`
+interface(`corenet_udp_send_monit_port',`
 	gen_require(`
-		type mountd_port_t;
+		type monit_port_t;
 	')
 
-	allow $1 mountd_port_t:udp_socket send_msg;
+	allow $1 monit_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the mountd port.
+##	Do not audit attempts to send UDP traffic on the monit port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49723,17 +50609,17 @@ interface(`corenet_udp_send_mountd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_mountd_port',`
+interface(`corenet_dontaudit_udp_send_monit_port',`
 	gen_require(`
-		type mountd_port_t;
+		type monit_port_t;
 	')
 
-	dontaudit $1 mountd_port_t:udp_socket send_msg;
+	dontaudit $1 monit_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the mountd port.
+##	Receive UDP traffic on the monit port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49742,17 +50628,17 @@ interface(`corenet_dontaudit_udp_send_mountd_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_mountd_port',`
+interface(`corenet_udp_receive_monit_port',`
 	gen_require(`
-		type mountd_port_t;
+		type monit_port_t;
 	')
 
-	allow $1 mountd_port_t:udp_socket recv_msg;
+	allow $1 monit_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the mountd port.
+##	Do not audit attempts to receive UDP traffic on the monit port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49761,17 +50647,17 @@ interface(`corenet_udp_receive_mountd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_mountd_port',`
+interface(`corenet_dontaudit_udp_receive_monit_port',`
 	gen_require(`
-		type mountd_port_t;
+		type monit_port_t;
 	')
 
-	dontaudit $1 mountd_port_t:udp_socket recv_msg;
+	dontaudit $1 monit_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the mountd port.
+##	Send and receive UDP traffic on the monit port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49780,15 +50666,15 @@ interface(`corenet_dontaudit_udp_receive_mountd_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_mountd_port',`
-	corenet_udp_send_mountd_port($1)
-	corenet_udp_receive_mountd_port($1)
+interface(`corenet_udp_sendrecv_monit_port',`
+	corenet_udp_send_monit_port($1)
+	corenet_udp_receive_monit_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the mountd port.
+##	UDP traffic on the monit port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49797,14 +50683,14 @@ interface(`corenet_udp_sendrecv_mountd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_mountd_port',`
-	corenet_dontaudit_udp_send_mountd_port($1)
-	corenet_dontaudit_udp_receive_mountd_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_monit_port',`
+	corenet_dontaudit_udp_send_monit_port($1)
+	corenet_dontaudit_udp_receive_monit_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the mountd port.
+##	Bind TCP sockets to the monit port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49813,18 +50699,18 @@ interface(`corenet_dontaudit_udp_sendrecv_mountd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_mountd_port',`
+interface(`corenet_tcp_bind_monit_port',`
 	gen_require(`
-		type mountd_port_t;
+		type monit_port_t;
 	')
 
-	allow $1 mountd_port_t:tcp_socket name_bind;
+	allow $1 monit_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the mountd port.
+##	Bind UDP sockets to the monit port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49833,18 +50719,18 @@ interface(`corenet_tcp_bind_mountd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_mountd_port',`
+interface(`corenet_udp_bind_monit_port',`
 	gen_require(`
-		type mountd_port_t;
+		type monit_port_t;
 	')
 
-	allow $1 mountd_port_t:udp_socket name_bind;
+	allow $1 monit_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the mountd port.
+##	Make a TCP connection to the monit port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49852,18 +50738,18 @@ interface(`corenet_udp_bind_mountd_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_mountd_port',`
+interface(`corenet_tcp_connect_monit_port',`
 	gen_require(`
-		type mountd_port_t;
+		type monit_port_t;
 	')
 
-	allow $1 mountd_port_t:tcp_socket name_connect;
+	allow $1 monit_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send mountd_client packets.
+##	Send monit_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49872,17 +50758,17 @@ interface(`corenet_tcp_connect_mountd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_mountd_client_packets',`
+interface(`corenet_send_monit_client_packets',`
 	gen_require(`
-		type mountd_client_packet_t;
+		type monit_client_packet_t;
 	')
 
-	allow $1 mountd_client_packet_t:packet send;
+	allow $1 monit_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send mountd_client packets.
+##	Do not audit attempts to send monit_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49891,17 +50777,17 @@ interface(`corenet_send_mountd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_mountd_client_packets',`
+interface(`corenet_dontaudit_send_monit_client_packets',`
 	gen_require(`
-		type mountd_client_packet_t;
+		type monit_client_packet_t;
 	')
 
-	dontaudit $1 mountd_client_packet_t:packet send;
+	dontaudit $1 monit_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive mountd_client packets.
+##	Receive monit_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49910,17 +50796,17 @@ interface(`corenet_dontaudit_send_mountd_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_mountd_client_packets',`
+interface(`corenet_receive_monit_client_packets',`
 	gen_require(`
-		type mountd_client_packet_t;
+		type monit_client_packet_t;
 	')
 
-	allow $1 mountd_client_packet_t:packet recv;
+	allow $1 monit_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive mountd_client packets.
+##	Do not audit attempts to receive monit_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49929,17 +50815,17 @@ interface(`corenet_receive_mountd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_mountd_client_packets',`
+interface(`corenet_dontaudit_receive_monit_client_packets',`
 	gen_require(`
-		type mountd_client_packet_t;
+		type monit_client_packet_t;
 	')
 
-	dontaudit $1 mountd_client_packet_t:packet recv;
+	dontaudit $1 monit_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive mountd_client packets.
+##	Send and receive monit_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49948,14 +50834,14 @@ interface(`corenet_dontaudit_receive_mountd_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_mountd_client_packets',`
-	corenet_send_mountd_client_packets($1)
-	corenet_receive_mountd_client_packets($1)
+interface(`corenet_sendrecv_monit_client_packets',`
+	corenet_send_monit_client_packets($1)
+	corenet_receive_monit_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive mountd_client packets.
+##	Do not audit attempts to send and receive monit_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49964,14 +50850,14 @@ interface(`corenet_sendrecv_mountd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_mountd_client_packets',`
-	corenet_dontaudit_send_mountd_client_packets($1)
-	corenet_dontaudit_receive_mountd_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_monit_client_packets',`
+	corenet_dontaudit_send_monit_client_packets($1)
+	corenet_dontaudit_receive_monit_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to mountd_client the packet type.
+##	Relabel packets to monit_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49979,18 +50865,18 @@ interface(`corenet_dontaudit_sendrecv_mountd_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_mountd_client_packets',`
+interface(`corenet_relabelto_monit_client_packets',`
 	gen_require(`
-		type mountd_client_packet_t;
+		type monit_client_packet_t;
 	')
 
-	allow $1 mountd_client_packet_t:packet relabelto;
+	allow $1 monit_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send mountd_server packets.
+##	Send monit_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -49999,17 +50885,17 @@ interface(`corenet_relabelto_mountd_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_mountd_server_packets',`
+interface(`corenet_send_monit_server_packets',`
 	gen_require(`
-		type mountd_server_packet_t;
+		type monit_server_packet_t;
 	')
 
-	allow $1 mountd_server_packet_t:packet send;
+	allow $1 monit_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send mountd_server packets.
+##	Do not audit attempts to send monit_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50018,17 +50904,17 @@ interface(`corenet_send_mountd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_mountd_server_packets',`
+interface(`corenet_dontaudit_send_monit_server_packets',`
 	gen_require(`
-		type mountd_server_packet_t;
+		type monit_server_packet_t;
 	')
 
-	dontaudit $1 mountd_server_packet_t:packet send;
+	dontaudit $1 monit_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive mountd_server packets.
+##	Receive monit_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50037,17 +50923,17 @@ interface(`corenet_dontaudit_send_mountd_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_mountd_server_packets',`
+interface(`corenet_receive_monit_server_packets',`
 	gen_require(`
-		type mountd_server_packet_t;
+		type monit_server_packet_t;
 	')
 
-	allow $1 mountd_server_packet_t:packet recv;
+	allow $1 monit_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive mountd_server packets.
+##	Do not audit attempts to receive monit_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50056,17 +50942,17 @@ interface(`corenet_receive_mountd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_mountd_server_packets',`
+interface(`corenet_dontaudit_receive_monit_server_packets',`
 	gen_require(`
-		type mountd_server_packet_t;
+		type monit_server_packet_t;
 	')
 
-	dontaudit $1 mountd_server_packet_t:packet recv;
+	dontaudit $1 monit_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive mountd_server packets.
+##	Send and receive monit_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50075,14 +50961,14 @@ interface(`corenet_dontaudit_receive_mountd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_mountd_server_packets',`
-	corenet_send_mountd_server_packets($1)
-	corenet_receive_mountd_server_packets($1)
+interface(`corenet_sendrecv_monit_server_packets',`
+	corenet_send_monit_server_packets($1)
+	corenet_receive_monit_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive mountd_server packets.
+##	Do not audit attempts to send and receive monit_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50091,14 +50977,14 @@ interface(`corenet_sendrecv_mountd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_mountd_server_packets',`
-	corenet_dontaudit_send_mountd_server_packets($1)
-	corenet_dontaudit_receive_mountd_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_monit_server_packets',`
+	corenet_dontaudit_send_monit_server_packets($1)
+	corenet_dontaudit_receive_monit_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to mountd_server the packet type.
+##	Relabel packets to monit_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50106,12 +50992,12 @@ interface(`corenet_dontaudit_sendrecv_mountd_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_mountd_server_packets',`
+interface(`corenet_relabelto_monit_server_packets',`
 	gen_require(`
-		type mountd_server_packet_t;
+		type monit_server_packet_t;
 	')
 
-	allow $1 mountd_server_packet_t:packet relabelto;
+	allow $1 monit_server_packet_t:packet relabelto;
 ')
 
 
@@ -50119,7 +51005,7 @@ interface(`corenet_relabelto_mountd_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the movaz_ssc port.
+##	Send and receive TCP traffic on the monopd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50128,17 +51014,17 @@ interface(`corenet_relabelto_mountd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_movaz_ssc_port',`
+interface(`corenet_tcp_sendrecv_monopd_port',`
 	gen_require(`
-		type movaz_ssc_port_t;
+		type monopd_port_t;
 	')
 
-	allow $1 movaz_ssc_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 monopd_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the movaz_ssc port.
+##	Send UDP traffic on the monopd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50147,17 +51033,17 @@ interface(`corenet_tcp_sendrecv_movaz_ssc_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_movaz_ssc_port',`
+interface(`corenet_udp_send_monopd_port',`
 	gen_require(`
-		type movaz_ssc_port_t;
+		type monopd_port_t;
 	')
 
-	allow $1 movaz_ssc_port_t:udp_socket send_msg;
+	allow $1 monopd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the movaz_ssc port.
+##	Do not audit attempts to send UDP traffic on the monopd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50166,17 +51052,17 @@ interface(`corenet_udp_send_movaz_ssc_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_movaz_ssc_port',`
+interface(`corenet_dontaudit_udp_send_monopd_port',`
 	gen_require(`
-		type movaz_ssc_port_t;
+		type monopd_port_t;
 	')
 
-	dontaudit $1 movaz_ssc_port_t:udp_socket send_msg;
+	dontaudit $1 monopd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the movaz_ssc port.
+##	Receive UDP traffic on the monopd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50185,17 +51071,17 @@ interface(`corenet_dontaudit_udp_send_movaz_ssc_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_movaz_ssc_port',`
+interface(`corenet_udp_receive_monopd_port',`
 	gen_require(`
-		type movaz_ssc_port_t;
+		type monopd_port_t;
 	')
 
-	allow $1 movaz_ssc_port_t:udp_socket recv_msg;
+	allow $1 monopd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the movaz_ssc port.
+##	Do not audit attempts to receive UDP traffic on the monopd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50204,17 +51090,17 @@ interface(`corenet_udp_receive_movaz_ssc_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_movaz_ssc_port',`
+interface(`corenet_dontaudit_udp_receive_monopd_port',`
 	gen_require(`
-		type movaz_ssc_port_t;
+		type monopd_port_t;
 	')
 
-	dontaudit $1 movaz_ssc_port_t:udp_socket recv_msg;
+	dontaudit $1 monopd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the movaz_ssc port.
+##	Send and receive UDP traffic on the monopd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50223,15 +51109,15 @@ interface(`corenet_dontaudit_udp_receive_movaz_ssc_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_movaz_ssc_port',`
-	corenet_udp_send_movaz_ssc_port($1)
-	corenet_udp_receive_movaz_ssc_port($1)
+interface(`corenet_udp_sendrecv_monopd_port',`
+	corenet_udp_send_monopd_port($1)
+	corenet_udp_receive_monopd_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the movaz_ssc port.
+##	UDP traffic on the monopd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50240,14 +51126,14 @@ interface(`corenet_udp_sendrecv_movaz_ssc_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_movaz_ssc_port',`
-	corenet_dontaudit_udp_send_movaz_ssc_port($1)
-	corenet_dontaudit_udp_receive_movaz_ssc_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_monopd_port',`
+	corenet_dontaudit_udp_send_monopd_port($1)
+	corenet_dontaudit_udp_receive_monopd_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the movaz_ssc port.
+##	Bind TCP sockets to the monopd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50256,18 +51142,18 @@ interface(`corenet_dontaudit_udp_sendrecv_movaz_ssc_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_movaz_ssc_port',`
+interface(`corenet_tcp_bind_monopd_port',`
 	gen_require(`
-		type movaz_ssc_port_t;
+		type monopd_port_t;
 	')
 
-	allow $1 movaz_ssc_port_t:tcp_socket name_bind;
+	allow $1 monopd_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the movaz_ssc port.
+##	Bind UDP sockets to the monopd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50276,18 +51162,18 @@ interface(`corenet_tcp_bind_movaz_ssc_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_movaz_ssc_port',`
+interface(`corenet_udp_bind_monopd_port',`
 	gen_require(`
-		type movaz_ssc_port_t;
+		type monopd_port_t;
 	')
 
-	allow $1 movaz_ssc_port_t:udp_socket name_bind;
+	allow $1 monopd_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the movaz_ssc port.
+##	Make a TCP connection to the monopd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50295,18 +51181,18 @@ interface(`corenet_udp_bind_movaz_ssc_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_movaz_ssc_port',`
+interface(`corenet_tcp_connect_monopd_port',`
 	gen_require(`
-		type movaz_ssc_port_t;
+		type monopd_port_t;
 	')
 
-	allow $1 movaz_ssc_port_t:tcp_socket name_connect;
+	allow $1 monopd_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send movaz_ssc_client packets.
+##	Send monopd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50315,17 +51201,17 @@ interface(`corenet_tcp_connect_movaz_ssc_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_movaz_ssc_client_packets',`
+interface(`corenet_send_monopd_client_packets',`
 	gen_require(`
-		type movaz_ssc_client_packet_t;
+		type monopd_client_packet_t;
 	')
 
-	allow $1 movaz_ssc_client_packet_t:packet send;
+	allow $1 monopd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send movaz_ssc_client packets.
+##	Do not audit attempts to send monopd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50334,17 +51220,17 @@ interface(`corenet_send_movaz_ssc_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_movaz_ssc_client_packets',`
+interface(`corenet_dontaudit_send_monopd_client_packets',`
 	gen_require(`
-		type movaz_ssc_client_packet_t;
+		type monopd_client_packet_t;
 	')
 
-	dontaudit $1 movaz_ssc_client_packet_t:packet send;
+	dontaudit $1 monopd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive movaz_ssc_client packets.
+##	Receive monopd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50353,17 +51239,17 @@ interface(`corenet_dontaudit_send_movaz_ssc_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_movaz_ssc_client_packets',`
+interface(`corenet_receive_monopd_client_packets',`
 	gen_require(`
-		type movaz_ssc_client_packet_t;
+		type monopd_client_packet_t;
 	')
 
-	allow $1 movaz_ssc_client_packet_t:packet recv;
+	allow $1 monopd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive movaz_ssc_client packets.
+##	Do not audit attempts to receive monopd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50372,17 +51258,17 @@ interface(`corenet_receive_movaz_ssc_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_movaz_ssc_client_packets',`
+interface(`corenet_dontaudit_receive_monopd_client_packets',`
 	gen_require(`
-		type movaz_ssc_client_packet_t;
+		type monopd_client_packet_t;
 	')
 
-	dontaudit $1 movaz_ssc_client_packet_t:packet recv;
+	dontaudit $1 monopd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive movaz_ssc_client packets.
+##	Send and receive monopd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50391,14 +51277,14 @@ interface(`corenet_dontaudit_receive_movaz_ssc_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_movaz_ssc_client_packets',`
-	corenet_send_movaz_ssc_client_packets($1)
-	corenet_receive_movaz_ssc_client_packets($1)
+interface(`corenet_sendrecv_monopd_client_packets',`
+	corenet_send_monopd_client_packets($1)
+	corenet_receive_monopd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive movaz_ssc_client packets.
+##	Do not audit attempts to send and receive monopd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50407,14 +51293,14 @@ interface(`corenet_sendrecv_movaz_ssc_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_movaz_ssc_client_packets',`
-	corenet_dontaudit_send_movaz_ssc_client_packets($1)
-	corenet_dontaudit_receive_movaz_ssc_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_monopd_client_packets',`
+	corenet_dontaudit_send_monopd_client_packets($1)
+	corenet_dontaudit_receive_monopd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to movaz_ssc_client the packet type.
+##	Relabel packets to monopd_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50422,18 +51308,18 @@ interface(`corenet_dontaudit_sendrecv_movaz_ssc_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_movaz_ssc_client_packets',`
+interface(`corenet_relabelto_monopd_client_packets',`
 	gen_require(`
-		type movaz_ssc_client_packet_t;
+		type monopd_client_packet_t;
 	')
 
-	allow $1 movaz_ssc_client_packet_t:packet relabelto;
+	allow $1 monopd_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send movaz_ssc_server packets.
+##	Send monopd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50442,17 +51328,17 @@ interface(`corenet_relabelto_movaz_ssc_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_movaz_ssc_server_packets',`
+interface(`corenet_send_monopd_server_packets',`
 	gen_require(`
-		type movaz_ssc_server_packet_t;
+		type monopd_server_packet_t;
 	')
 
-	allow $1 movaz_ssc_server_packet_t:packet send;
+	allow $1 monopd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send movaz_ssc_server packets.
+##	Do not audit attempts to send monopd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50461,17 +51347,17 @@ interface(`corenet_send_movaz_ssc_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_movaz_ssc_server_packets',`
+interface(`corenet_dontaudit_send_monopd_server_packets',`
 	gen_require(`
-		type movaz_ssc_server_packet_t;
+		type monopd_server_packet_t;
 	')
 
-	dontaudit $1 movaz_ssc_server_packet_t:packet send;
+	dontaudit $1 monopd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive movaz_ssc_server packets.
+##	Receive monopd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50480,17 +51366,17 @@ interface(`corenet_dontaudit_send_movaz_ssc_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_movaz_ssc_server_packets',`
+interface(`corenet_receive_monopd_server_packets',`
 	gen_require(`
-		type movaz_ssc_server_packet_t;
+		type monopd_server_packet_t;
 	')
 
-	allow $1 movaz_ssc_server_packet_t:packet recv;
+	allow $1 monopd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive movaz_ssc_server packets.
+##	Do not audit attempts to receive monopd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50499,17 +51385,17 @@ interface(`corenet_receive_movaz_ssc_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_movaz_ssc_server_packets',`
+interface(`corenet_dontaudit_receive_monopd_server_packets',`
 	gen_require(`
-		type movaz_ssc_server_packet_t;
+		type monopd_server_packet_t;
 	')
 
-	dontaudit $1 movaz_ssc_server_packet_t:packet recv;
+	dontaudit $1 monopd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive movaz_ssc_server packets.
+##	Send and receive monopd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50518,14 +51404,14 @@ interface(`corenet_dontaudit_receive_movaz_ssc_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_movaz_ssc_server_packets',`
-	corenet_send_movaz_ssc_server_packets($1)
-	corenet_receive_movaz_ssc_server_packets($1)
+interface(`corenet_sendrecv_monopd_server_packets',`
+	corenet_send_monopd_server_packets($1)
+	corenet_receive_monopd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive movaz_ssc_server packets.
+##	Do not audit attempts to send and receive monopd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50534,14 +51420,14 @@ interface(`corenet_sendrecv_movaz_ssc_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_movaz_ssc_server_packets',`
-	corenet_dontaudit_send_movaz_ssc_server_packets($1)
-	corenet_dontaudit_receive_movaz_ssc_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_monopd_server_packets',`
+	corenet_dontaudit_send_monopd_server_packets($1)
+	corenet_dontaudit_receive_monopd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to movaz_ssc_server the packet type.
+##	Relabel packets to monopd_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50549,12 +51435,12 @@ interface(`corenet_dontaudit_sendrecv_movaz_ssc_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_movaz_ssc_server_packets',`
+interface(`corenet_relabelto_monopd_server_packets',`
 	gen_require(`
-		type movaz_ssc_server_packet_t;
+		type monopd_server_packet_t;
 	')
 
-	allow $1 movaz_ssc_server_packet_t:packet relabelto;
+	allow $1 monopd_server_packet_t:packet relabelto;
 ')
 
 
@@ -50562,7 +51448,7 @@ interface(`corenet_relabelto_movaz_ssc_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the mpd port.
+##	Send and receive TCP traffic on the mountd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50571,17 +51457,17 @@ interface(`corenet_relabelto_movaz_ssc_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_mpd_port',`
+interface(`corenet_tcp_sendrecv_mountd_port',`
 	gen_require(`
-		type mpd_port_t;
+		type mountd_port_t;
 	')
 
-	allow $1 mpd_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 mountd_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the mpd port.
+##	Send UDP traffic on the mountd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50590,17 +51476,17 @@ interface(`corenet_tcp_sendrecv_mpd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_mpd_port',`
+interface(`corenet_udp_send_mountd_port',`
 	gen_require(`
-		type mpd_port_t;
+		type mountd_port_t;
 	')
 
-	allow $1 mpd_port_t:udp_socket send_msg;
+	allow $1 mountd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the mpd port.
+##	Do not audit attempts to send UDP traffic on the mountd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50609,17 +51495,17 @@ interface(`corenet_udp_send_mpd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_mpd_port',`
+interface(`corenet_dontaudit_udp_send_mountd_port',`
 	gen_require(`
-		type mpd_port_t;
+		type mountd_port_t;
 	')
 
-	dontaudit $1 mpd_port_t:udp_socket send_msg;
+	dontaudit $1 mountd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the mpd port.
+##	Receive UDP traffic on the mountd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50628,17 +51514,17 @@ interface(`corenet_dontaudit_udp_send_mpd_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_mpd_port',`
+interface(`corenet_udp_receive_mountd_port',`
 	gen_require(`
-		type mpd_port_t;
+		type mountd_port_t;
 	')
 
-	allow $1 mpd_port_t:udp_socket recv_msg;
+	allow $1 mountd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the mpd port.
+##	Do not audit attempts to receive UDP traffic on the mountd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50647,17 +51533,17 @@ interface(`corenet_udp_receive_mpd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_mpd_port',`
+interface(`corenet_dontaudit_udp_receive_mountd_port',`
 	gen_require(`
-		type mpd_port_t;
+		type mountd_port_t;
 	')
 
-	dontaudit $1 mpd_port_t:udp_socket recv_msg;
+	dontaudit $1 mountd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the mpd port.
+##	Send and receive UDP traffic on the mountd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50666,15 +51552,15 @@ interface(`corenet_dontaudit_udp_receive_mpd_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_mpd_port',`
-	corenet_udp_send_mpd_port($1)
-	corenet_udp_receive_mpd_port($1)
+interface(`corenet_udp_sendrecv_mountd_port',`
+	corenet_udp_send_mountd_port($1)
+	corenet_udp_receive_mountd_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the mpd port.
+##	UDP traffic on the mountd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50683,14 +51569,14 @@ interface(`corenet_udp_sendrecv_mpd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_mpd_port',`
-	corenet_dontaudit_udp_send_mpd_port($1)
-	corenet_dontaudit_udp_receive_mpd_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_mountd_port',`
+	corenet_dontaudit_udp_send_mountd_port($1)
+	corenet_dontaudit_udp_receive_mountd_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the mpd port.
+##	Bind TCP sockets to the mountd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50699,18 +51585,18 @@ interface(`corenet_dontaudit_udp_sendrecv_mpd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_mpd_port',`
+interface(`corenet_tcp_bind_mountd_port',`
 	gen_require(`
-		type mpd_port_t;
+		type mountd_port_t;
 	')
 
-	allow $1 mpd_port_t:tcp_socket name_bind;
+	allow $1 mountd_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the mpd port.
+##	Bind UDP sockets to the mountd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50719,18 +51605,18 @@ interface(`corenet_tcp_bind_mpd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_mpd_port',`
+interface(`corenet_udp_bind_mountd_port',`
 	gen_require(`
-		type mpd_port_t;
+		type mountd_port_t;
 	')
 
-	allow $1 mpd_port_t:udp_socket name_bind;
+	allow $1 mountd_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the mpd port.
+##	Make a TCP connection to the mountd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50738,18 +51624,18 @@ interface(`corenet_udp_bind_mpd_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_mpd_port',`
+interface(`corenet_tcp_connect_mountd_port',`
 	gen_require(`
-		type mpd_port_t;
+		type mountd_port_t;
 	')
 
-	allow $1 mpd_port_t:tcp_socket name_connect;
+	allow $1 mountd_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send mpd_client packets.
+##	Send mountd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50758,17 +51644,17 @@ interface(`corenet_tcp_connect_mpd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_mpd_client_packets',`
+interface(`corenet_send_mountd_client_packets',`
 	gen_require(`
-		type mpd_client_packet_t;
+		type mountd_client_packet_t;
 	')
 
-	allow $1 mpd_client_packet_t:packet send;
+	allow $1 mountd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send mpd_client packets.
+##	Do not audit attempts to send mountd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50777,17 +51663,17 @@ interface(`corenet_send_mpd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_mpd_client_packets',`
+interface(`corenet_dontaudit_send_mountd_client_packets',`
 	gen_require(`
-		type mpd_client_packet_t;
+		type mountd_client_packet_t;
 	')
 
-	dontaudit $1 mpd_client_packet_t:packet send;
+	dontaudit $1 mountd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive mpd_client packets.
+##	Receive mountd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50796,17 +51682,17 @@ interface(`corenet_dontaudit_send_mpd_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_mpd_client_packets',`
+interface(`corenet_receive_mountd_client_packets',`
 	gen_require(`
-		type mpd_client_packet_t;
+		type mountd_client_packet_t;
 	')
 
-	allow $1 mpd_client_packet_t:packet recv;
+	allow $1 mountd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive mpd_client packets.
+##	Do not audit attempts to receive mountd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50815,17 +51701,17 @@ interface(`corenet_receive_mpd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_mpd_client_packets',`
+interface(`corenet_dontaudit_receive_mountd_client_packets',`
 	gen_require(`
-		type mpd_client_packet_t;
+		type mountd_client_packet_t;
 	')
 
-	dontaudit $1 mpd_client_packet_t:packet recv;
+	dontaudit $1 mountd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive mpd_client packets.
+##	Send and receive mountd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50834,14 +51720,14 @@ interface(`corenet_dontaudit_receive_mpd_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_mpd_client_packets',`
-	corenet_send_mpd_client_packets($1)
-	corenet_receive_mpd_client_packets($1)
+interface(`corenet_sendrecv_mountd_client_packets',`
+	corenet_send_mountd_client_packets($1)
+	corenet_receive_mountd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive mpd_client packets.
+##	Do not audit attempts to send and receive mountd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50850,14 +51736,14 @@ interface(`corenet_sendrecv_mpd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_mpd_client_packets',`
-	corenet_dontaudit_send_mpd_client_packets($1)
-	corenet_dontaudit_receive_mpd_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_mountd_client_packets',`
+	corenet_dontaudit_send_mountd_client_packets($1)
+	corenet_dontaudit_receive_mountd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to mpd_client the packet type.
+##	Relabel packets to mountd_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50865,18 +51751,18 @@ interface(`corenet_dontaudit_sendrecv_mpd_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_mpd_client_packets',`
+interface(`corenet_relabelto_mountd_client_packets',`
 	gen_require(`
-		type mpd_client_packet_t;
+		type mountd_client_packet_t;
 	')
 
-	allow $1 mpd_client_packet_t:packet relabelto;
+	allow $1 mountd_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send mpd_server packets.
+##	Send mountd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50885,17 +51771,17 @@ interface(`corenet_relabelto_mpd_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_mpd_server_packets',`
+interface(`corenet_send_mountd_server_packets',`
 	gen_require(`
-		type mpd_server_packet_t;
+		type mountd_server_packet_t;
 	')
 
-	allow $1 mpd_server_packet_t:packet send;
+	allow $1 mountd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send mpd_server packets.
+##	Do not audit attempts to send mountd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50904,17 +51790,17 @@ interface(`corenet_send_mpd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_mpd_server_packets',`
+interface(`corenet_dontaudit_send_mountd_server_packets',`
 	gen_require(`
-		type mpd_server_packet_t;
+		type mountd_server_packet_t;
 	')
 
-	dontaudit $1 mpd_server_packet_t:packet send;
+	dontaudit $1 mountd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive mpd_server packets.
+##	Receive mountd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50923,17 +51809,17 @@ interface(`corenet_dontaudit_send_mpd_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_mpd_server_packets',`
+interface(`corenet_receive_mountd_server_packets',`
 	gen_require(`
-		type mpd_server_packet_t;
+		type mountd_server_packet_t;
 	')
 
-	allow $1 mpd_server_packet_t:packet recv;
+	allow $1 mountd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive mpd_server packets.
+##	Do not audit attempts to receive mountd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50942,17 +51828,17 @@ interface(`corenet_receive_mpd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_mpd_server_packets',`
+interface(`corenet_dontaudit_receive_mountd_server_packets',`
 	gen_require(`
-		type mpd_server_packet_t;
+		type mountd_server_packet_t;
 	')
 
-	dontaudit $1 mpd_server_packet_t:packet recv;
+	dontaudit $1 mountd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive mpd_server packets.
+##	Send and receive mountd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50961,14 +51847,14 @@ interface(`corenet_dontaudit_receive_mpd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_mpd_server_packets',`
-	corenet_send_mpd_server_packets($1)
-	corenet_receive_mpd_server_packets($1)
+interface(`corenet_sendrecv_mountd_server_packets',`
+	corenet_send_mountd_server_packets($1)
+	corenet_receive_mountd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive mpd_server packets.
+##	Do not audit attempts to send and receive mountd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50977,14 +51863,14 @@ interface(`corenet_sendrecv_mpd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_mpd_server_packets',`
-	corenet_dontaudit_send_mpd_server_packets($1)
-	corenet_dontaudit_receive_mpd_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_mountd_server_packets',`
+	corenet_dontaudit_send_mountd_server_packets($1)
+	corenet_dontaudit_receive_mountd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to mpd_server the packet type.
+##	Relabel packets to mountd_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -50992,12 +51878,12 @@ interface(`corenet_dontaudit_sendrecv_mpd_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_mpd_server_packets',`
+interface(`corenet_relabelto_mountd_server_packets',`
 	gen_require(`
-		type mpd_server_packet_t;
+		type mountd_server_packet_t;
 	')
 
-	allow $1 mpd_server_packet_t:packet relabelto;
+	allow $1 mountd_server_packet_t:packet relabelto;
 ')
 
 
@@ -51005,7 +51891,7 @@ interface(`corenet_relabelto_mpd_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the msgsrvr port.
+##	Send and receive TCP traffic on the movaz_ssc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51014,17 +51900,17 @@ interface(`corenet_relabelto_mpd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_msgsrvr_port',`
+interface(`corenet_tcp_sendrecv_movaz_ssc_port',`
 	gen_require(`
-		type msgsrvr_port_t;
+		type movaz_ssc_port_t;
 	')
 
-	allow $1 msgsrvr_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 movaz_ssc_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the msgsrvr port.
+##	Send UDP traffic on the movaz_ssc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51033,17 +51919,17 @@ interface(`corenet_tcp_sendrecv_msgsrvr_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_msgsrvr_port',`
+interface(`corenet_udp_send_movaz_ssc_port',`
 	gen_require(`
-		type msgsrvr_port_t;
+		type movaz_ssc_port_t;
 	')
 
-	allow $1 msgsrvr_port_t:udp_socket send_msg;
+	allow $1 movaz_ssc_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the msgsrvr port.
+##	Do not audit attempts to send UDP traffic on the movaz_ssc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51052,17 +51938,17 @@ interface(`corenet_udp_send_msgsrvr_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_msgsrvr_port',`
+interface(`corenet_dontaudit_udp_send_movaz_ssc_port',`
 	gen_require(`
-		type msgsrvr_port_t;
+		type movaz_ssc_port_t;
 	')
 
-	dontaudit $1 msgsrvr_port_t:udp_socket send_msg;
+	dontaudit $1 movaz_ssc_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the msgsrvr port.
+##	Receive UDP traffic on the movaz_ssc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51071,17 +51957,17 @@ interface(`corenet_dontaudit_udp_send_msgsrvr_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_msgsrvr_port',`
+interface(`corenet_udp_receive_movaz_ssc_port',`
 	gen_require(`
-		type msgsrvr_port_t;
+		type movaz_ssc_port_t;
 	')
 
-	allow $1 msgsrvr_port_t:udp_socket recv_msg;
+	allow $1 movaz_ssc_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the msgsrvr port.
+##	Do not audit attempts to receive UDP traffic on the movaz_ssc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51090,17 +51976,17 @@ interface(`corenet_udp_receive_msgsrvr_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_msgsrvr_port',`
+interface(`corenet_dontaudit_udp_receive_movaz_ssc_port',`
 	gen_require(`
-		type msgsrvr_port_t;
+		type movaz_ssc_port_t;
 	')
 
-	dontaudit $1 msgsrvr_port_t:udp_socket recv_msg;
+	dontaudit $1 movaz_ssc_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the msgsrvr port.
+##	Send and receive UDP traffic on the movaz_ssc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51109,15 +51995,15 @@ interface(`corenet_dontaudit_udp_receive_msgsrvr_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_msgsrvr_port',`
-	corenet_udp_send_msgsrvr_port($1)
-	corenet_udp_receive_msgsrvr_port($1)
+interface(`corenet_udp_sendrecv_movaz_ssc_port',`
+	corenet_udp_send_movaz_ssc_port($1)
+	corenet_udp_receive_movaz_ssc_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the msgsrvr port.
+##	UDP traffic on the movaz_ssc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51126,14 +52012,14 @@ interface(`corenet_udp_sendrecv_msgsrvr_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_msgsrvr_port',`
-	corenet_dontaudit_udp_send_msgsrvr_port($1)
-	corenet_dontaudit_udp_receive_msgsrvr_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_movaz_ssc_port',`
+	corenet_dontaudit_udp_send_movaz_ssc_port($1)
+	corenet_dontaudit_udp_receive_movaz_ssc_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the msgsrvr port.
+##	Bind TCP sockets to the movaz_ssc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51142,18 +52028,18 @@ interface(`corenet_dontaudit_udp_sendrecv_msgsrvr_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_msgsrvr_port',`
+interface(`corenet_tcp_bind_movaz_ssc_port',`
 	gen_require(`
-		type msgsrvr_port_t;
+		type movaz_ssc_port_t;
 	')
 
-	allow $1 msgsrvr_port_t:tcp_socket name_bind;
+	allow $1 movaz_ssc_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the msgsrvr port.
+##	Bind UDP sockets to the movaz_ssc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51162,18 +52048,18 @@ interface(`corenet_tcp_bind_msgsrvr_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_msgsrvr_port',`
+interface(`corenet_udp_bind_movaz_ssc_port',`
 	gen_require(`
-		type msgsrvr_port_t;
+		type movaz_ssc_port_t;
 	')
 
-	allow $1 msgsrvr_port_t:udp_socket name_bind;
+	allow $1 movaz_ssc_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the msgsrvr port.
+##	Make a TCP connection to the movaz_ssc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51181,18 +52067,18 @@ interface(`corenet_udp_bind_msgsrvr_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_msgsrvr_port',`
+interface(`corenet_tcp_connect_movaz_ssc_port',`
 	gen_require(`
-		type msgsrvr_port_t;
+		type movaz_ssc_port_t;
 	')
 
-	allow $1 msgsrvr_port_t:tcp_socket name_connect;
+	allow $1 movaz_ssc_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send msgsrvr_client packets.
+##	Send movaz_ssc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51201,17 +52087,17 @@ interface(`corenet_tcp_connect_msgsrvr_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_msgsrvr_client_packets',`
+interface(`corenet_send_movaz_ssc_client_packets',`
 	gen_require(`
-		type msgsrvr_client_packet_t;
+		type movaz_ssc_client_packet_t;
 	')
 
-	allow $1 msgsrvr_client_packet_t:packet send;
+	allow $1 movaz_ssc_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send msgsrvr_client packets.
+##	Do not audit attempts to send movaz_ssc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51220,17 +52106,17 @@ interface(`corenet_send_msgsrvr_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_msgsrvr_client_packets',`
+interface(`corenet_dontaudit_send_movaz_ssc_client_packets',`
 	gen_require(`
-		type msgsrvr_client_packet_t;
+		type movaz_ssc_client_packet_t;
 	')
 
-	dontaudit $1 msgsrvr_client_packet_t:packet send;
+	dontaudit $1 movaz_ssc_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive msgsrvr_client packets.
+##	Receive movaz_ssc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51239,17 +52125,17 @@ interface(`corenet_dontaudit_send_msgsrvr_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_msgsrvr_client_packets',`
+interface(`corenet_receive_movaz_ssc_client_packets',`
 	gen_require(`
-		type msgsrvr_client_packet_t;
+		type movaz_ssc_client_packet_t;
 	')
 
-	allow $1 msgsrvr_client_packet_t:packet recv;
+	allow $1 movaz_ssc_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive msgsrvr_client packets.
+##	Do not audit attempts to receive movaz_ssc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51258,17 +52144,17 @@ interface(`corenet_receive_msgsrvr_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_msgsrvr_client_packets',`
+interface(`corenet_dontaudit_receive_movaz_ssc_client_packets',`
 	gen_require(`
-		type msgsrvr_client_packet_t;
+		type movaz_ssc_client_packet_t;
 	')
 
-	dontaudit $1 msgsrvr_client_packet_t:packet recv;
+	dontaudit $1 movaz_ssc_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive msgsrvr_client packets.
+##	Send and receive movaz_ssc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51277,14 +52163,14 @@ interface(`corenet_dontaudit_receive_msgsrvr_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_msgsrvr_client_packets',`
-	corenet_send_msgsrvr_client_packets($1)
-	corenet_receive_msgsrvr_client_packets($1)
+interface(`corenet_sendrecv_movaz_ssc_client_packets',`
+	corenet_send_movaz_ssc_client_packets($1)
+	corenet_receive_movaz_ssc_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive msgsrvr_client packets.
+##	Do not audit attempts to send and receive movaz_ssc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51293,14 +52179,14 @@ interface(`corenet_sendrecv_msgsrvr_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_msgsrvr_client_packets',`
-	corenet_dontaudit_send_msgsrvr_client_packets($1)
-	corenet_dontaudit_receive_msgsrvr_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_movaz_ssc_client_packets',`
+	corenet_dontaudit_send_movaz_ssc_client_packets($1)
+	corenet_dontaudit_receive_movaz_ssc_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to msgsrvr_client the packet type.
+##	Relabel packets to movaz_ssc_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51308,18 +52194,18 @@ interface(`corenet_dontaudit_sendrecv_msgsrvr_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_msgsrvr_client_packets',`
+interface(`corenet_relabelto_movaz_ssc_client_packets',`
 	gen_require(`
-		type msgsrvr_client_packet_t;
+		type movaz_ssc_client_packet_t;
 	')
 
-	allow $1 msgsrvr_client_packet_t:packet relabelto;
+	allow $1 movaz_ssc_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send msgsrvr_server packets.
+##	Send movaz_ssc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51328,17 +52214,17 @@ interface(`corenet_relabelto_msgsrvr_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_msgsrvr_server_packets',`
+interface(`corenet_send_movaz_ssc_server_packets',`
 	gen_require(`
-		type msgsrvr_server_packet_t;
+		type movaz_ssc_server_packet_t;
 	')
 
-	allow $1 msgsrvr_server_packet_t:packet send;
+	allow $1 movaz_ssc_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send msgsrvr_server packets.
+##	Do not audit attempts to send movaz_ssc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51347,17 +52233,17 @@ interface(`corenet_send_msgsrvr_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_msgsrvr_server_packets',`
+interface(`corenet_dontaudit_send_movaz_ssc_server_packets',`
 	gen_require(`
-		type msgsrvr_server_packet_t;
+		type movaz_ssc_server_packet_t;
 	')
 
-	dontaudit $1 msgsrvr_server_packet_t:packet send;
+	dontaudit $1 movaz_ssc_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive msgsrvr_server packets.
+##	Receive movaz_ssc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51366,17 +52252,17 @@ interface(`corenet_dontaudit_send_msgsrvr_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_msgsrvr_server_packets',`
+interface(`corenet_receive_movaz_ssc_server_packets',`
 	gen_require(`
-		type msgsrvr_server_packet_t;
+		type movaz_ssc_server_packet_t;
 	')
 
-	allow $1 msgsrvr_server_packet_t:packet recv;
+	allow $1 movaz_ssc_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive msgsrvr_server packets.
+##	Do not audit attempts to receive movaz_ssc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51385,17 +52271,17 @@ interface(`corenet_receive_msgsrvr_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_msgsrvr_server_packets',`
+interface(`corenet_dontaudit_receive_movaz_ssc_server_packets',`
 	gen_require(`
-		type msgsrvr_server_packet_t;
+		type movaz_ssc_server_packet_t;
 	')
 
-	dontaudit $1 msgsrvr_server_packet_t:packet recv;
+	dontaudit $1 movaz_ssc_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive msgsrvr_server packets.
+##	Send and receive movaz_ssc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51404,14 +52290,14 @@ interface(`corenet_dontaudit_receive_msgsrvr_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_msgsrvr_server_packets',`
-	corenet_send_msgsrvr_server_packets($1)
-	corenet_receive_msgsrvr_server_packets($1)
+interface(`corenet_sendrecv_movaz_ssc_server_packets',`
+	corenet_send_movaz_ssc_server_packets($1)
+	corenet_receive_movaz_ssc_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive msgsrvr_server packets.
+##	Do not audit attempts to send and receive movaz_ssc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51420,14 +52306,14 @@ interface(`corenet_sendrecv_msgsrvr_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_msgsrvr_server_packets',`
-	corenet_dontaudit_send_msgsrvr_server_packets($1)
-	corenet_dontaudit_receive_msgsrvr_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_movaz_ssc_server_packets',`
+	corenet_dontaudit_send_movaz_ssc_server_packets($1)
+	corenet_dontaudit_receive_movaz_ssc_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to msgsrvr_server the packet type.
+##	Relabel packets to movaz_ssc_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51435,12 +52321,12 @@ interface(`corenet_dontaudit_sendrecv_msgsrvr_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_msgsrvr_server_packets',`
+interface(`corenet_relabelto_movaz_ssc_server_packets',`
 	gen_require(`
-		type msgsrvr_server_packet_t;
+		type movaz_ssc_server_packet_t;
 	')
 
-	allow $1 msgsrvr_server_packet_t:packet relabelto;
+	allow $1 movaz_ssc_server_packet_t:packet relabelto;
 ')
 
 
@@ -51448,7 +52334,7 @@ interface(`corenet_relabelto_msgsrvr_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the msnp port.
+##	Send and receive TCP traffic on the mpd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51457,17 +52343,17 @@ interface(`corenet_relabelto_msgsrvr_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_msnp_port',`
+interface(`corenet_tcp_sendrecv_mpd_port',`
 	gen_require(`
-		type msnp_port_t;
+		type mpd_port_t;
 	')
 
-	allow $1 msnp_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 mpd_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the msnp port.
+##	Send UDP traffic on the mpd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51476,17 +52362,17 @@ interface(`corenet_tcp_sendrecv_msnp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_msnp_port',`
+interface(`corenet_udp_send_mpd_port',`
 	gen_require(`
-		type msnp_port_t;
+		type mpd_port_t;
 	')
 
-	allow $1 msnp_port_t:udp_socket send_msg;
+	allow $1 mpd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the msnp port.
+##	Do not audit attempts to send UDP traffic on the mpd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51495,17 +52381,17 @@ interface(`corenet_udp_send_msnp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_msnp_port',`
+interface(`corenet_dontaudit_udp_send_mpd_port',`
 	gen_require(`
-		type msnp_port_t;
+		type mpd_port_t;
 	')
 
-	dontaudit $1 msnp_port_t:udp_socket send_msg;
+	dontaudit $1 mpd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the msnp port.
+##	Receive UDP traffic on the mpd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51514,17 +52400,17 @@ interface(`corenet_dontaudit_udp_send_msnp_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_msnp_port',`
+interface(`corenet_udp_receive_mpd_port',`
 	gen_require(`
-		type msnp_port_t;
+		type mpd_port_t;
 	')
 
-	allow $1 msnp_port_t:udp_socket recv_msg;
+	allow $1 mpd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the msnp port.
+##	Do not audit attempts to receive UDP traffic on the mpd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51533,17 +52419,17 @@ interface(`corenet_udp_receive_msnp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_msnp_port',`
+interface(`corenet_dontaudit_udp_receive_mpd_port',`
 	gen_require(`
-		type msnp_port_t;
+		type mpd_port_t;
 	')
 
-	dontaudit $1 msnp_port_t:udp_socket recv_msg;
+	dontaudit $1 mpd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the msnp port.
+##	Send and receive UDP traffic on the mpd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51552,15 +52438,15 @@ interface(`corenet_dontaudit_udp_receive_msnp_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_msnp_port',`
-	corenet_udp_send_msnp_port($1)
-	corenet_udp_receive_msnp_port($1)
+interface(`corenet_udp_sendrecv_mpd_port',`
+	corenet_udp_send_mpd_port($1)
+	corenet_udp_receive_mpd_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the msnp port.
+##	UDP traffic on the mpd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51569,14 +52455,14 @@ interface(`corenet_udp_sendrecv_msnp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_msnp_port',`
-	corenet_dontaudit_udp_send_msnp_port($1)
-	corenet_dontaudit_udp_receive_msnp_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_mpd_port',`
+	corenet_dontaudit_udp_send_mpd_port($1)
+	corenet_dontaudit_udp_receive_mpd_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the msnp port.
+##	Bind TCP sockets to the mpd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51585,18 +52471,18 @@ interface(`corenet_dontaudit_udp_sendrecv_msnp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_msnp_port',`
+interface(`corenet_tcp_bind_mpd_port',`
 	gen_require(`
-		type msnp_port_t;
+		type mpd_port_t;
 	')
 
-	allow $1 msnp_port_t:tcp_socket name_bind;
+	allow $1 mpd_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the msnp port.
+##	Bind UDP sockets to the mpd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51605,18 +52491,18 @@ interface(`corenet_tcp_bind_msnp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_msnp_port',`
+interface(`corenet_udp_bind_mpd_port',`
 	gen_require(`
-		type msnp_port_t;
+		type mpd_port_t;
 	')
 
-	allow $1 msnp_port_t:udp_socket name_bind;
+	allow $1 mpd_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the msnp port.
+##	Make a TCP connection to the mpd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51624,18 +52510,18 @@ interface(`corenet_udp_bind_msnp_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_msnp_port',`
+interface(`corenet_tcp_connect_mpd_port',`
 	gen_require(`
-		type msnp_port_t;
+		type mpd_port_t;
 	')
 
-	allow $1 msnp_port_t:tcp_socket name_connect;
+	allow $1 mpd_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send msnp_client packets.
+##	Send mpd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51644,17 +52530,17 @@ interface(`corenet_tcp_connect_msnp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_msnp_client_packets',`
+interface(`corenet_send_mpd_client_packets',`
 	gen_require(`
-		type msnp_client_packet_t;
+		type mpd_client_packet_t;
 	')
 
-	allow $1 msnp_client_packet_t:packet send;
+	allow $1 mpd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send msnp_client packets.
+##	Do not audit attempts to send mpd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51663,17 +52549,17 @@ interface(`corenet_send_msnp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_msnp_client_packets',`
+interface(`corenet_dontaudit_send_mpd_client_packets',`
 	gen_require(`
-		type msnp_client_packet_t;
+		type mpd_client_packet_t;
 	')
 
-	dontaudit $1 msnp_client_packet_t:packet send;
+	dontaudit $1 mpd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive msnp_client packets.
+##	Receive mpd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51682,17 +52568,17 @@ interface(`corenet_dontaudit_send_msnp_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_msnp_client_packets',`
+interface(`corenet_receive_mpd_client_packets',`
 	gen_require(`
-		type msnp_client_packet_t;
+		type mpd_client_packet_t;
 	')
 
-	allow $1 msnp_client_packet_t:packet recv;
+	allow $1 mpd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive msnp_client packets.
+##	Do not audit attempts to receive mpd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51701,17 +52587,17 @@ interface(`corenet_receive_msnp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_msnp_client_packets',`
+interface(`corenet_dontaudit_receive_mpd_client_packets',`
 	gen_require(`
-		type msnp_client_packet_t;
+		type mpd_client_packet_t;
 	')
 
-	dontaudit $1 msnp_client_packet_t:packet recv;
+	dontaudit $1 mpd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive msnp_client packets.
+##	Send and receive mpd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51720,14 +52606,14 @@ interface(`corenet_dontaudit_receive_msnp_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_msnp_client_packets',`
-	corenet_send_msnp_client_packets($1)
-	corenet_receive_msnp_client_packets($1)
+interface(`corenet_sendrecv_mpd_client_packets',`
+	corenet_send_mpd_client_packets($1)
+	corenet_receive_mpd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive msnp_client packets.
+##	Do not audit attempts to send and receive mpd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51736,14 +52622,14 @@ interface(`corenet_sendrecv_msnp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_msnp_client_packets',`
-	corenet_dontaudit_send_msnp_client_packets($1)
-	corenet_dontaudit_receive_msnp_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_mpd_client_packets',`
+	corenet_dontaudit_send_mpd_client_packets($1)
+	corenet_dontaudit_receive_mpd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to msnp_client the packet type.
+##	Relabel packets to mpd_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51751,18 +52637,18 @@ interface(`corenet_dontaudit_sendrecv_msnp_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_msnp_client_packets',`
+interface(`corenet_relabelto_mpd_client_packets',`
 	gen_require(`
-		type msnp_client_packet_t;
+		type mpd_client_packet_t;
 	')
 
-	allow $1 msnp_client_packet_t:packet relabelto;
+	allow $1 mpd_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send msnp_server packets.
+##	Send mpd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51771,17 +52657,17 @@ interface(`corenet_relabelto_msnp_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_msnp_server_packets',`
+interface(`corenet_send_mpd_server_packets',`
 	gen_require(`
-		type msnp_server_packet_t;
+		type mpd_server_packet_t;
 	')
 
-	allow $1 msnp_server_packet_t:packet send;
+	allow $1 mpd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send msnp_server packets.
+##	Do not audit attempts to send mpd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51790,17 +52676,17 @@ interface(`corenet_send_msnp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_msnp_server_packets',`
+interface(`corenet_dontaudit_send_mpd_server_packets',`
 	gen_require(`
-		type msnp_server_packet_t;
+		type mpd_server_packet_t;
 	')
 
-	dontaudit $1 msnp_server_packet_t:packet send;
+	dontaudit $1 mpd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive msnp_server packets.
+##	Receive mpd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51809,17 +52695,17 @@ interface(`corenet_dontaudit_send_msnp_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_msnp_server_packets',`
+interface(`corenet_receive_mpd_server_packets',`
 	gen_require(`
-		type msnp_server_packet_t;
+		type mpd_server_packet_t;
 	')
 
-	allow $1 msnp_server_packet_t:packet recv;
+	allow $1 mpd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive msnp_server packets.
+##	Do not audit attempts to receive mpd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51828,17 +52714,17 @@ interface(`corenet_receive_msnp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_msnp_server_packets',`
+interface(`corenet_dontaudit_receive_mpd_server_packets',`
 	gen_require(`
-		type msnp_server_packet_t;
+		type mpd_server_packet_t;
 	')
 
-	dontaudit $1 msnp_server_packet_t:packet recv;
+	dontaudit $1 mpd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive msnp_server packets.
+##	Send and receive mpd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51847,14 +52733,14 @@ interface(`corenet_dontaudit_receive_msnp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_msnp_server_packets',`
-	corenet_send_msnp_server_packets($1)
-	corenet_receive_msnp_server_packets($1)
+interface(`corenet_sendrecv_mpd_server_packets',`
+	corenet_send_mpd_server_packets($1)
+	corenet_receive_mpd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive msnp_server packets.
+##	Do not audit attempts to send and receive mpd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51863,14 +52749,14 @@ interface(`corenet_sendrecv_msnp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_msnp_server_packets',`
-	corenet_dontaudit_send_msnp_server_packets($1)
-	corenet_dontaudit_receive_msnp_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_mpd_server_packets',`
+	corenet_dontaudit_send_mpd_server_packets($1)
+	corenet_dontaudit_receive_mpd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to msnp_server the packet type.
+##	Relabel packets to mpd_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51878,12 +52764,12 @@ interface(`corenet_dontaudit_sendrecv_msnp_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_msnp_server_packets',`
+interface(`corenet_relabelto_mpd_server_packets',`
 	gen_require(`
-		type msnp_server_packet_t;
+		type mpd_server_packet_t;
 	')
 
-	allow $1 msnp_server_packet_t:packet relabelto;
+	allow $1 mpd_server_packet_t:packet relabelto;
 ')
 
 
@@ -51891,7 +52777,7 @@ interface(`corenet_relabelto_msnp_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the mssql port.
+##	Send and receive TCP traffic on the msgsrvr port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51900,17 +52786,17 @@ interface(`corenet_relabelto_msnp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_mssql_port',`
+interface(`corenet_tcp_sendrecv_msgsrvr_port',`
 	gen_require(`
-		type mssql_port_t;
+		type msgsrvr_port_t;
 	')
 
-	allow $1 mssql_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 msgsrvr_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the mssql port.
+##	Send UDP traffic on the msgsrvr port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51919,17 +52805,17 @@ interface(`corenet_tcp_sendrecv_mssql_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_mssql_port',`
+interface(`corenet_udp_send_msgsrvr_port',`
 	gen_require(`
-		type mssql_port_t;
+		type msgsrvr_port_t;
 	')
 
-	allow $1 mssql_port_t:udp_socket send_msg;
+	allow $1 msgsrvr_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the mssql port.
+##	Do not audit attempts to send UDP traffic on the msgsrvr port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51938,17 +52824,17 @@ interface(`corenet_udp_send_mssql_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_mssql_port',`
+interface(`corenet_dontaudit_udp_send_msgsrvr_port',`
 	gen_require(`
-		type mssql_port_t;
+		type msgsrvr_port_t;
 	')
 
-	dontaudit $1 mssql_port_t:udp_socket send_msg;
+	dontaudit $1 msgsrvr_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the mssql port.
+##	Receive UDP traffic on the msgsrvr port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51957,17 +52843,17 @@ interface(`corenet_dontaudit_udp_send_mssql_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_mssql_port',`
+interface(`corenet_udp_receive_msgsrvr_port',`
 	gen_require(`
-		type mssql_port_t;
+		type msgsrvr_port_t;
 	')
 
-	allow $1 mssql_port_t:udp_socket recv_msg;
+	allow $1 msgsrvr_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the mssql port.
+##	Do not audit attempts to receive UDP traffic on the msgsrvr port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51976,17 +52862,17 @@ interface(`corenet_udp_receive_mssql_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_mssql_port',`
+interface(`corenet_dontaudit_udp_receive_msgsrvr_port',`
 	gen_require(`
-		type mssql_port_t;
+		type msgsrvr_port_t;
 	')
 
-	dontaudit $1 mssql_port_t:udp_socket recv_msg;
+	dontaudit $1 msgsrvr_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the mssql port.
+##	Send and receive UDP traffic on the msgsrvr port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -51995,15 +52881,15 @@ interface(`corenet_dontaudit_udp_receive_mssql_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_mssql_port',`
-	corenet_udp_send_mssql_port($1)
-	corenet_udp_receive_mssql_port($1)
+interface(`corenet_udp_sendrecv_msgsrvr_port',`
+	corenet_udp_send_msgsrvr_port($1)
+	corenet_udp_receive_msgsrvr_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the mssql port.
+##	UDP traffic on the msgsrvr port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52012,14 +52898,14 @@ interface(`corenet_udp_sendrecv_mssql_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_mssql_port',`
-	corenet_dontaudit_udp_send_mssql_port($1)
-	corenet_dontaudit_udp_receive_mssql_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_msgsrvr_port',`
+	corenet_dontaudit_udp_send_msgsrvr_port($1)
+	corenet_dontaudit_udp_receive_msgsrvr_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the mssql port.
+##	Bind TCP sockets to the msgsrvr port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52028,18 +52914,18 @@ interface(`corenet_dontaudit_udp_sendrecv_mssql_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_mssql_port',`
+interface(`corenet_tcp_bind_msgsrvr_port',`
 	gen_require(`
-		type mssql_port_t;
+		type msgsrvr_port_t;
 	')
 
-	allow $1 mssql_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 msgsrvr_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the mssql port.
+##	Bind UDP sockets to the msgsrvr port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52048,18 +52934,18 @@ interface(`corenet_tcp_bind_mssql_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_mssql_port',`
+interface(`corenet_udp_bind_msgsrvr_port',`
 	gen_require(`
-		type mssql_port_t;
+		type msgsrvr_port_t;
 	')
 
-	allow $1 mssql_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 msgsrvr_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the mssql port.
+##	Make a TCP connection to the msgsrvr port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52067,18 +52953,18 @@ interface(`corenet_udp_bind_mssql_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_mssql_port',`
+interface(`corenet_tcp_connect_msgsrvr_port',`
 	gen_require(`
-		type mssql_port_t;
+		type msgsrvr_port_t;
 	')
 
-	allow $1 mssql_port_t:tcp_socket name_connect;
+	allow $1 msgsrvr_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send mssql_client packets.
+##	Send msgsrvr_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52087,17 +52973,17 @@ interface(`corenet_tcp_connect_mssql_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_mssql_client_packets',`
+interface(`corenet_send_msgsrvr_client_packets',`
 	gen_require(`
-		type mssql_client_packet_t;
+		type msgsrvr_client_packet_t;
 	')
 
-	allow $1 mssql_client_packet_t:packet send;
+	allow $1 msgsrvr_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send mssql_client packets.
+##	Do not audit attempts to send msgsrvr_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52106,17 +52992,17 @@ interface(`corenet_send_mssql_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_mssql_client_packets',`
+interface(`corenet_dontaudit_send_msgsrvr_client_packets',`
 	gen_require(`
-		type mssql_client_packet_t;
+		type msgsrvr_client_packet_t;
 	')
 
-	dontaudit $1 mssql_client_packet_t:packet send;
+	dontaudit $1 msgsrvr_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive mssql_client packets.
+##	Receive msgsrvr_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52125,17 +53011,17 @@ interface(`corenet_dontaudit_send_mssql_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_mssql_client_packets',`
+interface(`corenet_receive_msgsrvr_client_packets',`
 	gen_require(`
-		type mssql_client_packet_t;
+		type msgsrvr_client_packet_t;
 	')
 
-	allow $1 mssql_client_packet_t:packet recv;
+	allow $1 msgsrvr_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive mssql_client packets.
+##	Do not audit attempts to receive msgsrvr_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52144,17 +53030,17 @@ interface(`corenet_receive_mssql_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_mssql_client_packets',`
+interface(`corenet_dontaudit_receive_msgsrvr_client_packets',`
 	gen_require(`
-		type mssql_client_packet_t;
+		type msgsrvr_client_packet_t;
 	')
 
-	dontaudit $1 mssql_client_packet_t:packet recv;
+	dontaudit $1 msgsrvr_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive mssql_client packets.
+##	Send and receive msgsrvr_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52163,14 +53049,14 @@ interface(`corenet_dontaudit_receive_mssql_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_mssql_client_packets',`
-	corenet_send_mssql_client_packets($1)
-	corenet_receive_mssql_client_packets($1)
+interface(`corenet_sendrecv_msgsrvr_client_packets',`
+	corenet_send_msgsrvr_client_packets($1)
+	corenet_receive_msgsrvr_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive mssql_client packets.
+##	Do not audit attempts to send and receive msgsrvr_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52179,14 +53065,14 @@ interface(`corenet_sendrecv_mssql_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_mssql_client_packets',`
-	corenet_dontaudit_send_mssql_client_packets($1)
-	corenet_dontaudit_receive_mssql_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_msgsrvr_client_packets',`
+	corenet_dontaudit_send_msgsrvr_client_packets($1)
+	corenet_dontaudit_receive_msgsrvr_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to mssql_client the packet type.
+##	Relabel packets to msgsrvr_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52194,18 +53080,18 @@ interface(`corenet_dontaudit_sendrecv_mssql_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_mssql_client_packets',`
+interface(`corenet_relabelto_msgsrvr_client_packets',`
 	gen_require(`
-		type mssql_client_packet_t;
+		type msgsrvr_client_packet_t;
 	')
 
-	allow $1 mssql_client_packet_t:packet relabelto;
+	allow $1 msgsrvr_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send mssql_server packets.
+##	Send msgsrvr_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52214,17 +53100,17 @@ interface(`corenet_relabelto_mssql_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_mssql_server_packets',`
+interface(`corenet_send_msgsrvr_server_packets',`
 	gen_require(`
-		type mssql_server_packet_t;
+		type msgsrvr_server_packet_t;
 	')
 
-	allow $1 mssql_server_packet_t:packet send;
+	allow $1 msgsrvr_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send mssql_server packets.
+##	Do not audit attempts to send msgsrvr_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52233,17 +53119,17 @@ interface(`corenet_send_mssql_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_mssql_server_packets',`
+interface(`corenet_dontaudit_send_msgsrvr_server_packets',`
 	gen_require(`
-		type mssql_server_packet_t;
+		type msgsrvr_server_packet_t;
 	')
 
-	dontaudit $1 mssql_server_packet_t:packet send;
+	dontaudit $1 msgsrvr_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive mssql_server packets.
+##	Receive msgsrvr_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52252,17 +53138,17 @@ interface(`corenet_dontaudit_send_mssql_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_mssql_server_packets',`
+interface(`corenet_receive_msgsrvr_server_packets',`
 	gen_require(`
-		type mssql_server_packet_t;
+		type msgsrvr_server_packet_t;
 	')
 
-	allow $1 mssql_server_packet_t:packet recv;
+	allow $1 msgsrvr_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive mssql_server packets.
+##	Do not audit attempts to receive msgsrvr_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52271,17 +53157,17 @@ interface(`corenet_receive_mssql_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_mssql_server_packets',`
+interface(`corenet_dontaudit_receive_msgsrvr_server_packets',`
 	gen_require(`
-		type mssql_server_packet_t;
+		type msgsrvr_server_packet_t;
 	')
 
-	dontaudit $1 mssql_server_packet_t:packet recv;
+	dontaudit $1 msgsrvr_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive mssql_server packets.
+##	Send and receive msgsrvr_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52290,14 +53176,14 @@ interface(`corenet_dontaudit_receive_mssql_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_mssql_server_packets',`
-	corenet_send_mssql_server_packets($1)
-	corenet_receive_mssql_server_packets($1)
+interface(`corenet_sendrecv_msgsrvr_server_packets',`
+	corenet_send_msgsrvr_server_packets($1)
+	corenet_receive_msgsrvr_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive mssql_server packets.
+##	Do not audit attempts to send and receive msgsrvr_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52306,14 +53192,14 @@ interface(`corenet_sendrecv_mssql_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_mssql_server_packets',`
-	corenet_dontaudit_send_mssql_server_packets($1)
-	corenet_dontaudit_receive_mssql_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_msgsrvr_server_packets',`
+	corenet_dontaudit_send_msgsrvr_server_packets($1)
+	corenet_dontaudit_receive_msgsrvr_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to mssql_server the packet type.
+##	Relabel packets to msgsrvr_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52321,12 +53207,12 @@ interface(`corenet_dontaudit_sendrecv_mssql_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_mssql_server_packets',`
+interface(`corenet_relabelto_msgsrvr_server_packets',`
 	gen_require(`
-		type mssql_server_packet_t;
+		type msgsrvr_server_packet_t;
 	')
 
-	allow $1 mssql_server_packet_t:packet relabelto;
+	allow $1 msgsrvr_server_packet_t:packet relabelto;
 ')
 
 
@@ -52334,7 +53220,7 @@ interface(`corenet_relabelto_mssql_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the ms_streaming port.
+##	Send and receive TCP traffic on the msnp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52343,17 +53229,17 @@ interface(`corenet_relabelto_mssql_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_ms_streaming_port',`
+interface(`corenet_tcp_sendrecv_msnp_port',`
 	gen_require(`
-		type ms_streaming_port_t;
+		type msnp_port_t;
 	')
 
-	allow $1 ms_streaming_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 msnp_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the ms_streaming port.
+##	Send UDP traffic on the msnp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52362,17 +53248,17 @@ interface(`corenet_tcp_sendrecv_ms_streaming_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_ms_streaming_port',`
+interface(`corenet_udp_send_msnp_port',`
 	gen_require(`
-		type ms_streaming_port_t;
+		type msnp_port_t;
 	')
 
-	allow $1 ms_streaming_port_t:udp_socket send_msg;
+	allow $1 msnp_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the ms_streaming port.
+##	Do not audit attempts to send UDP traffic on the msnp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52381,17 +53267,17 @@ interface(`corenet_udp_send_ms_streaming_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_ms_streaming_port',`
+interface(`corenet_dontaudit_udp_send_msnp_port',`
 	gen_require(`
-		type ms_streaming_port_t;
+		type msnp_port_t;
 	')
 
-	dontaudit $1 ms_streaming_port_t:udp_socket send_msg;
+	dontaudit $1 msnp_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the ms_streaming port.
+##	Receive UDP traffic on the msnp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52400,17 +53286,17 @@ interface(`corenet_dontaudit_udp_send_ms_streaming_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_ms_streaming_port',`
+interface(`corenet_udp_receive_msnp_port',`
 	gen_require(`
-		type ms_streaming_port_t;
+		type msnp_port_t;
 	')
 
-	allow $1 ms_streaming_port_t:udp_socket recv_msg;
+	allow $1 msnp_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the ms_streaming port.
+##	Do not audit attempts to receive UDP traffic on the msnp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52419,17 +53305,17 @@ interface(`corenet_udp_receive_ms_streaming_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_ms_streaming_port',`
+interface(`corenet_dontaudit_udp_receive_msnp_port',`
 	gen_require(`
-		type ms_streaming_port_t;
+		type msnp_port_t;
 	')
 
-	dontaudit $1 ms_streaming_port_t:udp_socket recv_msg;
+	dontaudit $1 msnp_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the ms_streaming port.
+##	Send and receive UDP traffic on the msnp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52438,15 +53324,15 @@ interface(`corenet_dontaudit_udp_receive_ms_streaming_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_ms_streaming_port',`
-	corenet_udp_send_ms_streaming_port($1)
-	corenet_udp_receive_ms_streaming_port($1)
+interface(`corenet_udp_sendrecv_msnp_port',`
+	corenet_udp_send_msnp_port($1)
+	corenet_udp_receive_msnp_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the ms_streaming port.
+##	UDP traffic on the msnp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52455,14 +53341,14 @@ interface(`corenet_udp_sendrecv_ms_streaming_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_ms_streaming_port',`
-	corenet_dontaudit_udp_send_ms_streaming_port($1)
-	corenet_dontaudit_udp_receive_ms_streaming_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_msnp_port',`
+	corenet_dontaudit_udp_send_msnp_port($1)
+	corenet_dontaudit_udp_receive_msnp_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the ms_streaming port.
+##	Bind TCP sockets to the msnp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52471,18 +53357,18 @@ interface(`corenet_dontaudit_udp_sendrecv_ms_streaming_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_ms_streaming_port',`
+interface(`corenet_tcp_bind_msnp_port',`
 	gen_require(`
-		type ms_streaming_port_t;
+		type msnp_port_t;
 	')
 
-	allow $1 ms_streaming_port_t:tcp_socket name_bind;
+	allow $1 msnp_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the ms_streaming port.
+##	Bind UDP sockets to the msnp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52491,18 +53377,18 @@ interface(`corenet_tcp_bind_ms_streaming_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_ms_streaming_port',`
+interface(`corenet_udp_bind_msnp_port',`
 	gen_require(`
-		type ms_streaming_port_t;
+		type msnp_port_t;
 	')
 
-	allow $1 ms_streaming_port_t:udp_socket name_bind;
+	allow $1 msnp_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the ms_streaming port.
+##	Make a TCP connection to the msnp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52510,18 +53396,18 @@ interface(`corenet_udp_bind_ms_streaming_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_ms_streaming_port',`
+interface(`corenet_tcp_connect_msnp_port',`
 	gen_require(`
-		type ms_streaming_port_t;
+		type msnp_port_t;
 	')
 
-	allow $1 ms_streaming_port_t:tcp_socket name_connect;
+	allow $1 msnp_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ms_streaming_client packets.
+##	Send msnp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52530,17 +53416,17 @@ interface(`corenet_tcp_connect_ms_streaming_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ms_streaming_client_packets',`
+interface(`corenet_send_msnp_client_packets',`
 	gen_require(`
-		type ms_streaming_client_packet_t;
+		type msnp_client_packet_t;
 	')
 
-	allow $1 ms_streaming_client_packet_t:packet send;
+	allow $1 msnp_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ms_streaming_client packets.
+##	Do not audit attempts to send msnp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52549,17 +53435,17 @@ interface(`corenet_send_ms_streaming_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ms_streaming_client_packets',`
+interface(`corenet_dontaudit_send_msnp_client_packets',`
 	gen_require(`
-		type ms_streaming_client_packet_t;
+		type msnp_client_packet_t;
 	')
 
-	dontaudit $1 ms_streaming_client_packet_t:packet send;
+	dontaudit $1 msnp_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ms_streaming_client packets.
+##	Receive msnp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52568,17 +53454,17 @@ interface(`corenet_dontaudit_send_ms_streaming_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ms_streaming_client_packets',`
+interface(`corenet_receive_msnp_client_packets',`
 	gen_require(`
-		type ms_streaming_client_packet_t;
+		type msnp_client_packet_t;
 	')
 
-	allow $1 ms_streaming_client_packet_t:packet recv;
+	allow $1 msnp_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ms_streaming_client packets.
+##	Do not audit attempts to receive msnp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52587,17 +53473,17 @@ interface(`corenet_receive_ms_streaming_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ms_streaming_client_packets',`
+interface(`corenet_dontaudit_receive_msnp_client_packets',`
 	gen_require(`
-		type ms_streaming_client_packet_t;
+		type msnp_client_packet_t;
 	')
 
-	dontaudit $1 ms_streaming_client_packet_t:packet recv;
+	dontaudit $1 msnp_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ms_streaming_client packets.
+##	Send and receive msnp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52606,14 +53492,14 @@ interface(`corenet_dontaudit_receive_ms_streaming_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ms_streaming_client_packets',`
-	corenet_send_ms_streaming_client_packets($1)
-	corenet_receive_ms_streaming_client_packets($1)
+interface(`corenet_sendrecv_msnp_client_packets',`
+	corenet_send_msnp_client_packets($1)
+	corenet_receive_msnp_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ms_streaming_client packets.
+##	Do not audit attempts to send and receive msnp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52622,14 +53508,14 @@ interface(`corenet_sendrecv_ms_streaming_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ms_streaming_client_packets',`
-	corenet_dontaudit_send_ms_streaming_client_packets($1)
-	corenet_dontaudit_receive_ms_streaming_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_msnp_client_packets',`
+	corenet_dontaudit_send_msnp_client_packets($1)
+	corenet_dontaudit_receive_msnp_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ms_streaming_client the packet type.
+##	Relabel packets to msnp_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52637,18 +53523,18 @@ interface(`corenet_dontaudit_sendrecv_ms_streaming_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ms_streaming_client_packets',`
+interface(`corenet_relabelto_msnp_client_packets',`
 	gen_require(`
-		type ms_streaming_client_packet_t;
+		type msnp_client_packet_t;
 	')
 
-	allow $1 ms_streaming_client_packet_t:packet relabelto;
+	allow $1 msnp_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ms_streaming_server packets.
+##	Send msnp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52657,17 +53543,17 @@ interface(`corenet_relabelto_ms_streaming_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ms_streaming_server_packets',`
+interface(`corenet_send_msnp_server_packets',`
 	gen_require(`
-		type ms_streaming_server_packet_t;
+		type msnp_server_packet_t;
 	')
 
-	allow $1 ms_streaming_server_packet_t:packet send;
+	allow $1 msnp_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ms_streaming_server packets.
+##	Do not audit attempts to send msnp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52676,17 +53562,17 @@ interface(`corenet_send_ms_streaming_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ms_streaming_server_packets',`
+interface(`corenet_dontaudit_send_msnp_server_packets',`
 	gen_require(`
-		type ms_streaming_server_packet_t;
+		type msnp_server_packet_t;
 	')
 
-	dontaudit $1 ms_streaming_server_packet_t:packet send;
+	dontaudit $1 msnp_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ms_streaming_server packets.
+##	Receive msnp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52695,17 +53581,17 @@ interface(`corenet_dontaudit_send_ms_streaming_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ms_streaming_server_packets',`
+interface(`corenet_receive_msnp_server_packets',`
 	gen_require(`
-		type ms_streaming_server_packet_t;
+		type msnp_server_packet_t;
 	')
 
-	allow $1 ms_streaming_server_packet_t:packet recv;
+	allow $1 msnp_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ms_streaming_server packets.
+##	Do not audit attempts to receive msnp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52714,17 +53600,17 @@ interface(`corenet_receive_ms_streaming_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ms_streaming_server_packets',`
+interface(`corenet_dontaudit_receive_msnp_server_packets',`
 	gen_require(`
-		type ms_streaming_server_packet_t;
+		type msnp_server_packet_t;
 	')
 
-	dontaudit $1 ms_streaming_server_packet_t:packet recv;
+	dontaudit $1 msnp_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ms_streaming_server packets.
+##	Send and receive msnp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52733,14 +53619,14 @@ interface(`corenet_dontaudit_receive_ms_streaming_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ms_streaming_server_packets',`
-	corenet_send_ms_streaming_server_packets($1)
-	corenet_receive_ms_streaming_server_packets($1)
+interface(`corenet_sendrecv_msnp_server_packets',`
+	corenet_send_msnp_server_packets($1)
+	corenet_receive_msnp_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ms_streaming_server packets.
+##	Do not audit attempts to send and receive msnp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52749,14 +53635,14 @@ interface(`corenet_sendrecv_ms_streaming_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ms_streaming_server_packets',`
-	corenet_dontaudit_send_ms_streaming_server_packets($1)
-	corenet_dontaudit_receive_ms_streaming_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_msnp_server_packets',`
+	corenet_dontaudit_send_msnp_server_packets($1)
+	corenet_dontaudit_receive_msnp_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ms_streaming_server the packet type.
+##	Relabel packets to msnp_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52764,12 +53650,12 @@ interface(`corenet_dontaudit_sendrecv_ms_streaming_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ms_streaming_server_packets',`
+interface(`corenet_relabelto_msnp_server_packets',`
 	gen_require(`
-		type ms_streaming_server_packet_t;
+		type msnp_server_packet_t;
 	')
 
-	allow $1 ms_streaming_server_packet_t:packet relabelto;
+	allow $1 msnp_server_packet_t:packet relabelto;
 ')
 
 
@@ -52777,7 +53663,7 @@ interface(`corenet_relabelto_ms_streaming_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the munin port.
+##	Send and receive TCP traffic on the mssql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52786,17 +53672,17 @@ interface(`corenet_relabelto_ms_streaming_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_munin_port',`
+interface(`corenet_tcp_sendrecv_mssql_port',`
 	gen_require(`
-		type munin_port_t;
+		type mssql_port_t;
 	')
 
-	allow $1 munin_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 mssql_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the munin port.
+##	Send UDP traffic on the mssql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52805,17 +53691,17 @@ interface(`corenet_tcp_sendrecv_munin_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_munin_port',`
+interface(`corenet_udp_send_mssql_port',`
 	gen_require(`
-		type munin_port_t;
+		type mssql_port_t;
 	')
 
-	allow $1 munin_port_t:udp_socket send_msg;
+	allow $1 mssql_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the munin port.
+##	Do not audit attempts to send UDP traffic on the mssql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52824,17 +53710,17 @@ interface(`corenet_udp_send_munin_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_munin_port',`
+interface(`corenet_dontaudit_udp_send_mssql_port',`
 	gen_require(`
-		type munin_port_t;
+		type mssql_port_t;
 	')
 
-	dontaudit $1 munin_port_t:udp_socket send_msg;
+	dontaudit $1 mssql_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the munin port.
+##	Receive UDP traffic on the mssql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52843,17 +53729,17 @@ interface(`corenet_dontaudit_udp_send_munin_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_munin_port',`
+interface(`corenet_udp_receive_mssql_port',`
 	gen_require(`
-		type munin_port_t;
+		type mssql_port_t;
 	')
 
-	allow $1 munin_port_t:udp_socket recv_msg;
+	allow $1 mssql_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the munin port.
+##	Do not audit attempts to receive UDP traffic on the mssql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52862,17 +53748,17 @@ interface(`corenet_udp_receive_munin_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_munin_port',`
+interface(`corenet_dontaudit_udp_receive_mssql_port',`
 	gen_require(`
-		type munin_port_t;
+		type mssql_port_t;
 	')
 
-	dontaudit $1 munin_port_t:udp_socket recv_msg;
+	dontaudit $1 mssql_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the munin port.
+##	Send and receive UDP traffic on the mssql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52881,15 +53767,15 @@ interface(`corenet_dontaudit_udp_receive_munin_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_munin_port',`
-	corenet_udp_send_munin_port($1)
-	corenet_udp_receive_munin_port($1)
+interface(`corenet_udp_sendrecv_mssql_port',`
+	corenet_udp_send_mssql_port($1)
+	corenet_udp_receive_mssql_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the munin port.
+##	UDP traffic on the mssql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52898,14 +53784,14 @@ interface(`corenet_udp_sendrecv_munin_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_munin_port',`
-	corenet_dontaudit_udp_send_munin_port($1)
-	corenet_dontaudit_udp_receive_munin_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_mssql_port',`
+	corenet_dontaudit_udp_send_mssql_port($1)
+	corenet_dontaudit_udp_receive_mssql_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the munin port.
+##	Bind TCP sockets to the mssql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52914,18 +53800,18 @@ interface(`corenet_dontaudit_udp_sendrecv_munin_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_munin_port',`
+interface(`corenet_tcp_bind_mssql_port',`
 	gen_require(`
-		type munin_port_t;
+		type mssql_port_t;
 	')
 
-	allow $1 munin_port_t:tcp_socket name_bind;
-	
+	allow $1 mssql_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the munin port.
+##	Bind UDP sockets to the mssql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52934,18 +53820,18 @@ interface(`corenet_tcp_bind_munin_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_munin_port',`
+interface(`corenet_udp_bind_mssql_port',`
 	gen_require(`
-		type munin_port_t;
+		type mssql_port_t;
 	')
 
-	allow $1 munin_port_t:udp_socket name_bind;
-	
+	allow $1 mssql_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the munin port.
+##	Make a TCP connection to the mssql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52953,18 +53839,18 @@ interface(`corenet_udp_bind_munin_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_munin_port',`
+interface(`corenet_tcp_connect_mssql_port',`
 	gen_require(`
-		type munin_port_t;
+		type mssql_port_t;
 	')
 
-	allow $1 munin_port_t:tcp_socket name_connect;
+	allow $1 mssql_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send munin_client packets.
+##	Send mssql_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52973,17 +53859,17 @@ interface(`corenet_tcp_connect_munin_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_munin_client_packets',`
+interface(`corenet_send_mssql_client_packets',`
 	gen_require(`
-		type munin_client_packet_t;
+		type mssql_client_packet_t;
 	')
 
-	allow $1 munin_client_packet_t:packet send;
+	allow $1 mssql_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send munin_client packets.
+##	Do not audit attempts to send mssql_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -52992,17 +53878,17 @@ interface(`corenet_send_munin_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_munin_client_packets',`
+interface(`corenet_dontaudit_send_mssql_client_packets',`
 	gen_require(`
-		type munin_client_packet_t;
+		type mssql_client_packet_t;
 	')
 
-	dontaudit $1 munin_client_packet_t:packet send;
+	dontaudit $1 mssql_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive munin_client packets.
+##	Receive mssql_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53011,17 +53897,17 @@ interface(`corenet_dontaudit_send_munin_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_munin_client_packets',`
+interface(`corenet_receive_mssql_client_packets',`
 	gen_require(`
-		type munin_client_packet_t;
+		type mssql_client_packet_t;
 	')
 
-	allow $1 munin_client_packet_t:packet recv;
+	allow $1 mssql_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive munin_client packets.
+##	Do not audit attempts to receive mssql_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53030,17 +53916,17 @@ interface(`corenet_receive_munin_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_munin_client_packets',`
+interface(`corenet_dontaudit_receive_mssql_client_packets',`
 	gen_require(`
-		type munin_client_packet_t;
+		type mssql_client_packet_t;
 	')
 
-	dontaudit $1 munin_client_packet_t:packet recv;
+	dontaudit $1 mssql_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive munin_client packets.
+##	Send and receive mssql_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53049,14 +53935,14 @@ interface(`corenet_dontaudit_receive_munin_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_munin_client_packets',`
-	corenet_send_munin_client_packets($1)
-	corenet_receive_munin_client_packets($1)
+interface(`corenet_sendrecv_mssql_client_packets',`
+	corenet_send_mssql_client_packets($1)
+	corenet_receive_mssql_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive munin_client packets.
+##	Do not audit attempts to send and receive mssql_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53065,14 +53951,14 @@ interface(`corenet_sendrecv_munin_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_munin_client_packets',`
-	corenet_dontaudit_send_munin_client_packets($1)
-	corenet_dontaudit_receive_munin_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_mssql_client_packets',`
+	corenet_dontaudit_send_mssql_client_packets($1)
+	corenet_dontaudit_receive_mssql_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to munin_client the packet type.
+##	Relabel packets to mssql_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53080,18 +53966,18 @@ interface(`corenet_dontaudit_sendrecv_munin_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_munin_client_packets',`
+interface(`corenet_relabelto_mssql_client_packets',`
 	gen_require(`
-		type munin_client_packet_t;
+		type mssql_client_packet_t;
 	')
 
-	allow $1 munin_client_packet_t:packet relabelto;
+	allow $1 mssql_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send munin_server packets.
+##	Send mssql_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53100,17 +53986,17 @@ interface(`corenet_relabelto_munin_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_munin_server_packets',`
+interface(`corenet_send_mssql_server_packets',`
 	gen_require(`
-		type munin_server_packet_t;
+		type mssql_server_packet_t;
 	')
 
-	allow $1 munin_server_packet_t:packet send;
+	allow $1 mssql_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send munin_server packets.
+##	Do not audit attempts to send mssql_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53119,17 +54005,17 @@ interface(`corenet_send_munin_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_munin_server_packets',`
+interface(`corenet_dontaudit_send_mssql_server_packets',`
 	gen_require(`
-		type munin_server_packet_t;
+		type mssql_server_packet_t;
 	')
 
-	dontaudit $1 munin_server_packet_t:packet send;
+	dontaudit $1 mssql_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive munin_server packets.
+##	Receive mssql_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53138,17 +54024,17 @@ interface(`corenet_dontaudit_send_munin_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_munin_server_packets',`
+interface(`corenet_receive_mssql_server_packets',`
 	gen_require(`
-		type munin_server_packet_t;
+		type mssql_server_packet_t;
 	')
 
-	allow $1 munin_server_packet_t:packet recv;
+	allow $1 mssql_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive munin_server packets.
+##	Do not audit attempts to receive mssql_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53157,17 +54043,17 @@ interface(`corenet_receive_munin_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_munin_server_packets',`
+interface(`corenet_dontaudit_receive_mssql_server_packets',`
 	gen_require(`
-		type munin_server_packet_t;
+		type mssql_server_packet_t;
 	')
 
-	dontaudit $1 munin_server_packet_t:packet recv;
+	dontaudit $1 mssql_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive munin_server packets.
+##	Send and receive mssql_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53176,14 +54062,14 @@ interface(`corenet_dontaudit_receive_munin_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_munin_server_packets',`
-	corenet_send_munin_server_packets($1)
-	corenet_receive_munin_server_packets($1)
+interface(`corenet_sendrecv_mssql_server_packets',`
+	corenet_send_mssql_server_packets($1)
+	corenet_receive_mssql_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive munin_server packets.
+##	Do not audit attempts to send and receive mssql_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53192,14 +54078,14 @@ interface(`corenet_sendrecv_munin_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_munin_server_packets',`
-	corenet_dontaudit_send_munin_server_packets($1)
-	corenet_dontaudit_receive_munin_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_mssql_server_packets',`
+	corenet_dontaudit_send_mssql_server_packets($1)
+	corenet_dontaudit_receive_mssql_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to munin_server the packet type.
+##	Relabel packets to mssql_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53207,12 +54093,12 @@ interface(`corenet_dontaudit_sendrecv_munin_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_munin_server_packets',`
+interface(`corenet_relabelto_mssql_server_packets',`
 	gen_require(`
-		type munin_server_packet_t;
+		type mssql_server_packet_t;
 	')
 
-	allow $1 munin_server_packet_t:packet relabelto;
+	allow $1 mssql_server_packet_t:packet relabelto;
 ')
 
 
@@ -53220,7 +54106,7 @@ interface(`corenet_relabelto_munin_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the mxi port.
+##	Send and receive TCP traffic on the ms_streaming port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53229,17 +54115,17 @@ interface(`corenet_relabelto_munin_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_mxi_port',`
+interface(`corenet_tcp_sendrecv_ms_streaming_port',`
 	gen_require(`
-		type mxi_port_t;
+		type ms_streaming_port_t;
 	')
 
-	allow $1 mxi_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 ms_streaming_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the mxi port.
+##	Send UDP traffic on the ms_streaming port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53248,17 +54134,17 @@ interface(`corenet_tcp_sendrecv_mxi_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_mxi_port',`
+interface(`corenet_udp_send_ms_streaming_port',`
 	gen_require(`
-		type mxi_port_t;
+		type ms_streaming_port_t;
 	')
 
-	allow $1 mxi_port_t:udp_socket send_msg;
+	allow $1 ms_streaming_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the mxi port.
+##	Do not audit attempts to send UDP traffic on the ms_streaming port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53267,17 +54153,17 @@ interface(`corenet_udp_send_mxi_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_mxi_port',`
+interface(`corenet_dontaudit_udp_send_ms_streaming_port',`
 	gen_require(`
-		type mxi_port_t;
+		type ms_streaming_port_t;
 	')
 
-	dontaudit $1 mxi_port_t:udp_socket send_msg;
+	dontaudit $1 ms_streaming_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the mxi port.
+##	Receive UDP traffic on the ms_streaming port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53286,17 +54172,17 @@ interface(`corenet_dontaudit_udp_send_mxi_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_mxi_port',`
+interface(`corenet_udp_receive_ms_streaming_port',`
 	gen_require(`
-		type mxi_port_t;
+		type ms_streaming_port_t;
 	')
 
-	allow $1 mxi_port_t:udp_socket recv_msg;
+	allow $1 ms_streaming_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the mxi port.
+##	Do not audit attempts to receive UDP traffic on the ms_streaming port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53305,17 +54191,17 @@ interface(`corenet_udp_receive_mxi_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_mxi_port',`
+interface(`corenet_dontaudit_udp_receive_ms_streaming_port',`
 	gen_require(`
-		type mxi_port_t;
+		type ms_streaming_port_t;
 	')
 
-	dontaudit $1 mxi_port_t:udp_socket recv_msg;
+	dontaudit $1 ms_streaming_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the mxi port.
+##	Send and receive UDP traffic on the ms_streaming port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53324,15 +54210,15 @@ interface(`corenet_dontaudit_udp_receive_mxi_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_mxi_port',`
-	corenet_udp_send_mxi_port($1)
-	corenet_udp_receive_mxi_port($1)
+interface(`corenet_udp_sendrecv_ms_streaming_port',`
+	corenet_udp_send_ms_streaming_port($1)
+	corenet_udp_receive_ms_streaming_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the mxi port.
+##	UDP traffic on the ms_streaming port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53341,14 +54227,14 @@ interface(`corenet_udp_sendrecv_mxi_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_mxi_port',`
-	corenet_dontaudit_udp_send_mxi_port($1)
-	corenet_dontaudit_udp_receive_mxi_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_ms_streaming_port',`
+	corenet_dontaudit_udp_send_ms_streaming_port($1)
+	corenet_dontaudit_udp_receive_ms_streaming_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the mxi port.
+##	Bind TCP sockets to the ms_streaming port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53357,18 +54243,18 @@ interface(`corenet_dontaudit_udp_sendrecv_mxi_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_mxi_port',`
+interface(`corenet_tcp_bind_ms_streaming_port',`
 	gen_require(`
-		type mxi_port_t;
+		type ms_streaming_port_t;
 	')
 
-	allow $1 mxi_port_t:tcp_socket name_bind;
+	allow $1 ms_streaming_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the mxi port.
+##	Bind UDP sockets to the ms_streaming port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53377,18 +54263,18 @@ interface(`corenet_tcp_bind_mxi_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_mxi_port',`
+interface(`corenet_udp_bind_ms_streaming_port',`
 	gen_require(`
-		type mxi_port_t;
+		type ms_streaming_port_t;
 	')
 
-	allow $1 mxi_port_t:udp_socket name_bind;
+	allow $1 ms_streaming_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the mxi port.
+##	Make a TCP connection to the ms_streaming port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53396,18 +54282,18 @@ interface(`corenet_udp_bind_mxi_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_mxi_port',`
+interface(`corenet_tcp_connect_ms_streaming_port',`
 	gen_require(`
-		type mxi_port_t;
+		type ms_streaming_port_t;
 	')
 
-	allow $1 mxi_port_t:tcp_socket name_connect;
+	allow $1 ms_streaming_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send mxi_client packets.
+##	Send ms_streaming_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53416,17 +54302,17 @@ interface(`corenet_tcp_connect_mxi_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_mxi_client_packets',`
+interface(`corenet_send_ms_streaming_client_packets',`
 	gen_require(`
-		type mxi_client_packet_t;
+		type ms_streaming_client_packet_t;
 	')
 
-	allow $1 mxi_client_packet_t:packet send;
+	allow $1 ms_streaming_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send mxi_client packets.
+##	Do not audit attempts to send ms_streaming_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53435,17 +54321,17 @@ interface(`corenet_send_mxi_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_mxi_client_packets',`
+interface(`corenet_dontaudit_send_ms_streaming_client_packets',`
 	gen_require(`
-		type mxi_client_packet_t;
+		type ms_streaming_client_packet_t;
 	')
 
-	dontaudit $1 mxi_client_packet_t:packet send;
+	dontaudit $1 ms_streaming_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive mxi_client packets.
+##	Receive ms_streaming_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53454,17 +54340,17 @@ interface(`corenet_dontaudit_send_mxi_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_mxi_client_packets',`
+interface(`corenet_receive_ms_streaming_client_packets',`
 	gen_require(`
-		type mxi_client_packet_t;
+		type ms_streaming_client_packet_t;
 	')
 
-	allow $1 mxi_client_packet_t:packet recv;
+	allow $1 ms_streaming_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive mxi_client packets.
+##	Do not audit attempts to receive ms_streaming_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53473,17 +54359,17 @@ interface(`corenet_receive_mxi_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_mxi_client_packets',`
+interface(`corenet_dontaudit_receive_ms_streaming_client_packets',`
 	gen_require(`
-		type mxi_client_packet_t;
+		type ms_streaming_client_packet_t;
 	')
 
-	dontaudit $1 mxi_client_packet_t:packet recv;
+	dontaudit $1 ms_streaming_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive mxi_client packets.
+##	Send and receive ms_streaming_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53492,14 +54378,14 @@ interface(`corenet_dontaudit_receive_mxi_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_mxi_client_packets',`
-	corenet_send_mxi_client_packets($1)
-	corenet_receive_mxi_client_packets($1)
+interface(`corenet_sendrecv_ms_streaming_client_packets',`
+	corenet_send_ms_streaming_client_packets($1)
+	corenet_receive_ms_streaming_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive mxi_client packets.
+##	Do not audit attempts to send and receive ms_streaming_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53508,14 +54394,14 @@ interface(`corenet_sendrecv_mxi_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_mxi_client_packets',`
-	corenet_dontaudit_send_mxi_client_packets($1)
-	corenet_dontaudit_receive_mxi_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_ms_streaming_client_packets',`
+	corenet_dontaudit_send_ms_streaming_client_packets($1)
+	corenet_dontaudit_receive_ms_streaming_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to mxi_client the packet type.
+##	Relabel packets to ms_streaming_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53523,18 +54409,18 @@ interface(`corenet_dontaudit_sendrecv_mxi_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_mxi_client_packets',`
+interface(`corenet_relabelto_ms_streaming_client_packets',`
 	gen_require(`
-		type mxi_client_packet_t;
+		type ms_streaming_client_packet_t;
 	')
 
-	allow $1 mxi_client_packet_t:packet relabelto;
+	allow $1 ms_streaming_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send mxi_server packets.
+##	Send ms_streaming_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53543,17 +54429,17 @@ interface(`corenet_relabelto_mxi_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_mxi_server_packets',`
+interface(`corenet_send_ms_streaming_server_packets',`
 	gen_require(`
-		type mxi_server_packet_t;
+		type ms_streaming_server_packet_t;
 	')
 
-	allow $1 mxi_server_packet_t:packet send;
+	allow $1 ms_streaming_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send mxi_server packets.
+##	Do not audit attempts to send ms_streaming_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53562,17 +54448,17 @@ interface(`corenet_send_mxi_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_mxi_server_packets',`
+interface(`corenet_dontaudit_send_ms_streaming_server_packets',`
 	gen_require(`
-		type mxi_server_packet_t;
+		type ms_streaming_server_packet_t;
 	')
 
-	dontaudit $1 mxi_server_packet_t:packet send;
+	dontaudit $1 ms_streaming_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive mxi_server packets.
+##	Receive ms_streaming_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53581,17 +54467,17 @@ interface(`corenet_dontaudit_send_mxi_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_mxi_server_packets',`
+interface(`corenet_receive_ms_streaming_server_packets',`
 	gen_require(`
-		type mxi_server_packet_t;
+		type ms_streaming_server_packet_t;
 	')
 
-	allow $1 mxi_server_packet_t:packet recv;
+	allow $1 ms_streaming_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive mxi_server packets.
+##	Do not audit attempts to receive ms_streaming_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53600,17 +54486,17 @@ interface(`corenet_receive_mxi_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_mxi_server_packets',`
+interface(`corenet_dontaudit_receive_ms_streaming_server_packets',`
 	gen_require(`
-		type mxi_server_packet_t;
+		type ms_streaming_server_packet_t;
 	')
 
-	dontaudit $1 mxi_server_packet_t:packet recv;
+	dontaudit $1 ms_streaming_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive mxi_server packets.
+##	Send and receive ms_streaming_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53619,14 +54505,14 @@ interface(`corenet_dontaudit_receive_mxi_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_mxi_server_packets',`
-	corenet_send_mxi_server_packets($1)
-	corenet_receive_mxi_server_packets($1)
+interface(`corenet_sendrecv_ms_streaming_server_packets',`
+	corenet_send_ms_streaming_server_packets($1)
+	corenet_receive_ms_streaming_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive mxi_server packets.
+##	Do not audit attempts to send and receive ms_streaming_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53635,14 +54521,14 @@ interface(`corenet_sendrecv_mxi_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_mxi_server_packets',`
-	corenet_dontaudit_send_mxi_server_packets($1)
-	corenet_dontaudit_receive_mxi_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_ms_streaming_server_packets',`
+	corenet_dontaudit_send_ms_streaming_server_packets($1)
+	corenet_dontaudit_receive_ms_streaming_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to mxi_server the packet type.
+##	Relabel packets to ms_streaming_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53650,12 +54536,12 @@ interface(`corenet_dontaudit_sendrecv_mxi_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_mxi_server_packets',`
+interface(`corenet_relabelto_ms_streaming_server_packets',`
 	gen_require(`
-		type mxi_server_packet_t;
+		type ms_streaming_server_packet_t;
 	')
 
-	allow $1 mxi_server_packet_t:packet relabelto;
+	allow $1 ms_streaming_server_packet_t:packet relabelto;
 ')
 
 
@@ -53663,7 +54549,7 @@ interface(`corenet_relabelto_mxi_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the mysqld port.
+##	Send and receive TCP traffic on the munin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53672,17 +54558,17 @@ interface(`corenet_relabelto_mxi_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_mysqld_port',`
+interface(`corenet_tcp_sendrecv_munin_port',`
 	gen_require(`
-		type mysqld_port_t;
+		type munin_port_t;
 	')
 
-	allow $1 mysqld_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 munin_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the mysqld port.
+##	Send UDP traffic on the munin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53691,17 +54577,17 @@ interface(`corenet_tcp_sendrecv_mysqld_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_mysqld_port',`
+interface(`corenet_udp_send_munin_port',`
 	gen_require(`
-		type mysqld_port_t;
+		type munin_port_t;
 	')
 
-	allow $1 mysqld_port_t:udp_socket send_msg;
+	allow $1 munin_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the mysqld port.
+##	Do not audit attempts to send UDP traffic on the munin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53710,17 +54596,17 @@ interface(`corenet_udp_send_mysqld_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_mysqld_port',`
+interface(`corenet_dontaudit_udp_send_munin_port',`
 	gen_require(`
-		type mysqld_port_t;
+		type munin_port_t;
 	')
 
-	dontaudit $1 mysqld_port_t:udp_socket send_msg;
+	dontaudit $1 munin_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the mysqld port.
+##	Receive UDP traffic on the munin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53729,17 +54615,17 @@ interface(`corenet_dontaudit_udp_send_mysqld_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_mysqld_port',`
+interface(`corenet_udp_receive_munin_port',`
 	gen_require(`
-		type mysqld_port_t;
+		type munin_port_t;
 	')
 
-	allow $1 mysqld_port_t:udp_socket recv_msg;
+	allow $1 munin_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the mysqld port.
+##	Do not audit attempts to receive UDP traffic on the munin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53748,17 +54634,17 @@ interface(`corenet_udp_receive_mysqld_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_mysqld_port',`
+interface(`corenet_dontaudit_udp_receive_munin_port',`
 	gen_require(`
-		type mysqld_port_t;
+		type munin_port_t;
 	')
 
-	dontaudit $1 mysqld_port_t:udp_socket recv_msg;
+	dontaudit $1 munin_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the mysqld port.
+##	Send and receive UDP traffic on the munin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53767,15 +54653,15 @@ interface(`corenet_dontaudit_udp_receive_mysqld_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_mysqld_port',`
-	corenet_udp_send_mysqld_port($1)
-	corenet_udp_receive_mysqld_port($1)
+interface(`corenet_udp_sendrecv_munin_port',`
+	corenet_udp_send_munin_port($1)
+	corenet_udp_receive_munin_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the mysqld port.
+##	UDP traffic on the munin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53784,14 +54670,14 @@ interface(`corenet_udp_sendrecv_mysqld_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_mysqld_port',`
-	corenet_dontaudit_udp_send_mysqld_port($1)
-	corenet_dontaudit_udp_receive_mysqld_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_munin_port',`
+	corenet_dontaudit_udp_send_munin_port($1)
+	corenet_dontaudit_udp_receive_munin_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the mysqld port.
+##	Bind TCP sockets to the munin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53800,18 +54686,18 @@ interface(`corenet_dontaudit_udp_sendrecv_mysqld_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_mysqld_port',`
+interface(`corenet_tcp_bind_munin_port',`
 	gen_require(`
-		type mysqld_port_t;
+		type munin_port_t;
 	')
 
-	allow $1 mysqld_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 munin_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the mysqld port.
+##	Bind UDP sockets to the munin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53820,18 +54706,18 @@ interface(`corenet_tcp_bind_mysqld_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_mysqld_port',`
+interface(`corenet_udp_bind_munin_port',`
 	gen_require(`
-		type mysqld_port_t;
+		type munin_port_t;
 	')
 
-	allow $1 mysqld_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 munin_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the mysqld port.
+##	Make a TCP connection to the munin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53839,18 +54725,18 @@ interface(`corenet_udp_bind_mysqld_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_mysqld_port',`
+interface(`corenet_tcp_connect_munin_port',`
 	gen_require(`
-		type mysqld_port_t;
+		type munin_port_t;
 	')
 
-	allow $1 mysqld_port_t:tcp_socket name_connect;
+	allow $1 munin_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send mysqld_client packets.
+##	Send munin_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53859,17 +54745,17 @@ interface(`corenet_tcp_connect_mysqld_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_mysqld_client_packets',`
+interface(`corenet_send_munin_client_packets',`
 	gen_require(`
-		type mysqld_client_packet_t;
+		type munin_client_packet_t;
 	')
 
-	allow $1 mysqld_client_packet_t:packet send;
+	allow $1 munin_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send mysqld_client packets.
+##	Do not audit attempts to send munin_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53878,17 +54764,17 @@ interface(`corenet_send_mysqld_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_mysqld_client_packets',`
+interface(`corenet_dontaudit_send_munin_client_packets',`
 	gen_require(`
-		type mysqld_client_packet_t;
+		type munin_client_packet_t;
 	')
 
-	dontaudit $1 mysqld_client_packet_t:packet send;
+	dontaudit $1 munin_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive mysqld_client packets.
+##	Receive munin_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53897,17 +54783,17 @@ interface(`corenet_dontaudit_send_mysqld_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_mysqld_client_packets',`
+interface(`corenet_receive_munin_client_packets',`
 	gen_require(`
-		type mysqld_client_packet_t;
+		type munin_client_packet_t;
 	')
 
-	allow $1 mysqld_client_packet_t:packet recv;
+	allow $1 munin_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive mysqld_client packets.
+##	Do not audit attempts to receive munin_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53916,17 +54802,17 @@ interface(`corenet_receive_mysqld_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_mysqld_client_packets',`
+interface(`corenet_dontaudit_receive_munin_client_packets',`
 	gen_require(`
-		type mysqld_client_packet_t;
+		type munin_client_packet_t;
 	')
 
-	dontaudit $1 mysqld_client_packet_t:packet recv;
+	dontaudit $1 munin_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive mysqld_client packets.
+##	Send and receive munin_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53935,14 +54821,14 @@ interface(`corenet_dontaudit_receive_mysqld_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_mysqld_client_packets',`
-	corenet_send_mysqld_client_packets($1)
-	corenet_receive_mysqld_client_packets($1)
+interface(`corenet_sendrecv_munin_client_packets',`
+	corenet_send_munin_client_packets($1)
+	corenet_receive_munin_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive mysqld_client packets.
+##	Do not audit attempts to send and receive munin_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53951,14 +54837,14 @@ interface(`corenet_sendrecv_mysqld_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_mysqld_client_packets',`
-	corenet_dontaudit_send_mysqld_client_packets($1)
-	corenet_dontaudit_receive_mysqld_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_munin_client_packets',`
+	corenet_dontaudit_send_munin_client_packets($1)
+	corenet_dontaudit_receive_munin_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to mysqld_client the packet type.
+##	Relabel packets to munin_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53966,18 +54852,18 @@ interface(`corenet_dontaudit_sendrecv_mysqld_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_mysqld_client_packets',`
+interface(`corenet_relabelto_munin_client_packets',`
 	gen_require(`
-		type mysqld_client_packet_t;
+		type munin_client_packet_t;
 	')
 
-	allow $1 mysqld_client_packet_t:packet relabelto;
+	allow $1 munin_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send mysqld_server packets.
+##	Send munin_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -53986,17 +54872,17 @@ interface(`corenet_relabelto_mysqld_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_mysqld_server_packets',`
+interface(`corenet_send_munin_server_packets',`
 	gen_require(`
-		type mysqld_server_packet_t;
+		type munin_server_packet_t;
 	')
 
-	allow $1 mysqld_server_packet_t:packet send;
+	allow $1 munin_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send mysqld_server packets.
+##	Do not audit attempts to send munin_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54005,17 +54891,17 @@ interface(`corenet_send_mysqld_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_mysqld_server_packets',`
+interface(`corenet_dontaudit_send_munin_server_packets',`
 	gen_require(`
-		type mysqld_server_packet_t;
+		type munin_server_packet_t;
 	')
 
-	dontaudit $1 mysqld_server_packet_t:packet send;
+	dontaudit $1 munin_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive mysqld_server packets.
+##	Receive munin_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54024,17 +54910,17 @@ interface(`corenet_dontaudit_send_mysqld_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_mysqld_server_packets',`
+interface(`corenet_receive_munin_server_packets',`
 	gen_require(`
-		type mysqld_server_packet_t;
+		type munin_server_packet_t;
 	')
 
-	allow $1 mysqld_server_packet_t:packet recv;
+	allow $1 munin_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive mysqld_server packets.
+##	Do not audit attempts to receive munin_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54043,17 +54929,17 @@ interface(`corenet_receive_mysqld_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_mysqld_server_packets',`
+interface(`corenet_dontaudit_receive_munin_server_packets',`
 	gen_require(`
-		type mysqld_server_packet_t;
+		type munin_server_packet_t;
 	')
 
-	dontaudit $1 mysqld_server_packet_t:packet recv;
+	dontaudit $1 munin_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive mysqld_server packets.
+##	Send and receive munin_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54062,14 +54948,14 @@ interface(`corenet_dontaudit_receive_mysqld_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_mysqld_server_packets',`
-	corenet_send_mysqld_server_packets($1)
-	corenet_receive_mysqld_server_packets($1)
+interface(`corenet_sendrecv_munin_server_packets',`
+	corenet_send_munin_server_packets($1)
+	corenet_receive_munin_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive mysqld_server packets.
+##	Do not audit attempts to send and receive munin_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54078,14 +54964,14 @@ interface(`corenet_sendrecv_mysqld_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_mysqld_server_packets',`
-	corenet_dontaudit_send_mysqld_server_packets($1)
-	corenet_dontaudit_receive_mysqld_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_munin_server_packets',`
+	corenet_dontaudit_send_munin_server_packets($1)
+	corenet_dontaudit_receive_munin_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to mysqld_server the packet type.
+##	Relabel packets to munin_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54093,12 +54979,12 @@ interface(`corenet_dontaudit_sendrecv_mysqld_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_mysqld_server_packets',`
+interface(`corenet_relabelto_munin_server_packets',`
 	gen_require(`
-		type mysqld_server_packet_t;
+		type munin_server_packet_t;
 	')
 
-	allow $1 mysqld_server_packet_t:packet relabelto;
+	allow $1 munin_server_packet_t:packet relabelto;
 ')
 
 
@@ -54106,7 +54992,7 @@ interface(`corenet_relabelto_mysqld_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the mysqlmanagerd port.
+##	Send and receive TCP traffic on the mxi port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54115,17 +55001,17 @@ interface(`corenet_relabelto_mysqld_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_mysqlmanagerd_port',`
+interface(`corenet_tcp_sendrecv_mxi_port',`
 	gen_require(`
-		type mysqlmanagerd_port_t;
+		type mxi_port_t;
 	')
 
-	allow $1 mysqlmanagerd_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 mxi_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the mysqlmanagerd port.
+##	Send UDP traffic on the mxi port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54134,17 +55020,17 @@ interface(`corenet_tcp_sendrecv_mysqlmanagerd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_mysqlmanagerd_port',`
+interface(`corenet_udp_send_mxi_port',`
 	gen_require(`
-		type mysqlmanagerd_port_t;
+		type mxi_port_t;
 	')
 
-	allow $1 mysqlmanagerd_port_t:udp_socket send_msg;
+	allow $1 mxi_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the mysqlmanagerd port.
+##	Do not audit attempts to send UDP traffic on the mxi port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54153,17 +55039,17 @@ interface(`corenet_udp_send_mysqlmanagerd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_mysqlmanagerd_port',`
+interface(`corenet_dontaudit_udp_send_mxi_port',`
 	gen_require(`
-		type mysqlmanagerd_port_t;
+		type mxi_port_t;
 	')
 
-	dontaudit $1 mysqlmanagerd_port_t:udp_socket send_msg;
+	dontaudit $1 mxi_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the mysqlmanagerd port.
+##	Receive UDP traffic on the mxi port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54172,17 +55058,17 @@ interface(`corenet_dontaudit_udp_send_mysqlmanagerd_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_mysqlmanagerd_port',`
+interface(`corenet_udp_receive_mxi_port',`
 	gen_require(`
-		type mysqlmanagerd_port_t;
+		type mxi_port_t;
 	')
 
-	allow $1 mysqlmanagerd_port_t:udp_socket recv_msg;
+	allow $1 mxi_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the mysqlmanagerd port.
+##	Do not audit attempts to receive UDP traffic on the mxi port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54191,17 +55077,17 @@ interface(`corenet_udp_receive_mysqlmanagerd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_mysqlmanagerd_port',`
+interface(`corenet_dontaudit_udp_receive_mxi_port',`
 	gen_require(`
-		type mysqlmanagerd_port_t;
+		type mxi_port_t;
 	')
 
-	dontaudit $1 mysqlmanagerd_port_t:udp_socket recv_msg;
+	dontaudit $1 mxi_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the mysqlmanagerd port.
+##	Send and receive UDP traffic on the mxi port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54210,15 +55096,15 @@ interface(`corenet_dontaudit_udp_receive_mysqlmanagerd_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_mysqlmanagerd_port',`
-	corenet_udp_send_mysqlmanagerd_port($1)
-	corenet_udp_receive_mysqlmanagerd_port($1)
+interface(`corenet_udp_sendrecv_mxi_port',`
+	corenet_udp_send_mxi_port($1)
+	corenet_udp_receive_mxi_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the mysqlmanagerd port.
+##	UDP traffic on the mxi port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54227,14 +55113,14 @@ interface(`corenet_udp_sendrecv_mysqlmanagerd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_mysqlmanagerd_port',`
-	corenet_dontaudit_udp_send_mysqlmanagerd_port($1)
-	corenet_dontaudit_udp_receive_mysqlmanagerd_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_mxi_port',`
+	corenet_dontaudit_udp_send_mxi_port($1)
+	corenet_dontaudit_udp_receive_mxi_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the mysqlmanagerd port.
+##	Bind TCP sockets to the mxi port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54243,18 +55129,18 @@ interface(`corenet_dontaudit_udp_sendrecv_mysqlmanagerd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_mysqlmanagerd_port',`
+interface(`corenet_tcp_bind_mxi_port',`
 	gen_require(`
-		type mysqlmanagerd_port_t;
+		type mxi_port_t;
 	')
 
-	allow $1 mysqlmanagerd_port_t:tcp_socket name_bind;
+	allow $1 mxi_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the mysqlmanagerd port.
+##	Bind UDP sockets to the mxi port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54263,18 +55149,18 @@ interface(`corenet_tcp_bind_mysqlmanagerd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_mysqlmanagerd_port',`
+interface(`corenet_udp_bind_mxi_port',`
 	gen_require(`
-		type mysqlmanagerd_port_t;
+		type mxi_port_t;
 	')
 
-	allow $1 mysqlmanagerd_port_t:udp_socket name_bind;
+	allow $1 mxi_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the mysqlmanagerd port.
+##	Make a TCP connection to the mxi port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54282,18 +55168,18 @@ interface(`corenet_udp_bind_mysqlmanagerd_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_mysqlmanagerd_port',`
+interface(`corenet_tcp_connect_mxi_port',`
 	gen_require(`
-		type mysqlmanagerd_port_t;
+		type mxi_port_t;
 	')
 
-	allow $1 mysqlmanagerd_port_t:tcp_socket name_connect;
+	allow $1 mxi_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send mysqlmanagerd_client packets.
+##	Send mxi_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54302,17 +55188,17 @@ interface(`corenet_tcp_connect_mysqlmanagerd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_mysqlmanagerd_client_packets',`
+interface(`corenet_send_mxi_client_packets',`
 	gen_require(`
-		type mysqlmanagerd_client_packet_t;
+		type mxi_client_packet_t;
 	')
 
-	allow $1 mysqlmanagerd_client_packet_t:packet send;
+	allow $1 mxi_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send mysqlmanagerd_client packets.
+##	Do not audit attempts to send mxi_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54321,17 +55207,17 @@ interface(`corenet_send_mysqlmanagerd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_mysqlmanagerd_client_packets',`
+interface(`corenet_dontaudit_send_mxi_client_packets',`
 	gen_require(`
-		type mysqlmanagerd_client_packet_t;
+		type mxi_client_packet_t;
 	')
 
-	dontaudit $1 mysqlmanagerd_client_packet_t:packet send;
+	dontaudit $1 mxi_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive mysqlmanagerd_client packets.
+##	Receive mxi_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54340,17 +55226,17 @@ interface(`corenet_dontaudit_send_mysqlmanagerd_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_mysqlmanagerd_client_packets',`
+interface(`corenet_receive_mxi_client_packets',`
 	gen_require(`
-		type mysqlmanagerd_client_packet_t;
+		type mxi_client_packet_t;
 	')
 
-	allow $1 mysqlmanagerd_client_packet_t:packet recv;
+	allow $1 mxi_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive mysqlmanagerd_client packets.
+##	Do not audit attempts to receive mxi_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54359,17 +55245,17 @@ interface(`corenet_receive_mysqlmanagerd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_mysqlmanagerd_client_packets',`
+interface(`corenet_dontaudit_receive_mxi_client_packets',`
 	gen_require(`
-		type mysqlmanagerd_client_packet_t;
+		type mxi_client_packet_t;
 	')
 
-	dontaudit $1 mysqlmanagerd_client_packet_t:packet recv;
+	dontaudit $1 mxi_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive mysqlmanagerd_client packets.
+##	Send and receive mxi_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54378,14 +55264,14 @@ interface(`corenet_dontaudit_receive_mysqlmanagerd_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_mysqlmanagerd_client_packets',`
-	corenet_send_mysqlmanagerd_client_packets($1)
-	corenet_receive_mysqlmanagerd_client_packets($1)
+interface(`corenet_sendrecv_mxi_client_packets',`
+	corenet_send_mxi_client_packets($1)
+	corenet_receive_mxi_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive mysqlmanagerd_client packets.
+##	Do not audit attempts to send and receive mxi_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54394,14 +55280,14 @@ interface(`corenet_sendrecv_mysqlmanagerd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_mysqlmanagerd_client_packets',`
-	corenet_dontaudit_send_mysqlmanagerd_client_packets($1)
-	corenet_dontaudit_receive_mysqlmanagerd_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_mxi_client_packets',`
+	corenet_dontaudit_send_mxi_client_packets($1)
+	corenet_dontaudit_receive_mxi_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to mysqlmanagerd_client the packet type.
+##	Relabel packets to mxi_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54409,18 +55295,18 @@ interface(`corenet_dontaudit_sendrecv_mysqlmanagerd_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_mysqlmanagerd_client_packets',`
+interface(`corenet_relabelto_mxi_client_packets',`
 	gen_require(`
-		type mysqlmanagerd_client_packet_t;
+		type mxi_client_packet_t;
 	')
 
-	allow $1 mysqlmanagerd_client_packet_t:packet relabelto;
+	allow $1 mxi_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send mysqlmanagerd_server packets.
+##	Send mxi_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54429,17 +55315,17 @@ interface(`corenet_relabelto_mysqlmanagerd_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_mysqlmanagerd_server_packets',`
+interface(`corenet_send_mxi_server_packets',`
 	gen_require(`
-		type mysqlmanagerd_server_packet_t;
+		type mxi_server_packet_t;
 	')
 
-	allow $1 mysqlmanagerd_server_packet_t:packet send;
+	allow $1 mxi_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send mysqlmanagerd_server packets.
+##	Do not audit attempts to send mxi_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54448,17 +55334,17 @@ interface(`corenet_send_mysqlmanagerd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_mysqlmanagerd_server_packets',`
+interface(`corenet_dontaudit_send_mxi_server_packets',`
 	gen_require(`
-		type mysqlmanagerd_server_packet_t;
+		type mxi_server_packet_t;
 	')
 
-	dontaudit $1 mysqlmanagerd_server_packet_t:packet send;
+	dontaudit $1 mxi_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive mysqlmanagerd_server packets.
+##	Receive mxi_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54467,17 +55353,17 @@ interface(`corenet_dontaudit_send_mysqlmanagerd_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_mysqlmanagerd_server_packets',`
+interface(`corenet_receive_mxi_server_packets',`
 	gen_require(`
-		type mysqlmanagerd_server_packet_t;
+		type mxi_server_packet_t;
 	')
 
-	allow $1 mysqlmanagerd_server_packet_t:packet recv;
+	allow $1 mxi_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive mysqlmanagerd_server packets.
+##	Do not audit attempts to receive mxi_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54486,17 +55372,17 @@ interface(`corenet_receive_mysqlmanagerd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_mysqlmanagerd_server_packets',`
+interface(`corenet_dontaudit_receive_mxi_server_packets',`
 	gen_require(`
-		type mysqlmanagerd_server_packet_t;
+		type mxi_server_packet_t;
 	')
 
-	dontaudit $1 mysqlmanagerd_server_packet_t:packet recv;
+	dontaudit $1 mxi_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive mysqlmanagerd_server packets.
+##	Send and receive mxi_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54505,14 +55391,14 @@ interface(`corenet_dontaudit_receive_mysqlmanagerd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_mysqlmanagerd_server_packets',`
-	corenet_send_mysqlmanagerd_server_packets($1)
-	corenet_receive_mysqlmanagerd_server_packets($1)
+interface(`corenet_sendrecv_mxi_server_packets',`
+	corenet_send_mxi_server_packets($1)
+	corenet_receive_mxi_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive mysqlmanagerd_server packets.
+##	Do not audit attempts to send and receive mxi_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54521,14 +55407,14 @@ interface(`corenet_sendrecv_mysqlmanagerd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_mysqlmanagerd_server_packets',`
-	corenet_dontaudit_send_mysqlmanagerd_server_packets($1)
-	corenet_dontaudit_receive_mysqlmanagerd_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_mxi_server_packets',`
+	corenet_dontaudit_send_mxi_server_packets($1)
+	corenet_dontaudit_receive_mxi_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to mysqlmanagerd_server the packet type.
+##	Relabel packets to mxi_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54536,12 +55422,12 @@ interface(`corenet_dontaudit_sendrecv_mysqlmanagerd_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_mysqlmanagerd_server_packets',`
+interface(`corenet_relabelto_mxi_server_packets',`
 	gen_require(`
-		type mysqlmanagerd_server_packet_t;
+		type mxi_server_packet_t;
 	')
 
-	allow $1 mysqlmanagerd_server_packet_t:packet relabelto;
+	allow $1 mxi_server_packet_t:packet relabelto;
 ')
 
 
@@ -54549,7 +55435,7 @@ interface(`corenet_relabelto_mysqlmanagerd_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the nessus port.
+##	Send and receive TCP traffic on the mysqld port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54558,17 +55444,17 @@ interface(`corenet_relabelto_mysqlmanagerd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_nessus_port',`
+interface(`corenet_tcp_sendrecv_mysqld_port',`
 	gen_require(`
-		type nessus_port_t;
+		type mysqld_port_t;
 	')
 
-	allow $1 nessus_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 mysqld_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the nessus port.
+##	Send UDP traffic on the mysqld port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54577,17 +55463,17 @@ interface(`corenet_tcp_sendrecv_nessus_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_nessus_port',`
+interface(`corenet_udp_send_mysqld_port',`
 	gen_require(`
-		type nessus_port_t;
+		type mysqld_port_t;
 	')
 
-	allow $1 nessus_port_t:udp_socket send_msg;
+	allow $1 mysqld_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the nessus port.
+##	Do not audit attempts to send UDP traffic on the mysqld port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54596,17 +55482,17 @@ interface(`corenet_udp_send_nessus_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_nessus_port',`
+interface(`corenet_dontaudit_udp_send_mysqld_port',`
 	gen_require(`
-		type nessus_port_t;
+		type mysqld_port_t;
 	')
 
-	dontaudit $1 nessus_port_t:udp_socket send_msg;
+	dontaudit $1 mysqld_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the nessus port.
+##	Receive UDP traffic on the mysqld port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54615,17 +55501,17 @@ interface(`corenet_dontaudit_udp_send_nessus_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_nessus_port',`
+interface(`corenet_udp_receive_mysqld_port',`
 	gen_require(`
-		type nessus_port_t;
+		type mysqld_port_t;
 	')
 
-	allow $1 nessus_port_t:udp_socket recv_msg;
+	allow $1 mysqld_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the nessus port.
+##	Do not audit attempts to receive UDP traffic on the mysqld port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54634,17 +55520,17 @@ interface(`corenet_udp_receive_nessus_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_nessus_port',`
+interface(`corenet_dontaudit_udp_receive_mysqld_port',`
 	gen_require(`
-		type nessus_port_t;
+		type mysqld_port_t;
 	')
 
-	dontaudit $1 nessus_port_t:udp_socket recv_msg;
+	dontaudit $1 mysqld_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the nessus port.
+##	Send and receive UDP traffic on the mysqld port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54653,15 +55539,15 @@ interface(`corenet_dontaudit_udp_receive_nessus_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_nessus_port',`
-	corenet_udp_send_nessus_port($1)
-	corenet_udp_receive_nessus_port($1)
+interface(`corenet_udp_sendrecv_mysqld_port',`
+	corenet_udp_send_mysqld_port($1)
+	corenet_udp_receive_mysqld_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the nessus port.
+##	UDP traffic on the mysqld port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54670,14 +55556,14 @@ interface(`corenet_udp_sendrecv_nessus_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_nessus_port',`
-	corenet_dontaudit_udp_send_nessus_port($1)
-	corenet_dontaudit_udp_receive_nessus_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_mysqld_port',`
+	corenet_dontaudit_udp_send_mysqld_port($1)
+	corenet_dontaudit_udp_receive_mysqld_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the nessus port.
+##	Bind TCP sockets to the mysqld port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54686,18 +55572,18 @@ interface(`corenet_dontaudit_udp_sendrecv_nessus_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_nessus_port',`
+interface(`corenet_tcp_bind_mysqld_port',`
 	gen_require(`
-		type nessus_port_t;
+		type mysqld_port_t;
 	')
 
-	allow $1 nessus_port_t:tcp_socket name_bind;
-	
+	allow $1 mysqld_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the nessus port.
+##	Bind UDP sockets to the mysqld port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54706,18 +55592,18 @@ interface(`corenet_tcp_bind_nessus_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_nessus_port',`
+interface(`corenet_udp_bind_mysqld_port',`
 	gen_require(`
-		type nessus_port_t;
+		type mysqld_port_t;
 	')
 
-	allow $1 nessus_port_t:udp_socket name_bind;
-	
+	allow $1 mysqld_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the nessus port.
+##	Make a TCP connection to the mysqld port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54725,18 +55611,18 @@ interface(`corenet_udp_bind_nessus_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_nessus_port',`
+interface(`corenet_tcp_connect_mysqld_port',`
 	gen_require(`
-		type nessus_port_t;
+		type mysqld_port_t;
 	')
 
-	allow $1 nessus_port_t:tcp_socket name_connect;
+	allow $1 mysqld_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send nessus_client packets.
+##	Send mysqld_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54745,17 +55631,17 @@ interface(`corenet_tcp_connect_nessus_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_nessus_client_packets',`
+interface(`corenet_send_mysqld_client_packets',`
 	gen_require(`
-		type nessus_client_packet_t;
+		type mysqld_client_packet_t;
 	')
 
-	allow $1 nessus_client_packet_t:packet send;
+	allow $1 mysqld_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send nessus_client packets.
+##	Do not audit attempts to send mysqld_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54764,17 +55650,17 @@ interface(`corenet_send_nessus_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_nessus_client_packets',`
+interface(`corenet_dontaudit_send_mysqld_client_packets',`
 	gen_require(`
-		type nessus_client_packet_t;
+		type mysqld_client_packet_t;
 	')
 
-	dontaudit $1 nessus_client_packet_t:packet send;
+	dontaudit $1 mysqld_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive nessus_client packets.
+##	Receive mysqld_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54783,17 +55669,17 @@ interface(`corenet_dontaudit_send_nessus_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_nessus_client_packets',`
+interface(`corenet_receive_mysqld_client_packets',`
 	gen_require(`
-		type nessus_client_packet_t;
+		type mysqld_client_packet_t;
 	')
 
-	allow $1 nessus_client_packet_t:packet recv;
+	allow $1 mysqld_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive nessus_client packets.
+##	Do not audit attempts to receive mysqld_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54802,17 +55688,17 @@ interface(`corenet_receive_nessus_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_nessus_client_packets',`
+interface(`corenet_dontaudit_receive_mysqld_client_packets',`
 	gen_require(`
-		type nessus_client_packet_t;
+		type mysqld_client_packet_t;
 	')
 
-	dontaudit $1 nessus_client_packet_t:packet recv;
+	dontaudit $1 mysqld_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive nessus_client packets.
+##	Send and receive mysqld_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54821,14 +55707,14 @@ interface(`corenet_dontaudit_receive_nessus_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_nessus_client_packets',`
-	corenet_send_nessus_client_packets($1)
-	corenet_receive_nessus_client_packets($1)
+interface(`corenet_sendrecv_mysqld_client_packets',`
+	corenet_send_mysqld_client_packets($1)
+	corenet_receive_mysqld_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive nessus_client packets.
+##	Do not audit attempts to send and receive mysqld_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54837,14 +55723,14 @@ interface(`corenet_sendrecv_nessus_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_nessus_client_packets',`
-	corenet_dontaudit_send_nessus_client_packets($1)
-	corenet_dontaudit_receive_nessus_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_mysqld_client_packets',`
+	corenet_dontaudit_send_mysqld_client_packets($1)
+	corenet_dontaudit_receive_mysqld_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to nessus_client the packet type.
+##	Relabel packets to mysqld_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54852,18 +55738,18 @@ interface(`corenet_dontaudit_sendrecv_nessus_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_nessus_client_packets',`
+interface(`corenet_relabelto_mysqld_client_packets',`
 	gen_require(`
-		type nessus_client_packet_t;
+		type mysqld_client_packet_t;
 	')
 
-	allow $1 nessus_client_packet_t:packet relabelto;
+	allow $1 mysqld_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send nessus_server packets.
+##	Send mysqld_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54872,17 +55758,17 @@ interface(`corenet_relabelto_nessus_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_nessus_server_packets',`
+interface(`corenet_send_mysqld_server_packets',`
 	gen_require(`
-		type nessus_server_packet_t;
+		type mysqld_server_packet_t;
 	')
 
-	allow $1 nessus_server_packet_t:packet send;
+	allow $1 mysqld_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send nessus_server packets.
+##	Do not audit attempts to send mysqld_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54891,17 +55777,17 @@ interface(`corenet_send_nessus_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_nessus_server_packets',`
+interface(`corenet_dontaudit_send_mysqld_server_packets',`
 	gen_require(`
-		type nessus_server_packet_t;
+		type mysqld_server_packet_t;
 	')
 
-	dontaudit $1 nessus_server_packet_t:packet send;
+	dontaudit $1 mysqld_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive nessus_server packets.
+##	Receive mysqld_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54910,17 +55796,17 @@ interface(`corenet_dontaudit_send_nessus_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_nessus_server_packets',`
+interface(`corenet_receive_mysqld_server_packets',`
 	gen_require(`
-		type nessus_server_packet_t;
+		type mysqld_server_packet_t;
 	')
 
-	allow $1 nessus_server_packet_t:packet recv;
+	allow $1 mysqld_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive nessus_server packets.
+##	Do not audit attempts to receive mysqld_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54929,17 +55815,17 @@ interface(`corenet_receive_nessus_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_nessus_server_packets',`
+interface(`corenet_dontaudit_receive_mysqld_server_packets',`
 	gen_require(`
-		type nessus_server_packet_t;
+		type mysqld_server_packet_t;
 	')
 
-	dontaudit $1 nessus_server_packet_t:packet recv;
+	dontaudit $1 mysqld_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive nessus_server packets.
+##	Send and receive mysqld_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54948,14 +55834,14 @@ interface(`corenet_dontaudit_receive_nessus_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_nessus_server_packets',`
-	corenet_send_nessus_server_packets($1)
-	corenet_receive_nessus_server_packets($1)
+interface(`corenet_sendrecv_mysqld_server_packets',`
+	corenet_send_mysqld_server_packets($1)
+	corenet_receive_mysqld_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive nessus_server packets.
+##	Do not audit attempts to send and receive mysqld_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54964,14 +55850,14 @@ interface(`corenet_sendrecv_nessus_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_nessus_server_packets',`
-	corenet_dontaudit_send_nessus_server_packets($1)
-	corenet_dontaudit_receive_nessus_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_mysqld_server_packets',`
+	corenet_dontaudit_send_mysqld_server_packets($1)
+	corenet_dontaudit_receive_mysqld_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to nessus_server the packet type.
+##	Relabel packets to mysqld_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -54979,12 +55865,12 @@ interface(`corenet_dontaudit_sendrecv_nessus_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_nessus_server_packets',`
+interface(`corenet_relabelto_mysqld_server_packets',`
 	gen_require(`
-		type nessus_server_packet_t;
+		type mysqld_server_packet_t;
 	')
 
-	allow $1 nessus_server_packet_t:packet relabelto;
+	allow $1 mysqld_server_packet_t:packet relabelto;
 ')
 
 
@@ -54992,7 +55878,7 @@ interface(`corenet_relabelto_nessus_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the netport port.
+##	Send and receive TCP traffic on the mysqlmanagerd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55001,17 +55887,17 @@ interface(`corenet_relabelto_nessus_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_netport_port',`
+interface(`corenet_tcp_sendrecv_mysqlmanagerd_port',`
 	gen_require(`
-		type netport_port_t;
+		type mysqlmanagerd_port_t;
 	')
 
-	allow $1 netport_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 mysqlmanagerd_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the netport port.
+##	Send UDP traffic on the mysqlmanagerd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55020,17 +55906,17 @@ interface(`corenet_tcp_sendrecv_netport_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_netport_port',`
+interface(`corenet_udp_send_mysqlmanagerd_port',`
 	gen_require(`
-		type netport_port_t;
+		type mysqlmanagerd_port_t;
 	')
 
-	allow $1 netport_port_t:udp_socket send_msg;
+	allow $1 mysqlmanagerd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the netport port.
+##	Do not audit attempts to send UDP traffic on the mysqlmanagerd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55039,17 +55925,17 @@ interface(`corenet_udp_send_netport_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_netport_port',`
+interface(`corenet_dontaudit_udp_send_mysqlmanagerd_port',`
 	gen_require(`
-		type netport_port_t;
+		type mysqlmanagerd_port_t;
 	')
 
-	dontaudit $1 netport_port_t:udp_socket send_msg;
+	dontaudit $1 mysqlmanagerd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the netport port.
+##	Receive UDP traffic on the mysqlmanagerd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55058,17 +55944,17 @@ interface(`corenet_dontaudit_udp_send_netport_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_netport_port',`
+interface(`corenet_udp_receive_mysqlmanagerd_port',`
 	gen_require(`
-		type netport_port_t;
+		type mysqlmanagerd_port_t;
 	')
 
-	allow $1 netport_port_t:udp_socket recv_msg;
+	allow $1 mysqlmanagerd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the netport port.
+##	Do not audit attempts to receive UDP traffic on the mysqlmanagerd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55077,17 +55963,17 @@ interface(`corenet_udp_receive_netport_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_netport_port',`
+interface(`corenet_dontaudit_udp_receive_mysqlmanagerd_port',`
 	gen_require(`
-		type netport_port_t;
+		type mysqlmanagerd_port_t;
 	')
 
-	dontaudit $1 netport_port_t:udp_socket recv_msg;
+	dontaudit $1 mysqlmanagerd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the netport port.
+##	Send and receive UDP traffic on the mysqlmanagerd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55096,15 +55982,15 @@ interface(`corenet_dontaudit_udp_receive_netport_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_netport_port',`
-	corenet_udp_send_netport_port($1)
-	corenet_udp_receive_netport_port($1)
+interface(`corenet_udp_sendrecv_mysqlmanagerd_port',`
+	corenet_udp_send_mysqlmanagerd_port($1)
+	corenet_udp_receive_mysqlmanagerd_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the netport port.
+##	UDP traffic on the mysqlmanagerd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55113,14 +55999,14 @@ interface(`corenet_udp_sendrecv_netport_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_netport_port',`
-	corenet_dontaudit_udp_send_netport_port($1)
-	corenet_dontaudit_udp_receive_netport_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_mysqlmanagerd_port',`
+	corenet_dontaudit_udp_send_mysqlmanagerd_port($1)
+	corenet_dontaudit_udp_receive_mysqlmanagerd_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the netport port.
+##	Bind TCP sockets to the mysqlmanagerd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55129,18 +56015,18 @@ interface(`corenet_dontaudit_udp_sendrecv_netport_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_netport_port',`
+interface(`corenet_tcp_bind_mysqlmanagerd_port',`
 	gen_require(`
-		type netport_port_t;
+		type mysqlmanagerd_port_t;
 	')
 
-	allow $1 netport_port_t:tcp_socket name_bind;
+	allow $1 mysqlmanagerd_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the netport port.
+##	Bind UDP sockets to the mysqlmanagerd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55149,18 +56035,18 @@ interface(`corenet_tcp_bind_netport_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_netport_port',`
+interface(`corenet_udp_bind_mysqlmanagerd_port',`
 	gen_require(`
-		type netport_port_t;
+		type mysqlmanagerd_port_t;
 	')
 
-	allow $1 netport_port_t:udp_socket name_bind;
+	allow $1 mysqlmanagerd_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the netport port.
+##	Make a TCP connection to the mysqlmanagerd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55168,18 +56054,18 @@ interface(`corenet_udp_bind_netport_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_netport_port',`
+interface(`corenet_tcp_connect_mysqlmanagerd_port',`
 	gen_require(`
-		type netport_port_t;
+		type mysqlmanagerd_port_t;
 	')
 
-	allow $1 netport_port_t:tcp_socket name_connect;
+	allow $1 mysqlmanagerd_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send netport_client packets.
+##	Send mysqlmanagerd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55188,17 +56074,17 @@ interface(`corenet_tcp_connect_netport_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_netport_client_packets',`
+interface(`corenet_send_mysqlmanagerd_client_packets',`
 	gen_require(`
-		type netport_client_packet_t;
+		type mysqlmanagerd_client_packet_t;
 	')
 
-	allow $1 netport_client_packet_t:packet send;
+	allow $1 mysqlmanagerd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send netport_client packets.
+##	Do not audit attempts to send mysqlmanagerd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55207,17 +56093,17 @@ interface(`corenet_send_netport_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_netport_client_packets',`
+interface(`corenet_dontaudit_send_mysqlmanagerd_client_packets',`
 	gen_require(`
-		type netport_client_packet_t;
+		type mysqlmanagerd_client_packet_t;
 	')
 
-	dontaudit $1 netport_client_packet_t:packet send;
+	dontaudit $1 mysqlmanagerd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive netport_client packets.
+##	Receive mysqlmanagerd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55226,17 +56112,17 @@ interface(`corenet_dontaudit_send_netport_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_netport_client_packets',`
+interface(`corenet_receive_mysqlmanagerd_client_packets',`
 	gen_require(`
-		type netport_client_packet_t;
+		type mysqlmanagerd_client_packet_t;
 	')
 
-	allow $1 netport_client_packet_t:packet recv;
+	allow $1 mysqlmanagerd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive netport_client packets.
+##	Do not audit attempts to receive mysqlmanagerd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55245,17 +56131,17 @@ interface(`corenet_receive_netport_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_netport_client_packets',`
+interface(`corenet_dontaudit_receive_mysqlmanagerd_client_packets',`
 	gen_require(`
-		type netport_client_packet_t;
+		type mysqlmanagerd_client_packet_t;
 	')
 
-	dontaudit $1 netport_client_packet_t:packet recv;
+	dontaudit $1 mysqlmanagerd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive netport_client packets.
+##	Send and receive mysqlmanagerd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55264,14 +56150,14 @@ interface(`corenet_dontaudit_receive_netport_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_netport_client_packets',`
-	corenet_send_netport_client_packets($1)
-	corenet_receive_netport_client_packets($1)
+interface(`corenet_sendrecv_mysqlmanagerd_client_packets',`
+	corenet_send_mysqlmanagerd_client_packets($1)
+	corenet_receive_mysqlmanagerd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive netport_client packets.
+##	Do not audit attempts to send and receive mysqlmanagerd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55280,14 +56166,14 @@ interface(`corenet_sendrecv_netport_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_netport_client_packets',`
-	corenet_dontaudit_send_netport_client_packets($1)
-	corenet_dontaudit_receive_netport_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_mysqlmanagerd_client_packets',`
+	corenet_dontaudit_send_mysqlmanagerd_client_packets($1)
+	corenet_dontaudit_receive_mysqlmanagerd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to netport_client the packet type.
+##	Relabel packets to mysqlmanagerd_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55295,18 +56181,18 @@ interface(`corenet_dontaudit_sendrecv_netport_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_netport_client_packets',`
+interface(`corenet_relabelto_mysqlmanagerd_client_packets',`
 	gen_require(`
-		type netport_client_packet_t;
+		type mysqlmanagerd_client_packet_t;
 	')
 
-	allow $1 netport_client_packet_t:packet relabelto;
+	allow $1 mysqlmanagerd_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send netport_server packets.
+##	Send mysqlmanagerd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55315,17 +56201,17 @@ interface(`corenet_relabelto_netport_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_netport_server_packets',`
+interface(`corenet_send_mysqlmanagerd_server_packets',`
 	gen_require(`
-		type netport_server_packet_t;
+		type mysqlmanagerd_server_packet_t;
 	')
 
-	allow $1 netport_server_packet_t:packet send;
+	allow $1 mysqlmanagerd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send netport_server packets.
+##	Do not audit attempts to send mysqlmanagerd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55334,17 +56220,17 @@ interface(`corenet_send_netport_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_netport_server_packets',`
+interface(`corenet_dontaudit_send_mysqlmanagerd_server_packets',`
 	gen_require(`
-		type netport_server_packet_t;
+		type mysqlmanagerd_server_packet_t;
 	')
 
-	dontaudit $1 netport_server_packet_t:packet send;
+	dontaudit $1 mysqlmanagerd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive netport_server packets.
+##	Receive mysqlmanagerd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55353,17 +56239,17 @@ interface(`corenet_dontaudit_send_netport_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_netport_server_packets',`
+interface(`corenet_receive_mysqlmanagerd_server_packets',`
 	gen_require(`
-		type netport_server_packet_t;
+		type mysqlmanagerd_server_packet_t;
 	')
 
-	allow $1 netport_server_packet_t:packet recv;
+	allow $1 mysqlmanagerd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive netport_server packets.
+##	Do not audit attempts to receive mysqlmanagerd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55372,17 +56258,17 @@ interface(`corenet_receive_netport_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_netport_server_packets',`
+interface(`corenet_dontaudit_receive_mysqlmanagerd_server_packets',`
 	gen_require(`
-		type netport_server_packet_t;
+		type mysqlmanagerd_server_packet_t;
 	')
 
-	dontaudit $1 netport_server_packet_t:packet recv;
+	dontaudit $1 mysqlmanagerd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive netport_server packets.
+##	Send and receive mysqlmanagerd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55391,14 +56277,14 @@ interface(`corenet_dontaudit_receive_netport_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_netport_server_packets',`
-	corenet_send_netport_server_packets($1)
-	corenet_receive_netport_server_packets($1)
+interface(`corenet_sendrecv_mysqlmanagerd_server_packets',`
+	corenet_send_mysqlmanagerd_server_packets($1)
+	corenet_receive_mysqlmanagerd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive netport_server packets.
+##	Do not audit attempts to send and receive mysqlmanagerd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55407,14 +56293,14 @@ interface(`corenet_sendrecv_netport_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_netport_server_packets',`
-	corenet_dontaudit_send_netport_server_packets($1)
-	corenet_dontaudit_receive_netport_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_mysqlmanagerd_server_packets',`
+	corenet_dontaudit_send_mysqlmanagerd_server_packets($1)
+	corenet_dontaudit_receive_mysqlmanagerd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to netport_server the packet type.
+##	Relabel packets to mysqlmanagerd_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55422,12 +56308,12 @@ interface(`corenet_dontaudit_sendrecv_netport_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_netport_server_packets',`
+interface(`corenet_relabelto_mysqlmanagerd_server_packets',`
 	gen_require(`
-		type netport_server_packet_t;
+		type mysqlmanagerd_server_packet_t;
 	')
 
-	allow $1 netport_server_packet_t:packet relabelto;
+	allow $1 mysqlmanagerd_server_packet_t:packet relabelto;
 ')
 
 
@@ -55435,7 +56321,7 @@ interface(`corenet_relabelto_netport_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the netsupport port.
+##	Send and receive TCP traffic on the nessus port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55444,17 +56330,17 @@ interface(`corenet_relabelto_netport_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_netsupport_port',`
+interface(`corenet_tcp_sendrecv_nessus_port',`
 	gen_require(`
-		type netsupport_port_t;
+		type nessus_port_t;
 	')
 
-	allow $1 netsupport_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 nessus_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the netsupport port.
+##	Send UDP traffic on the nessus port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55463,17 +56349,17 @@ interface(`corenet_tcp_sendrecv_netsupport_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_netsupport_port',`
+interface(`corenet_udp_send_nessus_port',`
 	gen_require(`
-		type netsupport_port_t;
+		type nessus_port_t;
 	')
 
-	allow $1 netsupport_port_t:udp_socket send_msg;
+	allow $1 nessus_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the netsupport port.
+##	Do not audit attempts to send UDP traffic on the nessus port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55482,17 +56368,17 @@ interface(`corenet_udp_send_netsupport_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_netsupport_port',`
+interface(`corenet_dontaudit_udp_send_nessus_port',`
 	gen_require(`
-		type netsupport_port_t;
+		type nessus_port_t;
 	')
 
-	dontaudit $1 netsupport_port_t:udp_socket send_msg;
+	dontaudit $1 nessus_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the netsupport port.
+##	Receive UDP traffic on the nessus port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55501,17 +56387,17 @@ interface(`corenet_dontaudit_udp_send_netsupport_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_netsupport_port',`
+interface(`corenet_udp_receive_nessus_port',`
 	gen_require(`
-		type netsupport_port_t;
+		type nessus_port_t;
 	')
 
-	allow $1 netsupport_port_t:udp_socket recv_msg;
+	allow $1 nessus_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the netsupport port.
+##	Do not audit attempts to receive UDP traffic on the nessus port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55520,17 +56406,17 @@ interface(`corenet_udp_receive_netsupport_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_netsupport_port',`
+interface(`corenet_dontaudit_udp_receive_nessus_port',`
 	gen_require(`
-		type netsupport_port_t;
+		type nessus_port_t;
 	')
 
-	dontaudit $1 netsupport_port_t:udp_socket recv_msg;
+	dontaudit $1 nessus_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the netsupport port.
+##	Send and receive UDP traffic on the nessus port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55539,15 +56425,15 @@ interface(`corenet_dontaudit_udp_receive_netsupport_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_netsupport_port',`
-	corenet_udp_send_netsupport_port($1)
-	corenet_udp_receive_netsupport_port($1)
+interface(`corenet_udp_sendrecv_nessus_port',`
+	corenet_udp_send_nessus_port($1)
+	corenet_udp_receive_nessus_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the netsupport port.
+##	UDP traffic on the nessus port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55556,14 +56442,14 @@ interface(`corenet_udp_sendrecv_netsupport_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_netsupport_port',`
-	corenet_dontaudit_udp_send_netsupport_port($1)
-	corenet_dontaudit_udp_receive_netsupport_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_nessus_port',`
+	corenet_dontaudit_udp_send_nessus_port($1)
+	corenet_dontaudit_udp_receive_nessus_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the netsupport port.
+##	Bind TCP sockets to the nessus port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55572,18 +56458,18 @@ interface(`corenet_dontaudit_udp_sendrecv_netsupport_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_netsupport_port',`
+interface(`corenet_tcp_bind_nessus_port',`
 	gen_require(`
-		type netsupport_port_t;
+		type nessus_port_t;
 	')
 
-	allow $1 netsupport_port_t:tcp_socket name_bind;
+	allow $1 nessus_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the netsupport port.
+##	Bind UDP sockets to the nessus port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55592,18 +56478,18 @@ interface(`corenet_tcp_bind_netsupport_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_netsupport_port',`
+interface(`corenet_udp_bind_nessus_port',`
 	gen_require(`
-		type netsupport_port_t;
+		type nessus_port_t;
 	')
 
-	allow $1 netsupport_port_t:udp_socket name_bind;
+	allow $1 nessus_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the netsupport port.
+##	Make a TCP connection to the nessus port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55611,18 +56497,18 @@ interface(`corenet_udp_bind_netsupport_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_netsupport_port',`
+interface(`corenet_tcp_connect_nessus_port',`
 	gen_require(`
-		type netsupport_port_t;
+		type nessus_port_t;
 	')
 
-	allow $1 netsupport_port_t:tcp_socket name_connect;
+	allow $1 nessus_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send netsupport_client packets.
+##	Send nessus_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55631,17 +56517,17 @@ interface(`corenet_tcp_connect_netsupport_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_netsupport_client_packets',`
+interface(`corenet_send_nessus_client_packets',`
 	gen_require(`
-		type netsupport_client_packet_t;
+		type nessus_client_packet_t;
 	')
 
-	allow $1 netsupport_client_packet_t:packet send;
+	allow $1 nessus_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send netsupport_client packets.
+##	Do not audit attempts to send nessus_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55650,17 +56536,17 @@ interface(`corenet_send_netsupport_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_netsupport_client_packets',`
+interface(`corenet_dontaudit_send_nessus_client_packets',`
 	gen_require(`
-		type netsupport_client_packet_t;
+		type nessus_client_packet_t;
 	')
 
-	dontaudit $1 netsupport_client_packet_t:packet send;
+	dontaudit $1 nessus_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive netsupport_client packets.
+##	Receive nessus_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55669,17 +56555,17 @@ interface(`corenet_dontaudit_send_netsupport_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_netsupport_client_packets',`
+interface(`corenet_receive_nessus_client_packets',`
 	gen_require(`
-		type netsupport_client_packet_t;
+		type nessus_client_packet_t;
 	')
 
-	allow $1 netsupport_client_packet_t:packet recv;
+	allow $1 nessus_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive netsupport_client packets.
+##	Do not audit attempts to receive nessus_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55688,17 +56574,17 @@ interface(`corenet_receive_netsupport_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_netsupport_client_packets',`
+interface(`corenet_dontaudit_receive_nessus_client_packets',`
 	gen_require(`
-		type netsupport_client_packet_t;
+		type nessus_client_packet_t;
 	')
 
-	dontaudit $1 netsupport_client_packet_t:packet recv;
+	dontaudit $1 nessus_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive netsupport_client packets.
+##	Send and receive nessus_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55707,14 +56593,14 @@ interface(`corenet_dontaudit_receive_netsupport_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_netsupport_client_packets',`
-	corenet_send_netsupport_client_packets($1)
-	corenet_receive_netsupport_client_packets($1)
+interface(`corenet_sendrecv_nessus_client_packets',`
+	corenet_send_nessus_client_packets($1)
+	corenet_receive_nessus_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive netsupport_client packets.
+##	Do not audit attempts to send and receive nessus_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55723,14 +56609,14 @@ interface(`corenet_sendrecv_netsupport_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_netsupport_client_packets',`
-	corenet_dontaudit_send_netsupport_client_packets($1)
-	corenet_dontaudit_receive_netsupport_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_nessus_client_packets',`
+	corenet_dontaudit_send_nessus_client_packets($1)
+	corenet_dontaudit_receive_nessus_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to netsupport_client the packet type.
+##	Relabel packets to nessus_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55738,18 +56624,18 @@ interface(`corenet_dontaudit_sendrecv_netsupport_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_netsupport_client_packets',`
+interface(`corenet_relabelto_nessus_client_packets',`
 	gen_require(`
-		type netsupport_client_packet_t;
+		type nessus_client_packet_t;
 	')
 
-	allow $1 netsupport_client_packet_t:packet relabelto;
+	allow $1 nessus_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send netsupport_server packets.
+##	Send nessus_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55758,17 +56644,17 @@ interface(`corenet_relabelto_netsupport_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_netsupport_server_packets',`
+interface(`corenet_send_nessus_server_packets',`
 	gen_require(`
-		type netsupport_server_packet_t;
+		type nessus_server_packet_t;
 	')
 
-	allow $1 netsupport_server_packet_t:packet send;
+	allow $1 nessus_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send netsupport_server packets.
+##	Do not audit attempts to send nessus_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55777,17 +56663,17 @@ interface(`corenet_send_netsupport_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_netsupport_server_packets',`
+interface(`corenet_dontaudit_send_nessus_server_packets',`
 	gen_require(`
-		type netsupport_server_packet_t;
+		type nessus_server_packet_t;
 	')
 
-	dontaudit $1 netsupport_server_packet_t:packet send;
+	dontaudit $1 nessus_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive netsupport_server packets.
+##	Receive nessus_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55796,17 +56682,17 @@ interface(`corenet_dontaudit_send_netsupport_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_netsupport_server_packets',`
+interface(`corenet_receive_nessus_server_packets',`
 	gen_require(`
-		type netsupport_server_packet_t;
+		type nessus_server_packet_t;
 	')
 
-	allow $1 netsupport_server_packet_t:packet recv;
+	allow $1 nessus_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive netsupport_server packets.
+##	Do not audit attempts to receive nessus_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55815,17 +56701,17 @@ interface(`corenet_receive_netsupport_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_netsupport_server_packets',`
+interface(`corenet_dontaudit_receive_nessus_server_packets',`
 	gen_require(`
-		type netsupport_server_packet_t;
+		type nessus_server_packet_t;
 	')
 
-	dontaudit $1 netsupport_server_packet_t:packet recv;
+	dontaudit $1 nessus_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive netsupport_server packets.
+##	Send and receive nessus_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55834,14 +56720,14 @@ interface(`corenet_dontaudit_receive_netsupport_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_netsupport_server_packets',`
-	corenet_send_netsupport_server_packets($1)
-	corenet_receive_netsupport_server_packets($1)
+interface(`corenet_sendrecv_nessus_server_packets',`
+	corenet_send_nessus_server_packets($1)
+	corenet_receive_nessus_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive netsupport_server packets.
+##	Do not audit attempts to send and receive nessus_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55850,14 +56736,14 @@ interface(`corenet_sendrecv_netsupport_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_netsupport_server_packets',`
-	corenet_dontaudit_send_netsupport_server_packets($1)
-	corenet_dontaudit_receive_netsupport_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_nessus_server_packets',`
+	corenet_dontaudit_send_nessus_server_packets($1)
+	corenet_dontaudit_receive_nessus_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to netsupport_server the packet type.
+##	Relabel packets to nessus_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55865,12 +56751,12 @@ interface(`corenet_dontaudit_sendrecv_netsupport_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_netsupport_server_packets',`
+interface(`corenet_relabelto_nessus_server_packets',`
 	gen_require(`
-		type netsupport_server_packet_t;
+		type nessus_server_packet_t;
 	')
 
-	allow $1 netsupport_server_packet_t:packet relabelto;
+	allow $1 nessus_server_packet_t:packet relabelto;
 ')
 
 
@@ -55878,7 +56764,7 @@ interface(`corenet_relabelto_netsupport_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the nfs port.
+##	Send and receive TCP traffic on the netport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55887,17 +56773,17 @@ interface(`corenet_relabelto_netsupport_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_nfs_port',`
+interface(`corenet_tcp_sendrecv_netport_port',`
 	gen_require(`
-		type nfs_port_t;
+		type netport_port_t;
 	')
 
-	allow $1 nfs_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 netport_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the nfs port.
+##	Send UDP traffic on the netport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55906,17 +56792,17 @@ interface(`corenet_tcp_sendrecv_nfs_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_nfs_port',`
+interface(`corenet_udp_send_netport_port',`
 	gen_require(`
-		type nfs_port_t;
+		type netport_port_t;
 	')
 
-	allow $1 nfs_port_t:udp_socket send_msg;
+	allow $1 netport_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the nfs port.
+##	Do not audit attempts to send UDP traffic on the netport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55925,17 +56811,17 @@ interface(`corenet_udp_send_nfs_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_nfs_port',`
+interface(`corenet_dontaudit_udp_send_netport_port',`
 	gen_require(`
-		type nfs_port_t;
+		type netport_port_t;
 	')
 
-	dontaudit $1 nfs_port_t:udp_socket send_msg;
+	dontaudit $1 netport_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the nfs port.
+##	Receive UDP traffic on the netport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55944,17 +56830,17 @@ interface(`corenet_dontaudit_udp_send_nfs_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_nfs_port',`
+interface(`corenet_udp_receive_netport_port',`
 	gen_require(`
-		type nfs_port_t;
+		type netport_port_t;
 	')
 
-	allow $1 nfs_port_t:udp_socket recv_msg;
+	allow $1 netport_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the nfs port.
+##	Do not audit attempts to receive UDP traffic on the netport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55963,17 +56849,17 @@ interface(`corenet_udp_receive_nfs_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_nfs_port',`
+interface(`corenet_dontaudit_udp_receive_netport_port',`
 	gen_require(`
-		type nfs_port_t;
+		type netport_port_t;
 	')
 
-	dontaudit $1 nfs_port_t:udp_socket recv_msg;
+	dontaudit $1 netport_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the nfs port.
+##	Send and receive UDP traffic on the netport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55982,15 +56868,15 @@ interface(`corenet_dontaudit_udp_receive_nfs_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_nfs_port',`
-	corenet_udp_send_nfs_port($1)
-	corenet_udp_receive_nfs_port($1)
+interface(`corenet_udp_sendrecv_netport_port',`
+	corenet_udp_send_netport_port($1)
+	corenet_udp_receive_netport_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the nfs port.
+##	UDP traffic on the netport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -55999,14 +56885,14 @@ interface(`corenet_udp_sendrecv_nfs_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_nfs_port',`
-	corenet_dontaudit_udp_send_nfs_port($1)
-	corenet_dontaudit_udp_receive_nfs_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_netport_port',`
+	corenet_dontaudit_udp_send_netport_port($1)
+	corenet_dontaudit_udp_receive_netport_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the nfs port.
+##	Bind TCP sockets to the netport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56015,18 +56901,18 @@ interface(`corenet_dontaudit_udp_sendrecv_nfs_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_nfs_port',`
+interface(`corenet_tcp_bind_netport_port',`
 	gen_require(`
-		type nfs_port_t;
+		type netport_port_t;
 	')
 
-	allow $1 nfs_port_t:tcp_socket name_bind;
+	allow $1 netport_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the nfs port.
+##	Bind UDP sockets to the netport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56035,18 +56921,18 @@ interface(`corenet_tcp_bind_nfs_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_nfs_port',`
+interface(`corenet_udp_bind_netport_port',`
 	gen_require(`
-		type nfs_port_t;
+		type netport_port_t;
 	')
 
-	allow $1 nfs_port_t:udp_socket name_bind;
+	allow $1 netport_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the nfs port.
+##	Make a TCP connection to the netport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56054,18 +56940,18 @@ interface(`corenet_udp_bind_nfs_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_nfs_port',`
+interface(`corenet_tcp_connect_netport_port',`
 	gen_require(`
-		type nfs_port_t;
+		type netport_port_t;
 	')
 
-	allow $1 nfs_port_t:tcp_socket name_connect;
+	allow $1 netport_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send nfs_client packets.
+##	Send netport_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56074,17 +56960,17 @@ interface(`corenet_tcp_connect_nfs_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_nfs_client_packets',`
+interface(`corenet_send_netport_client_packets',`
 	gen_require(`
-		type nfs_client_packet_t;
+		type netport_client_packet_t;
 	')
 
-	allow $1 nfs_client_packet_t:packet send;
+	allow $1 netport_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send nfs_client packets.
+##	Do not audit attempts to send netport_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56093,17 +56979,17 @@ interface(`corenet_send_nfs_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_nfs_client_packets',`
+interface(`corenet_dontaudit_send_netport_client_packets',`
 	gen_require(`
-		type nfs_client_packet_t;
+		type netport_client_packet_t;
 	')
 
-	dontaudit $1 nfs_client_packet_t:packet send;
+	dontaudit $1 netport_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive nfs_client packets.
+##	Receive netport_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56112,17 +56998,17 @@ interface(`corenet_dontaudit_send_nfs_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_nfs_client_packets',`
+interface(`corenet_receive_netport_client_packets',`
 	gen_require(`
-		type nfs_client_packet_t;
+		type netport_client_packet_t;
 	')
 
-	allow $1 nfs_client_packet_t:packet recv;
+	allow $1 netport_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive nfs_client packets.
+##	Do not audit attempts to receive netport_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56131,17 +57017,17 @@ interface(`corenet_receive_nfs_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_nfs_client_packets',`
+interface(`corenet_dontaudit_receive_netport_client_packets',`
 	gen_require(`
-		type nfs_client_packet_t;
+		type netport_client_packet_t;
 	')
 
-	dontaudit $1 nfs_client_packet_t:packet recv;
+	dontaudit $1 netport_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive nfs_client packets.
+##	Send and receive netport_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56150,14 +57036,14 @@ interface(`corenet_dontaudit_receive_nfs_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_nfs_client_packets',`
-	corenet_send_nfs_client_packets($1)
-	corenet_receive_nfs_client_packets($1)
+interface(`corenet_sendrecv_netport_client_packets',`
+	corenet_send_netport_client_packets($1)
+	corenet_receive_netport_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive nfs_client packets.
+##	Do not audit attempts to send and receive netport_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56166,14 +57052,14 @@ interface(`corenet_sendrecv_nfs_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_nfs_client_packets',`
-	corenet_dontaudit_send_nfs_client_packets($1)
-	corenet_dontaudit_receive_nfs_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_netport_client_packets',`
+	corenet_dontaudit_send_netport_client_packets($1)
+	corenet_dontaudit_receive_netport_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to nfs_client the packet type.
+##	Relabel packets to netport_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56181,18 +57067,18 @@ interface(`corenet_dontaudit_sendrecv_nfs_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_nfs_client_packets',`
+interface(`corenet_relabelto_netport_client_packets',`
 	gen_require(`
-		type nfs_client_packet_t;
+		type netport_client_packet_t;
 	')
 
-	allow $1 nfs_client_packet_t:packet relabelto;
+	allow $1 netport_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send nfs_server packets.
+##	Send netport_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56201,17 +57087,17 @@ interface(`corenet_relabelto_nfs_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_nfs_server_packets',`
+interface(`corenet_send_netport_server_packets',`
 	gen_require(`
-		type nfs_server_packet_t;
+		type netport_server_packet_t;
 	')
 
-	allow $1 nfs_server_packet_t:packet send;
+	allow $1 netport_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send nfs_server packets.
+##	Do not audit attempts to send netport_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56220,17 +57106,17 @@ interface(`corenet_send_nfs_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_nfs_server_packets',`
+interface(`corenet_dontaudit_send_netport_server_packets',`
 	gen_require(`
-		type nfs_server_packet_t;
+		type netport_server_packet_t;
 	')
 
-	dontaudit $1 nfs_server_packet_t:packet send;
+	dontaudit $1 netport_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive nfs_server packets.
+##	Receive netport_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56239,17 +57125,17 @@ interface(`corenet_dontaudit_send_nfs_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_nfs_server_packets',`
+interface(`corenet_receive_netport_server_packets',`
 	gen_require(`
-		type nfs_server_packet_t;
+		type netport_server_packet_t;
 	')
 
-	allow $1 nfs_server_packet_t:packet recv;
+	allow $1 netport_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive nfs_server packets.
+##	Do not audit attempts to receive netport_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56258,17 +57144,17 @@ interface(`corenet_receive_nfs_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_nfs_server_packets',`
+interface(`corenet_dontaudit_receive_netport_server_packets',`
 	gen_require(`
-		type nfs_server_packet_t;
+		type netport_server_packet_t;
 	')
 
-	dontaudit $1 nfs_server_packet_t:packet recv;
+	dontaudit $1 netport_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive nfs_server packets.
+##	Send and receive netport_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56277,14 +57163,14 @@ interface(`corenet_dontaudit_receive_nfs_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_nfs_server_packets',`
-	corenet_send_nfs_server_packets($1)
-	corenet_receive_nfs_server_packets($1)
+interface(`corenet_sendrecv_netport_server_packets',`
+	corenet_send_netport_server_packets($1)
+	corenet_receive_netport_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive nfs_server packets.
+##	Do not audit attempts to send and receive netport_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56293,14 +57179,14 @@ interface(`corenet_sendrecv_nfs_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_nfs_server_packets',`
-	corenet_dontaudit_send_nfs_server_packets($1)
-	corenet_dontaudit_receive_nfs_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_netport_server_packets',`
+	corenet_dontaudit_send_netport_server_packets($1)
+	corenet_dontaudit_receive_netport_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to nfs_server the packet type.
+##	Relabel packets to netport_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56308,12 +57194,12 @@ interface(`corenet_dontaudit_sendrecv_nfs_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_nfs_server_packets',`
+interface(`corenet_relabelto_netport_server_packets',`
 	gen_require(`
-		type nfs_server_packet_t;
+		type netport_server_packet_t;
 	')
 
-	allow $1 nfs_server_packet_t:packet relabelto;
+	allow $1 netport_server_packet_t:packet relabelto;
 ')
 
 
@@ -56321,7 +57207,7 @@ interface(`corenet_relabelto_nfs_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the nfsrdma port.
+##	Send and receive TCP traffic on the netsupport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56330,17 +57216,17 @@ interface(`corenet_relabelto_nfs_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_nfsrdma_port',`
+interface(`corenet_tcp_sendrecv_netsupport_port',`
 	gen_require(`
-		type nfsrdma_port_t;
+		type netsupport_port_t;
 	')
 
-	allow $1 nfsrdma_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 netsupport_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the nfsrdma port.
+##	Send UDP traffic on the netsupport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56349,17 +57235,17 @@ interface(`corenet_tcp_sendrecv_nfsrdma_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_nfsrdma_port',`
+interface(`corenet_udp_send_netsupport_port',`
 	gen_require(`
-		type nfsrdma_port_t;
+		type netsupport_port_t;
 	')
 
-	allow $1 nfsrdma_port_t:udp_socket send_msg;
+	allow $1 netsupport_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the nfsrdma port.
+##	Do not audit attempts to send UDP traffic on the netsupport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56368,17 +57254,17 @@ interface(`corenet_udp_send_nfsrdma_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_nfsrdma_port',`
+interface(`corenet_dontaudit_udp_send_netsupport_port',`
 	gen_require(`
-		type nfsrdma_port_t;
+		type netsupport_port_t;
 	')
 
-	dontaudit $1 nfsrdma_port_t:udp_socket send_msg;
+	dontaudit $1 netsupport_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the nfsrdma port.
+##	Receive UDP traffic on the netsupport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56387,17 +57273,17 @@ interface(`corenet_dontaudit_udp_send_nfsrdma_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_nfsrdma_port',`
+interface(`corenet_udp_receive_netsupport_port',`
 	gen_require(`
-		type nfsrdma_port_t;
+		type netsupport_port_t;
 	')
 
-	allow $1 nfsrdma_port_t:udp_socket recv_msg;
+	allow $1 netsupport_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the nfsrdma port.
+##	Do not audit attempts to receive UDP traffic on the netsupport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56406,17 +57292,17 @@ interface(`corenet_udp_receive_nfsrdma_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_nfsrdma_port',`
+interface(`corenet_dontaudit_udp_receive_netsupport_port',`
 	gen_require(`
-		type nfsrdma_port_t;
+		type netsupport_port_t;
 	')
 
-	dontaudit $1 nfsrdma_port_t:udp_socket recv_msg;
+	dontaudit $1 netsupport_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the nfsrdma port.
+##	Send and receive UDP traffic on the netsupport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56425,15 +57311,15 @@ interface(`corenet_dontaudit_udp_receive_nfsrdma_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_nfsrdma_port',`
-	corenet_udp_send_nfsrdma_port($1)
-	corenet_udp_receive_nfsrdma_port($1)
+interface(`corenet_udp_sendrecv_netsupport_port',`
+	corenet_udp_send_netsupport_port($1)
+	corenet_udp_receive_netsupport_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the nfsrdma port.
+##	UDP traffic on the netsupport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56442,14 +57328,14 @@ interface(`corenet_udp_sendrecv_nfsrdma_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_nfsrdma_port',`
-	corenet_dontaudit_udp_send_nfsrdma_port($1)
-	corenet_dontaudit_udp_receive_nfsrdma_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_netsupport_port',`
+	corenet_dontaudit_udp_send_netsupport_port($1)
+	corenet_dontaudit_udp_receive_netsupport_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the nfsrdma port.
+##	Bind TCP sockets to the netsupport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56458,18 +57344,18 @@ interface(`corenet_dontaudit_udp_sendrecv_nfsrdma_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_nfsrdma_port',`
+interface(`corenet_tcp_bind_netsupport_port',`
 	gen_require(`
-		type nfsrdma_port_t;
+		type netsupport_port_t;
 	')
 
-	allow $1 nfsrdma_port_t:tcp_socket name_bind;
+	allow $1 netsupport_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the nfsrdma port.
+##	Bind UDP sockets to the netsupport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56478,18 +57364,18 @@ interface(`corenet_tcp_bind_nfsrdma_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_nfsrdma_port',`
+interface(`corenet_udp_bind_netsupport_port',`
 	gen_require(`
-		type nfsrdma_port_t;
+		type netsupport_port_t;
 	')
 
-	allow $1 nfsrdma_port_t:udp_socket name_bind;
+	allow $1 netsupport_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the nfsrdma port.
+##	Make a TCP connection to the netsupport port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56497,18 +57383,18 @@ interface(`corenet_udp_bind_nfsrdma_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_nfsrdma_port',`
+interface(`corenet_tcp_connect_netsupport_port',`
 	gen_require(`
-		type nfsrdma_port_t;
+		type netsupport_port_t;
 	')
 
-	allow $1 nfsrdma_port_t:tcp_socket name_connect;
+	allow $1 netsupport_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send nfsrdma_client packets.
+##	Send netsupport_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56517,17 +57403,17 @@ interface(`corenet_tcp_connect_nfsrdma_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_nfsrdma_client_packets',`
+interface(`corenet_send_netsupport_client_packets',`
 	gen_require(`
-		type nfsrdma_client_packet_t;
+		type netsupport_client_packet_t;
 	')
 
-	allow $1 nfsrdma_client_packet_t:packet send;
+	allow $1 netsupport_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send nfsrdma_client packets.
+##	Do not audit attempts to send netsupport_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56536,17 +57422,17 @@ interface(`corenet_send_nfsrdma_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_nfsrdma_client_packets',`
+interface(`corenet_dontaudit_send_netsupport_client_packets',`
 	gen_require(`
-		type nfsrdma_client_packet_t;
+		type netsupport_client_packet_t;
 	')
 
-	dontaudit $1 nfsrdma_client_packet_t:packet send;
+	dontaudit $1 netsupport_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive nfsrdma_client packets.
+##	Receive netsupport_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56555,17 +57441,17 @@ interface(`corenet_dontaudit_send_nfsrdma_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_nfsrdma_client_packets',`
+interface(`corenet_receive_netsupport_client_packets',`
 	gen_require(`
-		type nfsrdma_client_packet_t;
+		type netsupport_client_packet_t;
 	')
 
-	allow $1 nfsrdma_client_packet_t:packet recv;
+	allow $1 netsupport_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive nfsrdma_client packets.
+##	Do not audit attempts to receive netsupport_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56574,17 +57460,17 @@ interface(`corenet_receive_nfsrdma_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_nfsrdma_client_packets',`
+interface(`corenet_dontaudit_receive_netsupport_client_packets',`
 	gen_require(`
-		type nfsrdma_client_packet_t;
+		type netsupport_client_packet_t;
 	')
 
-	dontaudit $1 nfsrdma_client_packet_t:packet recv;
+	dontaudit $1 netsupport_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive nfsrdma_client packets.
+##	Send and receive netsupport_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56593,14 +57479,14 @@ interface(`corenet_dontaudit_receive_nfsrdma_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_nfsrdma_client_packets',`
-	corenet_send_nfsrdma_client_packets($1)
-	corenet_receive_nfsrdma_client_packets($1)
+interface(`corenet_sendrecv_netsupport_client_packets',`
+	corenet_send_netsupport_client_packets($1)
+	corenet_receive_netsupport_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive nfsrdma_client packets.
+##	Do not audit attempts to send and receive netsupport_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56609,14 +57495,14 @@ interface(`corenet_sendrecv_nfsrdma_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_nfsrdma_client_packets',`
-	corenet_dontaudit_send_nfsrdma_client_packets($1)
-	corenet_dontaudit_receive_nfsrdma_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_netsupport_client_packets',`
+	corenet_dontaudit_send_netsupport_client_packets($1)
+	corenet_dontaudit_receive_netsupport_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to nfsrdma_client the packet type.
+##	Relabel packets to netsupport_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56624,18 +57510,18 @@ interface(`corenet_dontaudit_sendrecv_nfsrdma_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_nfsrdma_client_packets',`
+interface(`corenet_relabelto_netsupport_client_packets',`
 	gen_require(`
-		type nfsrdma_client_packet_t;
+		type netsupport_client_packet_t;
 	')
 
-	allow $1 nfsrdma_client_packet_t:packet relabelto;
+	allow $1 netsupport_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send nfsrdma_server packets.
+##	Send netsupport_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56644,17 +57530,17 @@ interface(`corenet_relabelto_nfsrdma_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_nfsrdma_server_packets',`
+interface(`corenet_send_netsupport_server_packets',`
 	gen_require(`
-		type nfsrdma_server_packet_t;
+		type netsupport_server_packet_t;
 	')
 
-	allow $1 nfsrdma_server_packet_t:packet send;
+	allow $1 netsupport_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send nfsrdma_server packets.
+##	Do not audit attempts to send netsupport_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56663,17 +57549,17 @@ interface(`corenet_send_nfsrdma_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_nfsrdma_server_packets',`
+interface(`corenet_dontaudit_send_netsupport_server_packets',`
 	gen_require(`
-		type nfsrdma_server_packet_t;
+		type netsupport_server_packet_t;
 	')
 
-	dontaudit $1 nfsrdma_server_packet_t:packet send;
+	dontaudit $1 netsupport_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive nfsrdma_server packets.
+##	Receive netsupport_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56682,17 +57568,17 @@ interface(`corenet_dontaudit_send_nfsrdma_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_nfsrdma_server_packets',`
+interface(`corenet_receive_netsupport_server_packets',`
 	gen_require(`
-		type nfsrdma_server_packet_t;
+		type netsupport_server_packet_t;
 	')
 
-	allow $1 nfsrdma_server_packet_t:packet recv;
+	allow $1 netsupport_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive nfsrdma_server packets.
+##	Do not audit attempts to receive netsupport_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56701,17 +57587,17 @@ interface(`corenet_receive_nfsrdma_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_nfsrdma_server_packets',`
+interface(`corenet_dontaudit_receive_netsupport_server_packets',`
 	gen_require(`
-		type nfsrdma_server_packet_t;
+		type netsupport_server_packet_t;
 	')
 
-	dontaudit $1 nfsrdma_server_packet_t:packet recv;
+	dontaudit $1 netsupport_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive nfsrdma_server packets.
+##	Send and receive netsupport_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56720,14 +57606,14 @@ interface(`corenet_dontaudit_receive_nfsrdma_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_nfsrdma_server_packets',`
-	corenet_send_nfsrdma_server_packets($1)
-	corenet_receive_nfsrdma_server_packets($1)
+interface(`corenet_sendrecv_netsupport_server_packets',`
+	corenet_send_netsupport_server_packets($1)
+	corenet_receive_netsupport_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive nfsrdma_server packets.
+##	Do not audit attempts to send and receive netsupport_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56736,14 +57622,14 @@ interface(`corenet_sendrecv_nfsrdma_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_nfsrdma_server_packets',`
-	corenet_dontaudit_send_nfsrdma_server_packets($1)
-	corenet_dontaudit_receive_nfsrdma_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_netsupport_server_packets',`
+	corenet_dontaudit_send_netsupport_server_packets($1)
+	corenet_dontaudit_receive_netsupport_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to nfsrdma_server the packet type.
+##	Relabel packets to netsupport_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56751,12 +57637,12 @@ interface(`corenet_dontaudit_sendrecv_nfsrdma_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_nfsrdma_server_packets',`
+interface(`corenet_relabelto_netsupport_server_packets',`
 	gen_require(`
-		type nfsrdma_server_packet_t;
+		type netsupport_server_packet_t;
 	')
 
-	allow $1 nfsrdma_server_packet_t:packet relabelto;
+	allow $1 netsupport_server_packet_t:packet relabelto;
 ')
 
 
@@ -56764,7 +57650,7 @@ interface(`corenet_relabelto_nfsrdma_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the nmbd port.
+##	Send and receive TCP traffic on the nfs port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56773,17 +57659,17 @@ interface(`corenet_relabelto_nfsrdma_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_nmbd_port',`
+interface(`corenet_tcp_sendrecv_nfs_port',`
 	gen_require(`
-		type nmbd_port_t;
+		type nfs_port_t;
 	')
 
-	allow $1 nmbd_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 nfs_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the nmbd port.
+##	Send UDP traffic on the nfs port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56792,17 +57678,17 @@ interface(`corenet_tcp_sendrecv_nmbd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_nmbd_port',`
+interface(`corenet_udp_send_nfs_port',`
 	gen_require(`
-		type nmbd_port_t;
+		type nfs_port_t;
 	')
 
-	allow $1 nmbd_port_t:udp_socket send_msg;
+	allow $1 nfs_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the nmbd port.
+##	Do not audit attempts to send UDP traffic on the nfs port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56811,17 +57697,17 @@ interface(`corenet_udp_send_nmbd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_nmbd_port',`
+interface(`corenet_dontaudit_udp_send_nfs_port',`
 	gen_require(`
-		type nmbd_port_t;
+		type nfs_port_t;
 	')
 
-	dontaudit $1 nmbd_port_t:udp_socket send_msg;
+	dontaudit $1 nfs_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the nmbd port.
+##	Receive UDP traffic on the nfs port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56830,17 +57716,17 @@ interface(`corenet_dontaudit_udp_send_nmbd_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_nmbd_port',`
+interface(`corenet_udp_receive_nfs_port',`
 	gen_require(`
-		type nmbd_port_t;
+		type nfs_port_t;
 	')
 
-	allow $1 nmbd_port_t:udp_socket recv_msg;
+	allow $1 nfs_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the nmbd port.
+##	Do not audit attempts to receive UDP traffic on the nfs port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56849,17 +57735,17 @@ interface(`corenet_udp_receive_nmbd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_nmbd_port',`
+interface(`corenet_dontaudit_udp_receive_nfs_port',`
 	gen_require(`
-		type nmbd_port_t;
+		type nfs_port_t;
 	')
 
-	dontaudit $1 nmbd_port_t:udp_socket recv_msg;
+	dontaudit $1 nfs_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the nmbd port.
+##	Send and receive UDP traffic on the nfs port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56868,15 +57754,15 @@ interface(`corenet_dontaudit_udp_receive_nmbd_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_nmbd_port',`
-	corenet_udp_send_nmbd_port($1)
-	corenet_udp_receive_nmbd_port($1)
+interface(`corenet_udp_sendrecv_nfs_port',`
+	corenet_udp_send_nfs_port($1)
+	corenet_udp_receive_nfs_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the nmbd port.
+##	UDP traffic on the nfs port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56885,14 +57771,14 @@ interface(`corenet_udp_sendrecv_nmbd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_nmbd_port',`
-	corenet_dontaudit_udp_send_nmbd_port($1)
-	corenet_dontaudit_udp_receive_nmbd_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_nfs_port',`
+	corenet_dontaudit_udp_send_nfs_port($1)
+	corenet_dontaudit_udp_receive_nfs_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the nmbd port.
+##	Bind TCP sockets to the nfs port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56901,18 +57787,18 @@ interface(`corenet_dontaudit_udp_sendrecv_nmbd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_nmbd_port',`
+interface(`corenet_tcp_bind_nfs_port',`
 	gen_require(`
-		type nmbd_port_t;
+		type nfs_port_t;
 	')
 
-	allow $1 nmbd_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 nfs_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the nmbd port.
+##	Bind UDP sockets to the nfs port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56921,18 +57807,18 @@ interface(`corenet_tcp_bind_nmbd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_nmbd_port',`
+interface(`corenet_udp_bind_nfs_port',`
 	gen_require(`
-		type nmbd_port_t;
+		type nfs_port_t;
 	')
 
-	allow $1 nmbd_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 nfs_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the nmbd port.
+##	Make a TCP connection to the nfs port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56940,18 +57826,18 @@ interface(`corenet_udp_bind_nmbd_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_nmbd_port',`
+interface(`corenet_tcp_connect_nfs_port',`
 	gen_require(`
-		type nmbd_port_t;
+		type nfs_port_t;
 	')
 
-	allow $1 nmbd_port_t:tcp_socket name_connect;
+	allow $1 nfs_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send nmbd_client packets.
+##	Send nfs_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56960,17 +57846,17 @@ interface(`corenet_tcp_connect_nmbd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_nmbd_client_packets',`
+interface(`corenet_send_nfs_client_packets',`
 	gen_require(`
-		type nmbd_client_packet_t;
+		type nfs_client_packet_t;
 	')
 
-	allow $1 nmbd_client_packet_t:packet send;
+	allow $1 nfs_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send nmbd_client packets.
+##	Do not audit attempts to send nfs_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56979,17 +57865,17 @@ interface(`corenet_send_nmbd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_nmbd_client_packets',`
+interface(`corenet_dontaudit_send_nfs_client_packets',`
 	gen_require(`
-		type nmbd_client_packet_t;
+		type nfs_client_packet_t;
 	')
 
-	dontaudit $1 nmbd_client_packet_t:packet send;
+	dontaudit $1 nfs_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive nmbd_client packets.
+##	Receive nfs_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -56998,17 +57884,17 @@ interface(`corenet_dontaudit_send_nmbd_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_nmbd_client_packets',`
+interface(`corenet_receive_nfs_client_packets',`
 	gen_require(`
-		type nmbd_client_packet_t;
+		type nfs_client_packet_t;
 	')
 
-	allow $1 nmbd_client_packet_t:packet recv;
+	allow $1 nfs_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive nmbd_client packets.
+##	Do not audit attempts to receive nfs_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57017,17 +57903,17 @@ interface(`corenet_receive_nmbd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_nmbd_client_packets',`
+interface(`corenet_dontaudit_receive_nfs_client_packets',`
 	gen_require(`
-		type nmbd_client_packet_t;
+		type nfs_client_packet_t;
 	')
 
-	dontaudit $1 nmbd_client_packet_t:packet recv;
+	dontaudit $1 nfs_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive nmbd_client packets.
+##	Send and receive nfs_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57036,14 +57922,14 @@ interface(`corenet_dontaudit_receive_nmbd_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_nmbd_client_packets',`
-	corenet_send_nmbd_client_packets($1)
-	corenet_receive_nmbd_client_packets($1)
+interface(`corenet_sendrecv_nfs_client_packets',`
+	corenet_send_nfs_client_packets($1)
+	corenet_receive_nfs_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive nmbd_client packets.
+##	Do not audit attempts to send and receive nfs_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57052,14 +57938,14 @@ interface(`corenet_sendrecv_nmbd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_nmbd_client_packets',`
-	corenet_dontaudit_send_nmbd_client_packets($1)
-	corenet_dontaudit_receive_nmbd_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_nfs_client_packets',`
+	corenet_dontaudit_send_nfs_client_packets($1)
+	corenet_dontaudit_receive_nfs_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to nmbd_client the packet type.
+##	Relabel packets to nfs_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57067,18 +57953,18 @@ interface(`corenet_dontaudit_sendrecv_nmbd_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_nmbd_client_packets',`
+interface(`corenet_relabelto_nfs_client_packets',`
 	gen_require(`
-		type nmbd_client_packet_t;
+		type nfs_client_packet_t;
 	')
 
-	allow $1 nmbd_client_packet_t:packet relabelto;
+	allow $1 nfs_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send nmbd_server packets.
+##	Send nfs_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57087,17 +57973,17 @@ interface(`corenet_relabelto_nmbd_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_nmbd_server_packets',`
+interface(`corenet_send_nfs_server_packets',`
 	gen_require(`
-		type nmbd_server_packet_t;
+		type nfs_server_packet_t;
 	')
 
-	allow $1 nmbd_server_packet_t:packet send;
+	allow $1 nfs_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send nmbd_server packets.
+##	Do not audit attempts to send nfs_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57106,17 +57992,17 @@ interface(`corenet_send_nmbd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_nmbd_server_packets',`
+interface(`corenet_dontaudit_send_nfs_server_packets',`
 	gen_require(`
-		type nmbd_server_packet_t;
+		type nfs_server_packet_t;
 	')
 
-	dontaudit $1 nmbd_server_packet_t:packet send;
+	dontaudit $1 nfs_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive nmbd_server packets.
+##	Receive nfs_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57125,17 +58011,17 @@ interface(`corenet_dontaudit_send_nmbd_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_nmbd_server_packets',`
+interface(`corenet_receive_nfs_server_packets',`
 	gen_require(`
-		type nmbd_server_packet_t;
+		type nfs_server_packet_t;
 	')
 
-	allow $1 nmbd_server_packet_t:packet recv;
+	allow $1 nfs_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive nmbd_server packets.
+##	Do not audit attempts to receive nfs_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57144,17 +58030,17 @@ interface(`corenet_receive_nmbd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_nmbd_server_packets',`
+interface(`corenet_dontaudit_receive_nfs_server_packets',`
 	gen_require(`
-		type nmbd_server_packet_t;
+		type nfs_server_packet_t;
 	')
 
-	dontaudit $1 nmbd_server_packet_t:packet recv;
+	dontaudit $1 nfs_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive nmbd_server packets.
+##	Send and receive nfs_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57163,14 +58049,14 @@ interface(`corenet_dontaudit_receive_nmbd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_nmbd_server_packets',`
-	corenet_send_nmbd_server_packets($1)
-	corenet_receive_nmbd_server_packets($1)
+interface(`corenet_sendrecv_nfs_server_packets',`
+	corenet_send_nfs_server_packets($1)
+	corenet_receive_nfs_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive nmbd_server packets.
+##	Do not audit attempts to send and receive nfs_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57179,14 +58065,14 @@ interface(`corenet_sendrecv_nmbd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_nmbd_server_packets',`
-	corenet_dontaudit_send_nmbd_server_packets($1)
-	corenet_dontaudit_receive_nmbd_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_nfs_server_packets',`
+	corenet_dontaudit_send_nfs_server_packets($1)
+	corenet_dontaudit_receive_nfs_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to nmbd_server the packet type.
+##	Relabel packets to nfs_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57194,12 +58080,12 @@ interface(`corenet_dontaudit_sendrecv_nmbd_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_nmbd_server_packets',`
+interface(`corenet_relabelto_nfs_server_packets',`
 	gen_require(`
-		type nmbd_server_packet_t;
+		type nfs_server_packet_t;
 	')
 
-	allow $1 nmbd_server_packet_t:packet relabelto;
+	allow $1 nfs_server_packet_t:packet relabelto;
 ')
 
 
@@ -57207,7 +58093,7 @@ interface(`corenet_relabelto_nmbd_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the ntop port.
+##	Send and receive TCP traffic on the nfsrdma port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57216,17 +58102,17 @@ interface(`corenet_relabelto_nmbd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_ntop_port',`
+interface(`corenet_tcp_sendrecv_nfsrdma_port',`
 	gen_require(`
-		type ntop_port_t;
+		type nfsrdma_port_t;
 	')
 
-	allow $1 ntop_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 nfsrdma_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the ntop port.
+##	Send UDP traffic on the nfsrdma port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57235,17 +58121,17 @@ interface(`corenet_tcp_sendrecv_ntop_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_ntop_port',`
+interface(`corenet_udp_send_nfsrdma_port',`
 	gen_require(`
-		type ntop_port_t;
+		type nfsrdma_port_t;
 	')
 
-	allow $1 ntop_port_t:udp_socket send_msg;
+	allow $1 nfsrdma_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the ntop port.
+##	Do not audit attempts to send UDP traffic on the nfsrdma port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57254,17 +58140,17 @@ interface(`corenet_udp_send_ntop_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_ntop_port',`
+interface(`corenet_dontaudit_udp_send_nfsrdma_port',`
 	gen_require(`
-		type ntop_port_t;
+		type nfsrdma_port_t;
 	')
 
-	dontaudit $1 ntop_port_t:udp_socket send_msg;
+	dontaudit $1 nfsrdma_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the ntop port.
+##	Receive UDP traffic on the nfsrdma port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57273,17 +58159,17 @@ interface(`corenet_dontaudit_udp_send_ntop_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_ntop_port',`
+interface(`corenet_udp_receive_nfsrdma_port',`
 	gen_require(`
-		type ntop_port_t;
+		type nfsrdma_port_t;
 	')
 
-	allow $1 ntop_port_t:udp_socket recv_msg;
+	allow $1 nfsrdma_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the ntop port.
+##	Do not audit attempts to receive UDP traffic on the nfsrdma port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57292,17 +58178,17 @@ interface(`corenet_udp_receive_ntop_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_ntop_port',`
+interface(`corenet_dontaudit_udp_receive_nfsrdma_port',`
 	gen_require(`
-		type ntop_port_t;
+		type nfsrdma_port_t;
 	')
 
-	dontaudit $1 ntop_port_t:udp_socket recv_msg;
+	dontaudit $1 nfsrdma_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the ntop port.
+##	Send and receive UDP traffic on the nfsrdma port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57311,15 +58197,15 @@ interface(`corenet_dontaudit_udp_receive_ntop_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_ntop_port',`
-	corenet_udp_send_ntop_port($1)
-	corenet_udp_receive_ntop_port($1)
+interface(`corenet_udp_sendrecv_nfsrdma_port',`
+	corenet_udp_send_nfsrdma_port($1)
+	corenet_udp_receive_nfsrdma_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the ntop port.
+##	UDP traffic on the nfsrdma port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57328,14 +58214,14 @@ interface(`corenet_udp_sendrecv_ntop_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_ntop_port',`
-	corenet_dontaudit_udp_send_ntop_port($1)
-	corenet_dontaudit_udp_receive_ntop_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_nfsrdma_port',`
+	corenet_dontaudit_udp_send_nfsrdma_port($1)
+	corenet_dontaudit_udp_receive_nfsrdma_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the ntop port.
+##	Bind TCP sockets to the nfsrdma port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57344,18 +58230,18 @@ interface(`corenet_dontaudit_udp_sendrecv_ntop_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_ntop_port',`
+interface(`corenet_tcp_bind_nfsrdma_port',`
 	gen_require(`
-		type ntop_port_t;
+		type nfsrdma_port_t;
 	')
 
-	allow $1 ntop_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 nfsrdma_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the ntop port.
+##	Bind UDP sockets to the nfsrdma port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57364,18 +58250,18 @@ interface(`corenet_tcp_bind_ntop_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_ntop_port',`
+interface(`corenet_udp_bind_nfsrdma_port',`
 	gen_require(`
-		type ntop_port_t;
+		type nfsrdma_port_t;
 	')
 
-	allow $1 ntop_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 nfsrdma_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the ntop port.
+##	Make a TCP connection to the nfsrdma port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57383,18 +58269,18 @@ interface(`corenet_udp_bind_ntop_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_ntop_port',`
+interface(`corenet_tcp_connect_nfsrdma_port',`
 	gen_require(`
-		type ntop_port_t;
+		type nfsrdma_port_t;
 	')
 
-	allow $1 ntop_port_t:tcp_socket name_connect;
+	allow $1 nfsrdma_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ntop_client packets.
+##	Send nfsrdma_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57403,17 +58289,17 @@ interface(`corenet_tcp_connect_ntop_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ntop_client_packets',`
+interface(`corenet_send_nfsrdma_client_packets',`
 	gen_require(`
-		type ntop_client_packet_t;
+		type nfsrdma_client_packet_t;
 	')
 
-	allow $1 ntop_client_packet_t:packet send;
+	allow $1 nfsrdma_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ntop_client packets.
+##	Do not audit attempts to send nfsrdma_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57422,17 +58308,17 @@ interface(`corenet_send_ntop_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ntop_client_packets',`
+interface(`corenet_dontaudit_send_nfsrdma_client_packets',`
 	gen_require(`
-		type ntop_client_packet_t;
+		type nfsrdma_client_packet_t;
 	')
 
-	dontaudit $1 ntop_client_packet_t:packet send;
+	dontaudit $1 nfsrdma_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ntop_client packets.
+##	Receive nfsrdma_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57441,17 +58327,17 @@ interface(`corenet_dontaudit_send_ntop_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ntop_client_packets',`
+interface(`corenet_receive_nfsrdma_client_packets',`
 	gen_require(`
-		type ntop_client_packet_t;
+		type nfsrdma_client_packet_t;
 	')
 
-	allow $1 ntop_client_packet_t:packet recv;
+	allow $1 nfsrdma_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ntop_client packets.
+##	Do not audit attempts to receive nfsrdma_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57460,17 +58346,17 @@ interface(`corenet_receive_ntop_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ntop_client_packets',`
+interface(`corenet_dontaudit_receive_nfsrdma_client_packets',`
 	gen_require(`
-		type ntop_client_packet_t;
+		type nfsrdma_client_packet_t;
 	')
 
-	dontaudit $1 ntop_client_packet_t:packet recv;
+	dontaudit $1 nfsrdma_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ntop_client packets.
+##	Send and receive nfsrdma_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57479,14 +58365,14 @@ interface(`corenet_dontaudit_receive_ntop_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ntop_client_packets',`
-	corenet_send_ntop_client_packets($1)
-	corenet_receive_ntop_client_packets($1)
+interface(`corenet_sendrecv_nfsrdma_client_packets',`
+	corenet_send_nfsrdma_client_packets($1)
+	corenet_receive_nfsrdma_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ntop_client packets.
+##	Do not audit attempts to send and receive nfsrdma_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57495,14 +58381,14 @@ interface(`corenet_sendrecv_ntop_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ntop_client_packets',`
-	corenet_dontaudit_send_ntop_client_packets($1)
-	corenet_dontaudit_receive_ntop_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_nfsrdma_client_packets',`
+	corenet_dontaudit_send_nfsrdma_client_packets($1)
+	corenet_dontaudit_receive_nfsrdma_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ntop_client the packet type.
+##	Relabel packets to nfsrdma_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57510,18 +58396,18 @@ interface(`corenet_dontaudit_sendrecv_ntop_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ntop_client_packets',`
+interface(`corenet_relabelto_nfsrdma_client_packets',`
 	gen_require(`
-		type ntop_client_packet_t;
+		type nfsrdma_client_packet_t;
 	')
 
-	allow $1 ntop_client_packet_t:packet relabelto;
+	allow $1 nfsrdma_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ntop_server packets.
+##	Send nfsrdma_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57530,17 +58416,17 @@ interface(`corenet_relabelto_ntop_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ntop_server_packets',`
+interface(`corenet_send_nfsrdma_server_packets',`
 	gen_require(`
-		type ntop_server_packet_t;
+		type nfsrdma_server_packet_t;
 	')
 
-	allow $1 ntop_server_packet_t:packet send;
+	allow $1 nfsrdma_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ntop_server packets.
+##	Do not audit attempts to send nfsrdma_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57549,17 +58435,17 @@ interface(`corenet_send_ntop_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ntop_server_packets',`
+interface(`corenet_dontaudit_send_nfsrdma_server_packets',`
 	gen_require(`
-		type ntop_server_packet_t;
+		type nfsrdma_server_packet_t;
 	')
 
-	dontaudit $1 ntop_server_packet_t:packet send;
+	dontaudit $1 nfsrdma_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ntop_server packets.
+##	Receive nfsrdma_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57568,17 +58454,17 @@ interface(`corenet_dontaudit_send_ntop_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ntop_server_packets',`
+interface(`corenet_receive_nfsrdma_server_packets',`
 	gen_require(`
-		type ntop_server_packet_t;
+		type nfsrdma_server_packet_t;
 	')
 
-	allow $1 ntop_server_packet_t:packet recv;
+	allow $1 nfsrdma_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ntop_server packets.
+##	Do not audit attempts to receive nfsrdma_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57587,17 +58473,17 @@ interface(`corenet_receive_ntop_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ntop_server_packets',`
+interface(`corenet_dontaudit_receive_nfsrdma_server_packets',`
 	gen_require(`
-		type ntop_server_packet_t;
+		type nfsrdma_server_packet_t;
 	')
 
-	dontaudit $1 ntop_server_packet_t:packet recv;
+	dontaudit $1 nfsrdma_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ntop_server packets.
+##	Send and receive nfsrdma_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57606,14 +58492,14 @@ interface(`corenet_dontaudit_receive_ntop_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ntop_server_packets',`
-	corenet_send_ntop_server_packets($1)
-	corenet_receive_ntop_server_packets($1)
+interface(`corenet_sendrecv_nfsrdma_server_packets',`
+	corenet_send_nfsrdma_server_packets($1)
+	corenet_receive_nfsrdma_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ntop_server packets.
+##	Do not audit attempts to send and receive nfsrdma_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57622,14 +58508,14 @@ interface(`corenet_sendrecv_ntop_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ntop_server_packets',`
-	corenet_dontaudit_send_ntop_server_packets($1)
-	corenet_dontaudit_receive_ntop_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_nfsrdma_server_packets',`
+	corenet_dontaudit_send_nfsrdma_server_packets($1)
+	corenet_dontaudit_receive_nfsrdma_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ntop_server the packet type.
+##	Relabel packets to nfsrdma_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57637,12 +58523,12 @@ interface(`corenet_dontaudit_sendrecv_ntop_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ntop_server_packets',`
+interface(`corenet_relabelto_nfsrdma_server_packets',`
 	gen_require(`
-		type ntop_server_packet_t;
+		type nfsrdma_server_packet_t;
 	')
 
-	allow $1 ntop_server_packet_t:packet relabelto;
+	allow $1 nfsrdma_server_packet_t:packet relabelto;
 ')
 
 
@@ -57650,7 +58536,7 @@ interface(`corenet_relabelto_ntop_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the ntp port.
+##	Send and receive TCP traffic on the nmbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57659,17 +58545,17 @@ interface(`corenet_relabelto_ntop_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_ntp_port',`
+interface(`corenet_tcp_sendrecv_nmbd_port',`
 	gen_require(`
-		type ntp_port_t;
+		type nmbd_port_t;
 	')
 
-	allow $1 ntp_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 nmbd_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the ntp port.
+##	Send UDP traffic on the nmbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57678,17 +58564,17 @@ interface(`corenet_tcp_sendrecv_ntp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_ntp_port',`
+interface(`corenet_udp_send_nmbd_port',`
 	gen_require(`
-		type ntp_port_t;
+		type nmbd_port_t;
 	')
 
-	allow $1 ntp_port_t:udp_socket send_msg;
+	allow $1 nmbd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the ntp port.
+##	Do not audit attempts to send UDP traffic on the nmbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57697,17 +58583,17 @@ interface(`corenet_udp_send_ntp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_ntp_port',`
+interface(`corenet_dontaudit_udp_send_nmbd_port',`
 	gen_require(`
-		type ntp_port_t;
+		type nmbd_port_t;
 	')
 
-	dontaudit $1 ntp_port_t:udp_socket send_msg;
+	dontaudit $1 nmbd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the ntp port.
+##	Receive UDP traffic on the nmbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57716,17 +58602,17 @@ interface(`corenet_dontaudit_udp_send_ntp_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_ntp_port',`
+interface(`corenet_udp_receive_nmbd_port',`
 	gen_require(`
-		type ntp_port_t;
+		type nmbd_port_t;
 	')
 
-	allow $1 ntp_port_t:udp_socket recv_msg;
+	allow $1 nmbd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the ntp port.
+##	Do not audit attempts to receive UDP traffic on the nmbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57735,17 +58621,17 @@ interface(`corenet_udp_receive_ntp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_ntp_port',`
+interface(`corenet_dontaudit_udp_receive_nmbd_port',`
 	gen_require(`
-		type ntp_port_t;
+		type nmbd_port_t;
 	')
 
-	dontaudit $1 ntp_port_t:udp_socket recv_msg;
+	dontaudit $1 nmbd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the ntp port.
+##	Send and receive UDP traffic on the nmbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57754,15 +58640,15 @@ interface(`corenet_dontaudit_udp_receive_ntp_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_ntp_port',`
-	corenet_udp_send_ntp_port($1)
-	corenet_udp_receive_ntp_port($1)
+interface(`corenet_udp_sendrecv_nmbd_port',`
+	corenet_udp_send_nmbd_port($1)
+	corenet_udp_receive_nmbd_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the ntp port.
+##	UDP traffic on the nmbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57771,14 +58657,14 @@ interface(`corenet_udp_sendrecv_ntp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_ntp_port',`
-	corenet_dontaudit_udp_send_ntp_port($1)
-	corenet_dontaudit_udp_receive_ntp_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_nmbd_port',`
+	corenet_dontaudit_udp_send_nmbd_port($1)
+	corenet_dontaudit_udp_receive_nmbd_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the ntp port.
+##	Bind TCP sockets to the nmbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57787,18 +58673,18 @@ interface(`corenet_dontaudit_udp_sendrecv_ntp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_ntp_port',`
+interface(`corenet_tcp_bind_nmbd_port',`
 	gen_require(`
-		type ntp_port_t;
+		type nmbd_port_t;
 	')
 
-	allow $1 ntp_port_t:tcp_socket name_bind;
+	allow $1 nmbd_port_t:tcp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the ntp port.
+##	Bind UDP sockets to the nmbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57807,18 +58693,18 @@ interface(`corenet_tcp_bind_ntp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_ntp_port',`
+interface(`corenet_udp_bind_nmbd_port',`
 	gen_require(`
-		type ntp_port_t;
+		type nmbd_port_t;
 	')
 
-	allow $1 ntp_port_t:udp_socket name_bind;
+	allow $1 nmbd_port_t:udp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the ntp port.
+##	Make a TCP connection to the nmbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57826,18 +58712,18 @@ interface(`corenet_udp_bind_ntp_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_ntp_port',`
+interface(`corenet_tcp_connect_nmbd_port',`
 	gen_require(`
-		type ntp_port_t;
+		type nmbd_port_t;
 	')
 
-	allow $1 ntp_port_t:tcp_socket name_connect;
+	allow $1 nmbd_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ntp_client packets.
+##	Send nmbd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57846,17 +58732,17 @@ interface(`corenet_tcp_connect_ntp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ntp_client_packets',`
+interface(`corenet_send_nmbd_client_packets',`
 	gen_require(`
-		type ntp_client_packet_t;
+		type nmbd_client_packet_t;
 	')
 
-	allow $1 ntp_client_packet_t:packet send;
+	allow $1 nmbd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ntp_client packets.
+##	Do not audit attempts to send nmbd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57865,17 +58751,17 @@ interface(`corenet_send_ntp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ntp_client_packets',`
+interface(`corenet_dontaudit_send_nmbd_client_packets',`
 	gen_require(`
-		type ntp_client_packet_t;
+		type nmbd_client_packet_t;
 	')
 
-	dontaudit $1 ntp_client_packet_t:packet send;
+	dontaudit $1 nmbd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ntp_client packets.
+##	Receive nmbd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57884,17 +58770,17 @@ interface(`corenet_dontaudit_send_ntp_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ntp_client_packets',`
+interface(`corenet_receive_nmbd_client_packets',`
 	gen_require(`
-		type ntp_client_packet_t;
+		type nmbd_client_packet_t;
 	')
 
-	allow $1 ntp_client_packet_t:packet recv;
+	allow $1 nmbd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ntp_client packets.
+##	Do not audit attempts to receive nmbd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57903,17 +58789,17 @@ interface(`corenet_receive_ntp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ntp_client_packets',`
+interface(`corenet_dontaudit_receive_nmbd_client_packets',`
 	gen_require(`
-		type ntp_client_packet_t;
+		type nmbd_client_packet_t;
 	')
 
-	dontaudit $1 ntp_client_packet_t:packet recv;
+	dontaudit $1 nmbd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ntp_client packets.
+##	Send and receive nmbd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57922,14 +58808,14 @@ interface(`corenet_dontaudit_receive_ntp_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ntp_client_packets',`
-	corenet_send_ntp_client_packets($1)
-	corenet_receive_ntp_client_packets($1)
+interface(`corenet_sendrecv_nmbd_client_packets',`
+	corenet_send_nmbd_client_packets($1)
+	corenet_receive_nmbd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ntp_client packets.
+##	Do not audit attempts to send and receive nmbd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57938,14 +58824,14 @@ interface(`corenet_sendrecv_ntp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ntp_client_packets',`
-	corenet_dontaudit_send_ntp_client_packets($1)
-	corenet_dontaudit_receive_ntp_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_nmbd_client_packets',`
+	corenet_dontaudit_send_nmbd_client_packets($1)
+	corenet_dontaudit_receive_nmbd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ntp_client the packet type.
+##	Relabel packets to nmbd_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57953,18 +58839,18 @@ interface(`corenet_dontaudit_sendrecv_ntp_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ntp_client_packets',`
+interface(`corenet_relabelto_nmbd_client_packets',`
 	gen_require(`
-		type ntp_client_packet_t;
+		type nmbd_client_packet_t;
 	')
 
-	allow $1 ntp_client_packet_t:packet relabelto;
+	allow $1 nmbd_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ntp_server packets.
+##	Send nmbd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57973,17 +58859,17 @@ interface(`corenet_relabelto_ntp_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ntp_server_packets',`
+interface(`corenet_send_nmbd_server_packets',`
 	gen_require(`
-		type ntp_server_packet_t;
+		type nmbd_server_packet_t;
 	')
 
-	allow $1 ntp_server_packet_t:packet send;
+	allow $1 nmbd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ntp_server packets.
+##	Do not audit attempts to send nmbd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -57992,17 +58878,17 @@ interface(`corenet_send_ntp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ntp_server_packets',`
+interface(`corenet_dontaudit_send_nmbd_server_packets',`
 	gen_require(`
-		type ntp_server_packet_t;
+		type nmbd_server_packet_t;
 	')
 
-	dontaudit $1 ntp_server_packet_t:packet send;
+	dontaudit $1 nmbd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ntp_server packets.
+##	Receive nmbd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58011,17 +58897,17 @@ interface(`corenet_dontaudit_send_ntp_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ntp_server_packets',`
+interface(`corenet_receive_nmbd_server_packets',`
 	gen_require(`
-		type ntp_server_packet_t;
+		type nmbd_server_packet_t;
 	')
 
-	allow $1 ntp_server_packet_t:packet recv;
+	allow $1 nmbd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ntp_server packets.
+##	Do not audit attempts to receive nmbd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58030,17 +58916,17 @@ interface(`corenet_receive_ntp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ntp_server_packets',`
+interface(`corenet_dontaudit_receive_nmbd_server_packets',`
 	gen_require(`
-		type ntp_server_packet_t;
+		type nmbd_server_packet_t;
 	')
 
-	dontaudit $1 ntp_server_packet_t:packet recv;
+	dontaudit $1 nmbd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ntp_server packets.
+##	Send and receive nmbd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58049,14 +58935,14 @@ interface(`corenet_dontaudit_receive_ntp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ntp_server_packets',`
-	corenet_send_ntp_server_packets($1)
-	corenet_receive_ntp_server_packets($1)
+interface(`corenet_sendrecv_nmbd_server_packets',`
+	corenet_send_nmbd_server_packets($1)
+	corenet_receive_nmbd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ntp_server packets.
+##	Do not audit attempts to send and receive nmbd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58065,14 +58951,14 @@ interface(`corenet_sendrecv_ntp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ntp_server_packets',`
-	corenet_dontaudit_send_ntp_server_packets($1)
-	corenet_dontaudit_receive_ntp_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_nmbd_server_packets',`
+	corenet_dontaudit_send_nmbd_server_packets($1)
+	corenet_dontaudit_receive_nmbd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ntp_server the packet type.
+##	Relabel packets to nmbd_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58080,12 +58966,12 @@ interface(`corenet_dontaudit_sendrecv_ntp_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ntp_server_packets',`
+interface(`corenet_relabelto_nmbd_server_packets',`
 	gen_require(`
-		type ntp_server_packet_t;
+		type nmbd_server_packet_t;
 	')
 
-	allow $1 ntp_server_packet_t:packet relabelto;
+	allow $1 nmbd_server_packet_t:packet relabelto;
 ')
 
 
@@ -58093,7 +58979,7 @@ interface(`corenet_relabelto_ntp_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the oa_system port.
+##	Send and receive TCP traffic on the ntop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58102,17 +58988,17 @@ interface(`corenet_relabelto_ntp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_oa_system_port',`
+interface(`corenet_tcp_sendrecv_ntop_port',`
 	gen_require(`
-		type oa_system_port_t;
+		type ntop_port_t;
 	')
 
-	allow $1 oa_system_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 ntop_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the oa_system port.
+##	Send UDP traffic on the ntop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58121,17 +59007,17 @@ interface(`corenet_tcp_sendrecv_oa_system_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_oa_system_port',`
+interface(`corenet_udp_send_ntop_port',`
 	gen_require(`
-		type oa_system_port_t;
+		type ntop_port_t;
 	')
 
-	allow $1 oa_system_port_t:udp_socket send_msg;
+	allow $1 ntop_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the oa_system port.
+##	Do not audit attempts to send UDP traffic on the ntop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58140,17 +59026,17 @@ interface(`corenet_udp_send_oa_system_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_oa_system_port',`
+interface(`corenet_dontaudit_udp_send_ntop_port',`
 	gen_require(`
-		type oa_system_port_t;
+		type ntop_port_t;
 	')
 
-	dontaudit $1 oa_system_port_t:udp_socket send_msg;
+	dontaudit $1 ntop_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the oa_system port.
+##	Receive UDP traffic on the ntop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58159,17 +59045,17 @@ interface(`corenet_dontaudit_udp_send_oa_system_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_oa_system_port',`
+interface(`corenet_udp_receive_ntop_port',`
 	gen_require(`
-		type oa_system_port_t;
+		type ntop_port_t;
 	')
 
-	allow $1 oa_system_port_t:udp_socket recv_msg;
+	allow $1 ntop_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the oa_system port.
+##	Do not audit attempts to receive UDP traffic on the ntop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58178,17 +59064,17 @@ interface(`corenet_udp_receive_oa_system_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_oa_system_port',`
+interface(`corenet_dontaudit_udp_receive_ntop_port',`
 	gen_require(`
-		type oa_system_port_t;
+		type ntop_port_t;
 	')
 
-	dontaudit $1 oa_system_port_t:udp_socket recv_msg;
+	dontaudit $1 ntop_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the oa_system port.
+##	Send and receive UDP traffic on the ntop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58197,15 +59083,15 @@ interface(`corenet_dontaudit_udp_receive_oa_system_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_oa_system_port',`
-	corenet_udp_send_oa_system_port($1)
-	corenet_udp_receive_oa_system_port($1)
+interface(`corenet_udp_sendrecv_ntop_port',`
+	corenet_udp_send_ntop_port($1)
+	corenet_udp_receive_ntop_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the oa_system port.
+##	UDP traffic on the ntop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58214,14 +59100,14 @@ interface(`corenet_udp_sendrecv_oa_system_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_oa_system_port',`
-	corenet_dontaudit_udp_send_oa_system_port($1)
-	corenet_dontaudit_udp_receive_oa_system_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_ntop_port',`
+	corenet_dontaudit_udp_send_ntop_port($1)
+	corenet_dontaudit_udp_receive_ntop_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the oa_system port.
+##	Bind TCP sockets to the ntop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58230,18 +59116,18 @@ interface(`corenet_dontaudit_udp_sendrecv_oa_system_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_oa_system_port',`
+interface(`corenet_tcp_bind_ntop_port',`
 	gen_require(`
-		type oa_system_port_t;
+		type ntop_port_t;
 	')
 
-	allow $1 oa_system_port_t:tcp_socket name_bind;
-	
+	allow $1 ntop_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the oa_system port.
+##	Bind UDP sockets to the ntop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58250,18 +59136,18 @@ interface(`corenet_tcp_bind_oa_system_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_oa_system_port',`
+interface(`corenet_udp_bind_ntop_port',`
 	gen_require(`
-		type oa_system_port_t;
+		type ntop_port_t;
 	')
 
-	allow $1 oa_system_port_t:udp_socket name_bind;
-	
+	allow $1 ntop_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the oa_system port.
+##	Make a TCP connection to the ntop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58269,18 +59155,18 @@ interface(`corenet_udp_bind_oa_system_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_oa_system_port',`
+interface(`corenet_tcp_connect_ntop_port',`
 	gen_require(`
-		type oa_system_port_t;
+		type ntop_port_t;
 	')
 
-	allow $1 oa_system_port_t:tcp_socket name_connect;
+	allow $1 ntop_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send oa_system_client packets.
+##	Send ntop_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58289,17 +59175,17 @@ interface(`corenet_tcp_connect_oa_system_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_oa_system_client_packets',`
+interface(`corenet_send_ntop_client_packets',`
 	gen_require(`
-		type oa_system_client_packet_t;
+		type ntop_client_packet_t;
 	')
 
-	allow $1 oa_system_client_packet_t:packet send;
+	allow $1 ntop_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send oa_system_client packets.
+##	Do not audit attempts to send ntop_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58308,17 +59194,17 @@ interface(`corenet_send_oa_system_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_oa_system_client_packets',`
+interface(`corenet_dontaudit_send_ntop_client_packets',`
 	gen_require(`
-		type oa_system_client_packet_t;
+		type ntop_client_packet_t;
 	')
 
-	dontaudit $1 oa_system_client_packet_t:packet send;
+	dontaudit $1 ntop_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive oa_system_client packets.
+##	Receive ntop_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58327,17 +59213,17 @@ interface(`corenet_dontaudit_send_oa_system_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_oa_system_client_packets',`
+interface(`corenet_receive_ntop_client_packets',`
 	gen_require(`
-		type oa_system_client_packet_t;
+		type ntop_client_packet_t;
 	')
 
-	allow $1 oa_system_client_packet_t:packet recv;
+	allow $1 ntop_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive oa_system_client packets.
+##	Do not audit attempts to receive ntop_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58346,17 +59232,17 @@ interface(`corenet_receive_oa_system_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_oa_system_client_packets',`
+interface(`corenet_dontaudit_receive_ntop_client_packets',`
 	gen_require(`
-		type oa_system_client_packet_t;
+		type ntop_client_packet_t;
 	')
 
-	dontaudit $1 oa_system_client_packet_t:packet recv;
+	dontaudit $1 ntop_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive oa_system_client packets.
+##	Send and receive ntop_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58365,14 +59251,14 @@ interface(`corenet_dontaudit_receive_oa_system_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_oa_system_client_packets',`
-	corenet_send_oa_system_client_packets($1)
-	corenet_receive_oa_system_client_packets($1)
+interface(`corenet_sendrecv_ntop_client_packets',`
+	corenet_send_ntop_client_packets($1)
+	corenet_receive_ntop_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive oa_system_client packets.
+##	Do not audit attempts to send and receive ntop_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58381,14 +59267,14 @@ interface(`corenet_sendrecv_oa_system_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_oa_system_client_packets',`
-	corenet_dontaudit_send_oa_system_client_packets($1)
-	corenet_dontaudit_receive_oa_system_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_ntop_client_packets',`
+	corenet_dontaudit_send_ntop_client_packets($1)
+	corenet_dontaudit_receive_ntop_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to oa_system_client the packet type.
+##	Relabel packets to ntop_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58396,18 +59282,18 @@ interface(`corenet_dontaudit_sendrecv_oa_system_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_oa_system_client_packets',`
+interface(`corenet_relabelto_ntop_client_packets',`
 	gen_require(`
-		type oa_system_client_packet_t;
+		type ntop_client_packet_t;
 	')
 
-	allow $1 oa_system_client_packet_t:packet relabelto;
+	allow $1 ntop_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send oa_system_server packets.
+##	Send ntop_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58416,17 +59302,17 @@ interface(`corenet_relabelto_oa_system_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_oa_system_server_packets',`
+interface(`corenet_send_ntop_server_packets',`
 	gen_require(`
-		type oa_system_server_packet_t;
+		type ntop_server_packet_t;
 	')
 
-	allow $1 oa_system_server_packet_t:packet send;
+	allow $1 ntop_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send oa_system_server packets.
+##	Do not audit attempts to send ntop_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58435,17 +59321,17 @@ interface(`corenet_send_oa_system_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_oa_system_server_packets',`
+interface(`corenet_dontaudit_send_ntop_server_packets',`
 	gen_require(`
-		type oa_system_server_packet_t;
+		type ntop_server_packet_t;
 	')
 
-	dontaudit $1 oa_system_server_packet_t:packet send;
+	dontaudit $1 ntop_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive oa_system_server packets.
+##	Receive ntop_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58454,17 +59340,17 @@ interface(`corenet_dontaudit_send_oa_system_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_oa_system_server_packets',`
+interface(`corenet_receive_ntop_server_packets',`
 	gen_require(`
-		type oa_system_server_packet_t;
+		type ntop_server_packet_t;
 	')
 
-	allow $1 oa_system_server_packet_t:packet recv;
+	allow $1 ntop_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive oa_system_server packets.
+##	Do not audit attempts to receive ntop_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58473,17 +59359,17 @@ interface(`corenet_receive_oa_system_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_oa_system_server_packets',`
+interface(`corenet_dontaudit_receive_ntop_server_packets',`
 	gen_require(`
-		type oa_system_server_packet_t;
+		type ntop_server_packet_t;
 	')
 
-	dontaudit $1 oa_system_server_packet_t:packet recv;
+	dontaudit $1 ntop_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive oa_system_server packets.
+##	Send and receive ntop_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58492,14 +59378,14 @@ interface(`corenet_dontaudit_receive_oa_system_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_oa_system_server_packets',`
-	corenet_send_oa_system_server_packets($1)
-	corenet_receive_oa_system_server_packets($1)
+interface(`corenet_sendrecv_ntop_server_packets',`
+	corenet_send_ntop_server_packets($1)
+	corenet_receive_ntop_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive oa_system_server packets.
+##	Do not audit attempts to send and receive ntop_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58508,14 +59394,14 @@ interface(`corenet_sendrecv_oa_system_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_oa_system_server_packets',`
-	corenet_dontaudit_send_oa_system_server_packets($1)
-	corenet_dontaudit_receive_oa_system_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_ntop_server_packets',`
+	corenet_dontaudit_send_ntop_server_packets($1)
+	corenet_dontaudit_receive_ntop_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to oa_system_server the packet type.
+##	Relabel packets to ntop_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58523,12 +59409,12 @@ interface(`corenet_dontaudit_sendrecv_oa_system_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_oa_system_server_packets',`
+interface(`corenet_relabelto_ntop_server_packets',`
 	gen_require(`
-		type oa_system_server_packet_t;
+		type ntop_server_packet_t;
 	')
 
-	allow $1 oa_system_server_packet_t:packet relabelto;
+	allow $1 ntop_server_packet_t:packet relabelto;
 ')
 
 
@@ -58536,7 +59422,7 @@ interface(`corenet_relabelto_oa_system_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the oracledb port.
+##	Send and receive TCP traffic on the ntp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58545,17 +59431,17 @@ interface(`corenet_relabelto_oa_system_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_oracledb_port',`
+interface(`corenet_tcp_sendrecv_ntp_port',`
 	gen_require(`
-		type oracledb_port_t;
+		type ntp_port_t;
 	')
 
-	allow $1 oracledb_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 ntp_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the oracledb port.
+##	Send UDP traffic on the ntp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58564,17 +59450,17 @@ interface(`corenet_tcp_sendrecv_oracledb_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_oracledb_port',`
+interface(`corenet_udp_send_ntp_port',`
 	gen_require(`
-		type oracledb_port_t;
+		type ntp_port_t;
 	')
 
-	allow $1 oracledb_port_t:udp_socket send_msg;
+	allow $1 ntp_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the oracledb port.
+##	Do not audit attempts to send UDP traffic on the ntp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58583,17 +59469,17 @@ interface(`corenet_udp_send_oracledb_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_oracledb_port',`
+interface(`corenet_dontaudit_udp_send_ntp_port',`
 	gen_require(`
-		type oracledb_port_t;
+		type ntp_port_t;
 	')
 
-	dontaudit $1 oracledb_port_t:udp_socket send_msg;
+	dontaudit $1 ntp_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the oracledb port.
+##	Receive UDP traffic on the ntp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58602,17 +59488,17 @@ interface(`corenet_dontaudit_udp_send_oracledb_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_oracledb_port',`
+interface(`corenet_udp_receive_ntp_port',`
 	gen_require(`
-		type oracledb_port_t;
+		type ntp_port_t;
 	')
 
-	allow $1 oracledb_port_t:udp_socket recv_msg;
+	allow $1 ntp_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the oracledb port.
+##	Do not audit attempts to receive UDP traffic on the ntp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58621,17 +59507,17 @@ interface(`corenet_udp_receive_oracledb_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_oracledb_port',`
+interface(`corenet_dontaudit_udp_receive_ntp_port',`
 	gen_require(`
-		type oracledb_port_t;
+		type ntp_port_t;
 	')
 
-	dontaudit $1 oracledb_port_t:udp_socket recv_msg;
+	dontaudit $1 ntp_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the oracledb port.
+##	Send and receive UDP traffic on the ntp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58640,15 +59526,15 @@ interface(`corenet_dontaudit_udp_receive_oracledb_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_oracledb_port',`
-	corenet_udp_send_oracledb_port($1)
-	corenet_udp_receive_oracledb_port($1)
+interface(`corenet_udp_sendrecv_ntp_port',`
+	corenet_udp_send_ntp_port($1)
+	corenet_udp_receive_ntp_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the oracledb port.
+##	UDP traffic on the ntp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58657,14 +59543,14 @@ interface(`corenet_udp_sendrecv_oracledb_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_oracledb_port',`
-	corenet_dontaudit_udp_send_oracledb_port($1)
-	corenet_dontaudit_udp_receive_oracledb_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_ntp_port',`
+	corenet_dontaudit_udp_send_ntp_port($1)
+	corenet_dontaudit_udp_receive_ntp_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the oracledb port.
+##	Bind TCP sockets to the ntp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58673,18 +59559,18 @@ interface(`corenet_dontaudit_udp_sendrecv_oracledb_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_oracledb_port',`
+interface(`corenet_tcp_bind_ntp_port',`
 	gen_require(`
-		type oracledb_port_t;
+		type ntp_port_t;
 	')
 
-	allow $1 oracledb_port_t:tcp_socket name_bind;
-	
+	allow $1 ntp_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the oracledb port.
+##	Bind UDP sockets to the ntp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58693,18 +59579,18 @@ interface(`corenet_tcp_bind_oracledb_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_oracledb_port',`
+interface(`corenet_udp_bind_ntp_port',`
 	gen_require(`
-		type oracledb_port_t;
+		type ntp_port_t;
 	')
 
-	allow $1 oracledb_port_t:udp_socket name_bind;
-	
+	allow $1 ntp_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the oracledb port.
+##	Make a TCP connection to the ntp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58712,18 +59598,18 @@ interface(`corenet_udp_bind_oracledb_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_oracledb_port',`
+interface(`corenet_tcp_connect_ntp_port',`
 	gen_require(`
-		type oracledb_port_t;
+		type ntp_port_t;
 	')
 
-	allow $1 oracledb_port_t:tcp_socket name_connect;
+	allow $1 ntp_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send oracledb_client packets.
+##	Send ntp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58732,17 +59618,17 @@ interface(`corenet_tcp_connect_oracledb_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_oracledb_client_packets',`
+interface(`corenet_send_ntp_client_packets',`
 	gen_require(`
-		type oracledb_client_packet_t;
+		type ntp_client_packet_t;
 	')
 
-	allow $1 oracledb_client_packet_t:packet send;
+	allow $1 ntp_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send oracledb_client packets.
+##	Do not audit attempts to send ntp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58751,17 +59637,17 @@ interface(`corenet_send_oracledb_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_oracledb_client_packets',`
+interface(`corenet_dontaudit_send_ntp_client_packets',`
 	gen_require(`
-		type oracledb_client_packet_t;
+		type ntp_client_packet_t;
 	')
 
-	dontaudit $1 oracledb_client_packet_t:packet send;
+	dontaudit $1 ntp_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive oracledb_client packets.
+##	Receive ntp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58770,17 +59656,17 @@ interface(`corenet_dontaudit_send_oracledb_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_oracledb_client_packets',`
+interface(`corenet_receive_ntp_client_packets',`
 	gen_require(`
-		type oracledb_client_packet_t;
+		type ntp_client_packet_t;
 	')
 
-	allow $1 oracledb_client_packet_t:packet recv;
+	allow $1 ntp_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive oracledb_client packets.
+##	Do not audit attempts to receive ntp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58789,17 +59675,17 @@ interface(`corenet_receive_oracledb_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_oracledb_client_packets',`
+interface(`corenet_dontaudit_receive_ntp_client_packets',`
 	gen_require(`
-		type oracledb_client_packet_t;
+		type ntp_client_packet_t;
 	')
 
-	dontaudit $1 oracledb_client_packet_t:packet recv;
+	dontaudit $1 ntp_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive oracledb_client packets.
+##	Send and receive ntp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58808,14 +59694,14 @@ interface(`corenet_dontaudit_receive_oracledb_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_oracledb_client_packets',`
-	corenet_send_oracledb_client_packets($1)
-	corenet_receive_oracledb_client_packets($1)
+interface(`corenet_sendrecv_ntp_client_packets',`
+	corenet_send_ntp_client_packets($1)
+	corenet_receive_ntp_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive oracledb_client packets.
+##	Do not audit attempts to send and receive ntp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58824,14 +59710,14 @@ interface(`corenet_sendrecv_oracledb_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_oracledb_client_packets',`
-	corenet_dontaudit_send_oracledb_client_packets($1)
-	corenet_dontaudit_receive_oracledb_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_ntp_client_packets',`
+	corenet_dontaudit_send_ntp_client_packets($1)
+	corenet_dontaudit_receive_ntp_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to oracledb_client the packet type.
+##	Relabel packets to ntp_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58839,18 +59725,18 @@ interface(`corenet_dontaudit_sendrecv_oracledb_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_oracledb_client_packets',`
+interface(`corenet_relabelto_ntp_client_packets',`
 	gen_require(`
-		type oracledb_client_packet_t;
+		type ntp_client_packet_t;
 	')
 
-	allow $1 oracledb_client_packet_t:packet relabelto;
+	allow $1 ntp_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send oracledb_server packets.
+##	Send ntp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58859,17 +59745,17 @@ interface(`corenet_relabelto_oracledb_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_oracledb_server_packets',`
+interface(`corenet_send_ntp_server_packets',`
 	gen_require(`
-		type oracledb_server_packet_t;
+		type ntp_server_packet_t;
 	')
 
-	allow $1 oracledb_server_packet_t:packet send;
+	allow $1 ntp_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send oracledb_server packets.
+##	Do not audit attempts to send ntp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58878,17 +59764,17 @@ interface(`corenet_send_oracledb_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_oracledb_server_packets',`
+interface(`corenet_dontaudit_send_ntp_server_packets',`
 	gen_require(`
-		type oracledb_server_packet_t;
+		type ntp_server_packet_t;
 	')
 
-	dontaudit $1 oracledb_server_packet_t:packet send;
+	dontaudit $1 ntp_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive oracledb_server packets.
+##	Receive ntp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58897,17 +59783,17 @@ interface(`corenet_dontaudit_send_oracledb_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_oracledb_server_packets',`
+interface(`corenet_receive_ntp_server_packets',`
 	gen_require(`
-		type oracledb_server_packet_t;
+		type ntp_server_packet_t;
 	')
 
-	allow $1 oracledb_server_packet_t:packet recv;
+	allow $1 ntp_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive oracledb_server packets.
+##	Do not audit attempts to receive ntp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58916,17 +59802,17 @@ interface(`corenet_receive_oracledb_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_oracledb_server_packets',`
+interface(`corenet_dontaudit_receive_ntp_server_packets',`
 	gen_require(`
-		type oracledb_server_packet_t;
+		type ntp_server_packet_t;
 	')
 
-	dontaudit $1 oracledb_server_packet_t:packet recv;
+	dontaudit $1 ntp_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive oracledb_server packets.
+##	Send and receive ntp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58935,14 +59821,14 @@ interface(`corenet_dontaudit_receive_oracledb_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_oracledb_server_packets',`
-	corenet_send_oracledb_server_packets($1)
-	corenet_receive_oracledb_server_packets($1)
+interface(`corenet_sendrecv_ntp_server_packets',`
+	corenet_send_ntp_server_packets($1)
+	corenet_receive_ntp_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive oracledb_server packets.
+##	Do not audit attempts to send and receive ntp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58951,14 +59837,14 @@ interface(`corenet_sendrecv_oracledb_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_oracledb_server_packets',`
-	corenet_dontaudit_send_oracledb_server_packets($1)
-	corenet_dontaudit_receive_oracledb_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_ntp_server_packets',`
+	corenet_dontaudit_send_ntp_server_packets($1)
+	corenet_dontaudit_receive_ntp_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to oracledb_server the packet type.
+##	Relabel packets to ntp_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58966,12 +59852,12 @@ interface(`corenet_dontaudit_sendrecv_oracledb_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_oracledb_server_packets',`
+interface(`corenet_relabelto_ntp_server_packets',`
 	gen_require(`
-		type oracledb_server_packet_t;
+		type ntp_server_packet_t;
 	')
 
-	allow $1 oracledb_server_packet_t:packet relabelto;
+	allow $1 ntp_server_packet_t:packet relabelto;
 ')
 
 
@@ -58979,7 +59865,7 @@ interface(`corenet_relabelto_oracledb_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the ocsp port.
+##	Send and receive TCP traffic on the oa_system port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -58988,17 +59874,17 @@ interface(`corenet_relabelto_oracledb_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_ocsp_port',`
+interface(`corenet_tcp_sendrecv_oa_system_port',`
 	gen_require(`
-		type ocsp_port_t;
+		type oa_system_port_t;
 	')
 
-	allow $1 ocsp_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 oa_system_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the ocsp port.
+##	Send UDP traffic on the oa_system port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59007,17 +59893,17 @@ interface(`corenet_tcp_sendrecv_ocsp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_ocsp_port',`
+interface(`corenet_udp_send_oa_system_port',`
 	gen_require(`
-		type ocsp_port_t;
+		type oa_system_port_t;
 	')
 
-	allow $1 ocsp_port_t:udp_socket send_msg;
+	allow $1 oa_system_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the ocsp port.
+##	Do not audit attempts to send UDP traffic on the oa_system port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59026,17 +59912,17 @@ interface(`corenet_udp_send_ocsp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_ocsp_port',`
+interface(`corenet_dontaudit_udp_send_oa_system_port',`
 	gen_require(`
-		type ocsp_port_t;
+		type oa_system_port_t;
 	')
 
-	dontaudit $1 ocsp_port_t:udp_socket send_msg;
+	dontaudit $1 oa_system_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the ocsp port.
+##	Receive UDP traffic on the oa_system port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59045,17 +59931,17 @@ interface(`corenet_dontaudit_udp_send_ocsp_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_ocsp_port',`
+interface(`corenet_udp_receive_oa_system_port',`
 	gen_require(`
-		type ocsp_port_t;
+		type oa_system_port_t;
 	')
 
-	allow $1 ocsp_port_t:udp_socket recv_msg;
+	allow $1 oa_system_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the ocsp port.
+##	Do not audit attempts to receive UDP traffic on the oa_system port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59064,17 +59950,17 @@ interface(`corenet_udp_receive_ocsp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_ocsp_port',`
+interface(`corenet_dontaudit_udp_receive_oa_system_port',`
 	gen_require(`
-		type ocsp_port_t;
+		type oa_system_port_t;
 	')
 
-	dontaudit $1 ocsp_port_t:udp_socket recv_msg;
+	dontaudit $1 oa_system_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the ocsp port.
+##	Send and receive UDP traffic on the oa_system port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59083,15 +59969,15 @@ interface(`corenet_dontaudit_udp_receive_ocsp_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_ocsp_port',`
-	corenet_udp_send_ocsp_port($1)
-	corenet_udp_receive_ocsp_port($1)
+interface(`corenet_udp_sendrecv_oa_system_port',`
+	corenet_udp_send_oa_system_port($1)
+	corenet_udp_receive_oa_system_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the ocsp port.
+##	UDP traffic on the oa_system port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59100,14 +59986,14 @@ interface(`corenet_udp_sendrecv_ocsp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_ocsp_port',`
-	corenet_dontaudit_udp_send_ocsp_port($1)
-	corenet_dontaudit_udp_receive_ocsp_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_oa_system_port',`
+	corenet_dontaudit_udp_send_oa_system_port($1)
+	corenet_dontaudit_udp_receive_oa_system_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the ocsp port.
+##	Bind TCP sockets to the oa_system port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59116,18 +60002,18 @@ interface(`corenet_dontaudit_udp_sendrecv_ocsp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_ocsp_port',`
+interface(`corenet_tcp_bind_oa_system_port',`
 	gen_require(`
-		type ocsp_port_t;
+		type oa_system_port_t;
 	')
 
-	allow $1 ocsp_port_t:tcp_socket name_bind;
+	allow $1 oa_system_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the ocsp port.
+##	Bind UDP sockets to the oa_system port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59136,18 +60022,18 @@ interface(`corenet_tcp_bind_ocsp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_ocsp_port',`
+interface(`corenet_udp_bind_oa_system_port',`
 	gen_require(`
-		type ocsp_port_t;
+		type oa_system_port_t;
 	')
 
-	allow $1 ocsp_port_t:udp_socket name_bind;
+	allow $1 oa_system_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the ocsp port.
+##	Make a TCP connection to the oa_system port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59155,18 +60041,18 @@ interface(`corenet_udp_bind_ocsp_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_ocsp_port',`
+interface(`corenet_tcp_connect_oa_system_port',`
 	gen_require(`
-		type ocsp_port_t;
+		type oa_system_port_t;
 	')
 
-	allow $1 ocsp_port_t:tcp_socket name_connect;
+	allow $1 oa_system_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ocsp_client packets.
+##	Send oa_system_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59175,17 +60061,17 @@ interface(`corenet_tcp_connect_ocsp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ocsp_client_packets',`
+interface(`corenet_send_oa_system_client_packets',`
 	gen_require(`
-		type ocsp_client_packet_t;
+		type oa_system_client_packet_t;
 	')
 
-	allow $1 ocsp_client_packet_t:packet send;
+	allow $1 oa_system_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ocsp_client packets.
+##	Do not audit attempts to send oa_system_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59194,17 +60080,17 @@ interface(`corenet_send_ocsp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ocsp_client_packets',`
+interface(`corenet_dontaudit_send_oa_system_client_packets',`
 	gen_require(`
-		type ocsp_client_packet_t;
+		type oa_system_client_packet_t;
 	')
 
-	dontaudit $1 ocsp_client_packet_t:packet send;
+	dontaudit $1 oa_system_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ocsp_client packets.
+##	Receive oa_system_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59213,17 +60099,17 @@ interface(`corenet_dontaudit_send_ocsp_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ocsp_client_packets',`
+interface(`corenet_receive_oa_system_client_packets',`
 	gen_require(`
-		type ocsp_client_packet_t;
+		type oa_system_client_packet_t;
 	')
 
-	allow $1 ocsp_client_packet_t:packet recv;
+	allow $1 oa_system_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ocsp_client packets.
+##	Do not audit attempts to receive oa_system_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59232,17 +60118,17 @@ interface(`corenet_receive_ocsp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ocsp_client_packets',`
+interface(`corenet_dontaudit_receive_oa_system_client_packets',`
 	gen_require(`
-		type ocsp_client_packet_t;
+		type oa_system_client_packet_t;
 	')
 
-	dontaudit $1 ocsp_client_packet_t:packet recv;
+	dontaudit $1 oa_system_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ocsp_client packets.
+##	Send and receive oa_system_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59251,14 +60137,14 @@ interface(`corenet_dontaudit_receive_ocsp_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ocsp_client_packets',`
-	corenet_send_ocsp_client_packets($1)
-	corenet_receive_ocsp_client_packets($1)
+interface(`corenet_sendrecv_oa_system_client_packets',`
+	corenet_send_oa_system_client_packets($1)
+	corenet_receive_oa_system_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ocsp_client packets.
+##	Do not audit attempts to send and receive oa_system_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59267,14 +60153,14 @@ interface(`corenet_sendrecv_ocsp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ocsp_client_packets',`
-	corenet_dontaudit_send_ocsp_client_packets($1)
-	corenet_dontaudit_receive_ocsp_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_oa_system_client_packets',`
+	corenet_dontaudit_send_oa_system_client_packets($1)
+	corenet_dontaudit_receive_oa_system_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ocsp_client the packet type.
+##	Relabel packets to oa_system_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59282,18 +60168,18 @@ interface(`corenet_dontaudit_sendrecv_ocsp_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ocsp_client_packets',`
+interface(`corenet_relabelto_oa_system_client_packets',`
 	gen_require(`
-		type ocsp_client_packet_t;
+		type oa_system_client_packet_t;
 	')
 
-	allow $1 ocsp_client_packet_t:packet relabelto;
+	allow $1 oa_system_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ocsp_server packets.
+##	Send oa_system_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59302,17 +60188,17 @@ interface(`corenet_relabelto_ocsp_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ocsp_server_packets',`
+interface(`corenet_send_oa_system_server_packets',`
 	gen_require(`
-		type ocsp_server_packet_t;
+		type oa_system_server_packet_t;
 	')
 
-	allow $1 ocsp_server_packet_t:packet send;
+	allow $1 oa_system_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ocsp_server packets.
+##	Do not audit attempts to send oa_system_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59321,17 +60207,17 @@ interface(`corenet_send_ocsp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ocsp_server_packets',`
+interface(`corenet_dontaudit_send_oa_system_server_packets',`
 	gen_require(`
-		type ocsp_server_packet_t;
+		type oa_system_server_packet_t;
 	')
 
-	dontaudit $1 ocsp_server_packet_t:packet send;
+	dontaudit $1 oa_system_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ocsp_server packets.
+##	Receive oa_system_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59340,17 +60226,17 @@ interface(`corenet_dontaudit_send_ocsp_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ocsp_server_packets',`
+interface(`corenet_receive_oa_system_server_packets',`
 	gen_require(`
-		type ocsp_server_packet_t;
+		type oa_system_server_packet_t;
 	')
 
-	allow $1 ocsp_server_packet_t:packet recv;
+	allow $1 oa_system_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ocsp_server packets.
+##	Do not audit attempts to receive oa_system_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59359,17 +60245,17 @@ interface(`corenet_receive_ocsp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ocsp_server_packets',`
+interface(`corenet_dontaudit_receive_oa_system_server_packets',`
 	gen_require(`
-		type ocsp_server_packet_t;
+		type oa_system_server_packet_t;
 	')
 
-	dontaudit $1 ocsp_server_packet_t:packet recv;
+	dontaudit $1 oa_system_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ocsp_server packets.
+##	Send and receive oa_system_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59378,14 +60264,14 @@ interface(`corenet_dontaudit_receive_ocsp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ocsp_server_packets',`
-	corenet_send_ocsp_server_packets($1)
-	corenet_receive_ocsp_server_packets($1)
+interface(`corenet_sendrecv_oa_system_server_packets',`
+	corenet_send_oa_system_server_packets($1)
+	corenet_receive_oa_system_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ocsp_server packets.
+##	Do not audit attempts to send and receive oa_system_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59394,14 +60280,14 @@ interface(`corenet_sendrecv_ocsp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ocsp_server_packets',`
-	corenet_dontaudit_send_ocsp_server_packets($1)
-	corenet_dontaudit_receive_ocsp_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_oa_system_server_packets',`
+	corenet_dontaudit_send_oa_system_server_packets($1)
+	corenet_dontaudit_receive_oa_system_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ocsp_server the packet type.
+##	Relabel packets to oa_system_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59409,12 +60295,12 @@ interface(`corenet_dontaudit_sendrecv_ocsp_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ocsp_server_packets',`
+interface(`corenet_relabelto_oa_system_server_packets',`
 	gen_require(`
-		type ocsp_server_packet_t;
+		type oa_system_server_packet_t;
 	')
 
-	allow $1 ocsp_server_packet_t:packet relabelto;
+	allow $1 oa_system_server_packet_t:packet relabelto;
 ')
 
 
@@ -59422,7 +60308,7 @@ interface(`corenet_relabelto_ocsp_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the openhpid port.
+##	Send and receive TCP traffic on the oracledb port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59431,17 +60317,17 @@ interface(`corenet_relabelto_ocsp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_openhpid_port',`
+interface(`corenet_tcp_sendrecv_oracledb_port',`
 	gen_require(`
-		type openhpid_port_t;
+		type oracledb_port_t;
 	')
 
-	allow $1 openhpid_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 oracledb_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the openhpid port.
+##	Send UDP traffic on the oracledb port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59450,17 +60336,17 @@ interface(`corenet_tcp_sendrecv_openhpid_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_openhpid_port',`
+interface(`corenet_udp_send_oracledb_port',`
 	gen_require(`
-		type openhpid_port_t;
+		type oracledb_port_t;
 	')
 
-	allow $1 openhpid_port_t:udp_socket send_msg;
+	allow $1 oracledb_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the openhpid port.
+##	Do not audit attempts to send UDP traffic on the oracledb port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59469,17 +60355,17 @@ interface(`corenet_udp_send_openhpid_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_openhpid_port',`
+interface(`corenet_dontaudit_udp_send_oracledb_port',`
 	gen_require(`
-		type openhpid_port_t;
+		type oracledb_port_t;
 	')
 
-	dontaudit $1 openhpid_port_t:udp_socket send_msg;
+	dontaudit $1 oracledb_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the openhpid port.
+##	Receive UDP traffic on the oracledb port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59488,17 +60374,17 @@ interface(`corenet_dontaudit_udp_send_openhpid_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_openhpid_port',`
+interface(`corenet_udp_receive_oracledb_port',`
 	gen_require(`
-		type openhpid_port_t;
+		type oracledb_port_t;
 	')
 
-	allow $1 openhpid_port_t:udp_socket recv_msg;
+	allow $1 oracledb_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the openhpid port.
+##	Do not audit attempts to receive UDP traffic on the oracledb port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59507,17 +60393,17 @@ interface(`corenet_udp_receive_openhpid_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_openhpid_port',`
+interface(`corenet_dontaudit_udp_receive_oracledb_port',`
 	gen_require(`
-		type openhpid_port_t;
+		type oracledb_port_t;
 	')
 
-	dontaudit $1 openhpid_port_t:udp_socket recv_msg;
+	dontaudit $1 oracledb_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the openhpid port.
+##	Send and receive UDP traffic on the oracledb port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59526,15 +60412,15 @@ interface(`corenet_dontaudit_udp_receive_openhpid_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_openhpid_port',`
-	corenet_udp_send_openhpid_port($1)
-	corenet_udp_receive_openhpid_port($1)
+interface(`corenet_udp_sendrecv_oracledb_port',`
+	corenet_udp_send_oracledb_port($1)
+	corenet_udp_receive_oracledb_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the openhpid port.
+##	UDP traffic on the oracledb port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59543,14 +60429,14 @@ interface(`corenet_udp_sendrecv_openhpid_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_openhpid_port',`
-	corenet_dontaudit_udp_send_openhpid_port($1)
-	corenet_dontaudit_udp_receive_openhpid_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_oracledb_port',`
+	corenet_dontaudit_udp_send_oracledb_port($1)
+	corenet_dontaudit_udp_receive_oracledb_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the openhpid port.
+##	Bind TCP sockets to the oracledb port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59559,18 +60445,18 @@ interface(`corenet_dontaudit_udp_sendrecv_openhpid_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_openhpid_port',`
+interface(`corenet_tcp_bind_oracledb_port',`
 	gen_require(`
-		type openhpid_port_t;
+		type oracledb_port_t;
 	')
 
-	allow $1 openhpid_port_t:tcp_socket name_bind;
+	allow $1 oracledb_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the openhpid port.
+##	Bind UDP sockets to the oracledb port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59579,18 +60465,18 @@ interface(`corenet_tcp_bind_openhpid_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_openhpid_port',`
+interface(`corenet_udp_bind_oracledb_port',`
 	gen_require(`
-		type openhpid_port_t;
+		type oracledb_port_t;
 	')
 
-	allow $1 openhpid_port_t:udp_socket name_bind;
+	allow $1 oracledb_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the openhpid port.
+##	Make a TCP connection to the oracledb port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59598,18 +60484,18 @@ interface(`corenet_udp_bind_openhpid_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_openhpid_port',`
+interface(`corenet_tcp_connect_oracledb_port',`
 	gen_require(`
-		type openhpid_port_t;
+		type oracledb_port_t;
 	')
 
-	allow $1 openhpid_port_t:tcp_socket name_connect;
+	allow $1 oracledb_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send openhpid_client packets.
+##	Send oracledb_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59618,17 +60504,17 @@ interface(`corenet_tcp_connect_openhpid_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_openhpid_client_packets',`
+interface(`corenet_send_oracledb_client_packets',`
 	gen_require(`
-		type openhpid_client_packet_t;
+		type oracledb_client_packet_t;
 	')
 
-	allow $1 openhpid_client_packet_t:packet send;
+	allow $1 oracledb_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send openhpid_client packets.
+##	Do not audit attempts to send oracledb_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59637,17 +60523,17 @@ interface(`corenet_send_openhpid_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_openhpid_client_packets',`
+interface(`corenet_dontaudit_send_oracledb_client_packets',`
 	gen_require(`
-		type openhpid_client_packet_t;
+		type oracledb_client_packet_t;
 	')
 
-	dontaudit $1 openhpid_client_packet_t:packet send;
+	dontaudit $1 oracledb_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive openhpid_client packets.
+##	Receive oracledb_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59656,17 +60542,17 @@ interface(`corenet_dontaudit_send_openhpid_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_openhpid_client_packets',`
+interface(`corenet_receive_oracledb_client_packets',`
 	gen_require(`
-		type openhpid_client_packet_t;
+		type oracledb_client_packet_t;
 	')
 
-	allow $1 openhpid_client_packet_t:packet recv;
+	allow $1 oracledb_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive openhpid_client packets.
+##	Do not audit attempts to receive oracledb_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59675,17 +60561,17 @@ interface(`corenet_receive_openhpid_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_openhpid_client_packets',`
+interface(`corenet_dontaudit_receive_oracledb_client_packets',`
 	gen_require(`
-		type openhpid_client_packet_t;
+		type oracledb_client_packet_t;
 	')
 
-	dontaudit $1 openhpid_client_packet_t:packet recv;
+	dontaudit $1 oracledb_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive openhpid_client packets.
+##	Send and receive oracledb_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59694,14 +60580,14 @@ interface(`corenet_dontaudit_receive_openhpid_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_openhpid_client_packets',`
-	corenet_send_openhpid_client_packets($1)
-	corenet_receive_openhpid_client_packets($1)
+interface(`corenet_sendrecv_oracledb_client_packets',`
+	corenet_send_oracledb_client_packets($1)
+	corenet_receive_oracledb_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive openhpid_client packets.
+##	Do not audit attempts to send and receive oracledb_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59710,14 +60596,14 @@ interface(`corenet_sendrecv_openhpid_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_openhpid_client_packets',`
-	corenet_dontaudit_send_openhpid_client_packets($1)
-	corenet_dontaudit_receive_openhpid_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_oracledb_client_packets',`
+	corenet_dontaudit_send_oracledb_client_packets($1)
+	corenet_dontaudit_receive_oracledb_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to openhpid_client the packet type.
+##	Relabel packets to oracledb_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59725,18 +60611,18 @@ interface(`corenet_dontaudit_sendrecv_openhpid_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_openhpid_client_packets',`
+interface(`corenet_relabelto_oracledb_client_packets',`
 	gen_require(`
-		type openhpid_client_packet_t;
+		type oracledb_client_packet_t;
 	')
 
-	allow $1 openhpid_client_packet_t:packet relabelto;
+	allow $1 oracledb_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send openhpid_server packets.
+##	Send oracledb_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59745,17 +60631,17 @@ interface(`corenet_relabelto_openhpid_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_openhpid_server_packets',`
+interface(`corenet_send_oracledb_server_packets',`
 	gen_require(`
-		type openhpid_server_packet_t;
+		type oracledb_server_packet_t;
 	')
 
-	allow $1 openhpid_server_packet_t:packet send;
+	allow $1 oracledb_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send openhpid_server packets.
+##	Do not audit attempts to send oracledb_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59764,17 +60650,17 @@ interface(`corenet_send_openhpid_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_openhpid_server_packets',`
+interface(`corenet_dontaudit_send_oracledb_server_packets',`
 	gen_require(`
-		type openhpid_server_packet_t;
+		type oracledb_server_packet_t;
 	')
 
-	dontaudit $1 openhpid_server_packet_t:packet send;
+	dontaudit $1 oracledb_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive openhpid_server packets.
+##	Receive oracledb_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59783,17 +60669,17 @@ interface(`corenet_dontaudit_send_openhpid_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_openhpid_server_packets',`
+interface(`corenet_receive_oracledb_server_packets',`
 	gen_require(`
-		type openhpid_server_packet_t;
+		type oracledb_server_packet_t;
 	')
 
-	allow $1 openhpid_server_packet_t:packet recv;
+	allow $1 oracledb_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive openhpid_server packets.
+##	Do not audit attempts to receive oracledb_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59802,17 +60688,17 @@ interface(`corenet_receive_openhpid_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_openhpid_server_packets',`
+interface(`corenet_dontaudit_receive_oracledb_server_packets',`
 	gen_require(`
-		type openhpid_server_packet_t;
+		type oracledb_server_packet_t;
 	')
 
-	dontaudit $1 openhpid_server_packet_t:packet recv;
+	dontaudit $1 oracledb_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive openhpid_server packets.
+##	Send and receive oracledb_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59821,14 +60707,14 @@ interface(`corenet_dontaudit_receive_openhpid_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_openhpid_server_packets',`
-	corenet_send_openhpid_server_packets($1)
-	corenet_receive_openhpid_server_packets($1)
+interface(`corenet_sendrecv_oracledb_server_packets',`
+	corenet_send_oracledb_server_packets($1)
+	corenet_receive_oracledb_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive openhpid_server packets.
+##	Do not audit attempts to send and receive oracledb_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59837,14 +60723,14 @@ interface(`corenet_sendrecv_openhpid_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_openhpid_server_packets',`
-	corenet_dontaudit_send_openhpid_server_packets($1)
-	corenet_dontaudit_receive_openhpid_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_oracledb_server_packets',`
+	corenet_dontaudit_send_oracledb_server_packets($1)
+	corenet_dontaudit_receive_oracledb_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to openhpid_server the packet type.
+##	Relabel packets to oracledb_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59852,12 +60738,12 @@ interface(`corenet_dontaudit_sendrecv_openhpid_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_openhpid_server_packets',`
+interface(`corenet_relabelto_oracledb_server_packets',`
 	gen_require(`
-		type openhpid_server_packet_t;
+		type oracledb_server_packet_t;
 	')
 
-	allow $1 openhpid_server_packet_t:packet relabelto;
+	allow $1 oracledb_server_packet_t:packet relabelto;
 ')
 
 
@@ -59865,7 +60751,7 @@ interface(`corenet_relabelto_openhpid_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the openvpn port.
+##	Send and receive TCP traffic on the ocsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59874,17 +60760,17 @@ interface(`corenet_relabelto_openhpid_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_openvpn_port',`
+interface(`corenet_tcp_sendrecv_ocsp_port',`
 	gen_require(`
-		type openvpn_port_t;
+		type ocsp_port_t;
 	')
 
-	allow $1 openvpn_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 ocsp_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the openvpn port.
+##	Send UDP traffic on the ocsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59893,17 +60779,17 @@ interface(`corenet_tcp_sendrecv_openvpn_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_openvpn_port',`
+interface(`corenet_udp_send_ocsp_port',`
 	gen_require(`
-		type openvpn_port_t;
+		type ocsp_port_t;
 	')
 
-	allow $1 openvpn_port_t:udp_socket send_msg;
+	allow $1 ocsp_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the openvpn port.
+##	Do not audit attempts to send UDP traffic on the ocsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59912,17 +60798,17 @@ interface(`corenet_udp_send_openvpn_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_openvpn_port',`
+interface(`corenet_dontaudit_udp_send_ocsp_port',`
 	gen_require(`
-		type openvpn_port_t;
+		type ocsp_port_t;
 	')
 
-	dontaudit $1 openvpn_port_t:udp_socket send_msg;
+	dontaudit $1 ocsp_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the openvpn port.
+##	Receive UDP traffic on the ocsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59931,17 +60817,17 @@ interface(`corenet_dontaudit_udp_send_openvpn_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_openvpn_port',`
+interface(`corenet_udp_receive_ocsp_port',`
 	gen_require(`
-		type openvpn_port_t;
+		type ocsp_port_t;
 	')
 
-	allow $1 openvpn_port_t:udp_socket recv_msg;
+	allow $1 ocsp_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the openvpn port.
+##	Do not audit attempts to receive UDP traffic on the ocsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59950,17 +60836,17 @@ interface(`corenet_udp_receive_openvpn_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_openvpn_port',`
+interface(`corenet_dontaudit_udp_receive_ocsp_port',`
 	gen_require(`
-		type openvpn_port_t;
+		type ocsp_port_t;
 	')
 
-	dontaudit $1 openvpn_port_t:udp_socket recv_msg;
+	dontaudit $1 ocsp_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the openvpn port.
+##	Send and receive UDP traffic on the ocsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59969,15 +60855,15 @@ interface(`corenet_dontaudit_udp_receive_openvpn_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_openvpn_port',`
-	corenet_udp_send_openvpn_port($1)
-	corenet_udp_receive_openvpn_port($1)
+interface(`corenet_udp_sendrecv_ocsp_port',`
+	corenet_udp_send_ocsp_port($1)
+	corenet_udp_receive_ocsp_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the openvpn port.
+##	UDP traffic on the ocsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -59986,14 +60872,14 @@ interface(`corenet_udp_sendrecv_openvpn_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_openvpn_port',`
-	corenet_dontaudit_udp_send_openvpn_port($1)
-	corenet_dontaudit_udp_receive_openvpn_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_ocsp_port',`
+	corenet_dontaudit_udp_send_ocsp_port($1)
+	corenet_dontaudit_udp_receive_ocsp_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the openvpn port.
+##	Bind TCP sockets to the ocsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60002,18 +60888,18 @@ interface(`corenet_dontaudit_udp_sendrecv_openvpn_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_openvpn_port',`
+interface(`corenet_tcp_bind_ocsp_port',`
 	gen_require(`
-		type openvpn_port_t;
+		type ocsp_port_t;
 	')
 
-	allow $1 openvpn_port_t:tcp_socket name_bind;
+	allow $1 ocsp_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the openvpn port.
+##	Bind UDP sockets to the ocsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60022,18 +60908,18 @@ interface(`corenet_tcp_bind_openvpn_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_openvpn_port',`
+interface(`corenet_udp_bind_ocsp_port',`
 	gen_require(`
-		type openvpn_port_t;
+		type ocsp_port_t;
 	')
 
-	allow $1 openvpn_port_t:udp_socket name_bind;
+	allow $1 ocsp_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the openvpn port.
+##	Make a TCP connection to the ocsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60041,18 +60927,18 @@ interface(`corenet_udp_bind_openvpn_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_openvpn_port',`
+interface(`corenet_tcp_connect_ocsp_port',`
 	gen_require(`
-		type openvpn_port_t;
+		type ocsp_port_t;
 	')
 
-	allow $1 openvpn_port_t:tcp_socket name_connect;
+	allow $1 ocsp_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send openvpn_client packets.
+##	Send ocsp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60061,17 +60947,17 @@ interface(`corenet_tcp_connect_openvpn_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_openvpn_client_packets',`
+interface(`corenet_send_ocsp_client_packets',`
 	gen_require(`
-		type openvpn_client_packet_t;
+		type ocsp_client_packet_t;
 	')
 
-	allow $1 openvpn_client_packet_t:packet send;
+	allow $1 ocsp_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send openvpn_client packets.
+##	Do not audit attempts to send ocsp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60080,17 +60966,17 @@ interface(`corenet_send_openvpn_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_openvpn_client_packets',`
+interface(`corenet_dontaudit_send_ocsp_client_packets',`
 	gen_require(`
-		type openvpn_client_packet_t;
+		type ocsp_client_packet_t;
 	')
 
-	dontaudit $1 openvpn_client_packet_t:packet send;
+	dontaudit $1 ocsp_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive openvpn_client packets.
+##	Receive ocsp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60099,17 +60985,17 @@ interface(`corenet_dontaudit_send_openvpn_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_openvpn_client_packets',`
+interface(`corenet_receive_ocsp_client_packets',`
 	gen_require(`
-		type openvpn_client_packet_t;
+		type ocsp_client_packet_t;
 	')
 
-	allow $1 openvpn_client_packet_t:packet recv;
+	allow $1 ocsp_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive openvpn_client packets.
+##	Do not audit attempts to receive ocsp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60118,17 +61004,17 @@ interface(`corenet_receive_openvpn_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_openvpn_client_packets',`
+interface(`corenet_dontaudit_receive_ocsp_client_packets',`
 	gen_require(`
-		type openvpn_client_packet_t;
+		type ocsp_client_packet_t;
 	')
 
-	dontaudit $1 openvpn_client_packet_t:packet recv;
+	dontaudit $1 ocsp_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive openvpn_client packets.
+##	Send and receive ocsp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60137,14 +61023,14 @@ interface(`corenet_dontaudit_receive_openvpn_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_openvpn_client_packets',`
-	corenet_send_openvpn_client_packets($1)
-	corenet_receive_openvpn_client_packets($1)
+interface(`corenet_sendrecv_ocsp_client_packets',`
+	corenet_send_ocsp_client_packets($1)
+	corenet_receive_ocsp_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive openvpn_client packets.
+##	Do not audit attempts to send and receive ocsp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60153,14 +61039,14 @@ interface(`corenet_sendrecv_openvpn_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_openvpn_client_packets',`
-	corenet_dontaudit_send_openvpn_client_packets($1)
-	corenet_dontaudit_receive_openvpn_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_ocsp_client_packets',`
+	corenet_dontaudit_send_ocsp_client_packets($1)
+	corenet_dontaudit_receive_ocsp_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to openvpn_client the packet type.
+##	Relabel packets to ocsp_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60168,18 +61054,18 @@ interface(`corenet_dontaudit_sendrecv_openvpn_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_openvpn_client_packets',`
+interface(`corenet_relabelto_ocsp_client_packets',`
 	gen_require(`
-		type openvpn_client_packet_t;
+		type ocsp_client_packet_t;
 	')
 
-	allow $1 openvpn_client_packet_t:packet relabelto;
+	allow $1 ocsp_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send openvpn_server packets.
+##	Send ocsp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60188,17 +61074,17 @@ interface(`corenet_relabelto_openvpn_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_openvpn_server_packets',`
+interface(`corenet_send_ocsp_server_packets',`
 	gen_require(`
-		type openvpn_server_packet_t;
+		type ocsp_server_packet_t;
 	')
 
-	allow $1 openvpn_server_packet_t:packet send;
+	allow $1 ocsp_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send openvpn_server packets.
+##	Do not audit attempts to send ocsp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60207,17 +61093,17 @@ interface(`corenet_send_openvpn_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_openvpn_server_packets',`
+interface(`corenet_dontaudit_send_ocsp_server_packets',`
 	gen_require(`
-		type openvpn_server_packet_t;
+		type ocsp_server_packet_t;
 	')
 
-	dontaudit $1 openvpn_server_packet_t:packet send;
+	dontaudit $1 ocsp_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive openvpn_server packets.
+##	Receive ocsp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60226,17 +61112,17 @@ interface(`corenet_dontaudit_send_openvpn_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_openvpn_server_packets',`
+interface(`corenet_receive_ocsp_server_packets',`
 	gen_require(`
-		type openvpn_server_packet_t;
+		type ocsp_server_packet_t;
 	')
 
-	allow $1 openvpn_server_packet_t:packet recv;
+	allow $1 ocsp_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive openvpn_server packets.
+##	Do not audit attempts to receive ocsp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60245,17 +61131,17 @@ interface(`corenet_receive_openvpn_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_openvpn_server_packets',`
+interface(`corenet_dontaudit_receive_ocsp_server_packets',`
 	gen_require(`
-		type openvpn_server_packet_t;
+		type ocsp_server_packet_t;
 	')
 
-	dontaudit $1 openvpn_server_packet_t:packet recv;
+	dontaudit $1 ocsp_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive openvpn_server packets.
+##	Send and receive ocsp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60264,14 +61150,14 @@ interface(`corenet_dontaudit_receive_openvpn_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_openvpn_server_packets',`
-	corenet_send_openvpn_server_packets($1)
-	corenet_receive_openvpn_server_packets($1)
+interface(`corenet_sendrecv_ocsp_server_packets',`
+	corenet_send_ocsp_server_packets($1)
+	corenet_receive_ocsp_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive openvpn_server packets.
+##	Do not audit attempts to send and receive ocsp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60280,14 +61166,14 @@ interface(`corenet_sendrecv_openvpn_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_openvpn_server_packets',`
-	corenet_dontaudit_send_openvpn_server_packets($1)
-	corenet_dontaudit_receive_openvpn_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_ocsp_server_packets',`
+	corenet_dontaudit_send_ocsp_server_packets($1)
+	corenet_dontaudit_receive_ocsp_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to openvpn_server the packet type.
+##	Relabel packets to ocsp_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60295,12 +61181,12 @@ interface(`corenet_dontaudit_sendrecv_openvpn_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_openvpn_server_packets',`
+interface(`corenet_relabelto_ocsp_server_packets',`
 	gen_require(`
-		type openvpn_server_packet_t;
+		type ocsp_server_packet_t;
 	')
 
-	allow $1 openvpn_server_packet_t:packet relabelto;
+	allow $1 ocsp_server_packet_t:packet relabelto;
 ')
 
 
@@ -60308,7 +61194,7 @@ interface(`corenet_relabelto_openvpn_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the pdps port.
+##	Send and receive TCP traffic on the openhpid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60317,17 +61203,17 @@ interface(`corenet_relabelto_openvpn_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_pdps_port',`
+interface(`corenet_tcp_sendrecv_openhpid_port',`
 	gen_require(`
-		type pdps_port_t;
+		type openhpid_port_t;
 	')
 
-	allow $1 pdps_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 openhpid_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the pdps port.
+##	Send UDP traffic on the openhpid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60336,17 +61222,17 @@ interface(`corenet_tcp_sendrecv_pdps_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_pdps_port',`
+interface(`corenet_udp_send_openhpid_port',`
 	gen_require(`
-		type pdps_port_t;
+		type openhpid_port_t;
 	')
 
-	allow $1 pdps_port_t:udp_socket send_msg;
+	allow $1 openhpid_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the pdps port.
+##	Do not audit attempts to send UDP traffic on the openhpid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60355,17 +61241,17 @@ interface(`corenet_udp_send_pdps_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_pdps_port',`
+interface(`corenet_dontaudit_udp_send_openhpid_port',`
 	gen_require(`
-		type pdps_port_t;
+		type openhpid_port_t;
 	')
 
-	dontaudit $1 pdps_port_t:udp_socket send_msg;
+	dontaudit $1 openhpid_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the pdps port.
+##	Receive UDP traffic on the openhpid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60374,17 +61260,17 @@ interface(`corenet_dontaudit_udp_send_pdps_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_pdps_port',`
+interface(`corenet_udp_receive_openhpid_port',`
 	gen_require(`
-		type pdps_port_t;
+		type openhpid_port_t;
 	')
 
-	allow $1 pdps_port_t:udp_socket recv_msg;
+	allow $1 openhpid_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the pdps port.
+##	Do not audit attempts to receive UDP traffic on the openhpid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60393,17 +61279,17 @@ interface(`corenet_udp_receive_pdps_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_pdps_port',`
+interface(`corenet_dontaudit_udp_receive_openhpid_port',`
 	gen_require(`
-		type pdps_port_t;
+		type openhpid_port_t;
 	')
 
-	dontaudit $1 pdps_port_t:udp_socket recv_msg;
+	dontaudit $1 openhpid_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the pdps port.
+##	Send and receive UDP traffic on the openhpid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60412,15 +61298,15 @@ interface(`corenet_dontaudit_udp_receive_pdps_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_pdps_port',`
-	corenet_udp_send_pdps_port($1)
-	corenet_udp_receive_pdps_port($1)
+interface(`corenet_udp_sendrecv_openhpid_port',`
+	corenet_udp_send_openhpid_port($1)
+	corenet_udp_receive_openhpid_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the pdps port.
+##	UDP traffic on the openhpid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60429,14 +61315,14 @@ interface(`corenet_udp_sendrecv_pdps_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_pdps_port',`
-	corenet_dontaudit_udp_send_pdps_port($1)
-	corenet_dontaudit_udp_receive_pdps_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_openhpid_port',`
+	corenet_dontaudit_udp_send_openhpid_port($1)
+	corenet_dontaudit_udp_receive_openhpid_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the pdps port.
+##	Bind TCP sockets to the openhpid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60445,18 +61331,18 @@ interface(`corenet_dontaudit_udp_sendrecv_pdps_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_pdps_port',`
+interface(`corenet_tcp_bind_openhpid_port',`
 	gen_require(`
-		type pdps_port_t;
+		type openhpid_port_t;
 	')
 
-	allow $1 pdps_port_t:tcp_socket name_bind;
+	allow $1 openhpid_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the pdps port.
+##	Bind UDP sockets to the openhpid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60465,18 +61351,18 @@ interface(`corenet_tcp_bind_pdps_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_pdps_port',`
+interface(`corenet_udp_bind_openhpid_port',`
 	gen_require(`
-		type pdps_port_t;
+		type openhpid_port_t;
 	')
 
-	allow $1 pdps_port_t:udp_socket name_bind;
+	allow $1 openhpid_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the pdps port.
+##	Make a TCP connection to the openhpid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60484,18 +61370,18 @@ interface(`corenet_udp_bind_pdps_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_pdps_port',`
+interface(`corenet_tcp_connect_openhpid_port',`
 	gen_require(`
-		type pdps_port_t;
+		type openhpid_port_t;
 	')
 
-	allow $1 pdps_port_t:tcp_socket name_connect;
+	allow $1 openhpid_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pdps_client packets.
+##	Send openhpid_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60504,17 +61390,17 @@ interface(`corenet_tcp_connect_pdps_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pdps_client_packets',`
+interface(`corenet_send_openhpid_client_packets',`
 	gen_require(`
-		type pdps_client_packet_t;
+		type openhpid_client_packet_t;
 	')
 
-	allow $1 pdps_client_packet_t:packet send;
+	allow $1 openhpid_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pdps_client packets.
+##	Do not audit attempts to send openhpid_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60523,17 +61409,17 @@ interface(`corenet_send_pdps_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pdps_client_packets',`
+interface(`corenet_dontaudit_send_openhpid_client_packets',`
 	gen_require(`
-		type pdps_client_packet_t;
+		type openhpid_client_packet_t;
 	')
 
-	dontaudit $1 pdps_client_packet_t:packet send;
+	dontaudit $1 openhpid_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pdps_client packets.
+##	Receive openhpid_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60542,17 +61428,17 @@ interface(`corenet_dontaudit_send_pdps_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pdps_client_packets',`
+interface(`corenet_receive_openhpid_client_packets',`
 	gen_require(`
-		type pdps_client_packet_t;
+		type openhpid_client_packet_t;
 	')
 
-	allow $1 pdps_client_packet_t:packet recv;
+	allow $1 openhpid_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pdps_client packets.
+##	Do not audit attempts to receive openhpid_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60561,17 +61447,17 @@ interface(`corenet_receive_pdps_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pdps_client_packets',`
+interface(`corenet_dontaudit_receive_openhpid_client_packets',`
 	gen_require(`
-		type pdps_client_packet_t;
+		type openhpid_client_packet_t;
 	')
 
-	dontaudit $1 pdps_client_packet_t:packet recv;
+	dontaudit $1 openhpid_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pdps_client packets.
+##	Send and receive openhpid_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60580,14 +61466,14 @@ interface(`corenet_dontaudit_receive_pdps_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pdps_client_packets',`
-	corenet_send_pdps_client_packets($1)
-	corenet_receive_pdps_client_packets($1)
+interface(`corenet_sendrecv_openhpid_client_packets',`
+	corenet_send_openhpid_client_packets($1)
+	corenet_receive_openhpid_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pdps_client packets.
+##	Do not audit attempts to send and receive openhpid_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60596,14 +61482,14 @@ interface(`corenet_sendrecv_pdps_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pdps_client_packets',`
-	corenet_dontaudit_send_pdps_client_packets($1)
-	corenet_dontaudit_receive_pdps_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_openhpid_client_packets',`
+	corenet_dontaudit_send_openhpid_client_packets($1)
+	corenet_dontaudit_receive_openhpid_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pdps_client the packet type.
+##	Relabel packets to openhpid_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60611,18 +61497,18 @@ interface(`corenet_dontaudit_sendrecv_pdps_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pdps_client_packets',`
+interface(`corenet_relabelto_openhpid_client_packets',`
 	gen_require(`
-		type pdps_client_packet_t;
+		type openhpid_client_packet_t;
 	')
 
-	allow $1 pdps_client_packet_t:packet relabelto;
+	allow $1 openhpid_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pdps_server packets.
+##	Send openhpid_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60631,17 +61517,17 @@ interface(`corenet_relabelto_pdps_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pdps_server_packets',`
+interface(`corenet_send_openhpid_server_packets',`
 	gen_require(`
-		type pdps_server_packet_t;
+		type openhpid_server_packet_t;
 	')
 
-	allow $1 pdps_server_packet_t:packet send;
+	allow $1 openhpid_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pdps_server packets.
+##	Do not audit attempts to send openhpid_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60650,17 +61536,17 @@ interface(`corenet_send_pdps_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pdps_server_packets',`
+interface(`corenet_dontaudit_send_openhpid_server_packets',`
 	gen_require(`
-		type pdps_server_packet_t;
+		type openhpid_server_packet_t;
 	')
 
-	dontaudit $1 pdps_server_packet_t:packet send;
+	dontaudit $1 openhpid_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pdps_server packets.
+##	Receive openhpid_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60669,17 +61555,17 @@ interface(`corenet_dontaudit_send_pdps_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pdps_server_packets',`
+interface(`corenet_receive_openhpid_server_packets',`
 	gen_require(`
-		type pdps_server_packet_t;
+		type openhpid_server_packet_t;
 	')
 
-	allow $1 pdps_server_packet_t:packet recv;
+	allow $1 openhpid_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pdps_server packets.
+##	Do not audit attempts to receive openhpid_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60688,17 +61574,17 @@ interface(`corenet_receive_pdps_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pdps_server_packets',`
+interface(`corenet_dontaudit_receive_openhpid_server_packets',`
 	gen_require(`
-		type pdps_server_packet_t;
+		type openhpid_server_packet_t;
 	')
 
-	dontaudit $1 pdps_server_packet_t:packet recv;
+	dontaudit $1 openhpid_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pdps_server packets.
+##	Send and receive openhpid_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60707,14 +61593,14 @@ interface(`corenet_dontaudit_receive_pdps_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pdps_server_packets',`
-	corenet_send_pdps_server_packets($1)
-	corenet_receive_pdps_server_packets($1)
+interface(`corenet_sendrecv_openhpid_server_packets',`
+	corenet_send_openhpid_server_packets($1)
+	corenet_receive_openhpid_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pdps_server packets.
+##	Do not audit attempts to send and receive openhpid_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60723,14 +61609,14 @@ interface(`corenet_sendrecv_pdps_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pdps_server_packets',`
-	corenet_dontaudit_send_pdps_server_packets($1)
-	corenet_dontaudit_receive_pdps_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_openhpid_server_packets',`
+	corenet_dontaudit_send_openhpid_server_packets($1)
+	corenet_dontaudit_receive_openhpid_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pdps_server the packet type.
+##	Relabel packets to openhpid_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60738,12 +61624,12 @@ interface(`corenet_dontaudit_sendrecv_pdps_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pdps_server_packets',`
+interface(`corenet_relabelto_openhpid_server_packets',`
 	gen_require(`
-		type pdps_server_packet_t;
+		type openhpid_server_packet_t;
 	')
 
-	allow $1 pdps_server_packet_t:packet relabelto;
+	allow $1 openhpid_server_packet_t:packet relabelto;
 ')
 
 
@@ -60751,7 +61637,7 @@ interface(`corenet_relabelto_pdps_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the pegasus_http port.
+##	Send and receive TCP traffic on the openvpn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60760,17 +61646,17 @@ interface(`corenet_relabelto_pdps_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_pegasus_http_port',`
+interface(`corenet_tcp_sendrecv_openvpn_port',`
 	gen_require(`
-		type pegasus_http_port_t;
+		type openvpn_port_t;
 	')
 
-	allow $1 pegasus_http_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 openvpn_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the pegasus_http port.
+##	Send UDP traffic on the openvpn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60779,17 +61665,17 @@ interface(`corenet_tcp_sendrecv_pegasus_http_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_pegasus_http_port',`
+interface(`corenet_udp_send_openvpn_port',`
 	gen_require(`
-		type pegasus_http_port_t;
+		type openvpn_port_t;
 	')
 
-	allow $1 pegasus_http_port_t:udp_socket send_msg;
+	allow $1 openvpn_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the pegasus_http port.
+##	Do not audit attempts to send UDP traffic on the openvpn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60798,17 +61684,17 @@ interface(`corenet_udp_send_pegasus_http_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_pegasus_http_port',`
+interface(`corenet_dontaudit_udp_send_openvpn_port',`
 	gen_require(`
-		type pegasus_http_port_t;
+		type openvpn_port_t;
 	')
 
-	dontaudit $1 pegasus_http_port_t:udp_socket send_msg;
+	dontaudit $1 openvpn_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the pegasus_http port.
+##	Receive UDP traffic on the openvpn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60817,17 +61703,17 @@ interface(`corenet_dontaudit_udp_send_pegasus_http_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_pegasus_http_port',`
+interface(`corenet_udp_receive_openvpn_port',`
 	gen_require(`
-		type pegasus_http_port_t;
+		type openvpn_port_t;
 	')
 
-	allow $1 pegasus_http_port_t:udp_socket recv_msg;
+	allow $1 openvpn_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the pegasus_http port.
+##	Do not audit attempts to receive UDP traffic on the openvpn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60836,17 +61722,17 @@ interface(`corenet_udp_receive_pegasus_http_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_pegasus_http_port',`
+interface(`corenet_dontaudit_udp_receive_openvpn_port',`
 	gen_require(`
-		type pegasus_http_port_t;
+		type openvpn_port_t;
 	')
 
-	dontaudit $1 pegasus_http_port_t:udp_socket recv_msg;
+	dontaudit $1 openvpn_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the pegasus_http port.
+##	Send and receive UDP traffic on the openvpn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60855,15 +61741,15 @@ interface(`corenet_dontaudit_udp_receive_pegasus_http_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_pegasus_http_port',`
-	corenet_udp_send_pegasus_http_port($1)
-	corenet_udp_receive_pegasus_http_port($1)
+interface(`corenet_udp_sendrecv_openvpn_port',`
+	corenet_udp_send_openvpn_port($1)
+	corenet_udp_receive_openvpn_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the pegasus_http port.
+##	UDP traffic on the openvpn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60872,14 +61758,14 @@ interface(`corenet_udp_sendrecv_pegasus_http_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_pegasus_http_port',`
-	corenet_dontaudit_udp_send_pegasus_http_port($1)
-	corenet_dontaudit_udp_receive_pegasus_http_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_openvpn_port',`
+	corenet_dontaudit_udp_send_openvpn_port($1)
+	corenet_dontaudit_udp_receive_openvpn_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the pegasus_http port.
+##	Bind TCP sockets to the openvpn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60888,18 +61774,18 @@ interface(`corenet_dontaudit_udp_sendrecv_pegasus_http_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_pegasus_http_port',`
+interface(`corenet_tcp_bind_openvpn_port',`
 	gen_require(`
-		type pegasus_http_port_t;
+		type openvpn_port_t;
 	')
 
-	allow $1 pegasus_http_port_t:tcp_socket name_bind;
+	allow $1 openvpn_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the pegasus_http port.
+##	Bind UDP sockets to the openvpn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60908,18 +61794,18 @@ interface(`corenet_tcp_bind_pegasus_http_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_pegasus_http_port',`
+interface(`corenet_udp_bind_openvpn_port',`
 	gen_require(`
-		type pegasus_http_port_t;
+		type openvpn_port_t;
 	')
 
-	allow $1 pegasus_http_port_t:udp_socket name_bind;
+	allow $1 openvpn_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the pegasus_http port.
+##	Make a TCP connection to the openvpn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60927,18 +61813,18 @@ interface(`corenet_udp_bind_pegasus_http_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_pegasus_http_port',`
+interface(`corenet_tcp_connect_openvpn_port',`
 	gen_require(`
-		type pegasus_http_port_t;
+		type openvpn_port_t;
 	')
 
-	allow $1 pegasus_http_port_t:tcp_socket name_connect;
+	allow $1 openvpn_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pegasus_http_client packets.
+##	Send openvpn_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60947,17 +61833,17 @@ interface(`corenet_tcp_connect_pegasus_http_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pegasus_http_client_packets',`
+interface(`corenet_send_openvpn_client_packets',`
 	gen_require(`
-		type pegasus_http_client_packet_t;
+		type openvpn_client_packet_t;
 	')
 
-	allow $1 pegasus_http_client_packet_t:packet send;
+	allow $1 openvpn_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pegasus_http_client packets.
+##	Do not audit attempts to send openvpn_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60966,17 +61852,17 @@ interface(`corenet_send_pegasus_http_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pegasus_http_client_packets',`
+interface(`corenet_dontaudit_send_openvpn_client_packets',`
 	gen_require(`
-		type pegasus_http_client_packet_t;
+		type openvpn_client_packet_t;
 	')
 
-	dontaudit $1 pegasus_http_client_packet_t:packet send;
+	dontaudit $1 openvpn_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pegasus_http_client packets.
+##	Receive openvpn_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -60985,17 +61871,17 @@ interface(`corenet_dontaudit_send_pegasus_http_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pegasus_http_client_packets',`
+interface(`corenet_receive_openvpn_client_packets',`
 	gen_require(`
-		type pegasus_http_client_packet_t;
+		type openvpn_client_packet_t;
 	')
 
-	allow $1 pegasus_http_client_packet_t:packet recv;
+	allow $1 openvpn_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pegasus_http_client packets.
+##	Do not audit attempts to receive openvpn_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61004,17 +61890,17 @@ interface(`corenet_receive_pegasus_http_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pegasus_http_client_packets',`
+interface(`corenet_dontaudit_receive_openvpn_client_packets',`
 	gen_require(`
-		type pegasus_http_client_packet_t;
+		type openvpn_client_packet_t;
 	')
 
-	dontaudit $1 pegasus_http_client_packet_t:packet recv;
+	dontaudit $1 openvpn_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pegasus_http_client packets.
+##	Send and receive openvpn_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61023,14 +61909,14 @@ interface(`corenet_dontaudit_receive_pegasus_http_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pegasus_http_client_packets',`
-	corenet_send_pegasus_http_client_packets($1)
-	corenet_receive_pegasus_http_client_packets($1)
+interface(`corenet_sendrecv_openvpn_client_packets',`
+	corenet_send_openvpn_client_packets($1)
+	corenet_receive_openvpn_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pegasus_http_client packets.
+##	Do not audit attempts to send and receive openvpn_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61039,14 +61925,14 @@ interface(`corenet_sendrecv_pegasus_http_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pegasus_http_client_packets',`
-	corenet_dontaudit_send_pegasus_http_client_packets($1)
-	corenet_dontaudit_receive_pegasus_http_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_openvpn_client_packets',`
+	corenet_dontaudit_send_openvpn_client_packets($1)
+	corenet_dontaudit_receive_openvpn_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pegasus_http_client the packet type.
+##	Relabel packets to openvpn_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61054,18 +61940,18 @@ interface(`corenet_dontaudit_sendrecv_pegasus_http_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pegasus_http_client_packets',`
+interface(`corenet_relabelto_openvpn_client_packets',`
 	gen_require(`
-		type pegasus_http_client_packet_t;
+		type openvpn_client_packet_t;
 	')
 
-	allow $1 pegasus_http_client_packet_t:packet relabelto;
+	allow $1 openvpn_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pegasus_http_server packets.
+##	Send openvpn_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61074,17 +61960,17 @@ interface(`corenet_relabelto_pegasus_http_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pegasus_http_server_packets',`
+interface(`corenet_send_openvpn_server_packets',`
 	gen_require(`
-		type pegasus_http_server_packet_t;
+		type openvpn_server_packet_t;
 	')
 
-	allow $1 pegasus_http_server_packet_t:packet send;
+	allow $1 openvpn_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pegasus_http_server packets.
+##	Do not audit attempts to send openvpn_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61093,17 +61979,17 @@ interface(`corenet_send_pegasus_http_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pegasus_http_server_packets',`
+interface(`corenet_dontaudit_send_openvpn_server_packets',`
 	gen_require(`
-		type pegasus_http_server_packet_t;
+		type openvpn_server_packet_t;
 	')
 
-	dontaudit $1 pegasus_http_server_packet_t:packet send;
+	dontaudit $1 openvpn_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pegasus_http_server packets.
+##	Receive openvpn_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61112,17 +61998,17 @@ interface(`corenet_dontaudit_send_pegasus_http_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pegasus_http_server_packets',`
+interface(`corenet_receive_openvpn_server_packets',`
 	gen_require(`
-		type pegasus_http_server_packet_t;
+		type openvpn_server_packet_t;
 	')
 
-	allow $1 pegasus_http_server_packet_t:packet recv;
+	allow $1 openvpn_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pegasus_http_server packets.
+##	Do not audit attempts to receive openvpn_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61131,17 +62017,17 @@ interface(`corenet_receive_pegasus_http_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pegasus_http_server_packets',`
+interface(`corenet_dontaudit_receive_openvpn_server_packets',`
 	gen_require(`
-		type pegasus_http_server_packet_t;
+		type openvpn_server_packet_t;
 	')
 
-	dontaudit $1 pegasus_http_server_packet_t:packet recv;
+	dontaudit $1 openvpn_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pegasus_http_server packets.
+##	Send and receive openvpn_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61150,14 +62036,14 @@ interface(`corenet_dontaudit_receive_pegasus_http_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pegasus_http_server_packets',`
-	corenet_send_pegasus_http_server_packets($1)
-	corenet_receive_pegasus_http_server_packets($1)
+interface(`corenet_sendrecv_openvpn_server_packets',`
+	corenet_send_openvpn_server_packets($1)
+	corenet_receive_openvpn_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pegasus_http_server packets.
+##	Do not audit attempts to send and receive openvpn_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61166,14 +62052,14 @@ interface(`corenet_sendrecv_pegasus_http_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pegasus_http_server_packets',`
-	corenet_dontaudit_send_pegasus_http_server_packets($1)
-	corenet_dontaudit_receive_pegasus_http_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_openvpn_server_packets',`
+	corenet_dontaudit_send_openvpn_server_packets($1)
+	corenet_dontaudit_receive_openvpn_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pegasus_http_server the packet type.
+##	Relabel packets to openvpn_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61181,12 +62067,12 @@ interface(`corenet_dontaudit_sendrecv_pegasus_http_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pegasus_http_server_packets',`
+interface(`corenet_relabelto_openvpn_server_packets',`
 	gen_require(`
-		type pegasus_http_server_packet_t;
+		type openvpn_server_packet_t;
 	')
 
-	allow $1 pegasus_http_server_packet_t:packet relabelto;
+	allow $1 openvpn_server_packet_t:packet relabelto;
 ')
 
 
@@ -61194,7 +62080,7 @@ interface(`corenet_relabelto_pegasus_http_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the pegasus_https port.
+##	Send and receive TCP traffic on the pdps port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61203,17 +62089,17 @@ interface(`corenet_relabelto_pegasus_http_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_pegasus_https_port',`
+interface(`corenet_tcp_sendrecv_pdps_port',`
 	gen_require(`
-		type pegasus_https_port_t;
+		type pdps_port_t;
 	')
 
-	allow $1 pegasus_https_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 pdps_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the pegasus_https port.
+##	Send UDP traffic on the pdps port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61222,17 +62108,17 @@ interface(`corenet_tcp_sendrecv_pegasus_https_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_pegasus_https_port',`
+interface(`corenet_udp_send_pdps_port',`
 	gen_require(`
-		type pegasus_https_port_t;
+		type pdps_port_t;
 	')
 
-	allow $1 pegasus_https_port_t:udp_socket send_msg;
+	allow $1 pdps_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the pegasus_https port.
+##	Do not audit attempts to send UDP traffic on the pdps port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61241,17 +62127,17 @@ interface(`corenet_udp_send_pegasus_https_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_pegasus_https_port',`
+interface(`corenet_dontaudit_udp_send_pdps_port',`
 	gen_require(`
-		type pegasus_https_port_t;
+		type pdps_port_t;
 	')
 
-	dontaudit $1 pegasus_https_port_t:udp_socket send_msg;
+	dontaudit $1 pdps_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the pegasus_https port.
+##	Receive UDP traffic on the pdps port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61260,17 +62146,17 @@ interface(`corenet_dontaudit_udp_send_pegasus_https_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_pegasus_https_port',`
+interface(`corenet_udp_receive_pdps_port',`
 	gen_require(`
-		type pegasus_https_port_t;
+		type pdps_port_t;
 	')
 
-	allow $1 pegasus_https_port_t:udp_socket recv_msg;
+	allow $1 pdps_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the pegasus_https port.
+##	Do not audit attempts to receive UDP traffic on the pdps port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61279,17 +62165,17 @@ interface(`corenet_udp_receive_pegasus_https_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_pegasus_https_port',`
+interface(`corenet_dontaudit_udp_receive_pdps_port',`
 	gen_require(`
-		type pegasus_https_port_t;
+		type pdps_port_t;
 	')
 
-	dontaudit $1 pegasus_https_port_t:udp_socket recv_msg;
+	dontaudit $1 pdps_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the pegasus_https port.
+##	Send and receive UDP traffic on the pdps port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61298,15 +62184,15 @@ interface(`corenet_dontaudit_udp_receive_pegasus_https_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_pegasus_https_port',`
-	corenet_udp_send_pegasus_https_port($1)
-	corenet_udp_receive_pegasus_https_port($1)
+interface(`corenet_udp_sendrecv_pdps_port',`
+	corenet_udp_send_pdps_port($1)
+	corenet_udp_receive_pdps_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the pegasus_https port.
+##	UDP traffic on the pdps port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61315,14 +62201,14 @@ interface(`corenet_udp_sendrecv_pegasus_https_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_pegasus_https_port',`
-	corenet_dontaudit_udp_send_pegasus_https_port($1)
-	corenet_dontaudit_udp_receive_pegasus_https_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_pdps_port',`
+	corenet_dontaudit_udp_send_pdps_port($1)
+	corenet_dontaudit_udp_receive_pdps_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the pegasus_https port.
+##	Bind TCP sockets to the pdps port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61331,18 +62217,18 @@ interface(`corenet_dontaudit_udp_sendrecv_pegasus_https_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_pegasus_https_port',`
+interface(`corenet_tcp_bind_pdps_port',`
 	gen_require(`
-		type pegasus_https_port_t;
+		type pdps_port_t;
 	')
 
-	allow $1 pegasus_https_port_t:tcp_socket name_bind;
+	allow $1 pdps_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the pegasus_https port.
+##	Bind UDP sockets to the pdps port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61351,18 +62237,18 @@ interface(`corenet_tcp_bind_pegasus_https_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_pegasus_https_port',`
+interface(`corenet_udp_bind_pdps_port',`
 	gen_require(`
-		type pegasus_https_port_t;
+		type pdps_port_t;
 	')
 
-	allow $1 pegasus_https_port_t:udp_socket name_bind;
+	allow $1 pdps_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the pegasus_https port.
+##	Make a TCP connection to the pdps port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61370,18 +62256,18 @@ interface(`corenet_udp_bind_pegasus_https_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_pegasus_https_port',`
+interface(`corenet_tcp_connect_pdps_port',`
 	gen_require(`
-		type pegasus_https_port_t;
+		type pdps_port_t;
 	')
 
-	allow $1 pegasus_https_port_t:tcp_socket name_connect;
+	allow $1 pdps_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pegasus_https_client packets.
+##	Send pdps_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61390,17 +62276,17 @@ interface(`corenet_tcp_connect_pegasus_https_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pegasus_https_client_packets',`
+interface(`corenet_send_pdps_client_packets',`
 	gen_require(`
-		type pegasus_https_client_packet_t;
+		type pdps_client_packet_t;
 	')
 
-	allow $1 pegasus_https_client_packet_t:packet send;
+	allow $1 pdps_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pegasus_https_client packets.
+##	Do not audit attempts to send pdps_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61409,17 +62295,17 @@ interface(`corenet_send_pegasus_https_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pegasus_https_client_packets',`
+interface(`corenet_dontaudit_send_pdps_client_packets',`
 	gen_require(`
-		type pegasus_https_client_packet_t;
+		type pdps_client_packet_t;
 	')
 
-	dontaudit $1 pegasus_https_client_packet_t:packet send;
+	dontaudit $1 pdps_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pegasus_https_client packets.
+##	Receive pdps_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61428,17 +62314,17 @@ interface(`corenet_dontaudit_send_pegasus_https_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pegasus_https_client_packets',`
+interface(`corenet_receive_pdps_client_packets',`
 	gen_require(`
-		type pegasus_https_client_packet_t;
+		type pdps_client_packet_t;
 	')
 
-	allow $1 pegasus_https_client_packet_t:packet recv;
+	allow $1 pdps_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pegasus_https_client packets.
+##	Do not audit attempts to receive pdps_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61447,17 +62333,17 @@ interface(`corenet_receive_pegasus_https_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pegasus_https_client_packets',`
+interface(`corenet_dontaudit_receive_pdps_client_packets',`
 	gen_require(`
-		type pegasus_https_client_packet_t;
+		type pdps_client_packet_t;
 	')
 
-	dontaudit $1 pegasus_https_client_packet_t:packet recv;
+	dontaudit $1 pdps_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pegasus_https_client packets.
+##	Send and receive pdps_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61466,14 +62352,14 @@ interface(`corenet_dontaudit_receive_pegasus_https_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pegasus_https_client_packets',`
-	corenet_send_pegasus_https_client_packets($1)
-	corenet_receive_pegasus_https_client_packets($1)
+interface(`corenet_sendrecv_pdps_client_packets',`
+	corenet_send_pdps_client_packets($1)
+	corenet_receive_pdps_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pegasus_https_client packets.
+##	Do not audit attempts to send and receive pdps_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61482,14 +62368,14 @@ interface(`corenet_sendrecv_pegasus_https_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pegasus_https_client_packets',`
-	corenet_dontaudit_send_pegasus_https_client_packets($1)
-	corenet_dontaudit_receive_pegasus_https_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_pdps_client_packets',`
+	corenet_dontaudit_send_pdps_client_packets($1)
+	corenet_dontaudit_receive_pdps_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pegasus_https_client the packet type.
+##	Relabel packets to pdps_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61497,18 +62383,18 @@ interface(`corenet_dontaudit_sendrecv_pegasus_https_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pegasus_https_client_packets',`
+interface(`corenet_relabelto_pdps_client_packets',`
 	gen_require(`
-		type pegasus_https_client_packet_t;
+		type pdps_client_packet_t;
 	')
 
-	allow $1 pegasus_https_client_packet_t:packet relabelto;
+	allow $1 pdps_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pegasus_https_server packets.
+##	Send pdps_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61517,17 +62403,17 @@ interface(`corenet_relabelto_pegasus_https_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pegasus_https_server_packets',`
+interface(`corenet_send_pdps_server_packets',`
 	gen_require(`
-		type pegasus_https_server_packet_t;
+		type pdps_server_packet_t;
 	')
 
-	allow $1 pegasus_https_server_packet_t:packet send;
+	allow $1 pdps_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pegasus_https_server packets.
+##	Do not audit attempts to send pdps_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61536,17 +62422,17 @@ interface(`corenet_send_pegasus_https_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pegasus_https_server_packets',`
+interface(`corenet_dontaudit_send_pdps_server_packets',`
 	gen_require(`
-		type pegasus_https_server_packet_t;
+		type pdps_server_packet_t;
 	')
 
-	dontaudit $1 pegasus_https_server_packet_t:packet send;
+	dontaudit $1 pdps_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pegasus_https_server packets.
+##	Receive pdps_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61555,17 +62441,17 @@ interface(`corenet_dontaudit_send_pegasus_https_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pegasus_https_server_packets',`
+interface(`corenet_receive_pdps_server_packets',`
 	gen_require(`
-		type pegasus_https_server_packet_t;
+		type pdps_server_packet_t;
 	')
 
-	allow $1 pegasus_https_server_packet_t:packet recv;
+	allow $1 pdps_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pegasus_https_server packets.
+##	Do not audit attempts to receive pdps_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61574,17 +62460,17 @@ interface(`corenet_receive_pegasus_https_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pegasus_https_server_packets',`
+interface(`corenet_dontaudit_receive_pdps_server_packets',`
 	gen_require(`
-		type pegasus_https_server_packet_t;
+		type pdps_server_packet_t;
 	')
 
-	dontaudit $1 pegasus_https_server_packet_t:packet recv;
+	dontaudit $1 pdps_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pegasus_https_server packets.
+##	Send and receive pdps_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61593,14 +62479,14 @@ interface(`corenet_dontaudit_receive_pegasus_https_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pegasus_https_server_packets',`
-	corenet_send_pegasus_https_server_packets($1)
-	corenet_receive_pegasus_https_server_packets($1)
+interface(`corenet_sendrecv_pdps_server_packets',`
+	corenet_send_pdps_server_packets($1)
+	corenet_receive_pdps_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pegasus_https_server packets.
+##	Do not audit attempts to send and receive pdps_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61609,14 +62495,14 @@ interface(`corenet_sendrecv_pegasus_https_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pegasus_https_server_packets',`
-	corenet_dontaudit_send_pegasus_https_server_packets($1)
-	corenet_dontaudit_receive_pegasus_https_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_pdps_server_packets',`
+	corenet_dontaudit_send_pdps_server_packets($1)
+	corenet_dontaudit_receive_pdps_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pegasus_https_server the packet type.
+##	Relabel packets to pdps_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61624,12 +62510,12 @@ interface(`corenet_dontaudit_sendrecv_pegasus_https_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pegasus_https_server_packets',`
+interface(`corenet_relabelto_pdps_server_packets',`
 	gen_require(`
-		type pegasus_https_server_packet_t;
+		type pdps_server_packet_t;
 	')
 
-	allow $1 pegasus_https_server_packet_t:packet relabelto;
+	allow $1 pdps_server_packet_t:packet relabelto;
 ')
 
 
@@ -61637,7 +62523,7 @@ interface(`corenet_relabelto_pegasus_https_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the pgpkeyserver port.
+##	Send and receive TCP traffic on the pegasus_http port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61646,17 +62532,17 @@ interface(`corenet_relabelto_pegasus_https_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_pgpkeyserver_port',`
+interface(`corenet_tcp_sendrecv_pegasus_http_port',`
 	gen_require(`
-		type pgpkeyserver_port_t;
+		type pegasus_http_port_t;
 	')
 
-	allow $1 pgpkeyserver_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 pegasus_http_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the pgpkeyserver port.
+##	Send UDP traffic on the pegasus_http port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61665,17 +62551,17 @@ interface(`corenet_tcp_sendrecv_pgpkeyserver_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_pgpkeyserver_port',`
+interface(`corenet_udp_send_pegasus_http_port',`
 	gen_require(`
-		type pgpkeyserver_port_t;
+		type pegasus_http_port_t;
 	')
 
-	allow $1 pgpkeyserver_port_t:udp_socket send_msg;
+	allow $1 pegasus_http_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the pgpkeyserver port.
+##	Do not audit attempts to send UDP traffic on the pegasus_http port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61684,17 +62570,17 @@ interface(`corenet_udp_send_pgpkeyserver_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_pgpkeyserver_port',`
+interface(`corenet_dontaudit_udp_send_pegasus_http_port',`
 	gen_require(`
-		type pgpkeyserver_port_t;
+		type pegasus_http_port_t;
 	')
 
-	dontaudit $1 pgpkeyserver_port_t:udp_socket send_msg;
+	dontaudit $1 pegasus_http_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the pgpkeyserver port.
+##	Receive UDP traffic on the pegasus_http port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61703,17 +62589,17 @@ interface(`corenet_dontaudit_udp_send_pgpkeyserver_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_pgpkeyserver_port',`
+interface(`corenet_udp_receive_pegasus_http_port',`
 	gen_require(`
-		type pgpkeyserver_port_t;
+		type pegasus_http_port_t;
 	')
 
-	allow $1 pgpkeyserver_port_t:udp_socket recv_msg;
+	allow $1 pegasus_http_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the pgpkeyserver port.
+##	Do not audit attempts to receive UDP traffic on the pegasus_http port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61722,17 +62608,17 @@ interface(`corenet_udp_receive_pgpkeyserver_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_pgpkeyserver_port',`
+interface(`corenet_dontaudit_udp_receive_pegasus_http_port',`
 	gen_require(`
-		type pgpkeyserver_port_t;
+		type pegasus_http_port_t;
 	')
 
-	dontaudit $1 pgpkeyserver_port_t:udp_socket recv_msg;
+	dontaudit $1 pegasus_http_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the pgpkeyserver port.
+##	Send and receive UDP traffic on the pegasus_http port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61741,15 +62627,15 @@ interface(`corenet_dontaudit_udp_receive_pgpkeyserver_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_pgpkeyserver_port',`
-	corenet_udp_send_pgpkeyserver_port($1)
-	corenet_udp_receive_pgpkeyserver_port($1)
+interface(`corenet_udp_sendrecv_pegasus_http_port',`
+	corenet_udp_send_pegasus_http_port($1)
+	corenet_udp_receive_pegasus_http_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the pgpkeyserver port.
+##	UDP traffic on the pegasus_http port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61758,14 +62644,14 @@ interface(`corenet_udp_sendrecv_pgpkeyserver_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_pgpkeyserver_port',`
-	corenet_dontaudit_udp_send_pgpkeyserver_port($1)
-	corenet_dontaudit_udp_receive_pgpkeyserver_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_pegasus_http_port',`
+	corenet_dontaudit_udp_send_pegasus_http_port($1)
+	corenet_dontaudit_udp_receive_pegasus_http_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the pgpkeyserver port.
+##	Bind TCP sockets to the pegasus_http port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61774,18 +62660,18 @@ interface(`corenet_dontaudit_udp_sendrecv_pgpkeyserver_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_pgpkeyserver_port',`
+interface(`corenet_tcp_bind_pegasus_http_port',`
 	gen_require(`
-		type pgpkeyserver_port_t;
+		type pegasus_http_port_t;
 	')
 
-	allow $1 pgpkeyserver_port_t:tcp_socket name_bind;
+	allow $1 pegasus_http_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the pgpkeyserver port.
+##	Bind UDP sockets to the pegasus_http port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61794,18 +62680,18 @@ interface(`corenet_tcp_bind_pgpkeyserver_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_pgpkeyserver_port',`
+interface(`corenet_udp_bind_pegasus_http_port',`
 	gen_require(`
-		type pgpkeyserver_port_t;
+		type pegasus_http_port_t;
 	')
 
-	allow $1 pgpkeyserver_port_t:udp_socket name_bind;
+	allow $1 pegasus_http_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the pgpkeyserver port.
+##	Make a TCP connection to the pegasus_http port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61813,18 +62699,18 @@ interface(`corenet_udp_bind_pgpkeyserver_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_pgpkeyserver_port',`
+interface(`corenet_tcp_connect_pegasus_http_port',`
 	gen_require(`
-		type pgpkeyserver_port_t;
+		type pegasus_http_port_t;
 	')
 
-	allow $1 pgpkeyserver_port_t:tcp_socket name_connect;
+	allow $1 pegasus_http_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pgpkeyserver_client packets.
+##	Send pegasus_http_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61833,17 +62719,17 @@ interface(`corenet_tcp_connect_pgpkeyserver_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pgpkeyserver_client_packets',`
+interface(`corenet_send_pegasus_http_client_packets',`
 	gen_require(`
-		type pgpkeyserver_client_packet_t;
+		type pegasus_http_client_packet_t;
 	')
 
-	allow $1 pgpkeyserver_client_packet_t:packet send;
+	allow $1 pegasus_http_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pgpkeyserver_client packets.
+##	Do not audit attempts to send pegasus_http_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61852,17 +62738,17 @@ interface(`corenet_send_pgpkeyserver_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pgpkeyserver_client_packets',`
+interface(`corenet_dontaudit_send_pegasus_http_client_packets',`
 	gen_require(`
-		type pgpkeyserver_client_packet_t;
+		type pegasus_http_client_packet_t;
 	')
 
-	dontaudit $1 pgpkeyserver_client_packet_t:packet send;
+	dontaudit $1 pegasus_http_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pgpkeyserver_client packets.
+##	Receive pegasus_http_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61871,17 +62757,17 @@ interface(`corenet_dontaudit_send_pgpkeyserver_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pgpkeyserver_client_packets',`
+interface(`corenet_receive_pegasus_http_client_packets',`
 	gen_require(`
-		type pgpkeyserver_client_packet_t;
+		type pegasus_http_client_packet_t;
 	')
 
-	allow $1 pgpkeyserver_client_packet_t:packet recv;
+	allow $1 pegasus_http_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pgpkeyserver_client packets.
+##	Do not audit attempts to receive pegasus_http_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61890,17 +62776,17 @@ interface(`corenet_receive_pgpkeyserver_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pgpkeyserver_client_packets',`
+interface(`corenet_dontaudit_receive_pegasus_http_client_packets',`
 	gen_require(`
-		type pgpkeyserver_client_packet_t;
+		type pegasus_http_client_packet_t;
 	')
 
-	dontaudit $1 pgpkeyserver_client_packet_t:packet recv;
+	dontaudit $1 pegasus_http_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pgpkeyserver_client packets.
+##	Send and receive pegasus_http_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61909,14 +62795,14 @@ interface(`corenet_dontaudit_receive_pgpkeyserver_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pgpkeyserver_client_packets',`
-	corenet_send_pgpkeyserver_client_packets($1)
-	corenet_receive_pgpkeyserver_client_packets($1)
+interface(`corenet_sendrecv_pegasus_http_client_packets',`
+	corenet_send_pegasus_http_client_packets($1)
+	corenet_receive_pegasus_http_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pgpkeyserver_client packets.
+##	Do not audit attempts to send and receive pegasus_http_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61925,14 +62811,14 @@ interface(`corenet_sendrecv_pgpkeyserver_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pgpkeyserver_client_packets',`
-	corenet_dontaudit_send_pgpkeyserver_client_packets($1)
-	corenet_dontaudit_receive_pgpkeyserver_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_pegasus_http_client_packets',`
+	corenet_dontaudit_send_pegasus_http_client_packets($1)
+	corenet_dontaudit_receive_pegasus_http_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pgpkeyserver_client the packet type.
+##	Relabel packets to pegasus_http_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61940,18 +62826,18 @@ interface(`corenet_dontaudit_sendrecv_pgpkeyserver_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pgpkeyserver_client_packets',`
+interface(`corenet_relabelto_pegasus_http_client_packets',`
 	gen_require(`
-		type pgpkeyserver_client_packet_t;
+		type pegasus_http_client_packet_t;
 	')
 
-	allow $1 pgpkeyserver_client_packet_t:packet relabelto;
+	allow $1 pegasus_http_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pgpkeyserver_server packets.
+##	Send pegasus_http_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61960,17 +62846,17 @@ interface(`corenet_relabelto_pgpkeyserver_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pgpkeyserver_server_packets',`
+interface(`corenet_send_pegasus_http_server_packets',`
 	gen_require(`
-		type pgpkeyserver_server_packet_t;
+		type pegasus_http_server_packet_t;
 	')
 
-	allow $1 pgpkeyserver_server_packet_t:packet send;
+	allow $1 pegasus_http_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pgpkeyserver_server packets.
+##	Do not audit attempts to send pegasus_http_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61979,17 +62865,17 @@ interface(`corenet_send_pgpkeyserver_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pgpkeyserver_server_packets',`
+interface(`corenet_dontaudit_send_pegasus_http_server_packets',`
 	gen_require(`
-		type pgpkeyserver_server_packet_t;
+		type pegasus_http_server_packet_t;
 	')
 
-	dontaudit $1 pgpkeyserver_server_packet_t:packet send;
+	dontaudit $1 pegasus_http_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pgpkeyserver_server packets.
+##	Receive pegasus_http_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -61998,17 +62884,17 @@ interface(`corenet_dontaudit_send_pgpkeyserver_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pgpkeyserver_server_packets',`
+interface(`corenet_receive_pegasus_http_server_packets',`
 	gen_require(`
-		type pgpkeyserver_server_packet_t;
+		type pegasus_http_server_packet_t;
 	')
 
-	allow $1 pgpkeyserver_server_packet_t:packet recv;
+	allow $1 pegasus_http_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pgpkeyserver_server packets.
+##	Do not audit attempts to receive pegasus_http_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62017,17 +62903,17 @@ interface(`corenet_receive_pgpkeyserver_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pgpkeyserver_server_packets',`
+interface(`corenet_dontaudit_receive_pegasus_http_server_packets',`
 	gen_require(`
-		type pgpkeyserver_server_packet_t;
+		type pegasus_http_server_packet_t;
 	')
 
-	dontaudit $1 pgpkeyserver_server_packet_t:packet recv;
+	dontaudit $1 pegasus_http_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pgpkeyserver_server packets.
+##	Send and receive pegasus_http_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62036,14 +62922,14 @@ interface(`corenet_dontaudit_receive_pgpkeyserver_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pgpkeyserver_server_packets',`
-	corenet_send_pgpkeyserver_server_packets($1)
-	corenet_receive_pgpkeyserver_server_packets($1)
+interface(`corenet_sendrecv_pegasus_http_server_packets',`
+	corenet_send_pegasus_http_server_packets($1)
+	corenet_receive_pegasus_http_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pgpkeyserver_server packets.
+##	Do not audit attempts to send and receive pegasus_http_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62052,14 +62938,14 @@ interface(`corenet_sendrecv_pgpkeyserver_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pgpkeyserver_server_packets',`
-	corenet_dontaudit_send_pgpkeyserver_server_packets($1)
-	corenet_dontaudit_receive_pgpkeyserver_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_pegasus_http_server_packets',`
+	corenet_dontaudit_send_pegasus_http_server_packets($1)
+	corenet_dontaudit_receive_pegasus_http_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pgpkeyserver_server the packet type.
+##	Relabel packets to pegasus_http_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62067,12 +62953,12 @@ interface(`corenet_dontaudit_sendrecv_pgpkeyserver_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pgpkeyserver_server_packets',`
+interface(`corenet_relabelto_pegasus_http_server_packets',`
 	gen_require(`
-		type pgpkeyserver_server_packet_t;
+		type pegasus_http_server_packet_t;
 	')
 
-	allow $1 pgpkeyserver_server_packet_t:packet relabelto;
+	allow $1 pegasus_http_server_packet_t:packet relabelto;
 ')
 
 
@@ -62080,7 +62966,7 @@ interface(`corenet_relabelto_pgpkeyserver_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the pingd port.
+##	Send and receive TCP traffic on the pegasus_https port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62089,17 +62975,17 @@ interface(`corenet_relabelto_pgpkeyserver_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_pingd_port',`
+interface(`corenet_tcp_sendrecv_pegasus_https_port',`
 	gen_require(`
-		type pingd_port_t;
+		type pegasus_https_port_t;
 	')
 
-	allow $1 pingd_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 pegasus_https_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the pingd port.
+##	Send UDP traffic on the pegasus_https port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62108,17 +62994,17 @@ interface(`corenet_tcp_sendrecv_pingd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_pingd_port',`
+interface(`corenet_udp_send_pegasus_https_port',`
 	gen_require(`
-		type pingd_port_t;
+		type pegasus_https_port_t;
 	')
 
-	allow $1 pingd_port_t:udp_socket send_msg;
+	allow $1 pegasus_https_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the pingd port.
+##	Do not audit attempts to send UDP traffic on the pegasus_https port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62127,17 +63013,17 @@ interface(`corenet_udp_send_pingd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_pingd_port',`
+interface(`corenet_dontaudit_udp_send_pegasus_https_port',`
 	gen_require(`
-		type pingd_port_t;
+		type pegasus_https_port_t;
 	')
 
-	dontaudit $1 pingd_port_t:udp_socket send_msg;
+	dontaudit $1 pegasus_https_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the pingd port.
+##	Receive UDP traffic on the pegasus_https port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62146,17 +63032,17 @@ interface(`corenet_dontaudit_udp_send_pingd_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_pingd_port',`
+interface(`corenet_udp_receive_pegasus_https_port',`
 	gen_require(`
-		type pingd_port_t;
+		type pegasus_https_port_t;
 	')
 
-	allow $1 pingd_port_t:udp_socket recv_msg;
+	allow $1 pegasus_https_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the pingd port.
+##	Do not audit attempts to receive UDP traffic on the pegasus_https port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62165,17 +63051,17 @@ interface(`corenet_udp_receive_pingd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_pingd_port',`
+interface(`corenet_dontaudit_udp_receive_pegasus_https_port',`
 	gen_require(`
-		type pingd_port_t;
+		type pegasus_https_port_t;
 	')
 
-	dontaudit $1 pingd_port_t:udp_socket recv_msg;
+	dontaudit $1 pegasus_https_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the pingd port.
+##	Send and receive UDP traffic on the pegasus_https port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62184,15 +63070,15 @@ interface(`corenet_dontaudit_udp_receive_pingd_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_pingd_port',`
-	corenet_udp_send_pingd_port($1)
-	corenet_udp_receive_pingd_port($1)
+interface(`corenet_udp_sendrecv_pegasus_https_port',`
+	corenet_udp_send_pegasus_https_port($1)
+	corenet_udp_receive_pegasus_https_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the pingd port.
+##	UDP traffic on the pegasus_https port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62201,14 +63087,14 @@ interface(`corenet_udp_sendrecv_pingd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_pingd_port',`
-	corenet_dontaudit_udp_send_pingd_port($1)
-	corenet_dontaudit_udp_receive_pingd_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_pegasus_https_port',`
+	corenet_dontaudit_udp_send_pegasus_https_port($1)
+	corenet_dontaudit_udp_receive_pegasus_https_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the pingd port.
+##	Bind TCP sockets to the pegasus_https port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62217,18 +63103,18 @@ interface(`corenet_dontaudit_udp_sendrecv_pingd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_pingd_port',`
+interface(`corenet_tcp_bind_pegasus_https_port',`
 	gen_require(`
-		type pingd_port_t;
+		type pegasus_https_port_t;
 	')
 
-	allow $1 pingd_port_t:tcp_socket name_bind;
+	allow $1 pegasus_https_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the pingd port.
+##	Bind UDP sockets to the pegasus_https port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62237,18 +63123,18 @@ interface(`corenet_tcp_bind_pingd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_pingd_port',`
+interface(`corenet_udp_bind_pegasus_https_port',`
 	gen_require(`
-		type pingd_port_t;
+		type pegasus_https_port_t;
 	')
 
-	allow $1 pingd_port_t:udp_socket name_bind;
+	allow $1 pegasus_https_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the pingd port.
+##	Make a TCP connection to the pegasus_https port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62256,18 +63142,18 @@ interface(`corenet_udp_bind_pingd_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_pingd_port',`
+interface(`corenet_tcp_connect_pegasus_https_port',`
 	gen_require(`
-		type pingd_port_t;
+		type pegasus_https_port_t;
 	')
 
-	allow $1 pingd_port_t:tcp_socket name_connect;
+	allow $1 pegasus_https_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pingd_client packets.
+##	Send pegasus_https_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62276,17 +63162,17 @@ interface(`corenet_tcp_connect_pingd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pingd_client_packets',`
+interface(`corenet_send_pegasus_https_client_packets',`
 	gen_require(`
-		type pingd_client_packet_t;
+		type pegasus_https_client_packet_t;
 	')
 
-	allow $1 pingd_client_packet_t:packet send;
+	allow $1 pegasus_https_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pingd_client packets.
+##	Do not audit attempts to send pegasus_https_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62295,17 +63181,17 @@ interface(`corenet_send_pingd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pingd_client_packets',`
+interface(`corenet_dontaudit_send_pegasus_https_client_packets',`
 	gen_require(`
-		type pingd_client_packet_t;
+		type pegasus_https_client_packet_t;
 	')
 
-	dontaudit $1 pingd_client_packet_t:packet send;
+	dontaudit $1 pegasus_https_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pingd_client packets.
+##	Receive pegasus_https_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62314,17 +63200,17 @@ interface(`corenet_dontaudit_send_pingd_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pingd_client_packets',`
+interface(`corenet_receive_pegasus_https_client_packets',`
 	gen_require(`
-		type pingd_client_packet_t;
+		type pegasus_https_client_packet_t;
 	')
 
-	allow $1 pingd_client_packet_t:packet recv;
+	allow $1 pegasus_https_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pingd_client packets.
+##	Do not audit attempts to receive pegasus_https_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62333,17 +63219,17 @@ interface(`corenet_receive_pingd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pingd_client_packets',`
+interface(`corenet_dontaudit_receive_pegasus_https_client_packets',`
 	gen_require(`
-		type pingd_client_packet_t;
+		type pegasus_https_client_packet_t;
 	')
 
-	dontaudit $1 pingd_client_packet_t:packet recv;
+	dontaudit $1 pegasus_https_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pingd_client packets.
+##	Send and receive pegasus_https_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62352,14 +63238,14 @@ interface(`corenet_dontaudit_receive_pingd_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pingd_client_packets',`
-	corenet_send_pingd_client_packets($1)
-	corenet_receive_pingd_client_packets($1)
+interface(`corenet_sendrecv_pegasus_https_client_packets',`
+	corenet_send_pegasus_https_client_packets($1)
+	corenet_receive_pegasus_https_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pingd_client packets.
+##	Do not audit attempts to send and receive pegasus_https_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62368,14 +63254,14 @@ interface(`corenet_sendrecv_pingd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pingd_client_packets',`
-	corenet_dontaudit_send_pingd_client_packets($1)
-	corenet_dontaudit_receive_pingd_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_pegasus_https_client_packets',`
+	corenet_dontaudit_send_pegasus_https_client_packets($1)
+	corenet_dontaudit_receive_pegasus_https_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pingd_client the packet type.
+##	Relabel packets to pegasus_https_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62383,18 +63269,18 @@ interface(`corenet_dontaudit_sendrecv_pingd_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pingd_client_packets',`
+interface(`corenet_relabelto_pegasus_https_client_packets',`
 	gen_require(`
-		type pingd_client_packet_t;
+		type pegasus_https_client_packet_t;
 	')
 
-	allow $1 pingd_client_packet_t:packet relabelto;
+	allow $1 pegasus_https_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pingd_server packets.
+##	Send pegasus_https_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62403,17 +63289,17 @@ interface(`corenet_relabelto_pingd_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pingd_server_packets',`
+interface(`corenet_send_pegasus_https_server_packets',`
 	gen_require(`
-		type pingd_server_packet_t;
+		type pegasus_https_server_packet_t;
 	')
 
-	allow $1 pingd_server_packet_t:packet send;
+	allow $1 pegasus_https_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pingd_server packets.
+##	Do not audit attempts to send pegasus_https_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62422,17 +63308,17 @@ interface(`corenet_send_pingd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pingd_server_packets',`
+interface(`corenet_dontaudit_send_pegasus_https_server_packets',`
 	gen_require(`
-		type pingd_server_packet_t;
+		type pegasus_https_server_packet_t;
 	')
 
-	dontaudit $1 pingd_server_packet_t:packet send;
+	dontaudit $1 pegasus_https_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pingd_server packets.
+##	Receive pegasus_https_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62441,17 +63327,17 @@ interface(`corenet_dontaudit_send_pingd_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pingd_server_packets',`
+interface(`corenet_receive_pegasus_https_server_packets',`
 	gen_require(`
-		type pingd_server_packet_t;
+		type pegasus_https_server_packet_t;
 	')
 
-	allow $1 pingd_server_packet_t:packet recv;
+	allow $1 pegasus_https_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pingd_server packets.
+##	Do not audit attempts to receive pegasus_https_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62460,17 +63346,17 @@ interface(`corenet_receive_pingd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pingd_server_packets',`
+interface(`corenet_dontaudit_receive_pegasus_https_server_packets',`
 	gen_require(`
-		type pingd_server_packet_t;
+		type pegasus_https_server_packet_t;
 	')
 
-	dontaudit $1 pingd_server_packet_t:packet recv;
+	dontaudit $1 pegasus_https_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pingd_server packets.
+##	Send and receive pegasus_https_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62479,14 +63365,14 @@ interface(`corenet_dontaudit_receive_pingd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pingd_server_packets',`
-	corenet_send_pingd_server_packets($1)
-	corenet_receive_pingd_server_packets($1)
+interface(`corenet_sendrecv_pegasus_https_server_packets',`
+	corenet_send_pegasus_https_server_packets($1)
+	corenet_receive_pegasus_https_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pingd_server packets.
+##	Do not audit attempts to send and receive pegasus_https_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62495,14 +63381,14 @@ interface(`corenet_sendrecv_pingd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pingd_server_packets',`
-	corenet_dontaudit_send_pingd_server_packets($1)
-	corenet_dontaudit_receive_pingd_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_pegasus_https_server_packets',`
+	corenet_dontaudit_send_pegasus_https_server_packets($1)
+	corenet_dontaudit_receive_pegasus_https_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pingd_server the packet type.
+##	Relabel packets to pegasus_https_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62510,12 +63396,12 @@ interface(`corenet_dontaudit_sendrecv_pingd_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pingd_server_packets',`
+interface(`corenet_relabelto_pegasus_https_server_packets',`
 	gen_require(`
-		type pingd_server_packet_t;
+		type pegasus_https_server_packet_t;
 	')
 
-	allow $1 pingd_server_packet_t:packet relabelto;
+	allow $1 pegasus_https_server_packet_t:packet relabelto;
 ')
 
 
@@ -62523,7 +63409,7 @@ interface(`corenet_relabelto_pingd_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the pktcable_cops port.
+##	Send and receive TCP traffic on the pgpkeyserver port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62532,17 +63418,17 @@ interface(`corenet_relabelto_pingd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_pktcable_cops_port',`
+interface(`corenet_tcp_sendrecv_pgpkeyserver_port',`
 	gen_require(`
-		type pktcable_cops_port_t;
+		type pgpkeyserver_port_t;
 	')
 
-	allow $1 pktcable_cops_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 pgpkeyserver_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the pktcable_cops port.
+##	Send UDP traffic on the pgpkeyserver port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62551,17 +63437,17 @@ interface(`corenet_tcp_sendrecv_pktcable_cops_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_pktcable_cops_port',`
+interface(`corenet_udp_send_pgpkeyserver_port',`
 	gen_require(`
-		type pktcable_cops_port_t;
+		type pgpkeyserver_port_t;
 	')
 
-	allow $1 pktcable_cops_port_t:udp_socket send_msg;
+	allow $1 pgpkeyserver_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the pktcable_cops port.
+##	Do not audit attempts to send UDP traffic on the pgpkeyserver port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62570,17 +63456,17 @@ interface(`corenet_udp_send_pktcable_cops_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_pktcable_cops_port',`
+interface(`corenet_dontaudit_udp_send_pgpkeyserver_port',`
 	gen_require(`
-		type pktcable_cops_port_t;
+		type pgpkeyserver_port_t;
 	')
 
-	dontaudit $1 pktcable_cops_port_t:udp_socket send_msg;
+	dontaudit $1 pgpkeyserver_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the pktcable_cops port.
+##	Receive UDP traffic on the pgpkeyserver port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62589,17 +63475,17 @@ interface(`corenet_dontaudit_udp_send_pktcable_cops_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_pktcable_cops_port',`
+interface(`corenet_udp_receive_pgpkeyserver_port',`
 	gen_require(`
-		type pktcable_cops_port_t;
+		type pgpkeyserver_port_t;
 	')
 
-	allow $1 pktcable_cops_port_t:udp_socket recv_msg;
+	allow $1 pgpkeyserver_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the pktcable_cops port.
+##	Do not audit attempts to receive UDP traffic on the pgpkeyserver port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62608,17 +63494,17 @@ interface(`corenet_udp_receive_pktcable_cops_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_pktcable_cops_port',`
+interface(`corenet_dontaudit_udp_receive_pgpkeyserver_port',`
 	gen_require(`
-		type pktcable_cops_port_t;
+		type pgpkeyserver_port_t;
 	')
 
-	dontaudit $1 pktcable_cops_port_t:udp_socket recv_msg;
+	dontaudit $1 pgpkeyserver_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the pktcable_cops port.
+##	Send and receive UDP traffic on the pgpkeyserver port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62627,15 +63513,15 @@ interface(`corenet_dontaudit_udp_receive_pktcable_cops_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_pktcable_cops_port',`
-	corenet_udp_send_pktcable_cops_port($1)
-	corenet_udp_receive_pktcable_cops_port($1)
+interface(`corenet_udp_sendrecv_pgpkeyserver_port',`
+	corenet_udp_send_pgpkeyserver_port($1)
+	corenet_udp_receive_pgpkeyserver_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the pktcable_cops port.
+##	UDP traffic on the pgpkeyserver port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62644,14 +63530,14 @@ interface(`corenet_udp_sendrecv_pktcable_cops_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_pktcable_cops_port',`
-	corenet_dontaudit_udp_send_pktcable_cops_port($1)
-	corenet_dontaudit_udp_receive_pktcable_cops_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_pgpkeyserver_port',`
+	corenet_dontaudit_udp_send_pgpkeyserver_port($1)
+	corenet_dontaudit_udp_receive_pgpkeyserver_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the pktcable_cops port.
+##	Bind TCP sockets to the pgpkeyserver port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62660,18 +63546,18 @@ interface(`corenet_dontaudit_udp_sendrecv_pktcable_cops_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_pktcable_cops_port',`
+interface(`corenet_tcp_bind_pgpkeyserver_port',`
 	gen_require(`
-		type pktcable_cops_port_t;
+		type pgpkeyserver_port_t;
 	')
 
-	allow $1 pktcable_cops_port_t:tcp_socket name_bind;
+	allow $1 pgpkeyserver_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the pktcable_cops port.
+##	Bind UDP sockets to the pgpkeyserver port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62680,18 +63566,18 @@ interface(`corenet_tcp_bind_pktcable_cops_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_pktcable_cops_port',`
+interface(`corenet_udp_bind_pgpkeyserver_port',`
 	gen_require(`
-		type pktcable_cops_port_t;
+		type pgpkeyserver_port_t;
 	')
 
-	allow $1 pktcable_cops_port_t:udp_socket name_bind;
+	allow $1 pgpkeyserver_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the pktcable_cops port.
+##	Make a TCP connection to the pgpkeyserver port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62699,18 +63585,18 @@ interface(`corenet_udp_bind_pktcable_cops_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_pktcable_cops_port',`
+interface(`corenet_tcp_connect_pgpkeyserver_port',`
 	gen_require(`
-		type pktcable_cops_port_t;
+		type pgpkeyserver_port_t;
 	')
 
-	allow $1 pktcable_cops_port_t:tcp_socket name_connect;
+	allow $1 pgpkeyserver_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pktcable_cops_client packets.
+##	Send pgpkeyserver_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62719,17 +63605,17 @@ interface(`corenet_tcp_connect_pktcable_cops_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pktcable_cops_client_packets',`
+interface(`corenet_send_pgpkeyserver_client_packets',`
 	gen_require(`
-		type pktcable_cops_client_packet_t;
+		type pgpkeyserver_client_packet_t;
 	')
 
-	allow $1 pktcable_cops_client_packet_t:packet send;
+	allow $1 pgpkeyserver_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pktcable_cops_client packets.
+##	Do not audit attempts to send pgpkeyserver_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62738,17 +63624,17 @@ interface(`corenet_send_pktcable_cops_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pktcable_cops_client_packets',`
+interface(`corenet_dontaudit_send_pgpkeyserver_client_packets',`
 	gen_require(`
-		type pktcable_cops_client_packet_t;
+		type pgpkeyserver_client_packet_t;
 	')
 
-	dontaudit $1 pktcable_cops_client_packet_t:packet send;
+	dontaudit $1 pgpkeyserver_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pktcable_cops_client packets.
+##	Receive pgpkeyserver_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62757,17 +63643,17 @@ interface(`corenet_dontaudit_send_pktcable_cops_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pktcable_cops_client_packets',`
+interface(`corenet_receive_pgpkeyserver_client_packets',`
 	gen_require(`
-		type pktcable_cops_client_packet_t;
+		type pgpkeyserver_client_packet_t;
 	')
 
-	allow $1 pktcable_cops_client_packet_t:packet recv;
+	allow $1 pgpkeyserver_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pktcable_cops_client packets.
+##	Do not audit attempts to receive pgpkeyserver_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62776,17 +63662,17 @@ interface(`corenet_receive_pktcable_cops_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pktcable_cops_client_packets',`
+interface(`corenet_dontaudit_receive_pgpkeyserver_client_packets',`
 	gen_require(`
-		type pktcable_cops_client_packet_t;
+		type pgpkeyserver_client_packet_t;
 	')
 
-	dontaudit $1 pktcable_cops_client_packet_t:packet recv;
+	dontaudit $1 pgpkeyserver_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pktcable_cops_client packets.
+##	Send and receive pgpkeyserver_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62795,14 +63681,14 @@ interface(`corenet_dontaudit_receive_pktcable_cops_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pktcable_cops_client_packets',`
-	corenet_send_pktcable_cops_client_packets($1)
-	corenet_receive_pktcable_cops_client_packets($1)
+interface(`corenet_sendrecv_pgpkeyserver_client_packets',`
+	corenet_send_pgpkeyserver_client_packets($1)
+	corenet_receive_pgpkeyserver_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pktcable_cops_client packets.
+##	Do not audit attempts to send and receive pgpkeyserver_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62811,14 +63697,14 @@ interface(`corenet_sendrecv_pktcable_cops_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pktcable_cops_client_packets',`
-	corenet_dontaudit_send_pktcable_cops_client_packets($1)
-	corenet_dontaudit_receive_pktcable_cops_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_pgpkeyserver_client_packets',`
+	corenet_dontaudit_send_pgpkeyserver_client_packets($1)
+	corenet_dontaudit_receive_pgpkeyserver_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pktcable_cops_client the packet type.
+##	Relabel packets to pgpkeyserver_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62826,18 +63712,18 @@ interface(`corenet_dontaudit_sendrecv_pktcable_cops_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pktcable_cops_client_packets',`
+interface(`corenet_relabelto_pgpkeyserver_client_packets',`
 	gen_require(`
-		type pktcable_cops_client_packet_t;
+		type pgpkeyserver_client_packet_t;
 	')
 
-	allow $1 pktcable_cops_client_packet_t:packet relabelto;
+	allow $1 pgpkeyserver_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pktcable_cops_server packets.
+##	Send pgpkeyserver_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62846,17 +63732,17 @@ interface(`corenet_relabelto_pktcable_cops_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pktcable_cops_server_packets',`
+interface(`corenet_send_pgpkeyserver_server_packets',`
 	gen_require(`
-		type pktcable_cops_server_packet_t;
+		type pgpkeyserver_server_packet_t;
 	')
 
-	allow $1 pktcable_cops_server_packet_t:packet send;
+	allow $1 pgpkeyserver_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pktcable_cops_server packets.
+##	Do not audit attempts to send pgpkeyserver_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62865,17 +63751,17 @@ interface(`corenet_send_pktcable_cops_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pktcable_cops_server_packets',`
+interface(`corenet_dontaudit_send_pgpkeyserver_server_packets',`
 	gen_require(`
-		type pktcable_cops_server_packet_t;
+		type pgpkeyserver_server_packet_t;
 	')
 
-	dontaudit $1 pktcable_cops_server_packet_t:packet send;
+	dontaudit $1 pgpkeyserver_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pktcable_cops_server packets.
+##	Receive pgpkeyserver_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62884,17 +63770,17 @@ interface(`corenet_dontaudit_send_pktcable_cops_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pktcable_cops_server_packets',`
+interface(`corenet_receive_pgpkeyserver_server_packets',`
 	gen_require(`
-		type pktcable_cops_server_packet_t;
+		type pgpkeyserver_server_packet_t;
 	')
 
-	allow $1 pktcable_cops_server_packet_t:packet recv;
+	allow $1 pgpkeyserver_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pktcable_cops_server packets.
+##	Do not audit attempts to receive pgpkeyserver_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62903,17 +63789,17 @@ interface(`corenet_receive_pktcable_cops_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pktcable_cops_server_packets',`
+interface(`corenet_dontaudit_receive_pgpkeyserver_server_packets',`
 	gen_require(`
-		type pktcable_cops_server_packet_t;
+		type pgpkeyserver_server_packet_t;
 	')
 
-	dontaudit $1 pktcable_cops_server_packet_t:packet recv;
+	dontaudit $1 pgpkeyserver_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pktcable_cops_server packets.
+##	Send and receive pgpkeyserver_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62922,14 +63808,14 @@ interface(`corenet_dontaudit_receive_pktcable_cops_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pktcable_cops_server_packets',`
-	corenet_send_pktcable_cops_server_packets($1)
-	corenet_receive_pktcable_cops_server_packets($1)
+interface(`corenet_sendrecv_pgpkeyserver_server_packets',`
+	corenet_send_pgpkeyserver_server_packets($1)
+	corenet_receive_pgpkeyserver_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pktcable_cops_server packets.
+##	Do not audit attempts to send and receive pgpkeyserver_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62938,14 +63824,14 @@ interface(`corenet_sendrecv_pktcable_cops_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pktcable_cops_server_packets',`
-	corenet_dontaudit_send_pktcable_cops_server_packets($1)
-	corenet_dontaudit_receive_pktcable_cops_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_pgpkeyserver_server_packets',`
+	corenet_dontaudit_send_pgpkeyserver_server_packets($1)
+	corenet_dontaudit_receive_pgpkeyserver_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pktcable_cops_server the packet type.
+##	Relabel packets to pgpkeyserver_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62953,12 +63839,12 @@ interface(`corenet_dontaudit_sendrecv_pktcable_cops_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pktcable_cops_server_packets',`
+interface(`corenet_relabelto_pgpkeyserver_server_packets',`
 	gen_require(`
-		type pktcable_cops_server_packet_t;
+		type pgpkeyserver_server_packet_t;
 	')
 
-	allow $1 pktcable_cops_server_packet_t:packet relabelto;
+	allow $1 pgpkeyserver_server_packet_t:packet relabelto;
 ')
 
 
@@ -62966,7 +63852,7 @@ interface(`corenet_relabelto_pktcable_cops_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the pop port.
+##	Send and receive TCP traffic on the pingd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62975,17 +63861,17 @@ interface(`corenet_relabelto_pktcable_cops_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_pop_port',`
+interface(`corenet_tcp_sendrecv_pingd_port',`
 	gen_require(`
-		type pop_port_t;
+		type pingd_port_t;
 	')
 
-	allow $1 pop_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 pingd_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the pop port.
+##	Send UDP traffic on the pingd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -62994,17 +63880,17 @@ interface(`corenet_tcp_sendrecv_pop_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_pop_port',`
+interface(`corenet_udp_send_pingd_port',`
 	gen_require(`
-		type pop_port_t;
+		type pingd_port_t;
 	')
 
-	allow $1 pop_port_t:udp_socket send_msg;
+	allow $1 pingd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the pop port.
+##	Do not audit attempts to send UDP traffic on the pingd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63013,17 +63899,17 @@ interface(`corenet_udp_send_pop_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_pop_port',`
+interface(`corenet_dontaudit_udp_send_pingd_port',`
 	gen_require(`
-		type pop_port_t;
+		type pingd_port_t;
 	')
 
-	dontaudit $1 pop_port_t:udp_socket send_msg;
+	dontaudit $1 pingd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the pop port.
+##	Receive UDP traffic on the pingd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63032,17 +63918,17 @@ interface(`corenet_dontaudit_udp_send_pop_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_pop_port',`
+interface(`corenet_udp_receive_pingd_port',`
 	gen_require(`
-		type pop_port_t;
+		type pingd_port_t;
 	')
 
-	allow $1 pop_port_t:udp_socket recv_msg;
+	allow $1 pingd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the pop port.
+##	Do not audit attempts to receive UDP traffic on the pingd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63051,17 +63937,17 @@ interface(`corenet_udp_receive_pop_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_pop_port',`
+interface(`corenet_dontaudit_udp_receive_pingd_port',`
 	gen_require(`
-		type pop_port_t;
+		type pingd_port_t;
 	')
 
-	dontaudit $1 pop_port_t:udp_socket recv_msg;
+	dontaudit $1 pingd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the pop port.
+##	Send and receive UDP traffic on the pingd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63070,15 +63956,15 @@ interface(`corenet_dontaudit_udp_receive_pop_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_pop_port',`
-	corenet_udp_send_pop_port($1)
-	corenet_udp_receive_pop_port($1)
+interface(`corenet_udp_sendrecv_pingd_port',`
+	corenet_udp_send_pingd_port($1)
+	corenet_udp_receive_pingd_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the pop port.
+##	UDP traffic on the pingd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63087,14 +63973,14 @@ interface(`corenet_udp_sendrecv_pop_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_pop_port',`
-	corenet_dontaudit_udp_send_pop_port($1)
-	corenet_dontaudit_udp_receive_pop_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_pingd_port',`
+	corenet_dontaudit_udp_send_pingd_port($1)
+	corenet_dontaudit_udp_receive_pingd_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the pop port.
+##	Bind TCP sockets to the pingd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63103,18 +63989,18 @@ interface(`corenet_dontaudit_udp_sendrecv_pop_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_pop_port',`
+interface(`corenet_tcp_bind_pingd_port',`
 	gen_require(`
-		type pop_port_t;
+		type pingd_port_t;
 	')
 
-	allow $1 pop_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 pingd_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the pop port.
+##	Bind UDP sockets to the pingd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63123,18 +64009,18 @@ interface(`corenet_tcp_bind_pop_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_pop_port',`
+interface(`corenet_udp_bind_pingd_port',`
 	gen_require(`
-		type pop_port_t;
+		type pingd_port_t;
 	')
 
-	allow $1 pop_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 pingd_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the pop port.
+##	Make a TCP connection to the pingd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63142,18 +64028,18 @@ interface(`corenet_udp_bind_pop_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_pop_port',`
+interface(`corenet_tcp_connect_pingd_port',`
 	gen_require(`
-		type pop_port_t;
+		type pingd_port_t;
 	')
 
-	allow $1 pop_port_t:tcp_socket name_connect;
+	allow $1 pingd_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pop_client packets.
+##	Send pingd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63162,17 +64048,17 @@ interface(`corenet_tcp_connect_pop_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pop_client_packets',`
+interface(`corenet_send_pingd_client_packets',`
 	gen_require(`
-		type pop_client_packet_t;
+		type pingd_client_packet_t;
 	')
 
-	allow $1 pop_client_packet_t:packet send;
+	allow $1 pingd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pop_client packets.
+##	Do not audit attempts to send pingd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63181,17 +64067,17 @@ interface(`corenet_send_pop_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pop_client_packets',`
+interface(`corenet_dontaudit_send_pingd_client_packets',`
 	gen_require(`
-		type pop_client_packet_t;
+		type pingd_client_packet_t;
 	')
 
-	dontaudit $1 pop_client_packet_t:packet send;
+	dontaudit $1 pingd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pop_client packets.
+##	Receive pingd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63200,17 +64086,17 @@ interface(`corenet_dontaudit_send_pop_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pop_client_packets',`
+interface(`corenet_receive_pingd_client_packets',`
 	gen_require(`
-		type pop_client_packet_t;
+		type pingd_client_packet_t;
 	')
 
-	allow $1 pop_client_packet_t:packet recv;
+	allow $1 pingd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pop_client packets.
+##	Do not audit attempts to receive pingd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63219,17 +64105,17 @@ interface(`corenet_receive_pop_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pop_client_packets',`
+interface(`corenet_dontaudit_receive_pingd_client_packets',`
 	gen_require(`
-		type pop_client_packet_t;
+		type pingd_client_packet_t;
 	')
 
-	dontaudit $1 pop_client_packet_t:packet recv;
+	dontaudit $1 pingd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pop_client packets.
+##	Send and receive pingd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63238,14 +64124,14 @@ interface(`corenet_dontaudit_receive_pop_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pop_client_packets',`
-	corenet_send_pop_client_packets($1)
-	corenet_receive_pop_client_packets($1)
+interface(`corenet_sendrecv_pingd_client_packets',`
+	corenet_send_pingd_client_packets($1)
+	corenet_receive_pingd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pop_client packets.
+##	Do not audit attempts to send and receive pingd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63254,14 +64140,14 @@ interface(`corenet_sendrecv_pop_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pop_client_packets',`
-	corenet_dontaudit_send_pop_client_packets($1)
-	corenet_dontaudit_receive_pop_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_pingd_client_packets',`
+	corenet_dontaudit_send_pingd_client_packets($1)
+	corenet_dontaudit_receive_pingd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pop_client the packet type.
+##	Relabel packets to pingd_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63269,18 +64155,18 @@ interface(`corenet_dontaudit_sendrecv_pop_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pop_client_packets',`
+interface(`corenet_relabelto_pingd_client_packets',`
 	gen_require(`
-		type pop_client_packet_t;
+		type pingd_client_packet_t;
 	')
 
-	allow $1 pop_client_packet_t:packet relabelto;
+	allow $1 pingd_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pop_server packets.
+##	Send pingd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63289,17 +64175,17 @@ interface(`corenet_relabelto_pop_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pop_server_packets',`
+interface(`corenet_send_pingd_server_packets',`
 	gen_require(`
-		type pop_server_packet_t;
+		type pingd_server_packet_t;
 	')
 
-	allow $1 pop_server_packet_t:packet send;
+	allow $1 pingd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pop_server packets.
+##	Do not audit attempts to send pingd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63308,17 +64194,17 @@ interface(`corenet_send_pop_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pop_server_packets',`
+interface(`corenet_dontaudit_send_pingd_server_packets',`
 	gen_require(`
-		type pop_server_packet_t;
+		type pingd_server_packet_t;
 	')
 
-	dontaudit $1 pop_server_packet_t:packet send;
+	dontaudit $1 pingd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pop_server packets.
+##	Receive pingd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63327,17 +64213,17 @@ interface(`corenet_dontaudit_send_pop_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pop_server_packets',`
+interface(`corenet_receive_pingd_server_packets',`
 	gen_require(`
-		type pop_server_packet_t;
+		type pingd_server_packet_t;
 	')
 
-	allow $1 pop_server_packet_t:packet recv;
+	allow $1 pingd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pop_server packets.
+##	Do not audit attempts to receive pingd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63346,17 +64232,17 @@ interface(`corenet_receive_pop_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pop_server_packets',`
+interface(`corenet_dontaudit_receive_pingd_server_packets',`
 	gen_require(`
-		type pop_server_packet_t;
+		type pingd_server_packet_t;
 	')
 
-	dontaudit $1 pop_server_packet_t:packet recv;
+	dontaudit $1 pingd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pop_server packets.
+##	Send and receive pingd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63365,14 +64251,14 @@ interface(`corenet_dontaudit_receive_pop_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pop_server_packets',`
-	corenet_send_pop_server_packets($1)
-	corenet_receive_pop_server_packets($1)
+interface(`corenet_sendrecv_pingd_server_packets',`
+	corenet_send_pingd_server_packets($1)
+	corenet_receive_pingd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pop_server packets.
+##	Do not audit attempts to send and receive pingd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63381,14 +64267,14 @@ interface(`corenet_sendrecv_pop_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pop_server_packets',`
-	corenet_dontaudit_send_pop_server_packets($1)
-	corenet_dontaudit_receive_pop_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_pingd_server_packets',`
+	corenet_dontaudit_send_pingd_server_packets($1)
+	corenet_dontaudit_receive_pingd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pop_server the packet type.
+##	Relabel packets to pingd_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63396,12 +64282,12 @@ interface(`corenet_dontaudit_sendrecv_pop_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pop_server_packets',`
+interface(`corenet_relabelto_pingd_server_packets',`
 	gen_require(`
-		type pop_server_packet_t;
+		type pingd_server_packet_t;
 	')
 
-	allow $1 pop_server_packet_t:packet relabelto;
+	allow $1 pingd_server_packet_t:packet relabelto;
 ')
 
 
@@ -63409,7 +64295,7 @@ interface(`corenet_relabelto_pop_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the portmap port.
+##	Send and receive TCP traffic on the pktcable_cops port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63418,17 +64304,17 @@ interface(`corenet_relabelto_pop_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_portmap_port',`
+interface(`corenet_tcp_sendrecv_pktcable_cops_port',`
 	gen_require(`
-		type portmap_port_t;
+		type pktcable_cops_port_t;
 	')
 
-	allow $1 portmap_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 pktcable_cops_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the portmap port.
+##	Send UDP traffic on the pktcable_cops port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63437,17 +64323,17 @@ interface(`corenet_tcp_sendrecv_portmap_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_portmap_port',`
+interface(`corenet_udp_send_pktcable_cops_port',`
 	gen_require(`
-		type portmap_port_t;
+		type pktcable_cops_port_t;
 	')
 
-	allow $1 portmap_port_t:udp_socket send_msg;
+	allow $1 pktcable_cops_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the portmap port.
+##	Do not audit attempts to send UDP traffic on the pktcable_cops port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63456,17 +64342,17 @@ interface(`corenet_udp_send_portmap_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_portmap_port',`
+interface(`corenet_dontaudit_udp_send_pktcable_cops_port',`
 	gen_require(`
-		type portmap_port_t;
+		type pktcable_cops_port_t;
 	')
 
-	dontaudit $1 portmap_port_t:udp_socket send_msg;
+	dontaudit $1 pktcable_cops_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the portmap port.
+##	Receive UDP traffic on the pktcable_cops port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63475,17 +64361,17 @@ interface(`corenet_dontaudit_udp_send_portmap_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_portmap_port',`
+interface(`corenet_udp_receive_pktcable_cops_port',`
 	gen_require(`
-		type portmap_port_t;
+		type pktcable_cops_port_t;
 	')
 
-	allow $1 portmap_port_t:udp_socket recv_msg;
+	allow $1 pktcable_cops_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the portmap port.
+##	Do not audit attempts to receive UDP traffic on the pktcable_cops port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63494,17 +64380,17 @@ interface(`corenet_udp_receive_portmap_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_portmap_port',`
+interface(`corenet_dontaudit_udp_receive_pktcable_cops_port',`
 	gen_require(`
-		type portmap_port_t;
+		type pktcable_cops_port_t;
 	')
 
-	dontaudit $1 portmap_port_t:udp_socket recv_msg;
+	dontaudit $1 pktcable_cops_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the portmap port.
+##	Send and receive UDP traffic on the pktcable_cops port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63513,15 +64399,15 @@ interface(`corenet_dontaudit_udp_receive_portmap_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_portmap_port',`
-	corenet_udp_send_portmap_port($1)
-	corenet_udp_receive_portmap_port($1)
+interface(`corenet_udp_sendrecv_pktcable_cops_port',`
+	corenet_udp_send_pktcable_cops_port($1)
+	corenet_udp_receive_pktcable_cops_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the portmap port.
+##	UDP traffic on the pktcable_cops port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63530,14 +64416,14 @@ interface(`corenet_udp_sendrecv_portmap_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_portmap_port',`
-	corenet_dontaudit_udp_send_portmap_port($1)
-	corenet_dontaudit_udp_receive_portmap_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_pktcable_cops_port',`
+	corenet_dontaudit_udp_send_pktcable_cops_port($1)
+	corenet_dontaudit_udp_receive_pktcable_cops_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the portmap port.
+##	Bind TCP sockets to the pktcable_cops port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63546,18 +64432,18 @@ interface(`corenet_dontaudit_udp_sendrecv_portmap_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_portmap_port',`
+interface(`corenet_tcp_bind_pktcable_cops_port',`
 	gen_require(`
-		type portmap_port_t;
+		type pktcable_cops_port_t;
 	')
 
-	allow $1 portmap_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 pktcable_cops_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the portmap port.
+##	Bind UDP sockets to the pktcable_cops port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63566,18 +64452,18 @@ interface(`corenet_tcp_bind_portmap_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_portmap_port',`
+interface(`corenet_udp_bind_pktcable_cops_port',`
 	gen_require(`
-		type portmap_port_t;
+		type pktcable_cops_port_t;
 	')
 
-	allow $1 portmap_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 pktcable_cops_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the portmap port.
+##	Make a TCP connection to the pktcable_cops port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63585,18 +64471,18 @@ interface(`corenet_udp_bind_portmap_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_portmap_port',`
+interface(`corenet_tcp_connect_pktcable_cops_port',`
 	gen_require(`
-		type portmap_port_t;
+		type pktcable_cops_port_t;
 	')
 
-	allow $1 portmap_port_t:tcp_socket name_connect;
+	allow $1 pktcable_cops_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send portmap_client packets.
+##	Send pktcable_cops_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63605,17 +64491,17 @@ interface(`corenet_tcp_connect_portmap_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_portmap_client_packets',`
+interface(`corenet_send_pktcable_cops_client_packets',`
 	gen_require(`
-		type portmap_client_packet_t;
+		type pktcable_cops_client_packet_t;
 	')
 
-	allow $1 portmap_client_packet_t:packet send;
+	allow $1 pktcable_cops_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send portmap_client packets.
+##	Do not audit attempts to send pktcable_cops_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63624,17 +64510,17 @@ interface(`corenet_send_portmap_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_portmap_client_packets',`
+interface(`corenet_dontaudit_send_pktcable_cops_client_packets',`
 	gen_require(`
-		type portmap_client_packet_t;
+		type pktcable_cops_client_packet_t;
 	')
 
-	dontaudit $1 portmap_client_packet_t:packet send;
+	dontaudit $1 pktcable_cops_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive portmap_client packets.
+##	Receive pktcable_cops_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63643,17 +64529,17 @@ interface(`corenet_dontaudit_send_portmap_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_portmap_client_packets',`
+interface(`corenet_receive_pktcable_cops_client_packets',`
 	gen_require(`
-		type portmap_client_packet_t;
+		type pktcable_cops_client_packet_t;
 	')
 
-	allow $1 portmap_client_packet_t:packet recv;
+	allow $1 pktcable_cops_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive portmap_client packets.
+##	Do not audit attempts to receive pktcable_cops_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63662,17 +64548,17 @@ interface(`corenet_receive_portmap_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_portmap_client_packets',`
+interface(`corenet_dontaudit_receive_pktcable_cops_client_packets',`
 	gen_require(`
-		type portmap_client_packet_t;
+		type pktcable_cops_client_packet_t;
 	')
 
-	dontaudit $1 portmap_client_packet_t:packet recv;
+	dontaudit $1 pktcable_cops_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive portmap_client packets.
+##	Send and receive pktcable_cops_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63681,14 +64567,14 @@ interface(`corenet_dontaudit_receive_portmap_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_portmap_client_packets',`
-	corenet_send_portmap_client_packets($1)
-	corenet_receive_portmap_client_packets($1)
+interface(`corenet_sendrecv_pktcable_cops_client_packets',`
+	corenet_send_pktcable_cops_client_packets($1)
+	corenet_receive_pktcable_cops_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive portmap_client packets.
+##	Do not audit attempts to send and receive pktcable_cops_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63697,14 +64583,14 @@ interface(`corenet_sendrecv_portmap_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_portmap_client_packets',`
-	corenet_dontaudit_send_portmap_client_packets($1)
-	corenet_dontaudit_receive_portmap_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_pktcable_cops_client_packets',`
+	corenet_dontaudit_send_pktcable_cops_client_packets($1)
+	corenet_dontaudit_receive_pktcable_cops_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to portmap_client the packet type.
+##	Relabel packets to pktcable_cops_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63712,18 +64598,18 @@ interface(`corenet_dontaudit_sendrecv_portmap_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_portmap_client_packets',`
+interface(`corenet_relabelto_pktcable_cops_client_packets',`
 	gen_require(`
-		type portmap_client_packet_t;
+		type pktcable_cops_client_packet_t;
 	')
 
-	allow $1 portmap_client_packet_t:packet relabelto;
+	allow $1 pktcable_cops_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send portmap_server packets.
+##	Send pktcable_cops_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63732,17 +64618,17 @@ interface(`corenet_relabelto_portmap_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_portmap_server_packets',`
+interface(`corenet_send_pktcable_cops_server_packets',`
 	gen_require(`
-		type portmap_server_packet_t;
+		type pktcable_cops_server_packet_t;
 	')
 
-	allow $1 portmap_server_packet_t:packet send;
+	allow $1 pktcable_cops_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send portmap_server packets.
+##	Do not audit attempts to send pktcable_cops_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63751,17 +64637,17 @@ interface(`corenet_send_portmap_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_portmap_server_packets',`
+interface(`corenet_dontaudit_send_pktcable_cops_server_packets',`
 	gen_require(`
-		type portmap_server_packet_t;
+		type pktcable_cops_server_packet_t;
 	')
 
-	dontaudit $1 portmap_server_packet_t:packet send;
+	dontaudit $1 pktcable_cops_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive portmap_server packets.
+##	Receive pktcable_cops_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63770,17 +64656,17 @@ interface(`corenet_dontaudit_send_portmap_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_portmap_server_packets',`
+interface(`corenet_receive_pktcable_cops_server_packets',`
 	gen_require(`
-		type portmap_server_packet_t;
+		type pktcable_cops_server_packet_t;
 	')
 
-	allow $1 portmap_server_packet_t:packet recv;
+	allow $1 pktcable_cops_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive portmap_server packets.
+##	Do not audit attempts to receive pktcable_cops_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63789,17 +64675,17 @@ interface(`corenet_receive_portmap_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_portmap_server_packets',`
+interface(`corenet_dontaudit_receive_pktcable_cops_server_packets',`
 	gen_require(`
-		type portmap_server_packet_t;
+		type pktcable_cops_server_packet_t;
 	')
 
-	dontaudit $1 portmap_server_packet_t:packet recv;
+	dontaudit $1 pktcable_cops_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive portmap_server packets.
+##	Send and receive pktcable_cops_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63808,14 +64694,14 @@ interface(`corenet_dontaudit_receive_portmap_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_portmap_server_packets',`
-	corenet_send_portmap_server_packets($1)
-	corenet_receive_portmap_server_packets($1)
+interface(`corenet_sendrecv_pktcable_cops_server_packets',`
+	corenet_send_pktcable_cops_server_packets($1)
+	corenet_receive_pktcable_cops_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive portmap_server packets.
+##	Do not audit attempts to send and receive pktcable_cops_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63824,14 +64710,14 @@ interface(`corenet_sendrecv_portmap_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_portmap_server_packets',`
-	corenet_dontaudit_send_portmap_server_packets($1)
-	corenet_dontaudit_receive_portmap_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_pktcable_cops_server_packets',`
+	corenet_dontaudit_send_pktcable_cops_server_packets($1)
+	corenet_dontaudit_receive_pktcable_cops_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to portmap_server the packet type.
+##	Relabel packets to pktcable_cops_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63839,12 +64725,12 @@ interface(`corenet_dontaudit_sendrecv_portmap_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_portmap_server_packets',`
+interface(`corenet_relabelto_pktcable_cops_server_packets',`
 	gen_require(`
-		type portmap_server_packet_t;
+		type pktcable_cops_server_packet_t;
 	')
 
-	allow $1 portmap_server_packet_t:packet relabelto;
+	allow $1 pktcable_cops_server_packet_t:packet relabelto;
 ')
 
 
@@ -63852,7 +64738,7 @@ interface(`corenet_relabelto_portmap_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the postfix_policyd port.
+##	Send and receive TCP traffic on the pop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63861,17 +64747,17 @@ interface(`corenet_relabelto_portmap_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_postfix_policyd_port',`
+interface(`corenet_tcp_sendrecv_pop_port',`
 	gen_require(`
-		type postfix_policyd_port_t;
+		type pop_port_t;
 	')
 
-	allow $1 postfix_policyd_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 pop_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the postfix_policyd port.
+##	Send UDP traffic on the pop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63880,17 +64766,17 @@ interface(`corenet_tcp_sendrecv_postfix_policyd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_postfix_policyd_port',`
+interface(`corenet_udp_send_pop_port',`
 	gen_require(`
-		type postfix_policyd_port_t;
+		type pop_port_t;
 	')
 
-	allow $1 postfix_policyd_port_t:udp_socket send_msg;
+	allow $1 pop_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the postfix_policyd port.
+##	Do not audit attempts to send UDP traffic on the pop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63899,17 +64785,17 @@ interface(`corenet_udp_send_postfix_policyd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_postfix_policyd_port',`
+interface(`corenet_dontaudit_udp_send_pop_port',`
 	gen_require(`
-		type postfix_policyd_port_t;
+		type pop_port_t;
 	')
 
-	dontaudit $1 postfix_policyd_port_t:udp_socket send_msg;
+	dontaudit $1 pop_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the postfix_policyd port.
+##	Receive UDP traffic on the pop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63918,17 +64804,17 @@ interface(`corenet_dontaudit_udp_send_postfix_policyd_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_postfix_policyd_port',`
+interface(`corenet_udp_receive_pop_port',`
 	gen_require(`
-		type postfix_policyd_port_t;
+		type pop_port_t;
 	')
 
-	allow $1 postfix_policyd_port_t:udp_socket recv_msg;
+	allow $1 pop_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the postfix_policyd port.
+##	Do not audit attempts to receive UDP traffic on the pop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63937,17 +64823,17 @@ interface(`corenet_udp_receive_postfix_policyd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_postfix_policyd_port',`
+interface(`corenet_dontaudit_udp_receive_pop_port',`
 	gen_require(`
-		type postfix_policyd_port_t;
+		type pop_port_t;
 	')
 
-	dontaudit $1 postfix_policyd_port_t:udp_socket recv_msg;
+	dontaudit $1 pop_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the postfix_policyd port.
+##	Send and receive UDP traffic on the pop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63956,15 +64842,15 @@ interface(`corenet_dontaudit_udp_receive_postfix_policyd_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_postfix_policyd_port',`
-	corenet_udp_send_postfix_policyd_port($1)
-	corenet_udp_receive_postfix_policyd_port($1)
+interface(`corenet_udp_sendrecv_pop_port',`
+	corenet_udp_send_pop_port($1)
+	corenet_udp_receive_pop_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the postfix_policyd port.
+##	UDP traffic on the pop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63973,14 +64859,14 @@ interface(`corenet_udp_sendrecv_postfix_policyd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_postfix_policyd_port',`
-	corenet_dontaudit_udp_send_postfix_policyd_port($1)
-	corenet_dontaudit_udp_receive_postfix_policyd_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_pop_port',`
+	corenet_dontaudit_udp_send_pop_port($1)
+	corenet_dontaudit_udp_receive_pop_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the postfix_policyd port.
+##	Bind TCP sockets to the pop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -63989,18 +64875,18 @@ interface(`corenet_dontaudit_udp_sendrecv_postfix_policyd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_postfix_policyd_port',`
+interface(`corenet_tcp_bind_pop_port',`
 	gen_require(`
-		type postfix_policyd_port_t;
+		type pop_port_t;
 	')
 
-	allow $1 postfix_policyd_port_t:tcp_socket name_bind;
-	
+	allow $1 pop_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the postfix_policyd port.
+##	Bind UDP sockets to the pop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64009,18 +64895,18 @@ interface(`corenet_tcp_bind_postfix_policyd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_postfix_policyd_port',`
+interface(`corenet_udp_bind_pop_port',`
 	gen_require(`
-		type postfix_policyd_port_t;
+		type pop_port_t;
 	')
 
-	allow $1 postfix_policyd_port_t:udp_socket name_bind;
-	
+	allow $1 pop_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the postfix_policyd port.
+##	Make a TCP connection to the pop port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64028,18 +64914,18 @@ interface(`corenet_udp_bind_postfix_policyd_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_postfix_policyd_port',`
+interface(`corenet_tcp_connect_pop_port',`
 	gen_require(`
-		type postfix_policyd_port_t;
+		type pop_port_t;
 	')
 
-	allow $1 postfix_policyd_port_t:tcp_socket name_connect;
+	allow $1 pop_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send postfix_policyd_client packets.
+##	Send pop_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64048,17 +64934,17 @@ interface(`corenet_tcp_connect_postfix_policyd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_postfix_policyd_client_packets',`
+interface(`corenet_send_pop_client_packets',`
 	gen_require(`
-		type postfix_policyd_client_packet_t;
+		type pop_client_packet_t;
 	')
 
-	allow $1 postfix_policyd_client_packet_t:packet send;
+	allow $1 pop_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send postfix_policyd_client packets.
+##	Do not audit attempts to send pop_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64067,17 +64953,17 @@ interface(`corenet_send_postfix_policyd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_postfix_policyd_client_packets',`
+interface(`corenet_dontaudit_send_pop_client_packets',`
 	gen_require(`
-		type postfix_policyd_client_packet_t;
+		type pop_client_packet_t;
 	')
 
-	dontaudit $1 postfix_policyd_client_packet_t:packet send;
+	dontaudit $1 pop_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive postfix_policyd_client packets.
+##	Receive pop_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64086,17 +64972,17 @@ interface(`corenet_dontaudit_send_postfix_policyd_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_postfix_policyd_client_packets',`
+interface(`corenet_receive_pop_client_packets',`
 	gen_require(`
-		type postfix_policyd_client_packet_t;
+		type pop_client_packet_t;
 	')
 
-	allow $1 postfix_policyd_client_packet_t:packet recv;
+	allow $1 pop_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive postfix_policyd_client packets.
+##	Do not audit attempts to receive pop_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64105,17 +64991,17 @@ interface(`corenet_receive_postfix_policyd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_postfix_policyd_client_packets',`
+interface(`corenet_dontaudit_receive_pop_client_packets',`
 	gen_require(`
-		type postfix_policyd_client_packet_t;
+		type pop_client_packet_t;
 	')
 
-	dontaudit $1 postfix_policyd_client_packet_t:packet recv;
+	dontaudit $1 pop_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive postfix_policyd_client packets.
+##	Send and receive pop_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64124,14 +65010,14 @@ interface(`corenet_dontaudit_receive_postfix_policyd_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_postfix_policyd_client_packets',`
-	corenet_send_postfix_policyd_client_packets($1)
-	corenet_receive_postfix_policyd_client_packets($1)
+interface(`corenet_sendrecv_pop_client_packets',`
+	corenet_send_pop_client_packets($1)
+	corenet_receive_pop_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive postfix_policyd_client packets.
+##	Do not audit attempts to send and receive pop_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64140,14 +65026,14 @@ interface(`corenet_sendrecv_postfix_policyd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_postfix_policyd_client_packets',`
-	corenet_dontaudit_send_postfix_policyd_client_packets($1)
-	corenet_dontaudit_receive_postfix_policyd_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_pop_client_packets',`
+	corenet_dontaudit_send_pop_client_packets($1)
+	corenet_dontaudit_receive_pop_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to postfix_policyd_client the packet type.
+##	Relabel packets to pop_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64155,18 +65041,18 @@ interface(`corenet_dontaudit_sendrecv_postfix_policyd_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_postfix_policyd_client_packets',`
+interface(`corenet_relabelto_pop_client_packets',`
 	gen_require(`
-		type postfix_policyd_client_packet_t;
+		type pop_client_packet_t;
 	')
 
-	allow $1 postfix_policyd_client_packet_t:packet relabelto;
+	allow $1 pop_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send postfix_policyd_server packets.
+##	Send pop_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64175,17 +65061,17 @@ interface(`corenet_relabelto_postfix_policyd_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_postfix_policyd_server_packets',`
+interface(`corenet_send_pop_server_packets',`
 	gen_require(`
-		type postfix_policyd_server_packet_t;
+		type pop_server_packet_t;
 	')
 
-	allow $1 postfix_policyd_server_packet_t:packet send;
+	allow $1 pop_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send postfix_policyd_server packets.
+##	Do not audit attempts to send pop_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64194,17 +65080,17 @@ interface(`corenet_send_postfix_policyd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_postfix_policyd_server_packets',`
+interface(`corenet_dontaudit_send_pop_server_packets',`
 	gen_require(`
-		type postfix_policyd_server_packet_t;
+		type pop_server_packet_t;
 	')
 
-	dontaudit $1 postfix_policyd_server_packet_t:packet send;
+	dontaudit $1 pop_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive postfix_policyd_server packets.
+##	Receive pop_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64213,17 +65099,17 @@ interface(`corenet_dontaudit_send_postfix_policyd_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_postfix_policyd_server_packets',`
+interface(`corenet_receive_pop_server_packets',`
 	gen_require(`
-		type postfix_policyd_server_packet_t;
+		type pop_server_packet_t;
 	')
 
-	allow $1 postfix_policyd_server_packet_t:packet recv;
+	allow $1 pop_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive postfix_policyd_server packets.
+##	Do not audit attempts to receive pop_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64232,17 +65118,17 @@ interface(`corenet_receive_postfix_policyd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_postfix_policyd_server_packets',`
+interface(`corenet_dontaudit_receive_pop_server_packets',`
 	gen_require(`
-		type postfix_policyd_server_packet_t;
+		type pop_server_packet_t;
 	')
 
-	dontaudit $1 postfix_policyd_server_packet_t:packet recv;
+	dontaudit $1 pop_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive postfix_policyd_server packets.
+##	Send and receive pop_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64251,14 +65137,14 @@ interface(`corenet_dontaudit_receive_postfix_policyd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_postfix_policyd_server_packets',`
-	corenet_send_postfix_policyd_server_packets($1)
-	corenet_receive_postfix_policyd_server_packets($1)
+interface(`corenet_sendrecv_pop_server_packets',`
+	corenet_send_pop_server_packets($1)
+	corenet_receive_pop_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive postfix_policyd_server packets.
+##	Do not audit attempts to send and receive pop_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64267,14 +65153,14 @@ interface(`corenet_sendrecv_postfix_policyd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_postfix_policyd_server_packets',`
-	corenet_dontaudit_send_postfix_policyd_server_packets($1)
-	corenet_dontaudit_receive_postfix_policyd_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_pop_server_packets',`
+	corenet_dontaudit_send_pop_server_packets($1)
+	corenet_dontaudit_receive_pop_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to postfix_policyd_server the packet type.
+##	Relabel packets to pop_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64282,12 +65168,12 @@ interface(`corenet_dontaudit_sendrecv_postfix_policyd_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_postfix_policyd_server_packets',`
+interface(`corenet_relabelto_pop_server_packets',`
 	gen_require(`
-		type postfix_policyd_server_packet_t;
+		type pop_server_packet_t;
 	')
 
-	allow $1 postfix_policyd_server_packet_t:packet relabelto;
+	allow $1 pop_server_packet_t:packet relabelto;
 ')
 
 
@@ -64295,7 +65181,7 @@ interface(`corenet_relabelto_postfix_policyd_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the postgresql port.
+##	Send and receive TCP traffic on the portmap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64304,17 +65190,17 @@ interface(`corenet_relabelto_postfix_policyd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_postgresql_port',`
+interface(`corenet_tcp_sendrecv_portmap_port',`
 	gen_require(`
-		type postgresql_port_t;
+		type portmap_port_t;
 	')
 
-	allow $1 postgresql_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 portmap_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the postgresql port.
+##	Send UDP traffic on the portmap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64323,17 +65209,17 @@ interface(`corenet_tcp_sendrecv_postgresql_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_postgresql_port',`
+interface(`corenet_udp_send_portmap_port',`
 	gen_require(`
-		type postgresql_port_t;
+		type portmap_port_t;
 	')
 
-	allow $1 postgresql_port_t:udp_socket send_msg;
+	allow $1 portmap_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the postgresql port.
+##	Do not audit attempts to send UDP traffic on the portmap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64342,17 +65228,17 @@ interface(`corenet_udp_send_postgresql_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_postgresql_port',`
+interface(`corenet_dontaudit_udp_send_portmap_port',`
 	gen_require(`
-		type postgresql_port_t;
+		type portmap_port_t;
 	')
 
-	dontaudit $1 postgresql_port_t:udp_socket send_msg;
+	dontaudit $1 portmap_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the postgresql port.
+##	Receive UDP traffic on the portmap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64361,17 +65247,17 @@ interface(`corenet_dontaudit_udp_send_postgresql_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_postgresql_port',`
+interface(`corenet_udp_receive_portmap_port',`
 	gen_require(`
-		type postgresql_port_t;
+		type portmap_port_t;
 	')
 
-	allow $1 postgresql_port_t:udp_socket recv_msg;
+	allow $1 portmap_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the postgresql port.
+##	Do not audit attempts to receive UDP traffic on the portmap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64380,17 +65266,17 @@ interface(`corenet_udp_receive_postgresql_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_postgresql_port',`
+interface(`corenet_dontaudit_udp_receive_portmap_port',`
 	gen_require(`
-		type postgresql_port_t;
+		type portmap_port_t;
 	')
 
-	dontaudit $1 postgresql_port_t:udp_socket recv_msg;
+	dontaudit $1 portmap_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the postgresql port.
+##	Send and receive UDP traffic on the portmap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64399,15 +65285,15 @@ interface(`corenet_dontaudit_udp_receive_postgresql_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_postgresql_port',`
-	corenet_udp_send_postgresql_port($1)
-	corenet_udp_receive_postgresql_port($1)
+interface(`corenet_udp_sendrecv_portmap_port',`
+	corenet_udp_send_portmap_port($1)
+	corenet_udp_receive_portmap_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the postgresql port.
+##	UDP traffic on the portmap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64416,14 +65302,14 @@ interface(`corenet_udp_sendrecv_postgresql_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_postgresql_port',`
-	corenet_dontaudit_udp_send_postgresql_port($1)
-	corenet_dontaudit_udp_receive_postgresql_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_portmap_port',`
+	corenet_dontaudit_udp_send_portmap_port($1)
+	corenet_dontaudit_udp_receive_portmap_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the postgresql port.
+##	Bind TCP sockets to the portmap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64432,18 +65318,18 @@ interface(`corenet_dontaudit_udp_sendrecv_postgresql_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_postgresql_port',`
+interface(`corenet_tcp_bind_portmap_port',`
 	gen_require(`
-		type postgresql_port_t;
+		type portmap_port_t;
 	')
 
-	allow $1 postgresql_port_t:tcp_socket name_bind;
-	
+	allow $1 portmap_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the postgresql port.
+##	Bind UDP sockets to the portmap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64452,18 +65338,18 @@ interface(`corenet_tcp_bind_postgresql_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_postgresql_port',`
+interface(`corenet_udp_bind_portmap_port',`
 	gen_require(`
-		type postgresql_port_t;
+		type portmap_port_t;
 	')
 
-	allow $1 postgresql_port_t:udp_socket name_bind;
-	
+	allow $1 portmap_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the postgresql port.
+##	Make a TCP connection to the portmap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64471,18 +65357,18 @@ interface(`corenet_udp_bind_postgresql_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_postgresql_port',`
+interface(`corenet_tcp_connect_portmap_port',`
 	gen_require(`
-		type postgresql_port_t;
+		type portmap_port_t;
 	')
 
-	allow $1 postgresql_port_t:tcp_socket name_connect;
+	allow $1 portmap_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send postgresql_client packets.
+##	Send portmap_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64491,17 +65377,17 @@ interface(`corenet_tcp_connect_postgresql_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_postgresql_client_packets',`
+interface(`corenet_send_portmap_client_packets',`
 	gen_require(`
-		type postgresql_client_packet_t;
+		type portmap_client_packet_t;
 	')
 
-	allow $1 postgresql_client_packet_t:packet send;
+	allow $1 portmap_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send postgresql_client packets.
+##	Do not audit attempts to send portmap_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64510,17 +65396,17 @@ interface(`corenet_send_postgresql_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_postgresql_client_packets',`
+interface(`corenet_dontaudit_send_portmap_client_packets',`
 	gen_require(`
-		type postgresql_client_packet_t;
+		type portmap_client_packet_t;
 	')
 
-	dontaudit $1 postgresql_client_packet_t:packet send;
+	dontaudit $1 portmap_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive postgresql_client packets.
+##	Receive portmap_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64529,17 +65415,17 @@ interface(`corenet_dontaudit_send_postgresql_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_postgresql_client_packets',`
+interface(`corenet_receive_portmap_client_packets',`
 	gen_require(`
-		type postgresql_client_packet_t;
+		type portmap_client_packet_t;
 	')
 
-	allow $1 postgresql_client_packet_t:packet recv;
+	allow $1 portmap_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive postgresql_client packets.
+##	Do not audit attempts to receive portmap_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64548,17 +65434,17 @@ interface(`corenet_receive_postgresql_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_postgresql_client_packets',`
+interface(`corenet_dontaudit_receive_portmap_client_packets',`
 	gen_require(`
-		type postgresql_client_packet_t;
+		type portmap_client_packet_t;
 	')
 
-	dontaudit $1 postgresql_client_packet_t:packet recv;
+	dontaudit $1 portmap_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive postgresql_client packets.
+##	Send and receive portmap_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64567,14 +65453,14 @@ interface(`corenet_dontaudit_receive_postgresql_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_postgresql_client_packets',`
-	corenet_send_postgresql_client_packets($1)
-	corenet_receive_postgresql_client_packets($1)
+interface(`corenet_sendrecv_portmap_client_packets',`
+	corenet_send_portmap_client_packets($1)
+	corenet_receive_portmap_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive postgresql_client packets.
+##	Do not audit attempts to send and receive portmap_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64583,14 +65469,14 @@ interface(`corenet_sendrecv_postgresql_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_postgresql_client_packets',`
-	corenet_dontaudit_send_postgresql_client_packets($1)
-	corenet_dontaudit_receive_postgresql_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_portmap_client_packets',`
+	corenet_dontaudit_send_portmap_client_packets($1)
+	corenet_dontaudit_receive_portmap_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to postgresql_client the packet type.
+##	Relabel packets to portmap_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64598,18 +65484,18 @@ interface(`corenet_dontaudit_sendrecv_postgresql_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_postgresql_client_packets',`
+interface(`corenet_relabelto_portmap_client_packets',`
 	gen_require(`
-		type postgresql_client_packet_t;
+		type portmap_client_packet_t;
 	')
 
-	allow $1 postgresql_client_packet_t:packet relabelto;
+	allow $1 portmap_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send postgresql_server packets.
+##	Send portmap_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64618,17 +65504,17 @@ interface(`corenet_relabelto_postgresql_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_postgresql_server_packets',`
+interface(`corenet_send_portmap_server_packets',`
 	gen_require(`
-		type postgresql_server_packet_t;
+		type portmap_server_packet_t;
 	')
 
-	allow $1 postgresql_server_packet_t:packet send;
+	allow $1 portmap_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send postgresql_server packets.
+##	Do not audit attempts to send portmap_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64637,17 +65523,17 @@ interface(`corenet_send_postgresql_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_postgresql_server_packets',`
+interface(`corenet_dontaudit_send_portmap_server_packets',`
 	gen_require(`
-		type postgresql_server_packet_t;
+		type portmap_server_packet_t;
 	')
 
-	dontaudit $1 postgresql_server_packet_t:packet send;
+	dontaudit $1 portmap_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive postgresql_server packets.
+##	Receive portmap_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64656,17 +65542,17 @@ interface(`corenet_dontaudit_send_postgresql_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_postgresql_server_packets',`
+interface(`corenet_receive_portmap_server_packets',`
 	gen_require(`
-		type postgresql_server_packet_t;
+		type portmap_server_packet_t;
 	')
 
-	allow $1 postgresql_server_packet_t:packet recv;
+	allow $1 portmap_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive postgresql_server packets.
+##	Do not audit attempts to receive portmap_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64675,17 +65561,17 @@ interface(`corenet_receive_postgresql_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_postgresql_server_packets',`
+interface(`corenet_dontaudit_receive_portmap_server_packets',`
 	gen_require(`
-		type postgresql_server_packet_t;
+		type portmap_server_packet_t;
 	')
 
-	dontaudit $1 postgresql_server_packet_t:packet recv;
+	dontaudit $1 portmap_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive postgresql_server packets.
+##	Send and receive portmap_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64694,14 +65580,14 @@ interface(`corenet_dontaudit_receive_postgresql_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_postgresql_server_packets',`
-	corenet_send_postgresql_server_packets($1)
-	corenet_receive_postgresql_server_packets($1)
+interface(`corenet_sendrecv_portmap_server_packets',`
+	corenet_send_portmap_server_packets($1)
+	corenet_receive_portmap_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive postgresql_server packets.
+##	Do not audit attempts to send and receive portmap_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64710,14 +65596,14 @@ interface(`corenet_sendrecv_postgresql_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_postgresql_server_packets',`
-	corenet_dontaudit_send_postgresql_server_packets($1)
-	corenet_dontaudit_receive_postgresql_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_portmap_server_packets',`
+	corenet_dontaudit_send_portmap_server_packets($1)
+	corenet_dontaudit_receive_portmap_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to postgresql_server the packet type.
+##	Relabel packets to portmap_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64725,12 +65611,12 @@ interface(`corenet_dontaudit_sendrecv_postgresql_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_postgresql_server_packets',`
+interface(`corenet_relabelto_portmap_server_packets',`
 	gen_require(`
-		type postgresql_server_packet_t;
+		type portmap_server_packet_t;
 	')
 
-	allow $1 postgresql_server_packet_t:packet relabelto;
+	allow $1 portmap_server_packet_t:packet relabelto;
 ')
 
 
@@ -64738,7 +65624,7 @@ interface(`corenet_relabelto_postgresql_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the postgrey port.
+##	Send and receive TCP traffic on the postfix_policyd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64747,17 +65633,17 @@ interface(`corenet_relabelto_postgresql_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_postgrey_port',`
+interface(`corenet_tcp_sendrecv_postfix_policyd_port',`
 	gen_require(`
-		type postgrey_port_t;
+		type postfix_policyd_port_t;
 	')
 
-	allow $1 postgrey_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 postfix_policyd_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the postgrey port.
+##	Send UDP traffic on the postfix_policyd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64766,17 +65652,17 @@ interface(`corenet_tcp_sendrecv_postgrey_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_postgrey_port',`
+interface(`corenet_udp_send_postfix_policyd_port',`
 	gen_require(`
-		type postgrey_port_t;
+		type postfix_policyd_port_t;
 	')
 
-	allow $1 postgrey_port_t:udp_socket send_msg;
+	allow $1 postfix_policyd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the postgrey port.
+##	Do not audit attempts to send UDP traffic on the postfix_policyd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64785,17 +65671,17 @@ interface(`corenet_udp_send_postgrey_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_postgrey_port',`
+interface(`corenet_dontaudit_udp_send_postfix_policyd_port',`
 	gen_require(`
-		type postgrey_port_t;
+		type postfix_policyd_port_t;
 	')
 
-	dontaudit $1 postgrey_port_t:udp_socket send_msg;
+	dontaudit $1 postfix_policyd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the postgrey port.
+##	Receive UDP traffic on the postfix_policyd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64804,17 +65690,17 @@ interface(`corenet_dontaudit_udp_send_postgrey_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_postgrey_port',`
+interface(`corenet_udp_receive_postfix_policyd_port',`
 	gen_require(`
-		type postgrey_port_t;
+		type postfix_policyd_port_t;
 	')
 
-	allow $1 postgrey_port_t:udp_socket recv_msg;
+	allow $1 postfix_policyd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the postgrey port.
+##	Do not audit attempts to receive UDP traffic on the postfix_policyd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64823,17 +65709,17 @@ interface(`corenet_udp_receive_postgrey_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_postgrey_port',`
+interface(`corenet_dontaudit_udp_receive_postfix_policyd_port',`
 	gen_require(`
-		type postgrey_port_t;
+		type postfix_policyd_port_t;
 	')
 
-	dontaudit $1 postgrey_port_t:udp_socket recv_msg;
+	dontaudit $1 postfix_policyd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the postgrey port.
+##	Send and receive UDP traffic on the postfix_policyd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64842,15 +65728,15 @@ interface(`corenet_dontaudit_udp_receive_postgrey_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_postgrey_port',`
-	corenet_udp_send_postgrey_port($1)
-	corenet_udp_receive_postgrey_port($1)
+interface(`corenet_udp_sendrecv_postfix_policyd_port',`
+	corenet_udp_send_postfix_policyd_port($1)
+	corenet_udp_receive_postfix_policyd_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the postgrey port.
+##	UDP traffic on the postfix_policyd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64859,14 +65745,14 @@ interface(`corenet_udp_sendrecv_postgrey_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_postgrey_port',`
-	corenet_dontaudit_udp_send_postgrey_port($1)
-	corenet_dontaudit_udp_receive_postgrey_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_postfix_policyd_port',`
+	corenet_dontaudit_udp_send_postfix_policyd_port($1)
+	corenet_dontaudit_udp_receive_postfix_policyd_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the postgrey port.
+##	Bind TCP sockets to the postfix_policyd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64875,18 +65761,18 @@ interface(`corenet_dontaudit_udp_sendrecv_postgrey_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_postgrey_port',`
+interface(`corenet_tcp_bind_postfix_policyd_port',`
 	gen_require(`
-		type postgrey_port_t;
+		type postfix_policyd_port_t;
 	')
 
-	allow $1 postgrey_port_t:tcp_socket name_bind;
+	allow $1 postfix_policyd_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the postgrey port.
+##	Bind UDP sockets to the postfix_policyd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64895,18 +65781,18 @@ interface(`corenet_tcp_bind_postgrey_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_postgrey_port',`
+interface(`corenet_udp_bind_postfix_policyd_port',`
 	gen_require(`
-		type postgrey_port_t;
+		type postfix_policyd_port_t;
 	')
 
-	allow $1 postgrey_port_t:udp_socket name_bind;
+	allow $1 postfix_policyd_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the postgrey port.
+##	Make a TCP connection to the postfix_policyd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64914,18 +65800,18 @@ interface(`corenet_udp_bind_postgrey_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_postgrey_port',`
+interface(`corenet_tcp_connect_postfix_policyd_port',`
 	gen_require(`
-		type postgrey_port_t;
+		type postfix_policyd_port_t;
 	')
 
-	allow $1 postgrey_port_t:tcp_socket name_connect;
+	allow $1 postfix_policyd_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send postgrey_client packets.
+##	Send postfix_policyd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64934,17 +65820,17 @@ interface(`corenet_tcp_connect_postgrey_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_postgrey_client_packets',`
+interface(`corenet_send_postfix_policyd_client_packets',`
 	gen_require(`
-		type postgrey_client_packet_t;
+		type postfix_policyd_client_packet_t;
 	')
 
-	allow $1 postgrey_client_packet_t:packet send;
+	allow $1 postfix_policyd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send postgrey_client packets.
+##	Do not audit attempts to send postfix_policyd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64953,17 +65839,17 @@ interface(`corenet_send_postgrey_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_postgrey_client_packets',`
+interface(`corenet_dontaudit_send_postfix_policyd_client_packets',`
 	gen_require(`
-		type postgrey_client_packet_t;
+		type postfix_policyd_client_packet_t;
 	')
 
-	dontaudit $1 postgrey_client_packet_t:packet send;
+	dontaudit $1 postfix_policyd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive postgrey_client packets.
+##	Receive postfix_policyd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64972,17 +65858,17 @@ interface(`corenet_dontaudit_send_postgrey_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_postgrey_client_packets',`
+interface(`corenet_receive_postfix_policyd_client_packets',`
 	gen_require(`
-		type postgrey_client_packet_t;
+		type postfix_policyd_client_packet_t;
 	')
 
-	allow $1 postgrey_client_packet_t:packet recv;
+	allow $1 postfix_policyd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive postgrey_client packets.
+##	Do not audit attempts to receive postfix_policyd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -64991,17 +65877,17 @@ interface(`corenet_receive_postgrey_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_postgrey_client_packets',`
+interface(`corenet_dontaudit_receive_postfix_policyd_client_packets',`
 	gen_require(`
-		type postgrey_client_packet_t;
+		type postfix_policyd_client_packet_t;
 	')
 
-	dontaudit $1 postgrey_client_packet_t:packet recv;
+	dontaudit $1 postfix_policyd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive postgrey_client packets.
+##	Send and receive postfix_policyd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65010,14 +65896,14 @@ interface(`corenet_dontaudit_receive_postgrey_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_postgrey_client_packets',`
-	corenet_send_postgrey_client_packets($1)
-	corenet_receive_postgrey_client_packets($1)
+interface(`corenet_sendrecv_postfix_policyd_client_packets',`
+	corenet_send_postfix_policyd_client_packets($1)
+	corenet_receive_postfix_policyd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive postgrey_client packets.
+##	Do not audit attempts to send and receive postfix_policyd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65026,14 +65912,14 @@ interface(`corenet_sendrecv_postgrey_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_postgrey_client_packets',`
-	corenet_dontaudit_send_postgrey_client_packets($1)
-	corenet_dontaudit_receive_postgrey_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_postfix_policyd_client_packets',`
+	corenet_dontaudit_send_postfix_policyd_client_packets($1)
+	corenet_dontaudit_receive_postfix_policyd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to postgrey_client the packet type.
+##	Relabel packets to postfix_policyd_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65041,18 +65927,18 @@ interface(`corenet_dontaudit_sendrecv_postgrey_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_postgrey_client_packets',`
+interface(`corenet_relabelto_postfix_policyd_client_packets',`
 	gen_require(`
-		type postgrey_client_packet_t;
+		type postfix_policyd_client_packet_t;
 	')
 
-	allow $1 postgrey_client_packet_t:packet relabelto;
+	allow $1 postfix_policyd_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send postgrey_server packets.
+##	Send postfix_policyd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65061,17 +65947,17 @@ interface(`corenet_relabelto_postgrey_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_postgrey_server_packets',`
+interface(`corenet_send_postfix_policyd_server_packets',`
 	gen_require(`
-		type postgrey_server_packet_t;
+		type postfix_policyd_server_packet_t;
 	')
 
-	allow $1 postgrey_server_packet_t:packet send;
+	allow $1 postfix_policyd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send postgrey_server packets.
+##	Do not audit attempts to send postfix_policyd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65080,17 +65966,17 @@ interface(`corenet_send_postgrey_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_postgrey_server_packets',`
+interface(`corenet_dontaudit_send_postfix_policyd_server_packets',`
 	gen_require(`
-		type postgrey_server_packet_t;
+		type postfix_policyd_server_packet_t;
 	')
 
-	dontaudit $1 postgrey_server_packet_t:packet send;
+	dontaudit $1 postfix_policyd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive postgrey_server packets.
+##	Receive postfix_policyd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65099,17 +65985,17 @@ interface(`corenet_dontaudit_send_postgrey_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_postgrey_server_packets',`
+interface(`corenet_receive_postfix_policyd_server_packets',`
 	gen_require(`
-		type postgrey_server_packet_t;
+		type postfix_policyd_server_packet_t;
 	')
 
-	allow $1 postgrey_server_packet_t:packet recv;
+	allow $1 postfix_policyd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive postgrey_server packets.
+##	Do not audit attempts to receive postfix_policyd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65118,17 +66004,17 @@ interface(`corenet_receive_postgrey_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_postgrey_server_packets',`
+interface(`corenet_dontaudit_receive_postfix_policyd_server_packets',`
 	gen_require(`
-		type postgrey_server_packet_t;
+		type postfix_policyd_server_packet_t;
 	')
 
-	dontaudit $1 postgrey_server_packet_t:packet recv;
+	dontaudit $1 postfix_policyd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive postgrey_server packets.
+##	Send and receive postfix_policyd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65137,14 +66023,14 @@ interface(`corenet_dontaudit_receive_postgrey_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_postgrey_server_packets',`
-	corenet_send_postgrey_server_packets($1)
-	corenet_receive_postgrey_server_packets($1)
+interface(`corenet_sendrecv_postfix_policyd_server_packets',`
+	corenet_send_postfix_policyd_server_packets($1)
+	corenet_receive_postfix_policyd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive postgrey_server packets.
+##	Do not audit attempts to send and receive postfix_policyd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65153,14 +66039,14 @@ interface(`corenet_sendrecv_postgrey_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_postgrey_server_packets',`
-	corenet_dontaudit_send_postgrey_server_packets($1)
-	corenet_dontaudit_receive_postgrey_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_postfix_policyd_server_packets',`
+	corenet_dontaudit_send_postfix_policyd_server_packets($1)
+	corenet_dontaudit_receive_postfix_policyd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to postgrey_server the packet type.
+##	Relabel packets to postfix_policyd_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65168,12 +66054,12 @@ interface(`corenet_dontaudit_sendrecv_postgrey_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_postgrey_server_packets',`
+interface(`corenet_relabelto_postfix_policyd_server_packets',`
 	gen_require(`
-		type postgrey_server_packet_t;
+		type postfix_policyd_server_packet_t;
 	')
 
-	allow $1 postgrey_server_packet_t:packet relabelto;
+	allow $1 postfix_policyd_server_packet_t:packet relabelto;
 ')
 
 
@@ -65181,7 +66067,7 @@ interface(`corenet_relabelto_postgrey_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the pptp port.
+##	Send and receive TCP traffic on the postgresql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65190,17 +66076,17 @@ interface(`corenet_relabelto_postgrey_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_pptp_port',`
+interface(`corenet_tcp_sendrecv_postgresql_port',`
 	gen_require(`
-		type pptp_port_t;
+		type postgresql_port_t;
 	')
 
-	allow $1 pptp_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 postgresql_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the pptp port.
+##	Send UDP traffic on the postgresql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65209,17 +66095,17 @@ interface(`corenet_tcp_sendrecv_pptp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_pptp_port',`
+interface(`corenet_udp_send_postgresql_port',`
 	gen_require(`
-		type pptp_port_t;
+		type postgresql_port_t;
 	')
 
-	allow $1 pptp_port_t:udp_socket send_msg;
+	allow $1 postgresql_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the pptp port.
+##	Do not audit attempts to send UDP traffic on the postgresql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65228,17 +66114,17 @@ interface(`corenet_udp_send_pptp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_pptp_port',`
+interface(`corenet_dontaudit_udp_send_postgresql_port',`
 	gen_require(`
-		type pptp_port_t;
+		type postgresql_port_t;
 	')
 
-	dontaudit $1 pptp_port_t:udp_socket send_msg;
+	dontaudit $1 postgresql_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the pptp port.
+##	Receive UDP traffic on the postgresql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65247,17 +66133,17 @@ interface(`corenet_dontaudit_udp_send_pptp_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_pptp_port',`
+interface(`corenet_udp_receive_postgresql_port',`
 	gen_require(`
-		type pptp_port_t;
+		type postgresql_port_t;
 	')
 
-	allow $1 pptp_port_t:udp_socket recv_msg;
+	allow $1 postgresql_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the pptp port.
+##	Do not audit attempts to receive UDP traffic on the postgresql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65266,17 +66152,17 @@ interface(`corenet_udp_receive_pptp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_pptp_port',`
+interface(`corenet_dontaudit_udp_receive_postgresql_port',`
 	gen_require(`
-		type pptp_port_t;
+		type postgresql_port_t;
 	')
 
-	dontaudit $1 pptp_port_t:udp_socket recv_msg;
+	dontaudit $1 postgresql_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the pptp port.
+##	Send and receive UDP traffic on the postgresql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65285,15 +66171,15 @@ interface(`corenet_dontaudit_udp_receive_pptp_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_pptp_port',`
-	corenet_udp_send_pptp_port($1)
-	corenet_udp_receive_pptp_port($1)
+interface(`corenet_udp_sendrecv_postgresql_port',`
+	corenet_udp_send_postgresql_port($1)
+	corenet_udp_receive_postgresql_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the pptp port.
+##	UDP traffic on the postgresql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65302,14 +66188,14 @@ interface(`corenet_udp_sendrecv_pptp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_pptp_port',`
-	corenet_dontaudit_udp_send_pptp_port($1)
-	corenet_dontaudit_udp_receive_pptp_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_postgresql_port',`
+	corenet_dontaudit_udp_send_postgresql_port($1)
+	corenet_dontaudit_udp_receive_postgresql_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the pptp port.
+##	Bind TCP sockets to the postgresql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65318,18 +66204,18 @@ interface(`corenet_dontaudit_udp_sendrecv_pptp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_pptp_port',`
+interface(`corenet_tcp_bind_postgresql_port',`
 	gen_require(`
-		type pptp_port_t;
+		type postgresql_port_t;
 	')
 
-	allow $1 pptp_port_t:tcp_socket name_bind;
+	allow $1 postgresql_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the pptp port.
+##	Bind UDP sockets to the postgresql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65338,18 +66224,18 @@ interface(`corenet_tcp_bind_pptp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_pptp_port',`
+interface(`corenet_udp_bind_postgresql_port',`
 	gen_require(`
-		type pptp_port_t;
+		type postgresql_port_t;
 	')
 
-	allow $1 pptp_port_t:udp_socket name_bind;
+	allow $1 postgresql_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the pptp port.
+##	Make a TCP connection to the postgresql port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65357,18 +66243,18 @@ interface(`corenet_udp_bind_pptp_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_pptp_port',`
+interface(`corenet_tcp_connect_postgresql_port',`
 	gen_require(`
-		type pptp_port_t;
+		type postgresql_port_t;
 	')
 
-	allow $1 pptp_port_t:tcp_socket name_connect;
+	allow $1 postgresql_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pptp_client packets.
+##	Send postgresql_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65377,17 +66263,17 @@ interface(`corenet_tcp_connect_pptp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pptp_client_packets',`
+interface(`corenet_send_postgresql_client_packets',`
 	gen_require(`
-		type pptp_client_packet_t;
+		type postgresql_client_packet_t;
 	')
 
-	allow $1 pptp_client_packet_t:packet send;
+	allow $1 postgresql_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pptp_client packets.
+##	Do not audit attempts to send postgresql_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65396,17 +66282,17 @@ interface(`corenet_send_pptp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pptp_client_packets',`
+interface(`corenet_dontaudit_send_postgresql_client_packets',`
 	gen_require(`
-		type pptp_client_packet_t;
+		type postgresql_client_packet_t;
 	')
 
-	dontaudit $1 pptp_client_packet_t:packet send;
+	dontaudit $1 postgresql_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pptp_client packets.
+##	Receive postgresql_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65415,17 +66301,17 @@ interface(`corenet_dontaudit_send_pptp_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pptp_client_packets',`
+interface(`corenet_receive_postgresql_client_packets',`
 	gen_require(`
-		type pptp_client_packet_t;
+		type postgresql_client_packet_t;
 	')
 
-	allow $1 pptp_client_packet_t:packet recv;
+	allow $1 postgresql_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pptp_client packets.
+##	Do not audit attempts to receive postgresql_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65434,17 +66320,17 @@ interface(`corenet_receive_pptp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pptp_client_packets',`
+interface(`corenet_dontaudit_receive_postgresql_client_packets',`
 	gen_require(`
-		type pptp_client_packet_t;
+		type postgresql_client_packet_t;
 	')
 
-	dontaudit $1 pptp_client_packet_t:packet recv;
+	dontaudit $1 postgresql_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pptp_client packets.
+##	Send and receive postgresql_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65453,14 +66339,14 @@ interface(`corenet_dontaudit_receive_pptp_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pptp_client_packets',`
-	corenet_send_pptp_client_packets($1)
-	corenet_receive_pptp_client_packets($1)
+interface(`corenet_sendrecv_postgresql_client_packets',`
+	corenet_send_postgresql_client_packets($1)
+	corenet_receive_postgresql_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pptp_client packets.
+##	Do not audit attempts to send and receive postgresql_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65469,14 +66355,14 @@ interface(`corenet_sendrecv_pptp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pptp_client_packets',`
-	corenet_dontaudit_send_pptp_client_packets($1)
-	corenet_dontaudit_receive_pptp_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_postgresql_client_packets',`
+	corenet_dontaudit_send_postgresql_client_packets($1)
+	corenet_dontaudit_receive_postgresql_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pptp_client the packet type.
+##	Relabel packets to postgresql_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65484,18 +66370,18 @@ interface(`corenet_dontaudit_sendrecv_pptp_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pptp_client_packets',`
+interface(`corenet_relabelto_postgresql_client_packets',`
 	gen_require(`
-		type pptp_client_packet_t;
+		type postgresql_client_packet_t;
 	')
 
-	allow $1 pptp_client_packet_t:packet relabelto;
+	allow $1 postgresql_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pptp_server packets.
+##	Send postgresql_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65504,17 +66390,17 @@ interface(`corenet_relabelto_pptp_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pptp_server_packets',`
+interface(`corenet_send_postgresql_server_packets',`
 	gen_require(`
-		type pptp_server_packet_t;
+		type postgresql_server_packet_t;
 	')
 
-	allow $1 pptp_server_packet_t:packet send;
+	allow $1 postgresql_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pptp_server packets.
+##	Do not audit attempts to send postgresql_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65523,17 +66409,17 @@ interface(`corenet_send_pptp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pptp_server_packets',`
+interface(`corenet_dontaudit_send_postgresql_server_packets',`
 	gen_require(`
-		type pptp_server_packet_t;
+		type postgresql_server_packet_t;
 	')
 
-	dontaudit $1 pptp_server_packet_t:packet send;
+	dontaudit $1 postgresql_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pptp_server packets.
+##	Receive postgresql_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65542,17 +66428,17 @@ interface(`corenet_dontaudit_send_pptp_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pptp_server_packets',`
+interface(`corenet_receive_postgresql_server_packets',`
 	gen_require(`
-		type pptp_server_packet_t;
+		type postgresql_server_packet_t;
 	')
 
-	allow $1 pptp_server_packet_t:packet recv;
+	allow $1 postgresql_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pptp_server packets.
+##	Do not audit attempts to receive postgresql_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65561,17 +66447,17 @@ interface(`corenet_receive_pptp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pptp_server_packets',`
+interface(`corenet_dontaudit_receive_postgresql_server_packets',`
 	gen_require(`
-		type pptp_server_packet_t;
+		type postgresql_server_packet_t;
 	')
 
-	dontaudit $1 pptp_server_packet_t:packet recv;
+	dontaudit $1 postgresql_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pptp_server packets.
+##	Send and receive postgresql_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65580,14 +66466,14 @@ interface(`corenet_dontaudit_receive_pptp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pptp_server_packets',`
-	corenet_send_pptp_server_packets($1)
-	corenet_receive_pptp_server_packets($1)
+interface(`corenet_sendrecv_postgresql_server_packets',`
+	corenet_send_postgresql_server_packets($1)
+	corenet_receive_postgresql_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pptp_server packets.
+##	Do not audit attempts to send and receive postgresql_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65596,14 +66482,14 @@ interface(`corenet_sendrecv_pptp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pptp_server_packets',`
-	corenet_dontaudit_send_pptp_server_packets($1)
-	corenet_dontaudit_receive_pptp_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_postgresql_server_packets',`
+	corenet_dontaudit_send_postgresql_server_packets($1)
+	corenet_dontaudit_receive_postgresql_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pptp_server the packet type.
+##	Relabel packets to postgresql_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65611,12 +66497,12 @@ interface(`corenet_dontaudit_sendrecv_pptp_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pptp_server_packets',`
+interface(`corenet_relabelto_postgresql_server_packets',`
 	gen_require(`
-		type pptp_server_packet_t;
+		type postgresql_server_packet_t;
 	')
 
-	allow $1 pptp_server_packet_t:packet relabelto;
+	allow $1 postgresql_server_packet_t:packet relabelto;
 ')
 
 
@@ -65624,7 +66510,7 @@ interface(`corenet_relabelto_pptp_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the prelude port.
+##	Send and receive TCP traffic on the postgrey port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65633,17 +66519,17 @@ interface(`corenet_relabelto_pptp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_prelude_port',`
+interface(`corenet_tcp_sendrecv_postgrey_port',`
 	gen_require(`
-		type prelude_port_t;
+		type postgrey_port_t;
 	')
 
-	allow $1 prelude_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 postgrey_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the prelude port.
+##	Send UDP traffic on the postgrey port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65652,17 +66538,17 @@ interface(`corenet_tcp_sendrecv_prelude_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_prelude_port',`
+interface(`corenet_udp_send_postgrey_port',`
 	gen_require(`
-		type prelude_port_t;
+		type postgrey_port_t;
 	')
 
-	allow $1 prelude_port_t:udp_socket send_msg;
+	allow $1 postgrey_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the prelude port.
+##	Do not audit attempts to send UDP traffic on the postgrey port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65671,17 +66557,17 @@ interface(`corenet_udp_send_prelude_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_prelude_port',`
+interface(`corenet_dontaudit_udp_send_postgrey_port',`
 	gen_require(`
-		type prelude_port_t;
+		type postgrey_port_t;
 	')
 
-	dontaudit $1 prelude_port_t:udp_socket send_msg;
+	dontaudit $1 postgrey_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the prelude port.
+##	Receive UDP traffic on the postgrey port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65690,17 +66576,17 @@ interface(`corenet_dontaudit_udp_send_prelude_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_prelude_port',`
+interface(`corenet_udp_receive_postgrey_port',`
 	gen_require(`
-		type prelude_port_t;
+		type postgrey_port_t;
 	')
 
-	allow $1 prelude_port_t:udp_socket recv_msg;
+	allow $1 postgrey_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the prelude port.
+##	Do not audit attempts to receive UDP traffic on the postgrey port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65709,17 +66595,17 @@ interface(`corenet_udp_receive_prelude_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_prelude_port',`
+interface(`corenet_dontaudit_udp_receive_postgrey_port',`
 	gen_require(`
-		type prelude_port_t;
+		type postgrey_port_t;
 	')
 
-	dontaudit $1 prelude_port_t:udp_socket recv_msg;
+	dontaudit $1 postgrey_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the prelude port.
+##	Send and receive UDP traffic on the postgrey port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65728,15 +66614,15 @@ interface(`corenet_dontaudit_udp_receive_prelude_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_prelude_port',`
-	corenet_udp_send_prelude_port($1)
-	corenet_udp_receive_prelude_port($1)
+interface(`corenet_udp_sendrecv_postgrey_port',`
+	corenet_udp_send_postgrey_port($1)
+	corenet_udp_receive_postgrey_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the prelude port.
+##	UDP traffic on the postgrey port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65745,14 +66631,14 @@ interface(`corenet_udp_sendrecv_prelude_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_prelude_port',`
-	corenet_dontaudit_udp_send_prelude_port($1)
-	corenet_dontaudit_udp_receive_prelude_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_postgrey_port',`
+	corenet_dontaudit_udp_send_postgrey_port($1)
+	corenet_dontaudit_udp_receive_postgrey_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the prelude port.
+##	Bind TCP sockets to the postgrey port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65761,18 +66647,18 @@ interface(`corenet_dontaudit_udp_sendrecv_prelude_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_prelude_port',`
+interface(`corenet_tcp_bind_postgrey_port',`
 	gen_require(`
-		type prelude_port_t;
+		type postgrey_port_t;
 	')
 
-	allow $1 prelude_port_t:tcp_socket name_bind;
+	allow $1 postgrey_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the prelude port.
+##	Bind UDP sockets to the postgrey port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65781,18 +66667,18 @@ interface(`corenet_tcp_bind_prelude_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_prelude_port',`
+interface(`corenet_udp_bind_postgrey_port',`
 	gen_require(`
-		type prelude_port_t;
+		type postgrey_port_t;
 	')
 
-	allow $1 prelude_port_t:udp_socket name_bind;
+	allow $1 postgrey_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the prelude port.
+##	Make a TCP connection to the postgrey port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65800,18 +66686,18 @@ interface(`corenet_udp_bind_prelude_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_prelude_port',`
+interface(`corenet_tcp_connect_postgrey_port',`
 	gen_require(`
-		type prelude_port_t;
+		type postgrey_port_t;
 	')
 
-	allow $1 prelude_port_t:tcp_socket name_connect;
+	allow $1 postgrey_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send prelude_client packets.
+##	Send postgrey_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65820,17 +66706,17 @@ interface(`corenet_tcp_connect_prelude_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_prelude_client_packets',`
+interface(`corenet_send_postgrey_client_packets',`
 	gen_require(`
-		type prelude_client_packet_t;
+		type postgrey_client_packet_t;
 	')
 
-	allow $1 prelude_client_packet_t:packet send;
+	allow $1 postgrey_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send prelude_client packets.
+##	Do not audit attempts to send postgrey_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65839,17 +66725,17 @@ interface(`corenet_send_prelude_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_prelude_client_packets',`
+interface(`corenet_dontaudit_send_postgrey_client_packets',`
 	gen_require(`
-		type prelude_client_packet_t;
+		type postgrey_client_packet_t;
 	')
 
-	dontaudit $1 prelude_client_packet_t:packet send;
+	dontaudit $1 postgrey_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive prelude_client packets.
+##	Receive postgrey_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65858,17 +66744,17 @@ interface(`corenet_dontaudit_send_prelude_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_prelude_client_packets',`
+interface(`corenet_receive_postgrey_client_packets',`
 	gen_require(`
-		type prelude_client_packet_t;
+		type postgrey_client_packet_t;
 	')
 
-	allow $1 prelude_client_packet_t:packet recv;
+	allow $1 postgrey_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive prelude_client packets.
+##	Do not audit attempts to receive postgrey_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65877,17 +66763,17 @@ interface(`corenet_receive_prelude_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_prelude_client_packets',`
+interface(`corenet_dontaudit_receive_postgrey_client_packets',`
 	gen_require(`
-		type prelude_client_packet_t;
+		type postgrey_client_packet_t;
 	')
 
-	dontaudit $1 prelude_client_packet_t:packet recv;
+	dontaudit $1 postgrey_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive prelude_client packets.
+##	Send and receive postgrey_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65896,14 +66782,14 @@ interface(`corenet_dontaudit_receive_prelude_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_prelude_client_packets',`
-	corenet_send_prelude_client_packets($1)
-	corenet_receive_prelude_client_packets($1)
+interface(`corenet_sendrecv_postgrey_client_packets',`
+	corenet_send_postgrey_client_packets($1)
+	corenet_receive_postgrey_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive prelude_client packets.
+##	Do not audit attempts to send and receive postgrey_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65912,14 +66798,14 @@ interface(`corenet_sendrecv_prelude_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_prelude_client_packets',`
-	corenet_dontaudit_send_prelude_client_packets($1)
-	corenet_dontaudit_receive_prelude_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_postgrey_client_packets',`
+	corenet_dontaudit_send_postgrey_client_packets($1)
+	corenet_dontaudit_receive_postgrey_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to prelude_client the packet type.
+##	Relabel packets to postgrey_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65927,18 +66813,18 @@ interface(`corenet_dontaudit_sendrecv_prelude_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_prelude_client_packets',`
+interface(`corenet_relabelto_postgrey_client_packets',`
 	gen_require(`
-		type prelude_client_packet_t;
+		type postgrey_client_packet_t;
 	')
 
-	allow $1 prelude_client_packet_t:packet relabelto;
+	allow $1 postgrey_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send prelude_server packets.
+##	Send postgrey_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65947,17 +66833,17 @@ interface(`corenet_relabelto_prelude_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_prelude_server_packets',`
+interface(`corenet_send_postgrey_server_packets',`
 	gen_require(`
-		type prelude_server_packet_t;
+		type postgrey_server_packet_t;
 	')
 
-	allow $1 prelude_server_packet_t:packet send;
+	allow $1 postgrey_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send prelude_server packets.
+##	Do not audit attempts to send postgrey_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65966,17 +66852,17 @@ interface(`corenet_send_prelude_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_prelude_server_packets',`
+interface(`corenet_dontaudit_send_postgrey_server_packets',`
 	gen_require(`
-		type prelude_server_packet_t;
+		type postgrey_server_packet_t;
 	')
 
-	dontaudit $1 prelude_server_packet_t:packet send;
+	dontaudit $1 postgrey_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive prelude_server packets.
+##	Receive postgrey_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -65985,17 +66871,17 @@ interface(`corenet_dontaudit_send_prelude_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_prelude_server_packets',`
+interface(`corenet_receive_postgrey_server_packets',`
 	gen_require(`
-		type prelude_server_packet_t;
+		type postgrey_server_packet_t;
 	')
 
-	allow $1 prelude_server_packet_t:packet recv;
+	allow $1 postgrey_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive prelude_server packets.
+##	Do not audit attempts to receive postgrey_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66004,17 +66890,17 @@ interface(`corenet_receive_prelude_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_prelude_server_packets',`
+interface(`corenet_dontaudit_receive_postgrey_server_packets',`
 	gen_require(`
-		type prelude_server_packet_t;
+		type postgrey_server_packet_t;
 	')
 
-	dontaudit $1 prelude_server_packet_t:packet recv;
+	dontaudit $1 postgrey_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive prelude_server packets.
+##	Send and receive postgrey_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66023,14 +66909,14 @@ interface(`corenet_dontaudit_receive_prelude_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_prelude_server_packets',`
-	corenet_send_prelude_server_packets($1)
-	corenet_receive_prelude_server_packets($1)
+interface(`corenet_sendrecv_postgrey_server_packets',`
+	corenet_send_postgrey_server_packets($1)
+	corenet_receive_postgrey_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive prelude_server packets.
+##	Do not audit attempts to send and receive postgrey_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66039,14 +66925,14 @@ interface(`corenet_sendrecv_prelude_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_prelude_server_packets',`
-	corenet_dontaudit_send_prelude_server_packets($1)
-	corenet_dontaudit_receive_prelude_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_postgrey_server_packets',`
+	corenet_dontaudit_send_postgrey_server_packets($1)
+	corenet_dontaudit_receive_postgrey_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to prelude_server the packet type.
+##	Relabel packets to postgrey_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66054,12 +66940,12 @@ interface(`corenet_dontaudit_sendrecv_prelude_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_prelude_server_packets',`
+interface(`corenet_relabelto_postgrey_server_packets',`
 	gen_require(`
-		type prelude_server_packet_t;
+		type postgrey_server_packet_t;
 	')
 
-	allow $1 prelude_server_packet_t:packet relabelto;
+	allow $1 postgrey_server_packet_t:packet relabelto;
 ')
 
 
@@ -66067,7 +66953,7 @@ interface(`corenet_relabelto_prelude_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the presence port.
+##	Send and receive TCP traffic on the pptp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66076,17 +66962,17 @@ interface(`corenet_relabelto_prelude_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_presence_port',`
+interface(`corenet_tcp_sendrecv_pptp_port',`
 	gen_require(`
-		type presence_port_t;
+		type pptp_port_t;
 	')
 
-	allow $1 presence_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 pptp_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the presence port.
+##	Send UDP traffic on the pptp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66095,12 +66981,898 @@ interface(`corenet_tcp_sendrecv_presence_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_presence_port',`
+interface(`corenet_udp_send_pptp_port',`
 	gen_require(`
-		type presence_port_t;
+		type pptp_port_t;
 	')
 
-	allow $1 presence_port_t:udp_socket send_msg;
+	allow $1 pptp_port_t:udp_socket send_msg;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send UDP traffic on the pptp port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_send_pptp_port',`
+	gen_require(`
+		type pptp_port_t;
+	')
+
+	dontaudit $1 pptp_port_t:udp_socket send_msg;
+')
+
+########################################
+## <summary>
+##	Receive UDP traffic on the pptp port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_udp_receive_pptp_port',`
+	gen_require(`
+		type pptp_port_t;
+	')
+
+	allow $1 pptp_port_t:udp_socket recv_msg;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive UDP traffic on the pptp port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_receive_pptp_port',`
+	gen_require(`
+		type pptp_port_t;
+	')
+
+	dontaudit $1 pptp_port_t:udp_socket recv_msg;
+')
+
+########################################
+## <summary>
+##	Send and receive UDP traffic on the pptp port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_udp_sendrecv_pptp_port',`
+	corenet_udp_send_pptp_port($1)
+	corenet_udp_receive_pptp_port($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive
+##	UDP traffic on the pptp port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_sendrecv_pptp_port',`
+	corenet_dontaudit_udp_send_pptp_port($1)
+	corenet_dontaudit_udp_receive_pptp_port($1)
+')
+
+########################################
+## <summary>
+##	Bind TCP sockets to the pptp port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_tcp_bind_pptp_port',`
+	gen_require(`
+		type pptp_port_t;
+	')
+
+	allow $1 pptp_port_t:tcp_socket name_bind;
+	
+')
+
+########################################
+## <summary>
+##	Bind UDP sockets to the pptp port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_udp_bind_pptp_port',`
+	gen_require(`
+		type pptp_port_t;
+	')
+
+	allow $1 pptp_port_t:udp_socket name_bind;
+	
+')
+
+########################################
+## <summary>
+##	Make a TCP connection to the pptp port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_tcp_connect_pptp_port',`
+	gen_require(`
+		type pptp_port_t;
+	')
+
+	allow $1 pptp_port_t:tcp_socket name_connect;
+')
+
+
+########################################
+## <summary>
+##	Send pptp_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_send_pptp_client_packets',`
+	gen_require(`
+		type pptp_client_packet_t;
+	')
+
+	allow $1 pptp_client_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send pptp_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_send_pptp_client_packets',`
+	gen_require(`
+		type pptp_client_packet_t;
+	')
+
+	dontaudit $1 pptp_client_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Receive pptp_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_receive_pptp_client_packets',`
+	gen_require(`
+		type pptp_client_packet_t;
+	')
+
+	allow $1 pptp_client_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive pptp_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_receive_pptp_client_packets',`
+	gen_require(`
+		type pptp_client_packet_t;
+	')
+
+	dontaudit $1 pptp_client_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Send and receive pptp_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_sendrecv_pptp_client_packets',`
+	corenet_send_pptp_client_packets($1)
+	corenet_receive_pptp_client_packets($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive pptp_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_sendrecv_pptp_client_packets',`
+	corenet_dontaudit_send_pptp_client_packets($1)
+	corenet_dontaudit_receive_pptp_client_packets($1)
+')
+
+########################################
+## <summary>
+##	Relabel packets to pptp_client the packet type.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_relabelto_pptp_client_packets',`
+	gen_require(`
+		type pptp_client_packet_t;
+	')
+
+	allow $1 pptp_client_packet_t:packet relabelto;
+')
+
+
+########################################
+## <summary>
+##	Send pptp_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_send_pptp_server_packets',`
+	gen_require(`
+		type pptp_server_packet_t;
+	')
+
+	allow $1 pptp_server_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send pptp_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_send_pptp_server_packets',`
+	gen_require(`
+		type pptp_server_packet_t;
+	')
+
+	dontaudit $1 pptp_server_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Receive pptp_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_receive_pptp_server_packets',`
+	gen_require(`
+		type pptp_server_packet_t;
+	')
+
+	allow $1 pptp_server_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive pptp_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_receive_pptp_server_packets',`
+	gen_require(`
+		type pptp_server_packet_t;
+	')
+
+	dontaudit $1 pptp_server_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Send and receive pptp_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_sendrecv_pptp_server_packets',`
+	corenet_send_pptp_server_packets($1)
+	corenet_receive_pptp_server_packets($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive pptp_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_sendrecv_pptp_server_packets',`
+	corenet_dontaudit_send_pptp_server_packets($1)
+	corenet_dontaudit_receive_pptp_server_packets($1)
+')
+
+########################################
+## <summary>
+##	Relabel packets to pptp_server the packet type.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_relabelto_pptp_server_packets',`
+	gen_require(`
+		type pptp_server_packet_t;
+	')
+
+	allow $1 pptp_server_packet_t:packet relabelto;
+')
+
+
+
+
+########################################
+## <summary>
+##	Send and receive TCP traffic on the prelude port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_tcp_sendrecv_prelude_port',`
+	gen_require(`
+		type prelude_port_t;
+	')
+
+	allow $1 prelude_port_t:tcp_socket { send_msg recv_msg };
+')
+
+########################################
+## <summary>
+##	Send UDP traffic on the prelude port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_udp_send_prelude_port',`
+	gen_require(`
+		type prelude_port_t;
+	')
+
+	allow $1 prelude_port_t:udp_socket send_msg;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send UDP traffic on the prelude port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_send_prelude_port',`
+	gen_require(`
+		type prelude_port_t;
+	')
+
+	dontaudit $1 prelude_port_t:udp_socket send_msg;
+')
+
+########################################
+## <summary>
+##	Receive UDP traffic on the prelude port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_udp_receive_prelude_port',`
+	gen_require(`
+		type prelude_port_t;
+	')
+
+	allow $1 prelude_port_t:udp_socket recv_msg;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive UDP traffic on the prelude port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_receive_prelude_port',`
+	gen_require(`
+		type prelude_port_t;
+	')
+
+	dontaudit $1 prelude_port_t:udp_socket recv_msg;
+')
+
+########################################
+## <summary>
+##	Send and receive UDP traffic on the prelude port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_udp_sendrecv_prelude_port',`
+	corenet_udp_send_prelude_port($1)
+	corenet_udp_receive_prelude_port($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive
+##	UDP traffic on the prelude port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_sendrecv_prelude_port',`
+	corenet_dontaudit_udp_send_prelude_port($1)
+	corenet_dontaudit_udp_receive_prelude_port($1)
+')
+
+########################################
+## <summary>
+##	Bind TCP sockets to the prelude port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_tcp_bind_prelude_port',`
+	gen_require(`
+		type prelude_port_t;
+	')
+
+	allow $1 prelude_port_t:tcp_socket name_bind;
+	
+')
+
+########################################
+## <summary>
+##	Bind UDP sockets to the prelude port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_udp_bind_prelude_port',`
+	gen_require(`
+		type prelude_port_t;
+	')
+
+	allow $1 prelude_port_t:udp_socket name_bind;
+	
+')
+
+########################################
+## <summary>
+##	Make a TCP connection to the prelude port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_tcp_connect_prelude_port',`
+	gen_require(`
+		type prelude_port_t;
+	')
+
+	allow $1 prelude_port_t:tcp_socket name_connect;
+')
+
+
+########################################
+## <summary>
+##	Send prelude_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_send_prelude_client_packets',`
+	gen_require(`
+		type prelude_client_packet_t;
+	')
+
+	allow $1 prelude_client_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send prelude_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_send_prelude_client_packets',`
+	gen_require(`
+		type prelude_client_packet_t;
+	')
+
+	dontaudit $1 prelude_client_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Receive prelude_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_receive_prelude_client_packets',`
+	gen_require(`
+		type prelude_client_packet_t;
+	')
+
+	allow $1 prelude_client_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive prelude_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_receive_prelude_client_packets',`
+	gen_require(`
+		type prelude_client_packet_t;
+	')
+
+	dontaudit $1 prelude_client_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Send and receive prelude_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_sendrecv_prelude_client_packets',`
+	corenet_send_prelude_client_packets($1)
+	corenet_receive_prelude_client_packets($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive prelude_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_sendrecv_prelude_client_packets',`
+	corenet_dontaudit_send_prelude_client_packets($1)
+	corenet_dontaudit_receive_prelude_client_packets($1)
+')
+
+########################################
+## <summary>
+##	Relabel packets to prelude_client the packet type.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_relabelto_prelude_client_packets',`
+	gen_require(`
+		type prelude_client_packet_t;
+	')
+
+	allow $1 prelude_client_packet_t:packet relabelto;
+')
+
+
+########################################
+## <summary>
+##	Send prelude_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_send_prelude_server_packets',`
+	gen_require(`
+		type prelude_server_packet_t;
+	')
+
+	allow $1 prelude_server_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send prelude_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_send_prelude_server_packets',`
+	gen_require(`
+		type prelude_server_packet_t;
+	')
+
+	dontaudit $1 prelude_server_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Receive prelude_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_receive_prelude_server_packets',`
+	gen_require(`
+		type prelude_server_packet_t;
+	')
+
+	allow $1 prelude_server_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive prelude_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_receive_prelude_server_packets',`
+	gen_require(`
+		type prelude_server_packet_t;
+	')
+
+	dontaudit $1 prelude_server_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Send and receive prelude_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_sendrecv_prelude_server_packets',`
+	corenet_send_prelude_server_packets($1)
+	corenet_receive_prelude_server_packets($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive prelude_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_sendrecv_prelude_server_packets',`
+	corenet_dontaudit_send_prelude_server_packets($1)
+	corenet_dontaudit_receive_prelude_server_packets($1)
+')
+
+########################################
+## <summary>
+##	Relabel packets to prelude_server the packet type.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_relabelto_prelude_server_packets',`
+	gen_require(`
+		type prelude_server_packet_t;
+	')
+
+	allow $1 prelude_server_packet_t:packet relabelto;
+')
+
+
+
+
+########################################
+## <summary>
+##	Send and receive TCP traffic on the presence port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_tcp_sendrecv_presence_port',`
+	gen_require(`
+		type presence_port_t;
+	')
+
+	allow $1 presence_port_t:tcp_socket { send_msg recv_msg };
+')
+
+########################################
+## <summary>
+##	Send UDP traffic on the presence port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_udp_send_presence_port',`
+	gen_require(`
+		type presence_port_t;
+	')
+
+	allow $1 presence_port_t:udp_socket send_msg;
 ')
 
 ########################################
@@ -66114,17 +67886,903 @@ interface(`corenet_udp_send_presence_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_presence_port',`
+interface(`corenet_dontaudit_udp_send_presence_port',`
+	gen_require(`
+		type presence_port_t;
+	')
+
+	dontaudit $1 presence_port_t:udp_socket send_msg;
+')
+
+########################################
+## <summary>
+##	Receive UDP traffic on the presence port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_udp_receive_presence_port',`
+	gen_require(`
+		type presence_port_t;
+	')
+
+	allow $1 presence_port_t:udp_socket recv_msg;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive UDP traffic on the presence port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_receive_presence_port',`
+	gen_require(`
+		type presence_port_t;
+	')
+
+	dontaudit $1 presence_port_t:udp_socket recv_msg;
+')
+
+########################################
+## <summary>
+##	Send and receive UDP traffic on the presence port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_udp_sendrecv_presence_port',`
+	corenet_udp_send_presence_port($1)
+	corenet_udp_receive_presence_port($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive
+##	UDP traffic on the presence port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_sendrecv_presence_port',`
+	corenet_dontaudit_udp_send_presence_port($1)
+	corenet_dontaudit_udp_receive_presence_port($1)
+')
+
+########################################
+## <summary>
+##	Bind TCP sockets to the presence port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_tcp_bind_presence_port',`
+	gen_require(`
+		type presence_port_t;
+	')
+
+	allow $1 presence_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
+')
+
+########################################
+## <summary>
+##	Bind UDP sockets to the presence port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_udp_bind_presence_port',`
+	gen_require(`
+		type presence_port_t;
+	')
+
+	allow $1 presence_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
+')
+
+########################################
+## <summary>
+##	Make a TCP connection to the presence port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_tcp_connect_presence_port',`
+	gen_require(`
+		type presence_port_t;
+	')
+
+	allow $1 presence_port_t:tcp_socket name_connect;
+')
+
+
+########################################
+## <summary>
+##	Send presence_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_send_presence_client_packets',`
+	gen_require(`
+		type presence_client_packet_t;
+	')
+
+	allow $1 presence_client_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send presence_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_send_presence_client_packets',`
+	gen_require(`
+		type presence_client_packet_t;
+	')
+
+	dontaudit $1 presence_client_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Receive presence_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_receive_presence_client_packets',`
+	gen_require(`
+		type presence_client_packet_t;
+	')
+
+	allow $1 presence_client_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive presence_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_receive_presence_client_packets',`
+	gen_require(`
+		type presence_client_packet_t;
+	')
+
+	dontaudit $1 presence_client_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Send and receive presence_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_sendrecv_presence_client_packets',`
+	corenet_send_presence_client_packets($1)
+	corenet_receive_presence_client_packets($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive presence_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_sendrecv_presence_client_packets',`
+	corenet_dontaudit_send_presence_client_packets($1)
+	corenet_dontaudit_receive_presence_client_packets($1)
+')
+
+########################################
+## <summary>
+##	Relabel packets to presence_client the packet type.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_relabelto_presence_client_packets',`
+	gen_require(`
+		type presence_client_packet_t;
+	')
+
+	allow $1 presence_client_packet_t:packet relabelto;
+')
+
+
+########################################
+## <summary>
+##	Send presence_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_send_presence_server_packets',`
+	gen_require(`
+		type presence_server_packet_t;
+	')
+
+	allow $1 presence_server_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send presence_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_send_presence_server_packets',`
+	gen_require(`
+		type presence_server_packet_t;
+	')
+
+	dontaudit $1 presence_server_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Receive presence_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_receive_presence_server_packets',`
+	gen_require(`
+		type presence_server_packet_t;
+	')
+
+	allow $1 presence_server_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive presence_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_receive_presence_server_packets',`
+	gen_require(`
+		type presence_server_packet_t;
+	')
+
+	dontaudit $1 presence_server_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Send and receive presence_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_sendrecv_presence_server_packets',`
+	corenet_send_presence_server_packets($1)
+	corenet_receive_presence_server_packets($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive presence_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_sendrecv_presence_server_packets',`
+	corenet_dontaudit_send_presence_server_packets($1)
+	corenet_dontaudit_receive_presence_server_packets($1)
+')
+
+########################################
+## <summary>
+##	Relabel packets to presence_server the packet type.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_relabelto_presence_server_packets',`
+	gen_require(`
+		type presence_server_packet_t;
+	')
+
+	allow $1 presence_server_packet_t:packet relabelto;
+')
+
+
+
+
+########################################
+## <summary>
+##	Send and receive TCP traffic on the printer port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_tcp_sendrecv_printer_port',`
+	gen_require(`
+		type printer_port_t;
+	')
+
+	allow $1 printer_port_t:tcp_socket { send_msg recv_msg };
+')
+
+########################################
+## <summary>
+##	Send UDP traffic on the printer port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_udp_send_printer_port',`
+	gen_require(`
+		type printer_port_t;
+	')
+
+	allow $1 printer_port_t:udp_socket send_msg;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send UDP traffic on the printer port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_send_printer_port',`
+	gen_require(`
+		type printer_port_t;
+	')
+
+	dontaudit $1 printer_port_t:udp_socket send_msg;
+')
+
+########################################
+## <summary>
+##	Receive UDP traffic on the printer port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_udp_receive_printer_port',`
+	gen_require(`
+		type printer_port_t;
+	')
+
+	allow $1 printer_port_t:udp_socket recv_msg;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive UDP traffic on the printer port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_receive_printer_port',`
+	gen_require(`
+		type printer_port_t;
+	')
+
+	dontaudit $1 printer_port_t:udp_socket recv_msg;
+')
+
+########################################
+## <summary>
+##	Send and receive UDP traffic on the printer port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_udp_sendrecv_printer_port',`
+	corenet_udp_send_printer_port($1)
+	corenet_udp_receive_printer_port($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive
+##	UDP traffic on the printer port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_sendrecv_printer_port',`
+	corenet_dontaudit_udp_send_printer_port($1)
+	corenet_dontaudit_udp_receive_printer_port($1)
+')
+
+########################################
+## <summary>
+##	Bind TCP sockets to the printer port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_tcp_bind_printer_port',`
+	gen_require(`
+		type printer_port_t;
+	')
+
+	allow $1 printer_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
+')
+
+########################################
+## <summary>
+##	Bind UDP sockets to the printer port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_udp_bind_printer_port',`
+	gen_require(`
+		type printer_port_t;
+	')
+
+	allow $1 printer_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
+')
+
+########################################
+## <summary>
+##	Make a TCP connection to the printer port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_tcp_connect_printer_port',`
+	gen_require(`
+		type printer_port_t;
+	')
+
+	allow $1 printer_port_t:tcp_socket name_connect;
+')
+
+
+########################################
+## <summary>
+##	Send printer_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_send_printer_client_packets',`
+	gen_require(`
+		type printer_client_packet_t;
+	')
+
+	allow $1 printer_client_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send printer_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_send_printer_client_packets',`
+	gen_require(`
+		type printer_client_packet_t;
+	')
+
+	dontaudit $1 printer_client_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Receive printer_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_receive_printer_client_packets',`
+	gen_require(`
+		type printer_client_packet_t;
+	')
+
+	allow $1 printer_client_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive printer_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_receive_printer_client_packets',`
+	gen_require(`
+		type printer_client_packet_t;
+	')
+
+	dontaudit $1 printer_client_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Send and receive printer_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_sendrecv_printer_client_packets',`
+	corenet_send_printer_client_packets($1)
+	corenet_receive_printer_client_packets($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive printer_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_sendrecv_printer_client_packets',`
+	corenet_dontaudit_send_printer_client_packets($1)
+	corenet_dontaudit_receive_printer_client_packets($1)
+')
+
+########################################
+## <summary>
+##	Relabel packets to printer_client the packet type.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_relabelto_printer_client_packets',`
+	gen_require(`
+		type printer_client_packet_t;
+	')
+
+	allow $1 printer_client_packet_t:packet relabelto;
+')
+
+
+########################################
+## <summary>
+##	Send printer_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_send_printer_server_packets',`
+	gen_require(`
+		type printer_server_packet_t;
+	')
+
+	allow $1 printer_server_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send printer_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_send_printer_server_packets',`
+	gen_require(`
+		type printer_server_packet_t;
+	')
+
+	dontaudit $1 printer_server_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Receive printer_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_receive_printer_server_packets',`
+	gen_require(`
+		type printer_server_packet_t;
+	')
+
+	allow $1 printer_server_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive printer_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_receive_printer_server_packets',`
+	gen_require(`
+		type printer_server_packet_t;
+	')
+
+	dontaudit $1 printer_server_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Send and receive printer_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_sendrecv_printer_server_packets',`
+	corenet_send_printer_server_packets($1)
+	corenet_receive_printer_server_packets($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive printer_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_sendrecv_printer_server_packets',`
+	corenet_dontaudit_send_printer_server_packets($1)
+	corenet_dontaudit_receive_printer_server_packets($1)
+')
+
+########################################
+## <summary>
+##	Relabel packets to printer_server the packet type.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_relabelto_printer_server_packets',`
+	gen_require(`
+		type printer_server_packet_t;
+	')
+
+	allow $1 printer_server_packet_t:packet relabelto;
+')
+
+
+
+
+########################################
+## <summary>
+##	Send and receive TCP traffic on the ptal port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_tcp_sendrecv_ptal_port',`
+	gen_require(`
+		type ptal_port_t;
+	')
+
+	allow $1 ptal_port_t:tcp_socket { send_msg recv_msg };
+')
+
+########################################
+## <summary>
+##	Send UDP traffic on the ptal port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_udp_send_ptal_port',`
+	gen_require(`
+		type ptal_port_t;
+	')
+
+	allow $1 ptal_port_t:udp_socket send_msg;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send UDP traffic on the ptal port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_send_ptal_port',`
 	gen_require(`
-		type presence_port_t;
+		type ptal_port_t;
 	')
 
-	dontaudit $1 presence_port_t:udp_socket send_msg;
+	dontaudit $1 ptal_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the presence port.
+##	Receive UDP traffic on the ptal port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66133,17 +68791,17 @@ interface(`corenet_dontaudit_udp_send_presence_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_presence_port',`
+interface(`corenet_udp_receive_ptal_port',`
 	gen_require(`
-		type presence_port_t;
+		type ptal_port_t;
 	')
 
-	allow $1 presence_port_t:udp_socket recv_msg;
+	allow $1 ptal_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the presence port.
+##	Do not audit attempts to receive UDP traffic on the ptal port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66152,17 +68810,17 @@ interface(`corenet_udp_receive_presence_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_presence_port',`
+interface(`corenet_dontaudit_udp_receive_ptal_port',`
 	gen_require(`
-		type presence_port_t;
+		type ptal_port_t;
 	')
 
-	dontaudit $1 presence_port_t:udp_socket recv_msg;
+	dontaudit $1 ptal_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the presence port.
+##	Send and receive UDP traffic on the ptal port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66171,15 +68829,458 @@ interface(`corenet_dontaudit_udp_receive_presence_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_presence_port',`
-	corenet_udp_send_presence_port($1)
-	corenet_udp_receive_presence_port($1)
+interface(`corenet_udp_sendrecv_ptal_port',`
+	corenet_udp_send_ptal_port($1)
+	corenet_udp_receive_ptal_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the presence port.
+##	UDP traffic on the ptal port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_sendrecv_ptal_port',`
+	corenet_dontaudit_udp_send_ptal_port($1)
+	corenet_dontaudit_udp_receive_ptal_port($1)
+')
+
+########################################
+## <summary>
+##	Bind TCP sockets to the ptal port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_tcp_bind_ptal_port',`
+	gen_require(`
+		type ptal_port_t;
+	')
+
+	allow $1 ptal_port_t:tcp_socket name_bind;
+	
+')
+
+########################################
+## <summary>
+##	Bind UDP sockets to the ptal port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_udp_bind_ptal_port',`
+	gen_require(`
+		type ptal_port_t;
+	')
+
+	allow $1 ptal_port_t:udp_socket name_bind;
+	
+')
+
+########################################
+## <summary>
+##	Make a TCP connection to the ptal port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_tcp_connect_ptal_port',`
+	gen_require(`
+		type ptal_port_t;
+	')
+
+	allow $1 ptal_port_t:tcp_socket name_connect;
+')
+
+
+########################################
+## <summary>
+##	Send ptal_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_send_ptal_client_packets',`
+	gen_require(`
+		type ptal_client_packet_t;
+	')
+
+	allow $1 ptal_client_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send ptal_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_send_ptal_client_packets',`
+	gen_require(`
+		type ptal_client_packet_t;
+	')
+
+	dontaudit $1 ptal_client_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Receive ptal_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_receive_ptal_client_packets',`
+	gen_require(`
+		type ptal_client_packet_t;
+	')
+
+	allow $1 ptal_client_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive ptal_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_receive_ptal_client_packets',`
+	gen_require(`
+		type ptal_client_packet_t;
+	')
+
+	dontaudit $1 ptal_client_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Send and receive ptal_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_sendrecv_ptal_client_packets',`
+	corenet_send_ptal_client_packets($1)
+	corenet_receive_ptal_client_packets($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive ptal_client packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_sendrecv_ptal_client_packets',`
+	corenet_dontaudit_send_ptal_client_packets($1)
+	corenet_dontaudit_receive_ptal_client_packets($1)
+')
+
+########################################
+## <summary>
+##	Relabel packets to ptal_client the packet type.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_relabelto_ptal_client_packets',`
+	gen_require(`
+		type ptal_client_packet_t;
+	')
+
+	allow $1 ptal_client_packet_t:packet relabelto;
+')
+
+
+########################################
+## <summary>
+##	Send ptal_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_send_ptal_server_packets',`
+	gen_require(`
+		type ptal_server_packet_t;
+	')
+
+	allow $1 ptal_server_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send ptal_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_send_ptal_server_packets',`
+	gen_require(`
+		type ptal_server_packet_t;
+	')
+
+	dontaudit $1 ptal_server_packet_t:packet send;
+')
+
+########################################
+## <summary>
+##	Receive ptal_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_receive_ptal_server_packets',`
+	gen_require(`
+		type ptal_server_packet_t;
+	')
+
+	allow $1 ptal_server_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive ptal_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_receive_ptal_server_packets',`
+	gen_require(`
+		type ptal_server_packet_t;
+	')
+
+	dontaudit $1 ptal_server_packet_t:packet recv;
+')
+
+########################################
+## <summary>
+##	Send and receive ptal_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_sendrecv_ptal_server_packets',`
+	corenet_send_ptal_server_packets($1)
+	corenet_receive_ptal_server_packets($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive ptal_server packets.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_sendrecv_ptal_server_packets',`
+	corenet_dontaudit_send_ptal_server_packets($1)
+	corenet_dontaudit_receive_ptal_server_packets($1)
+')
+
+########################################
+## <summary>
+##	Relabel packets to ptal_server the packet type.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`corenet_relabelto_ptal_server_packets',`
+	gen_require(`
+		type ptal_server_packet_t;
+	')
+
+	allow $1 ptal_server_packet_t:packet relabelto;
+')
+
+
+
+
+########################################
+## <summary>
+##	Send and receive TCP traffic on the pulseaudio port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_tcp_sendrecv_pulseaudio_port',`
+	gen_require(`
+		type pulseaudio_port_t;
+	')
+
+	allow $1 pulseaudio_port_t:tcp_socket { send_msg recv_msg };
+')
+
+########################################
+## <summary>
+##	Send UDP traffic on the pulseaudio port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="write" weight="10"/>
+#
+interface(`corenet_udp_send_pulseaudio_port',`
+	gen_require(`
+		type pulseaudio_port_t;
+	')
+
+	allow $1 pulseaudio_port_t:udp_socket send_msg;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send UDP traffic on the pulseaudio port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_send_pulseaudio_port',`
+	gen_require(`
+		type pulseaudio_port_t;
+	')
+
+	dontaudit $1 pulseaudio_port_t:udp_socket send_msg;
+')
+
+########################################
+## <summary>
+##	Receive UDP traffic on the pulseaudio port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="read" weight="10"/>
+#
+interface(`corenet_udp_receive_pulseaudio_port',`
+	gen_require(`
+		type pulseaudio_port_t;
+	')
+
+	allow $1 pulseaudio_port_t:udp_socket recv_msg;
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to receive UDP traffic on the pulseaudio port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain to not audit.
+##	</summary>
+## </param>
+## <infoflow type="none"/>
+#
+interface(`corenet_dontaudit_udp_receive_pulseaudio_port',`
+	gen_require(`
+		type pulseaudio_port_t;
+	')
+
+	dontaudit $1 pulseaudio_port_t:udp_socket recv_msg;
+')
+
+########################################
+## <summary>
+##	Send and receive UDP traffic on the pulseaudio port.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+## <infoflow type="both" weight="10"/>
+#
+interface(`corenet_udp_sendrecv_pulseaudio_port',`
+	corenet_udp_send_pulseaudio_port($1)
+	corenet_udp_receive_pulseaudio_port($1)
+')
+
+########################################
+## <summary>
+##	Do not audit attempts to send and receive
+##	UDP traffic on the pulseaudio port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66188,14 +69289,14 @@ interface(`corenet_udp_sendrecv_presence_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_presence_port',`
-	corenet_dontaudit_udp_send_presence_port($1)
-	corenet_dontaudit_udp_receive_presence_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_pulseaudio_port',`
+	corenet_dontaudit_udp_send_pulseaudio_port($1)
+	corenet_dontaudit_udp_receive_pulseaudio_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the presence port.
+##	Bind TCP sockets to the pulseaudio port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66204,18 +69305,18 @@ interface(`corenet_dontaudit_udp_sendrecv_presence_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_presence_port',`
+interface(`corenet_tcp_bind_pulseaudio_port',`
 	gen_require(`
-		type presence_port_t;
+		type pulseaudio_port_t;
 	')
 
-	allow $1 presence_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 pulseaudio_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the presence port.
+##	Bind UDP sockets to the pulseaudio port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66224,18 +69325,18 @@ interface(`corenet_tcp_bind_presence_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_presence_port',`
+interface(`corenet_udp_bind_pulseaudio_port',`
 	gen_require(`
-		type presence_port_t;
+		type pulseaudio_port_t;
 	')
 
-	allow $1 presence_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 pulseaudio_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the presence port.
+##	Make a TCP connection to the pulseaudio port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66243,18 +69344,18 @@ interface(`corenet_udp_bind_presence_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_presence_port',`
+interface(`corenet_tcp_connect_pulseaudio_port',`
 	gen_require(`
-		type presence_port_t;
+		type pulseaudio_port_t;
 	')
 
-	allow $1 presence_port_t:tcp_socket name_connect;
+	allow $1 pulseaudio_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send presence_client packets.
+##	Send pulseaudio_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66263,17 +69364,17 @@ interface(`corenet_tcp_connect_presence_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_presence_client_packets',`
+interface(`corenet_send_pulseaudio_client_packets',`
 	gen_require(`
-		type presence_client_packet_t;
+		type pulseaudio_client_packet_t;
 	')
 
-	allow $1 presence_client_packet_t:packet send;
+	allow $1 pulseaudio_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send presence_client packets.
+##	Do not audit attempts to send pulseaudio_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66282,17 +69383,17 @@ interface(`corenet_send_presence_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_presence_client_packets',`
+interface(`corenet_dontaudit_send_pulseaudio_client_packets',`
 	gen_require(`
-		type presence_client_packet_t;
+		type pulseaudio_client_packet_t;
 	')
 
-	dontaudit $1 presence_client_packet_t:packet send;
+	dontaudit $1 pulseaudio_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive presence_client packets.
+##	Receive pulseaudio_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66301,17 +69402,17 @@ interface(`corenet_dontaudit_send_presence_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_presence_client_packets',`
+interface(`corenet_receive_pulseaudio_client_packets',`
 	gen_require(`
-		type presence_client_packet_t;
+		type pulseaudio_client_packet_t;
 	')
 
-	allow $1 presence_client_packet_t:packet recv;
+	allow $1 pulseaudio_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive presence_client packets.
+##	Do not audit attempts to receive pulseaudio_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66320,17 +69421,17 @@ interface(`corenet_receive_presence_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_presence_client_packets',`
+interface(`corenet_dontaudit_receive_pulseaudio_client_packets',`
 	gen_require(`
-		type presence_client_packet_t;
+		type pulseaudio_client_packet_t;
 	')
 
-	dontaudit $1 presence_client_packet_t:packet recv;
+	dontaudit $1 pulseaudio_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive presence_client packets.
+##	Send and receive pulseaudio_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66339,14 +69440,14 @@ interface(`corenet_dontaudit_receive_presence_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_presence_client_packets',`
-	corenet_send_presence_client_packets($1)
-	corenet_receive_presence_client_packets($1)
+interface(`corenet_sendrecv_pulseaudio_client_packets',`
+	corenet_send_pulseaudio_client_packets($1)
+	corenet_receive_pulseaudio_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive presence_client packets.
+##	Do not audit attempts to send and receive pulseaudio_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66355,14 +69456,14 @@ interface(`corenet_sendrecv_presence_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_presence_client_packets',`
-	corenet_dontaudit_send_presence_client_packets($1)
-	corenet_dontaudit_receive_presence_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_pulseaudio_client_packets',`
+	corenet_dontaudit_send_pulseaudio_client_packets($1)
+	corenet_dontaudit_receive_pulseaudio_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to presence_client the packet type.
+##	Relabel packets to pulseaudio_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66370,18 +69471,18 @@ interface(`corenet_dontaudit_sendrecv_presence_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_presence_client_packets',`
+interface(`corenet_relabelto_pulseaudio_client_packets',`
 	gen_require(`
-		type presence_client_packet_t;
+		type pulseaudio_client_packet_t;
 	')
 
-	allow $1 presence_client_packet_t:packet relabelto;
+	allow $1 pulseaudio_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send presence_server packets.
+##	Send pulseaudio_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66390,17 +69491,17 @@ interface(`corenet_relabelto_presence_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_presence_server_packets',`
+interface(`corenet_send_pulseaudio_server_packets',`
 	gen_require(`
-		type presence_server_packet_t;
+		type pulseaudio_server_packet_t;
 	')
 
-	allow $1 presence_server_packet_t:packet send;
+	allow $1 pulseaudio_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send presence_server packets.
+##	Do not audit attempts to send pulseaudio_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66409,17 +69510,17 @@ interface(`corenet_send_presence_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_presence_server_packets',`
+interface(`corenet_dontaudit_send_pulseaudio_server_packets',`
 	gen_require(`
-		type presence_server_packet_t;
+		type pulseaudio_server_packet_t;
 	')
 
-	dontaudit $1 presence_server_packet_t:packet send;
+	dontaudit $1 pulseaudio_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive presence_server packets.
+##	Receive pulseaudio_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66428,17 +69529,17 @@ interface(`corenet_dontaudit_send_presence_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_presence_server_packets',`
+interface(`corenet_receive_pulseaudio_server_packets',`
 	gen_require(`
-		type presence_server_packet_t;
+		type pulseaudio_server_packet_t;
 	')
 
-	allow $1 presence_server_packet_t:packet recv;
+	allow $1 pulseaudio_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive presence_server packets.
+##	Do not audit attempts to receive pulseaudio_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66447,17 +69548,17 @@ interface(`corenet_receive_presence_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_presence_server_packets',`
+interface(`corenet_dontaudit_receive_pulseaudio_server_packets',`
 	gen_require(`
-		type presence_server_packet_t;
+		type pulseaudio_server_packet_t;
 	')
 
-	dontaudit $1 presence_server_packet_t:packet recv;
+	dontaudit $1 pulseaudio_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive presence_server packets.
+##	Send and receive pulseaudio_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66466,14 +69567,14 @@ interface(`corenet_dontaudit_receive_presence_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_presence_server_packets',`
-	corenet_send_presence_server_packets($1)
-	corenet_receive_presence_server_packets($1)
+interface(`corenet_sendrecv_pulseaudio_server_packets',`
+	corenet_send_pulseaudio_server_packets($1)
+	corenet_receive_pulseaudio_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive presence_server packets.
+##	Do not audit attempts to send and receive pulseaudio_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66482,14 +69583,14 @@ interface(`corenet_sendrecv_presence_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_presence_server_packets',`
-	corenet_dontaudit_send_presence_server_packets($1)
-	corenet_dontaudit_receive_presence_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_pulseaudio_server_packets',`
+	corenet_dontaudit_send_pulseaudio_server_packets($1)
+	corenet_dontaudit_receive_pulseaudio_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to presence_server the packet type.
+##	Relabel packets to pulseaudio_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66497,12 +69598,12 @@ interface(`corenet_dontaudit_sendrecv_presence_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_presence_server_packets',`
+interface(`corenet_relabelto_pulseaudio_server_packets',`
 	gen_require(`
-		type presence_server_packet_t;
+		type pulseaudio_server_packet_t;
 	')
 
-	allow $1 presence_server_packet_t:packet relabelto;
+	allow $1 pulseaudio_server_packet_t:packet relabelto;
 ')
 
 
@@ -66510,7 +69611,7 @@ interface(`corenet_relabelto_presence_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the printer port.
+##	Send and receive TCP traffic on the puppet port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66519,17 +69620,17 @@ interface(`corenet_relabelto_presence_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_printer_port',`
+interface(`corenet_tcp_sendrecv_puppet_port',`
 	gen_require(`
-		type printer_port_t;
+		type puppet_port_t;
 	')
 
-	allow $1 printer_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 puppet_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the printer port.
+##	Send UDP traffic on the puppet port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66538,17 +69639,17 @@ interface(`corenet_tcp_sendrecv_printer_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_printer_port',`
+interface(`corenet_udp_send_puppet_port',`
 	gen_require(`
-		type printer_port_t;
+		type puppet_port_t;
 	')
 
-	allow $1 printer_port_t:udp_socket send_msg;
+	allow $1 puppet_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the printer port.
+##	Do not audit attempts to send UDP traffic on the puppet port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66557,17 +69658,17 @@ interface(`corenet_udp_send_printer_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_printer_port',`
+interface(`corenet_dontaudit_udp_send_puppet_port',`
 	gen_require(`
-		type printer_port_t;
+		type puppet_port_t;
 	')
 
-	dontaudit $1 printer_port_t:udp_socket send_msg;
+	dontaudit $1 puppet_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the printer port.
+##	Receive UDP traffic on the puppet port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66576,17 +69677,17 @@ interface(`corenet_dontaudit_udp_send_printer_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_printer_port',`
+interface(`corenet_udp_receive_puppet_port',`
 	gen_require(`
-		type printer_port_t;
+		type puppet_port_t;
 	')
 
-	allow $1 printer_port_t:udp_socket recv_msg;
+	allow $1 puppet_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the printer port.
+##	Do not audit attempts to receive UDP traffic on the puppet port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66595,17 +69696,17 @@ interface(`corenet_udp_receive_printer_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_printer_port',`
+interface(`corenet_dontaudit_udp_receive_puppet_port',`
 	gen_require(`
-		type printer_port_t;
+		type puppet_port_t;
 	')
 
-	dontaudit $1 printer_port_t:udp_socket recv_msg;
+	dontaudit $1 puppet_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the printer port.
+##	Send and receive UDP traffic on the puppet port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66614,15 +69715,15 @@ interface(`corenet_dontaudit_udp_receive_printer_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_printer_port',`
-	corenet_udp_send_printer_port($1)
-	corenet_udp_receive_printer_port($1)
+interface(`corenet_udp_sendrecv_puppet_port',`
+	corenet_udp_send_puppet_port($1)
+	corenet_udp_receive_puppet_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the printer port.
+##	UDP traffic on the puppet port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66631,14 +69732,14 @@ interface(`corenet_udp_sendrecv_printer_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_printer_port',`
-	corenet_dontaudit_udp_send_printer_port($1)
-	corenet_dontaudit_udp_receive_printer_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_puppet_port',`
+	corenet_dontaudit_udp_send_puppet_port($1)
+	corenet_dontaudit_udp_receive_puppet_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the printer port.
+##	Bind TCP sockets to the puppet port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66647,18 +69748,18 @@ interface(`corenet_dontaudit_udp_sendrecv_printer_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_printer_port',`
+interface(`corenet_tcp_bind_puppet_port',`
 	gen_require(`
-		type printer_port_t;
+		type puppet_port_t;
 	')
 
-	allow $1 printer_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 puppet_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the printer port.
+##	Bind UDP sockets to the puppet port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66667,18 +69768,18 @@ interface(`corenet_tcp_bind_printer_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_printer_port',`
+interface(`corenet_udp_bind_puppet_port',`
 	gen_require(`
-		type printer_port_t;
+		type puppet_port_t;
 	')
 
-	allow $1 printer_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 puppet_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the printer port.
+##	Make a TCP connection to the puppet port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66686,18 +69787,18 @@ interface(`corenet_udp_bind_printer_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_printer_port',`
+interface(`corenet_tcp_connect_puppet_port',`
 	gen_require(`
-		type printer_port_t;
+		type puppet_port_t;
 	')
 
-	allow $1 printer_port_t:tcp_socket name_connect;
+	allow $1 puppet_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send printer_client packets.
+##	Send puppet_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66706,17 +69807,17 @@ interface(`corenet_tcp_connect_printer_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_printer_client_packets',`
+interface(`corenet_send_puppet_client_packets',`
 	gen_require(`
-		type printer_client_packet_t;
+		type puppet_client_packet_t;
 	')
 
-	allow $1 printer_client_packet_t:packet send;
+	allow $1 puppet_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send printer_client packets.
+##	Do not audit attempts to send puppet_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66725,17 +69826,17 @@ interface(`corenet_send_printer_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_printer_client_packets',`
+interface(`corenet_dontaudit_send_puppet_client_packets',`
 	gen_require(`
-		type printer_client_packet_t;
+		type puppet_client_packet_t;
 	')
 
-	dontaudit $1 printer_client_packet_t:packet send;
+	dontaudit $1 puppet_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive printer_client packets.
+##	Receive puppet_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66744,17 +69845,17 @@ interface(`corenet_dontaudit_send_printer_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_printer_client_packets',`
+interface(`corenet_receive_puppet_client_packets',`
 	gen_require(`
-		type printer_client_packet_t;
+		type puppet_client_packet_t;
 	')
 
-	allow $1 printer_client_packet_t:packet recv;
+	allow $1 puppet_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive printer_client packets.
+##	Do not audit attempts to receive puppet_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66763,17 +69864,17 @@ interface(`corenet_receive_printer_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_printer_client_packets',`
+interface(`corenet_dontaudit_receive_puppet_client_packets',`
 	gen_require(`
-		type printer_client_packet_t;
+		type puppet_client_packet_t;
 	')
 
-	dontaudit $1 printer_client_packet_t:packet recv;
+	dontaudit $1 puppet_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive printer_client packets.
+##	Send and receive puppet_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66782,14 +69883,14 @@ interface(`corenet_dontaudit_receive_printer_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_printer_client_packets',`
-	corenet_send_printer_client_packets($1)
-	corenet_receive_printer_client_packets($1)
+interface(`corenet_sendrecv_puppet_client_packets',`
+	corenet_send_puppet_client_packets($1)
+	corenet_receive_puppet_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive printer_client packets.
+##	Do not audit attempts to send and receive puppet_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66798,14 +69899,14 @@ interface(`corenet_sendrecv_printer_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_printer_client_packets',`
-	corenet_dontaudit_send_printer_client_packets($1)
-	corenet_dontaudit_receive_printer_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_puppet_client_packets',`
+	corenet_dontaudit_send_puppet_client_packets($1)
+	corenet_dontaudit_receive_puppet_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to printer_client the packet type.
+##	Relabel packets to puppet_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66813,18 +69914,18 @@ interface(`corenet_dontaudit_sendrecv_printer_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_printer_client_packets',`
+interface(`corenet_relabelto_puppet_client_packets',`
 	gen_require(`
-		type printer_client_packet_t;
+		type puppet_client_packet_t;
 	')
 
-	allow $1 printer_client_packet_t:packet relabelto;
+	allow $1 puppet_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send printer_server packets.
+##	Send puppet_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66833,17 +69934,17 @@ interface(`corenet_relabelto_printer_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_printer_server_packets',`
+interface(`corenet_send_puppet_server_packets',`
 	gen_require(`
-		type printer_server_packet_t;
+		type puppet_server_packet_t;
 	')
 
-	allow $1 printer_server_packet_t:packet send;
+	allow $1 puppet_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send printer_server packets.
+##	Do not audit attempts to send puppet_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66852,17 +69953,17 @@ interface(`corenet_send_printer_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_printer_server_packets',`
+interface(`corenet_dontaudit_send_puppet_server_packets',`
 	gen_require(`
-		type printer_server_packet_t;
+		type puppet_server_packet_t;
 	')
 
-	dontaudit $1 printer_server_packet_t:packet send;
+	dontaudit $1 puppet_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive printer_server packets.
+##	Receive puppet_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66871,17 +69972,17 @@ interface(`corenet_dontaudit_send_printer_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_printer_server_packets',`
+interface(`corenet_receive_puppet_server_packets',`
 	gen_require(`
-		type printer_server_packet_t;
+		type puppet_server_packet_t;
 	')
 
-	allow $1 printer_server_packet_t:packet recv;
+	allow $1 puppet_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive printer_server packets.
+##	Do not audit attempts to receive puppet_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66890,17 +69991,17 @@ interface(`corenet_receive_printer_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_printer_server_packets',`
+interface(`corenet_dontaudit_receive_puppet_server_packets',`
 	gen_require(`
-		type printer_server_packet_t;
+		type puppet_server_packet_t;
 	')
 
-	dontaudit $1 printer_server_packet_t:packet recv;
+	dontaudit $1 puppet_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive printer_server packets.
+##	Send and receive puppet_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66909,14 +70010,14 @@ interface(`corenet_dontaudit_receive_printer_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_printer_server_packets',`
-	corenet_send_printer_server_packets($1)
-	corenet_receive_printer_server_packets($1)
+interface(`corenet_sendrecv_puppet_server_packets',`
+	corenet_send_puppet_server_packets($1)
+	corenet_receive_puppet_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive printer_server packets.
+##	Do not audit attempts to send and receive puppet_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66925,14 +70026,14 @@ interface(`corenet_sendrecv_printer_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_printer_server_packets',`
-	corenet_dontaudit_send_printer_server_packets($1)
-	corenet_dontaudit_receive_printer_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_puppet_server_packets',`
+	corenet_dontaudit_send_puppet_server_packets($1)
+	corenet_dontaudit_receive_puppet_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to printer_server the packet type.
+##	Relabel packets to puppet_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66940,12 +70041,12 @@ interface(`corenet_dontaudit_sendrecv_printer_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_printer_server_packets',`
+interface(`corenet_relabelto_puppet_server_packets',`
 	gen_require(`
-		type printer_server_packet_t;
+		type puppet_server_packet_t;
 	')
 
-	allow $1 printer_server_packet_t:packet relabelto;
+	allow $1 puppet_server_packet_t:packet relabelto;
 ')
 
 
@@ -66953,7 +70054,7 @@ interface(`corenet_relabelto_printer_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the ptal port.
+##	Send and receive TCP traffic on the puppetclient port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66962,17 +70063,17 @@ interface(`corenet_relabelto_printer_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_ptal_port',`
+interface(`corenet_tcp_sendrecv_puppetclient_port',`
 	gen_require(`
-		type ptal_port_t;
+		type puppetclient_port_t;
 	')
 
-	allow $1 ptal_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 puppetclient_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the ptal port.
+##	Send UDP traffic on the puppetclient port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -66981,17 +70082,17 @@ interface(`corenet_tcp_sendrecv_ptal_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_ptal_port',`
+interface(`corenet_udp_send_puppetclient_port',`
 	gen_require(`
-		type ptal_port_t;
+		type puppetclient_port_t;
 	')
 
-	allow $1 ptal_port_t:udp_socket send_msg;
+	allow $1 puppetclient_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the ptal port.
+##	Do not audit attempts to send UDP traffic on the puppetclient port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67000,17 +70101,17 @@ interface(`corenet_udp_send_ptal_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_ptal_port',`
+interface(`corenet_dontaudit_udp_send_puppetclient_port',`
 	gen_require(`
-		type ptal_port_t;
+		type puppetclient_port_t;
 	')
 
-	dontaudit $1 ptal_port_t:udp_socket send_msg;
+	dontaudit $1 puppetclient_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the ptal port.
+##	Receive UDP traffic on the puppetclient port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67019,17 +70120,17 @@ interface(`corenet_dontaudit_udp_send_ptal_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_ptal_port',`
+interface(`corenet_udp_receive_puppetclient_port',`
 	gen_require(`
-		type ptal_port_t;
+		type puppetclient_port_t;
 	')
 
-	allow $1 ptal_port_t:udp_socket recv_msg;
+	allow $1 puppetclient_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the ptal port.
+##	Do not audit attempts to receive UDP traffic on the puppetclient port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67038,17 +70139,17 @@ interface(`corenet_udp_receive_ptal_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_ptal_port',`
+interface(`corenet_dontaudit_udp_receive_puppetclient_port',`
 	gen_require(`
-		type ptal_port_t;
+		type puppetclient_port_t;
 	')
 
-	dontaudit $1 ptal_port_t:udp_socket recv_msg;
+	dontaudit $1 puppetclient_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the ptal port.
+##	Send and receive UDP traffic on the puppetclient port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67057,15 +70158,15 @@ interface(`corenet_dontaudit_udp_receive_ptal_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_ptal_port',`
-	corenet_udp_send_ptal_port($1)
-	corenet_udp_receive_ptal_port($1)
+interface(`corenet_udp_sendrecv_puppetclient_port',`
+	corenet_udp_send_puppetclient_port($1)
+	corenet_udp_receive_puppetclient_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the ptal port.
+##	UDP traffic on the puppetclient port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67074,14 +70175,14 @@ interface(`corenet_udp_sendrecv_ptal_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_ptal_port',`
-	corenet_dontaudit_udp_send_ptal_port($1)
-	corenet_dontaudit_udp_receive_ptal_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_puppetclient_port',`
+	corenet_dontaudit_udp_send_puppetclient_port($1)
+	corenet_dontaudit_udp_receive_puppetclient_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the ptal port.
+##	Bind TCP sockets to the puppetclient port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67090,18 +70191,18 @@ interface(`corenet_dontaudit_udp_sendrecv_ptal_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_ptal_port',`
+interface(`corenet_tcp_bind_puppetclient_port',`
 	gen_require(`
-		type ptal_port_t;
+		type puppetclient_port_t;
 	')
 
-	allow $1 ptal_port_t:tcp_socket name_bind;
+	allow $1 puppetclient_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the ptal port.
+##	Bind UDP sockets to the puppetclient port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67110,18 +70211,18 @@ interface(`corenet_tcp_bind_ptal_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_ptal_port',`
+interface(`corenet_udp_bind_puppetclient_port',`
 	gen_require(`
-		type ptal_port_t;
+		type puppetclient_port_t;
 	')
 
-	allow $1 ptal_port_t:udp_socket name_bind;
+	allow $1 puppetclient_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the ptal port.
+##	Make a TCP connection to the puppetclient port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67129,18 +70230,18 @@ interface(`corenet_udp_bind_ptal_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_ptal_port',`
+interface(`corenet_tcp_connect_puppetclient_port',`
 	gen_require(`
-		type ptal_port_t;
+		type puppetclient_port_t;
 	')
 
-	allow $1 ptal_port_t:tcp_socket name_connect;
+	allow $1 puppetclient_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ptal_client packets.
+##	Send puppetclient_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67149,17 +70250,17 @@ interface(`corenet_tcp_connect_ptal_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ptal_client_packets',`
+interface(`corenet_send_puppetclient_client_packets',`
 	gen_require(`
-		type ptal_client_packet_t;
+		type puppetclient_client_packet_t;
 	')
 
-	allow $1 ptal_client_packet_t:packet send;
+	allow $1 puppetclient_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ptal_client packets.
+##	Do not audit attempts to send puppetclient_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67168,17 +70269,17 @@ interface(`corenet_send_ptal_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ptal_client_packets',`
+interface(`corenet_dontaudit_send_puppetclient_client_packets',`
 	gen_require(`
-		type ptal_client_packet_t;
+		type puppetclient_client_packet_t;
 	')
 
-	dontaudit $1 ptal_client_packet_t:packet send;
+	dontaudit $1 puppetclient_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ptal_client packets.
+##	Receive puppetclient_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67187,17 +70288,17 @@ interface(`corenet_dontaudit_send_ptal_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ptal_client_packets',`
+interface(`corenet_receive_puppetclient_client_packets',`
 	gen_require(`
-		type ptal_client_packet_t;
+		type puppetclient_client_packet_t;
 	')
 
-	allow $1 ptal_client_packet_t:packet recv;
+	allow $1 puppetclient_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ptal_client packets.
+##	Do not audit attempts to receive puppetclient_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67206,17 +70307,17 @@ interface(`corenet_receive_ptal_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ptal_client_packets',`
+interface(`corenet_dontaudit_receive_puppetclient_client_packets',`
 	gen_require(`
-		type ptal_client_packet_t;
+		type puppetclient_client_packet_t;
 	')
 
-	dontaudit $1 ptal_client_packet_t:packet recv;
+	dontaudit $1 puppetclient_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ptal_client packets.
+##	Send and receive puppetclient_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67225,14 +70326,14 @@ interface(`corenet_dontaudit_receive_ptal_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ptal_client_packets',`
-	corenet_send_ptal_client_packets($1)
-	corenet_receive_ptal_client_packets($1)
+interface(`corenet_sendrecv_puppetclient_client_packets',`
+	corenet_send_puppetclient_client_packets($1)
+	corenet_receive_puppetclient_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ptal_client packets.
+##	Do not audit attempts to send and receive puppetclient_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67241,14 +70342,14 @@ interface(`corenet_sendrecv_ptal_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ptal_client_packets',`
-	corenet_dontaudit_send_ptal_client_packets($1)
-	corenet_dontaudit_receive_ptal_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_puppetclient_client_packets',`
+	corenet_dontaudit_send_puppetclient_client_packets($1)
+	corenet_dontaudit_receive_puppetclient_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ptal_client the packet type.
+##	Relabel packets to puppetclient_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67256,18 +70357,18 @@ interface(`corenet_dontaudit_sendrecv_ptal_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ptal_client_packets',`
+interface(`corenet_relabelto_puppetclient_client_packets',`
 	gen_require(`
-		type ptal_client_packet_t;
+		type puppetclient_client_packet_t;
 	')
 
-	allow $1 ptal_client_packet_t:packet relabelto;
+	allow $1 puppetclient_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ptal_server packets.
+##	Send puppetclient_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67276,17 +70377,17 @@ interface(`corenet_relabelto_ptal_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ptal_server_packets',`
+interface(`corenet_send_puppetclient_server_packets',`
 	gen_require(`
-		type ptal_server_packet_t;
+		type puppetclient_server_packet_t;
 	')
 
-	allow $1 ptal_server_packet_t:packet send;
+	allow $1 puppetclient_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ptal_server packets.
+##	Do not audit attempts to send puppetclient_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67295,17 +70396,17 @@ interface(`corenet_send_ptal_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ptal_server_packets',`
+interface(`corenet_dontaudit_send_puppetclient_server_packets',`
 	gen_require(`
-		type ptal_server_packet_t;
+		type puppetclient_server_packet_t;
 	')
 
-	dontaudit $1 ptal_server_packet_t:packet send;
+	dontaudit $1 puppetclient_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ptal_server packets.
+##	Receive puppetclient_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67314,17 +70415,17 @@ interface(`corenet_dontaudit_send_ptal_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ptal_server_packets',`
+interface(`corenet_receive_puppetclient_server_packets',`
 	gen_require(`
-		type ptal_server_packet_t;
+		type puppetclient_server_packet_t;
 	')
 
-	allow $1 ptal_server_packet_t:packet recv;
+	allow $1 puppetclient_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ptal_server packets.
+##	Do not audit attempts to receive puppetclient_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67333,17 +70434,17 @@ interface(`corenet_receive_ptal_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ptal_server_packets',`
+interface(`corenet_dontaudit_receive_puppetclient_server_packets',`
 	gen_require(`
-		type ptal_server_packet_t;
+		type puppetclient_server_packet_t;
 	')
 
-	dontaudit $1 ptal_server_packet_t:packet recv;
+	dontaudit $1 puppetclient_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ptal_server packets.
+##	Send and receive puppetclient_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67352,14 +70453,14 @@ interface(`corenet_dontaudit_receive_ptal_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ptal_server_packets',`
-	corenet_send_ptal_server_packets($1)
-	corenet_receive_ptal_server_packets($1)
+interface(`corenet_sendrecv_puppetclient_server_packets',`
+	corenet_send_puppetclient_server_packets($1)
+	corenet_receive_puppetclient_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ptal_server packets.
+##	Do not audit attempts to send and receive puppetclient_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67368,14 +70469,14 @@ interface(`corenet_sendrecv_ptal_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ptal_server_packets',`
-	corenet_dontaudit_send_ptal_server_packets($1)
-	corenet_dontaudit_receive_ptal_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_puppetclient_server_packets',`
+	corenet_dontaudit_send_puppetclient_server_packets($1)
+	corenet_dontaudit_receive_puppetclient_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ptal_server the packet type.
+##	Relabel packets to puppetclient_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67383,12 +70484,12 @@ interface(`corenet_dontaudit_sendrecv_ptal_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ptal_server_packets',`
+interface(`corenet_relabelto_puppetclient_server_packets',`
 	gen_require(`
-		type ptal_server_packet_t;
+		type puppetclient_server_packet_t;
 	')
 
-	allow $1 ptal_server_packet_t:packet relabelto;
+	allow $1 puppetclient_server_packet_t:packet relabelto;
 ')
 
 
@@ -67396,7 +70497,7 @@ interface(`corenet_relabelto_ptal_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the pulseaudio port.
+##	Send and receive TCP traffic on the pxe port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67405,17 +70506,17 @@ interface(`corenet_relabelto_ptal_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_pulseaudio_port',`
+interface(`corenet_tcp_sendrecv_pxe_port',`
 	gen_require(`
-		type pulseaudio_port_t;
+		type pxe_port_t;
 	')
 
-	allow $1 pulseaudio_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 pxe_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the pulseaudio port.
+##	Send UDP traffic on the pxe port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67424,17 +70525,17 @@ interface(`corenet_tcp_sendrecv_pulseaudio_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_pulseaudio_port',`
+interface(`corenet_udp_send_pxe_port',`
 	gen_require(`
-		type pulseaudio_port_t;
+		type pxe_port_t;
 	')
 
-	allow $1 pulseaudio_port_t:udp_socket send_msg;
+	allow $1 pxe_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the pulseaudio port.
+##	Do not audit attempts to send UDP traffic on the pxe port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67443,17 +70544,17 @@ interface(`corenet_udp_send_pulseaudio_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_pulseaudio_port',`
+interface(`corenet_dontaudit_udp_send_pxe_port',`
 	gen_require(`
-		type pulseaudio_port_t;
+		type pxe_port_t;
 	')
 
-	dontaudit $1 pulseaudio_port_t:udp_socket send_msg;
+	dontaudit $1 pxe_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the pulseaudio port.
+##	Receive UDP traffic on the pxe port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67462,17 +70563,17 @@ interface(`corenet_dontaudit_udp_send_pulseaudio_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_pulseaudio_port',`
+interface(`corenet_udp_receive_pxe_port',`
 	gen_require(`
-		type pulseaudio_port_t;
+		type pxe_port_t;
 	')
 
-	allow $1 pulseaudio_port_t:udp_socket recv_msg;
+	allow $1 pxe_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the pulseaudio port.
+##	Do not audit attempts to receive UDP traffic on the pxe port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67481,17 +70582,17 @@ interface(`corenet_udp_receive_pulseaudio_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_pulseaudio_port',`
+interface(`corenet_dontaudit_udp_receive_pxe_port',`
 	gen_require(`
-		type pulseaudio_port_t;
+		type pxe_port_t;
 	')
 
-	dontaudit $1 pulseaudio_port_t:udp_socket recv_msg;
+	dontaudit $1 pxe_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the pulseaudio port.
+##	Send and receive UDP traffic on the pxe port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67500,15 +70601,15 @@ interface(`corenet_dontaudit_udp_receive_pulseaudio_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_pulseaudio_port',`
-	corenet_udp_send_pulseaudio_port($1)
-	corenet_udp_receive_pulseaudio_port($1)
+interface(`corenet_udp_sendrecv_pxe_port',`
+	corenet_udp_send_pxe_port($1)
+	corenet_udp_receive_pxe_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the pulseaudio port.
+##	UDP traffic on the pxe port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67517,14 +70618,14 @@ interface(`corenet_udp_sendrecv_pulseaudio_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_pulseaudio_port',`
-	corenet_dontaudit_udp_send_pulseaudio_port($1)
-	corenet_dontaudit_udp_receive_pulseaudio_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_pxe_port',`
+	corenet_dontaudit_udp_send_pxe_port($1)
+	corenet_dontaudit_udp_receive_pxe_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the pulseaudio port.
+##	Bind TCP sockets to the pxe port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67533,18 +70634,18 @@ interface(`corenet_dontaudit_udp_sendrecv_pulseaudio_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_pulseaudio_port',`
+interface(`corenet_tcp_bind_pxe_port',`
 	gen_require(`
-		type pulseaudio_port_t;
+		type pxe_port_t;
 	')
 
-	allow $1 pulseaudio_port_t:tcp_socket name_bind;
+	allow $1 pxe_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the pulseaudio port.
+##	Bind UDP sockets to the pxe port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67553,18 +70654,18 @@ interface(`corenet_tcp_bind_pulseaudio_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_pulseaudio_port',`
+interface(`corenet_udp_bind_pxe_port',`
 	gen_require(`
-		type pulseaudio_port_t;
+		type pxe_port_t;
 	')
 
-	allow $1 pulseaudio_port_t:udp_socket name_bind;
+	allow $1 pxe_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the pulseaudio port.
+##	Make a TCP connection to the pxe port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67572,18 +70673,18 @@ interface(`corenet_udp_bind_pulseaudio_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_pulseaudio_port',`
+interface(`corenet_tcp_connect_pxe_port',`
 	gen_require(`
-		type pulseaudio_port_t;
+		type pxe_port_t;
 	')
 
-	allow $1 pulseaudio_port_t:tcp_socket name_connect;
+	allow $1 pxe_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pulseaudio_client packets.
+##	Send pxe_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67592,17 +70693,17 @@ interface(`corenet_tcp_connect_pulseaudio_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pulseaudio_client_packets',`
+interface(`corenet_send_pxe_client_packets',`
 	gen_require(`
-		type pulseaudio_client_packet_t;
+		type pxe_client_packet_t;
 	')
 
-	allow $1 pulseaudio_client_packet_t:packet send;
+	allow $1 pxe_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pulseaudio_client packets.
+##	Do not audit attempts to send pxe_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67611,17 +70712,17 @@ interface(`corenet_send_pulseaudio_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pulseaudio_client_packets',`
+interface(`corenet_dontaudit_send_pxe_client_packets',`
 	gen_require(`
-		type pulseaudio_client_packet_t;
+		type pxe_client_packet_t;
 	')
 
-	dontaudit $1 pulseaudio_client_packet_t:packet send;
+	dontaudit $1 pxe_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pulseaudio_client packets.
+##	Receive pxe_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67630,17 +70731,17 @@ interface(`corenet_dontaudit_send_pulseaudio_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pulseaudio_client_packets',`
+interface(`corenet_receive_pxe_client_packets',`
 	gen_require(`
-		type pulseaudio_client_packet_t;
+		type pxe_client_packet_t;
 	')
 
-	allow $1 pulseaudio_client_packet_t:packet recv;
+	allow $1 pxe_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pulseaudio_client packets.
+##	Do not audit attempts to receive pxe_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67649,17 +70750,17 @@ interface(`corenet_receive_pulseaudio_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pulseaudio_client_packets',`
+interface(`corenet_dontaudit_receive_pxe_client_packets',`
 	gen_require(`
-		type pulseaudio_client_packet_t;
+		type pxe_client_packet_t;
 	')
 
-	dontaudit $1 pulseaudio_client_packet_t:packet recv;
+	dontaudit $1 pxe_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pulseaudio_client packets.
+##	Send and receive pxe_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67668,14 +70769,14 @@ interface(`corenet_dontaudit_receive_pulseaudio_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pulseaudio_client_packets',`
-	corenet_send_pulseaudio_client_packets($1)
-	corenet_receive_pulseaudio_client_packets($1)
+interface(`corenet_sendrecv_pxe_client_packets',`
+	corenet_send_pxe_client_packets($1)
+	corenet_receive_pxe_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pulseaudio_client packets.
+##	Do not audit attempts to send and receive pxe_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67684,14 +70785,14 @@ interface(`corenet_sendrecv_pulseaudio_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pulseaudio_client_packets',`
-	corenet_dontaudit_send_pulseaudio_client_packets($1)
-	corenet_dontaudit_receive_pulseaudio_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_pxe_client_packets',`
+	corenet_dontaudit_send_pxe_client_packets($1)
+	corenet_dontaudit_receive_pxe_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pulseaudio_client the packet type.
+##	Relabel packets to pxe_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67699,18 +70800,18 @@ interface(`corenet_dontaudit_sendrecv_pulseaudio_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pulseaudio_client_packets',`
+interface(`corenet_relabelto_pxe_client_packets',`
 	gen_require(`
-		type pulseaudio_client_packet_t;
+		type pxe_client_packet_t;
 	')
 
-	allow $1 pulseaudio_client_packet_t:packet relabelto;
+	allow $1 pxe_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pulseaudio_server packets.
+##	Send pxe_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67719,17 +70820,17 @@ interface(`corenet_relabelto_pulseaudio_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pulseaudio_server_packets',`
+interface(`corenet_send_pxe_server_packets',`
 	gen_require(`
-		type pulseaudio_server_packet_t;
+		type pxe_server_packet_t;
 	')
 
-	allow $1 pulseaudio_server_packet_t:packet send;
+	allow $1 pxe_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pulseaudio_server packets.
+##	Do not audit attempts to send pxe_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67738,17 +70839,17 @@ interface(`corenet_send_pulseaudio_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pulseaudio_server_packets',`
+interface(`corenet_dontaudit_send_pxe_server_packets',`
 	gen_require(`
-		type pulseaudio_server_packet_t;
+		type pxe_server_packet_t;
 	')
 
-	dontaudit $1 pulseaudio_server_packet_t:packet send;
+	dontaudit $1 pxe_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pulseaudio_server packets.
+##	Receive pxe_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67757,17 +70858,17 @@ interface(`corenet_dontaudit_send_pulseaudio_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pulseaudio_server_packets',`
+interface(`corenet_receive_pxe_server_packets',`
 	gen_require(`
-		type pulseaudio_server_packet_t;
+		type pxe_server_packet_t;
 	')
 
-	allow $1 pulseaudio_server_packet_t:packet recv;
+	allow $1 pxe_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pulseaudio_server packets.
+##	Do not audit attempts to receive pxe_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67776,17 +70877,17 @@ interface(`corenet_receive_pulseaudio_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pulseaudio_server_packets',`
+interface(`corenet_dontaudit_receive_pxe_server_packets',`
 	gen_require(`
-		type pulseaudio_server_packet_t;
+		type pxe_server_packet_t;
 	')
 
-	dontaudit $1 pulseaudio_server_packet_t:packet recv;
+	dontaudit $1 pxe_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pulseaudio_server packets.
+##	Send and receive pxe_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67795,14 +70896,14 @@ interface(`corenet_dontaudit_receive_pulseaudio_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pulseaudio_server_packets',`
-	corenet_send_pulseaudio_server_packets($1)
-	corenet_receive_pulseaudio_server_packets($1)
+interface(`corenet_sendrecv_pxe_server_packets',`
+	corenet_send_pxe_server_packets($1)
+	corenet_receive_pxe_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pulseaudio_server packets.
+##	Do not audit attempts to send and receive pxe_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67811,14 +70912,14 @@ interface(`corenet_sendrecv_pulseaudio_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pulseaudio_server_packets',`
-	corenet_dontaudit_send_pulseaudio_server_packets($1)
-	corenet_dontaudit_receive_pulseaudio_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_pxe_server_packets',`
+	corenet_dontaudit_send_pxe_server_packets($1)
+	corenet_dontaudit_receive_pxe_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pulseaudio_server the packet type.
+##	Relabel packets to pxe_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67826,12 +70927,12 @@ interface(`corenet_dontaudit_sendrecv_pulseaudio_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pulseaudio_server_packets',`
+interface(`corenet_relabelto_pxe_server_packets',`
 	gen_require(`
-		type pulseaudio_server_packet_t;
+		type pxe_server_packet_t;
 	')
 
-	allow $1 pulseaudio_server_packet_t:packet relabelto;
+	allow $1 pxe_server_packet_t:packet relabelto;
 ')
 
 
@@ -67839,7 +70940,7 @@ interface(`corenet_relabelto_pulseaudio_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the puppet port.
+##	Send and receive TCP traffic on the pyzor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67848,17 +70949,17 @@ interface(`corenet_relabelto_pulseaudio_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_puppet_port',`
+interface(`corenet_tcp_sendrecv_pyzor_port',`
 	gen_require(`
-		type puppet_port_t;
+		type pyzor_port_t;
 	')
 
-	allow $1 puppet_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 pyzor_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the puppet port.
+##	Send UDP traffic on the pyzor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67867,17 +70968,17 @@ interface(`corenet_tcp_sendrecv_puppet_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_puppet_port',`
+interface(`corenet_udp_send_pyzor_port',`
 	gen_require(`
-		type puppet_port_t;
+		type pyzor_port_t;
 	')
 
-	allow $1 puppet_port_t:udp_socket send_msg;
+	allow $1 pyzor_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the puppet port.
+##	Do not audit attempts to send UDP traffic on the pyzor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67886,17 +70987,17 @@ interface(`corenet_udp_send_puppet_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_puppet_port',`
+interface(`corenet_dontaudit_udp_send_pyzor_port',`
 	gen_require(`
-		type puppet_port_t;
+		type pyzor_port_t;
 	')
 
-	dontaudit $1 puppet_port_t:udp_socket send_msg;
+	dontaudit $1 pyzor_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the puppet port.
+##	Receive UDP traffic on the pyzor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67905,17 +71006,17 @@ interface(`corenet_dontaudit_udp_send_puppet_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_puppet_port',`
+interface(`corenet_udp_receive_pyzor_port',`
 	gen_require(`
-		type puppet_port_t;
+		type pyzor_port_t;
 	')
 
-	allow $1 puppet_port_t:udp_socket recv_msg;
+	allow $1 pyzor_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the puppet port.
+##	Do not audit attempts to receive UDP traffic on the pyzor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67924,17 +71025,17 @@ interface(`corenet_udp_receive_puppet_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_puppet_port',`
+interface(`corenet_dontaudit_udp_receive_pyzor_port',`
 	gen_require(`
-		type puppet_port_t;
+		type pyzor_port_t;
 	')
 
-	dontaudit $1 puppet_port_t:udp_socket recv_msg;
+	dontaudit $1 pyzor_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the puppet port.
+##	Send and receive UDP traffic on the pyzor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67943,15 +71044,15 @@ interface(`corenet_dontaudit_udp_receive_puppet_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_puppet_port',`
-	corenet_udp_send_puppet_port($1)
-	corenet_udp_receive_puppet_port($1)
+interface(`corenet_udp_sendrecv_pyzor_port',`
+	corenet_udp_send_pyzor_port($1)
+	corenet_udp_receive_pyzor_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the puppet port.
+##	UDP traffic on the pyzor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67960,14 +71061,14 @@ interface(`corenet_udp_sendrecv_puppet_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_puppet_port',`
-	corenet_dontaudit_udp_send_puppet_port($1)
-	corenet_dontaudit_udp_receive_puppet_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_pyzor_port',`
+	corenet_dontaudit_udp_send_pyzor_port($1)
+	corenet_dontaudit_udp_receive_pyzor_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the puppet port.
+##	Bind TCP sockets to the pyzor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67976,18 +71077,18 @@ interface(`corenet_dontaudit_udp_sendrecv_puppet_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_puppet_port',`
+interface(`corenet_tcp_bind_pyzor_port',`
 	gen_require(`
-		type puppet_port_t;
+		type pyzor_port_t;
 	')
 
-	allow $1 puppet_port_t:tcp_socket name_bind;
+	allow $1 pyzor_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the puppet port.
+##	Bind UDP sockets to the pyzor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -67996,18 +71097,18 @@ interface(`corenet_tcp_bind_puppet_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_puppet_port',`
+interface(`corenet_udp_bind_pyzor_port',`
 	gen_require(`
-		type puppet_port_t;
+		type pyzor_port_t;
 	')
 
-	allow $1 puppet_port_t:udp_socket name_bind;
+	allow $1 pyzor_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the puppet port.
+##	Make a TCP connection to the pyzor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68015,18 +71116,18 @@ interface(`corenet_udp_bind_puppet_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_puppet_port',`
+interface(`corenet_tcp_connect_pyzor_port',`
 	gen_require(`
-		type puppet_port_t;
+		type pyzor_port_t;
 	')
 
-	allow $1 puppet_port_t:tcp_socket name_connect;
+	allow $1 pyzor_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send puppet_client packets.
+##	Send pyzor_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68035,17 +71136,17 @@ interface(`corenet_tcp_connect_puppet_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_puppet_client_packets',`
+interface(`corenet_send_pyzor_client_packets',`
 	gen_require(`
-		type puppet_client_packet_t;
+		type pyzor_client_packet_t;
 	')
 
-	allow $1 puppet_client_packet_t:packet send;
+	allow $1 pyzor_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send puppet_client packets.
+##	Do not audit attempts to send pyzor_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68054,17 +71155,17 @@ interface(`corenet_send_puppet_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_puppet_client_packets',`
+interface(`corenet_dontaudit_send_pyzor_client_packets',`
 	gen_require(`
-		type puppet_client_packet_t;
+		type pyzor_client_packet_t;
 	')
 
-	dontaudit $1 puppet_client_packet_t:packet send;
+	dontaudit $1 pyzor_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive puppet_client packets.
+##	Receive pyzor_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68073,17 +71174,17 @@ interface(`corenet_dontaudit_send_puppet_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_puppet_client_packets',`
+interface(`corenet_receive_pyzor_client_packets',`
 	gen_require(`
-		type puppet_client_packet_t;
+		type pyzor_client_packet_t;
 	')
 
-	allow $1 puppet_client_packet_t:packet recv;
+	allow $1 pyzor_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive puppet_client packets.
+##	Do not audit attempts to receive pyzor_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68092,17 +71193,17 @@ interface(`corenet_receive_puppet_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_puppet_client_packets',`
+interface(`corenet_dontaudit_receive_pyzor_client_packets',`
 	gen_require(`
-		type puppet_client_packet_t;
+		type pyzor_client_packet_t;
 	')
 
-	dontaudit $1 puppet_client_packet_t:packet recv;
+	dontaudit $1 pyzor_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive puppet_client packets.
+##	Send and receive pyzor_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68111,14 +71212,14 @@ interface(`corenet_dontaudit_receive_puppet_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_puppet_client_packets',`
-	corenet_send_puppet_client_packets($1)
-	corenet_receive_puppet_client_packets($1)
+interface(`corenet_sendrecv_pyzor_client_packets',`
+	corenet_send_pyzor_client_packets($1)
+	corenet_receive_pyzor_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive puppet_client packets.
+##	Do not audit attempts to send and receive pyzor_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68127,14 +71228,14 @@ interface(`corenet_sendrecv_puppet_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_puppet_client_packets',`
-	corenet_dontaudit_send_puppet_client_packets($1)
-	corenet_dontaudit_receive_puppet_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_pyzor_client_packets',`
+	corenet_dontaudit_send_pyzor_client_packets($1)
+	corenet_dontaudit_receive_pyzor_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to puppet_client the packet type.
+##	Relabel packets to pyzor_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68142,18 +71243,18 @@ interface(`corenet_dontaudit_sendrecv_puppet_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_puppet_client_packets',`
+interface(`corenet_relabelto_pyzor_client_packets',`
 	gen_require(`
-		type puppet_client_packet_t;
+		type pyzor_client_packet_t;
 	')
 
-	allow $1 puppet_client_packet_t:packet relabelto;
+	allow $1 pyzor_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send puppet_server packets.
+##	Send pyzor_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68162,17 +71263,17 @@ interface(`corenet_relabelto_puppet_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_puppet_server_packets',`
+interface(`corenet_send_pyzor_server_packets',`
 	gen_require(`
-		type puppet_server_packet_t;
+		type pyzor_server_packet_t;
 	')
 
-	allow $1 puppet_server_packet_t:packet send;
+	allow $1 pyzor_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send puppet_server packets.
+##	Do not audit attempts to send pyzor_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68181,17 +71282,17 @@ interface(`corenet_send_puppet_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_puppet_server_packets',`
+interface(`corenet_dontaudit_send_pyzor_server_packets',`
 	gen_require(`
-		type puppet_server_packet_t;
+		type pyzor_server_packet_t;
 	')
 
-	dontaudit $1 puppet_server_packet_t:packet send;
+	dontaudit $1 pyzor_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive puppet_server packets.
+##	Receive pyzor_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68200,17 +71301,17 @@ interface(`corenet_dontaudit_send_puppet_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_puppet_server_packets',`
+interface(`corenet_receive_pyzor_server_packets',`
 	gen_require(`
-		type puppet_server_packet_t;
+		type pyzor_server_packet_t;
 	')
 
-	allow $1 puppet_server_packet_t:packet recv;
+	allow $1 pyzor_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive puppet_server packets.
+##	Do not audit attempts to receive pyzor_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68219,17 +71320,17 @@ interface(`corenet_receive_puppet_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_puppet_server_packets',`
+interface(`corenet_dontaudit_receive_pyzor_server_packets',`
 	gen_require(`
-		type puppet_server_packet_t;
+		type pyzor_server_packet_t;
 	')
 
-	dontaudit $1 puppet_server_packet_t:packet recv;
+	dontaudit $1 pyzor_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive puppet_server packets.
+##	Send and receive pyzor_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68238,14 +71339,14 @@ interface(`corenet_dontaudit_receive_puppet_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_puppet_server_packets',`
-	corenet_send_puppet_server_packets($1)
-	corenet_receive_puppet_server_packets($1)
+interface(`corenet_sendrecv_pyzor_server_packets',`
+	corenet_send_pyzor_server_packets($1)
+	corenet_receive_pyzor_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive puppet_server packets.
+##	Do not audit attempts to send and receive pyzor_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68254,14 +71355,14 @@ interface(`corenet_sendrecv_puppet_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_puppet_server_packets',`
-	corenet_dontaudit_send_puppet_server_packets($1)
-	corenet_dontaudit_receive_puppet_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_pyzor_server_packets',`
+	corenet_dontaudit_send_pyzor_server_packets($1)
+	corenet_dontaudit_receive_pyzor_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to puppet_server the packet type.
+##	Relabel packets to pyzor_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68269,12 +71370,12 @@ interface(`corenet_dontaudit_sendrecv_puppet_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_puppet_server_packets',`
+interface(`corenet_relabelto_pyzor_server_packets',`
 	gen_require(`
-		type puppet_server_packet_t;
+		type pyzor_server_packet_t;
 	')
 
-	allow $1 puppet_server_packet_t:packet relabelto;
+	allow $1 pyzor_server_packet_t:packet relabelto;
 ')
 
 
@@ -68282,7 +71383,7 @@ interface(`corenet_relabelto_puppet_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the puppetclient port.
+##	Send and receive TCP traffic on the radacct port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68291,17 +71392,17 @@ interface(`corenet_relabelto_puppet_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_puppetclient_port',`
+interface(`corenet_tcp_sendrecv_radacct_port',`
 	gen_require(`
-		type puppetclient_port_t;
+		type radacct_port_t;
 	')
 
-	allow $1 puppetclient_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 radacct_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the puppetclient port.
+##	Send UDP traffic on the radacct port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68310,17 +71411,17 @@ interface(`corenet_tcp_sendrecv_puppetclient_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_puppetclient_port',`
+interface(`corenet_udp_send_radacct_port',`
 	gen_require(`
-		type puppetclient_port_t;
+		type radacct_port_t;
 	')
 
-	allow $1 puppetclient_port_t:udp_socket send_msg;
+	allow $1 radacct_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the puppetclient port.
+##	Do not audit attempts to send UDP traffic on the radacct port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68329,17 +71430,17 @@ interface(`corenet_udp_send_puppetclient_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_puppetclient_port',`
+interface(`corenet_dontaudit_udp_send_radacct_port',`
 	gen_require(`
-		type puppetclient_port_t;
+		type radacct_port_t;
 	')
 
-	dontaudit $1 puppetclient_port_t:udp_socket send_msg;
+	dontaudit $1 radacct_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the puppetclient port.
+##	Receive UDP traffic on the radacct port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68348,17 +71449,17 @@ interface(`corenet_dontaudit_udp_send_puppetclient_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_puppetclient_port',`
+interface(`corenet_udp_receive_radacct_port',`
 	gen_require(`
-		type puppetclient_port_t;
+		type radacct_port_t;
 	')
 
-	allow $1 puppetclient_port_t:udp_socket recv_msg;
+	allow $1 radacct_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the puppetclient port.
+##	Do not audit attempts to receive UDP traffic on the radacct port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68367,17 +71468,17 @@ interface(`corenet_udp_receive_puppetclient_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_puppetclient_port',`
+interface(`corenet_dontaudit_udp_receive_radacct_port',`
 	gen_require(`
-		type puppetclient_port_t;
+		type radacct_port_t;
 	')
 
-	dontaudit $1 puppetclient_port_t:udp_socket recv_msg;
+	dontaudit $1 radacct_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the puppetclient port.
+##	Send and receive UDP traffic on the radacct port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68386,15 +71487,15 @@ interface(`corenet_dontaudit_udp_receive_puppetclient_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_puppetclient_port',`
-	corenet_udp_send_puppetclient_port($1)
-	corenet_udp_receive_puppetclient_port($1)
+interface(`corenet_udp_sendrecv_radacct_port',`
+	corenet_udp_send_radacct_port($1)
+	corenet_udp_receive_radacct_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the puppetclient port.
+##	UDP traffic on the radacct port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68403,14 +71504,14 @@ interface(`corenet_udp_sendrecv_puppetclient_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_puppetclient_port',`
-	corenet_dontaudit_udp_send_puppetclient_port($1)
-	corenet_dontaudit_udp_receive_puppetclient_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_radacct_port',`
+	corenet_dontaudit_udp_send_radacct_port($1)
+	corenet_dontaudit_udp_receive_radacct_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the puppetclient port.
+##	Bind TCP sockets to the radacct port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68419,18 +71520,18 @@ interface(`corenet_dontaudit_udp_sendrecv_puppetclient_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_puppetclient_port',`
+interface(`corenet_tcp_bind_radacct_port',`
 	gen_require(`
-		type puppetclient_port_t;
+		type radacct_port_t;
 	')
 
-	allow $1 puppetclient_port_t:tcp_socket name_bind;
+	allow $1 radacct_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the puppetclient port.
+##	Bind UDP sockets to the radacct port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68439,18 +71540,18 @@ interface(`corenet_tcp_bind_puppetclient_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_puppetclient_port',`
+interface(`corenet_udp_bind_radacct_port',`
 	gen_require(`
-		type puppetclient_port_t;
+		type radacct_port_t;
 	')
 
-	allow $1 puppetclient_port_t:udp_socket name_bind;
+	allow $1 radacct_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the puppetclient port.
+##	Make a TCP connection to the radacct port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68458,18 +71559,18 @@ interface(`corenet_udp_bind_puppetclient_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_puppetclient_port',`
+interface(`corenet_tcp_connect_radacct_port',`
 	gen_require(`
-		type puppetclient_port_t;
+		type radacct_port_t;
 	')
 
-	allow $1 puppetclient_port_t:tcp_socket name_connect;
+	allow $1 radacct_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send puppetclient_client packets.
+##	Send radacct_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68478,17 +71579,17 @@ interface(`corenet_tcp_connect_puppetclient_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_puppetclient_client_packets',`
+interface(`corenet_send_radacct_client_packets',`
 	gen_require(`
-		type puppetclient_client_packet_t;
+		type radacct_client_packet_t;
 	')
 
-	allow $1 puppetclient_client_packet_t:packet send;
+	allow $1 radacct_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send puppetclient_client packets.
+##	Do not audit attempts to send radacct_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68497,17 +71598,17 @@ interface(`corenet_send_puppetclient_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_puppetclient_client_packets',`
+interface(`corenet_dontaudit_send_radacct_client_packets',`
 	gen_require(`
-		type puppetclient_client_packet_t;
+		type radacct_client_packet_t;
 	')
 
-	dontaudit $1 puppetclient_client_packet_t:packet send;
+	dontaudit $1 radacct_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive puppetclient_client packets.
+##	Receive radacct_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68516,17 +71617,17 @@ interface(`corenet_dontaudit_send_puppetclient_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_puppetclient_client_packets',`
+interface(`corenet_receive_radacct_client_packets',`
 	gen_require(`
-		type puppetclient_client_packet_t;
+		type radacct_client_packet_t;
 	')
 
-	allow $1 puppetclient_client_packet_t:packet recv;
+	allow $1 radacct_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive puppetclient_client packets.
+##	Do not audit attempts to receive radacct_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68535,17 +71636,17 @@ interface(`corenet_receive_puppetclient_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_puppetclient_client_packets',`
+interface(`corenet_dontaudit_receive_radacct_client_packets',`
 	gen_require(`
-		type puppetclient_client_packet_t;
+		type radacct_client_packet_t;
 	')
 
-	dontaudit $1 puppetclient_client_packet_t:packet recv;
+	dontaudit $1 radacct_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive puppetclient_client packets.
+##	Send and receive radacct_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68554,14 +71655,14 @@ interface(`corenet_dontaudit_receive_puppetclient_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_puppetclient_client_packets',`
-	corenet_send_puppetclient_client_packets($1)
-	corenet_receive_puppetclient_client_packets($1)
+interface(`corenet_sendrecv_radacct_client_packets',`
+	corenet_send_radacct_client_packets($1)
+	corenet_receive_radacct_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive puppetclient_client packets.
+##	Do not audit attempts to send and receive radacct_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68570,14 +71671,14 @@ interface(`corenet_sendrecv_puppetclient_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_puppetclient_client_packets',`
-	corenet_dontaudit_send_puppetclient_client_packets($1)
-	corenet_dontaudit_receive_puppetclient_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_radacct_client_packets',`
+	corenet_dontaudit_send_radacct_client_packets($1)
+	corenet_dontaudit_receive_radacct_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to puppetclient_client the packet type.
+##	Relabel packets to radacct_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68585,18 +71686,18 @@ interface(`corenet_dontaudit_sendrecv_puppetclient_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_puppetclient_client_packets',`
+interface(`corenet_relabelto_radacct_client_packets',`
 	gen_require(`
-		type puppetclient_client_packet_t;
+		type radacct_client_packet_t;
 	')
 
-	allow $1 puppetclient_client_packet_t:packet relabelto;
+	allow $1 radacct_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send puppetclient_server packets.
+##	Send radacct_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68605,17 +71706,17 @@ interface(`corenet_relabelto_puppetclient_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_puppetclient_server_packets',`
+interface(`corenet_send_radacct_server_packets',`
 	gen_require(`
-		type puppetclient_server_packet_t;
+		type radacct_server_packet_t;
 	')
 
-	allow $1 puppetclient_server_packet_t:packet send;
+	allow $1 radacct_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send puppetclient_server packets.
+##	Do not audit attempts to send radacct_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68624,17 +71725,17 @@ interface(`corenet_send_puppetclient_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_puppetclient_server_packets',`
+interface(`corenet_dontaudit_send_radacct_server_packets',`
 	gen_require(`
-		type puppetclient_server_packet_t;
+		type radacct_server_packet_t;
 	')
 
-	dontaudit $1 puppetclient_server_packet_t:packet send;
+	dontaudit $1 radacct_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive puppetclient_server packets.
+##	Receive radacct_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68643,17 +71744,17 @@ interface(`corenet_dontaudit_send_puppetclient_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_puppetclient_server_packets',`
+interface(`corenet_receive_radacct_server_packets',`
 	gen_require(`
-		type puppetclient_server_packet_t;
+		type radacct_server_packet_t;
 	')
 
-	allow $1 puppetclient_server_packet_t:packet recv;
+	allow $1 radacct_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive puppetclient_server packets.
+##	Do not audit attempts to receive radacct_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68662,17 +71763,17 @@ interface(`corenet_receive_puppetclient_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_puppetclient_server_packets',`
+interface(`corenet_dontaudit_receive_radacct_server_packets',`
 	gen_require(`
-		type puppetclient_server_packet_t;
+		type radacct_server_packet_t;
 	')
 
-	dontaudit $1 puppetclient_server_packet_t:packet recv;
+	dontaudit $1 radacct_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive puppetclient_server packets.
+##	Send and receive radacct_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68681,14 +71782,14 @@ interface(`corenet_dontaudit_receive_puppetclient_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_puppetclient_server_packets',`
-	corenet_send_puppetclient_server_packets($1)
-	corenet_receive_puppetclient_server_packets($1)
+interface(`corenet_sendrecv_radacct_server_packets',`
+	corenet_send_radacct_server_packets($1)
+	corenet_receive_radacct_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive puppetclient_server packets.
+##	Do not audit attempts to send and receive radacct_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68697,14 +71798,14 @@ interface(`corenet_sendrecv_puppetclient_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_puppetclient_server_packets',`
-	corenet_dontaudit_send_puppetclient_server_packets($1)
-	corenet_dontaudit_receive_puppetclient_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_radacct_server_packets',`
+	corenet_dontaudit_send_radacct_server_packets($1)
+	corenet_dontaudit_receive_radacct_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to puppetclient_server the packet type.
+##	Relabel packets to radacct_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68712,12 +71813,12 @@ interface(`corenet_dontaudit_sendrecv_puppetclient_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_puppetclient_server_packets',`
+interface(`corenet_relabelto_radacct_server_packets',`
 	gen_require(`
-		type puppetclient_server_packet_t;
+		type radacct_server_packet_t;
 	')
 
-	allow $1 puppetclient_server_packet_t:packet relabelto;
+	allow $1 radacct_server_packet_t:packet relabelto;
 ')
 
 
@@ -68725,7 +71826,7 @@ interface(`corenet_relabelto_puppetclient_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the pxe port.
+##	Send and receive TCP traffic on the radius port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68734,17 +71835,17 @@ interface(`corenet_relabelto_puppetclient_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_pxe_port',`
+interface(`corenet_tcp_sendrecv_radius_port',`
 	gen_require(`
-		type pxe_port_t;
+		type radius_port_t;
 	')
 
-	allow $1 pxe_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 radius_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the pxe port.
+##	Send UDP traffic on the radius port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68753,17 +71854,17 @@ interface(`corenet_tcp_sendrecv_pxe_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_pxe_port',`
+interface(`corenet_udp_send_radius_port',`
 	gen_require(`
-		type pxe_port_t;
+		type radius_port_t;
 	')
 
-	allow $1 pxe_port_t:udp_socket send_msg;
+	allow $1 radius_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the pxe port.
+##	Do not audit attempts to send UDP traffic on the radius port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68772,17 +71873,17 @@ interface(`corenet_udp_send_pxe_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_pxe_port',`
+interface(`corenet_dontaudit_udp_send_radius_port',`
 	gen_require(`
-		type pxe_port_t;
+		type radius_port_t;
 	')
 
-	dontaudit $1 pxe_port_t:udp_socket send_msg;
+	dontaudit $1 radius_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the pxe port.
+##	Receive UDP traffic on the radius port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68791,17 +71892,17 @@ interface(`corenet_dontaudit_udp_send_pxe_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_pxe_port',`
+interface(`corenet_udp_receive_radius_port',`
 	gen_require(`
-		type pxe_port_t;
+		type radius_port_t;
 	')
 
-	allow $1 pxe_port_t:udp_socket recv_msg;
+	allow $1 radius_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the pxe port.
+##	Do not audit attempts to receive UDP traffic on the radius port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68810,17 +71911,17 @@ interface(`corenet_udp_receive_pxe_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_pxe_port',`
+interface(`corenet_dontaudit_udp_receive_radius_port',`
 	gen_require(`
-		type pxe_port_t;
+		type radius_port_t;
 	')
 
-	dontaudit $1 pxe_port_t:udp_socket recv_msg;
+	dontaudit $1 radius_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the pxe port.
+##	Send and receive UDP traffic on the radius port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68829,15 +71930,15 @@ interface(`corenet_dontaudit_udp_receive_pxe_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_pxe_port',`
-	corenet_udp_send_pxe_port($1)
-	corenet_udp_receive_pxe_port($1)
+interface(`corenet_udp_sendrecv_radius_port',`
+	corenet_udp_send_radius_port($1)
+	corenet_udp_receive_radius_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the pxe port.
+##	UDP traffic on the radius port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68846,14 +71947,14 @@ interface(`corenet_udp_sendrecv_pxe_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_pxe_port',`
-	corenet_dontaudit_udp_send_pxe_port($1)
-	corenet_dontaudit_udp_receive_pxe_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_radius_port',`
+	corenet_dontaudit_udp_send_radius_port($1)
+	corenet_dontaudit_udp_receive_radius_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the pxe port.
+##	Bind TCP sockets to the radius port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68862,18 +71963,18 @@ interface(`corenet_dontaudit_udp_sendrecv_pxe_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_pxe_port',`
+interface(`corenet_tcp_bind_radius_port',`
 	gen_require(`
-		type pxe_port_t;
+		type radius_port_t;
 	')
 
-	allow $1 pxe_port_t:tcp_socket name_bind;
+	allow $1 radius_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the pxe port.
+##	Bind UDP sockets to the radius port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68882,18 +71983,18 @@ interface(`corenet_tcp_bind_pxe_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_pxe_port',`
+interface(`corenet_udp_bind_radius_port',`
 	gen_require(`
-		type pxe_port_t;
+		type radius_port_t;
 	')
 
-	allow $1 pxe_port_t:udp_socket name_bind;
+	allow $1 radius_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the pxe port.
+##	Make a TCP connection to the radius port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68901,18 +72002,18 @@ interface(`corenet_udp_bind_pxe_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_pxe_port',`
+interface(`corenet_tcp_connect_radius_port',`
 	gen_require(`
-		type pxe_port_t;
+		type radius_port_t;
 	')
 
-	allow $1 pxe_port_t:tcp_socket name_connect;
+	allow $1 radius_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pxe_client packets.
+##	Send radius_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68921,17 +72022,17 @@ interface(`corenet_tcp_connect_pxe_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pxe_client_packets',`
+interface(`corenet_send_radius_client_packets',`
 	gen_require(`
-		type pxe_client_packet_t;
+		type radius_client_packet_t;
 	')
 
-	allow $1 pxe_client_packet_t:packet send;
+	allow $1 radius_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pxe_client packets.
+##	Do not audit attempts to send radius_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68940,17 +72041,17 @@ interface(`corenet_send_pxe_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pxe_client_packets',`
+interface(`corenet_dontaudit_send_radius_client_packets',`
 	gen_require(`
-		type pxe_client_packet_t;
+		type radius_client_packet_t;
 	')
 
-	dontaudit $1 pxe_client_packet_t:packet send;
+	dontaudit $1 radius_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pxe_client packets.
+##	Receive radius_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68959,17 +72060,17 @@ interface(`corenet_dontaudit_send_pxe_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pxe_client_packets',`
+interface(`corenet_receive_radius_client_packets',`
 	gen_require(`
-		type pxe_client_packet_t;
+		type radius_client_packet_t;
 	')
 
-	allow $1 pxe_client_packet_t:packet recv;
+	allow $1 radius_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pxe_client packets.
+##	Do not audit attempts to receive radius_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68978,17 +72079,17 @@ interface(`corenet_receive_pxe_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pxe_client_packets',`
+interface(`corenet_dontaudit_receive_radius_client_packets',`
 	gen_require(`
-		type pxe_client_packet_t;
+		type radius_client_packet_t;
 	')
 
-	dontaudit $1 pxe_client_packet_t:packet recv;
+	dontaudit $1 radius_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pxe_client packets.
+##	Send and receive radius_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -68997,14 +72098,14 @@ interface(`corenet_dontaudit_receive_pxe_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pxe_client_packets',`
-	corenet_send_pxe_client_packets($1)
-	corenet_receive_pxe_client_packets($1)
+interface(`corenet_sendrecv_radius_client_packets',`
+	corenet_send_radius_client_packets($1)
+	corenet_receive_radius_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pxe_client packets.
+##	Do not audit attempts to send and receive radius_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69013,14 +72114,14 @@ interface(`corenet_sendrecv_pxe_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pxe_client_packets',`
-	corenet_dontaudit_send_pxe_client_packets($1)
-	corenet_dontaudit_receive_pxe_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_radius_client_packets',`
+	corenet_dontaudit_send_radius_client_packets($1)
+	corenet_dontaudit_receive_radius_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pxe_client the packet type.
+##	Relabel packets to radius_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69028,18 +72129,18 @@ interface(`corenet_dontaudit_sendrecv_pxe_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pxe_client_packets',`
+interface(`corenet_relabelto_radius_client_packets',`
 	gen_require(`
-		type pxe_client_packet_t;
+		type radius_client_packet_t;
 	')
 
-	allow $1 pxe_client_packet_t:packet relabelto;
+	allow $1 radius_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pxe_server packets.
+##	Send radius_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69048,17 +72149,17 @@ interface(`corenet_relabelto_pxe_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pxe_server_packets',`
+interface(`corenet_send_radius_server_packets',`
 	gen_require(`
-		type pxe_server_packet_t;
+		type radius_server_packet_t;
 	')
 
-	allow $1 pxe_server_packet_t:packet send;
+	allow $1 radius_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pxe_server packets.
+##	Do not audit attempts to send radius_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69067,17 +72168,17 @@ interface(`corenet_send_pxe_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pxe_server_packets',`
+interface(`corenet_dontaudit_send_radius_server_packets',`
 	gen_require(`
-		type pxe_server_packet_t;
+		type radius_server_packet_t;
 	')
 
-	dontaudit $1 pxe_server_packet_t:packet send;
+	dontaudit $1 radius_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pxe_server packets.
+##	Receive radius_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69086,17 +72187,17 @@ interface(`corenet_dontaudit_send_pxe_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pxe_server_packets',`
+interface(`corenet_receive_radius_server_packets',`
 	gen_require(`
-		type pxe_server_packet_t;
+		type radius_server_packet_t;
 	')
 
-	allow $1 pxe_server_packet_t:packet recv;
+	allow $1 radius_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pxe_server packets.
+##	Do not audit attempts to receive radius_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69105,17 +72206,17 @@ interface(`corenet_receive_pxe_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pxe_server_packets',`
+interface(`corenet_dontaudit_receive_radius_server_packets',`
 	gen_require(`
-		type pxe_server_packet_t;
+		type radius_server_packet_t;
 	')
 
-	dontaudit $1 pxe_server_packet_t:packet recv;
+	dontaudit $1 radius_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pxe_server packets.
+##	Send and receive radius_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69124,14 +72225,14 @@ interface(`corenet_dontaudit_receive_pxe_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pxe_server_packets',`
-	corenet_send_pxe_server_packets($1)
-	corenet_receive_pxe_server_packets($1)
+interface(`corenet_sendrecv_radius_server_packets',`
+	corenet_send_radius_server_packets($1)
+	corenet_receive_radius_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pxe_server packets.
+##	Do not audit attempts to send and receive radius_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69140,14 +72241,14 @@ interface(`corenet_sendrecv_pxe_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pxe_server_packets',`
-	corenet_dontaudit_send_pxe_server_packets($1)
-	corenet_dontaudit_receive_pxe_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_radius_server_packets',`
+	corenet_dontaudit_send_radius_server_packets($1)
+	corenet_dontaudit_receive_radius_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pxe_server the packet type.
+##	Relabel packets to radius_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69155,12 +72256,12 @@ interface(`corenet_dontaudit_sendrecv_pxe_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pxe_server_packets',`
+interface(`corenet_relabelto_radius_server_packets',`
 	gen_require(`
-		type pxe_server_packet_t;
+		type radius_server_packet_t;
 	')
 
-	allow $1 pxe_server_packet_t:packet relabelto;
+	allow $1 radius_server_packet_t:packet relabelto;
 ')
 
 
@@ -69168,7 +72269,7 @@ interface(`corenet_relabelto_pxe_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the pyzor port.
+##	Send and receive TCP traffic on the radsec port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69177,17 +72278,17 @@ interface(`corenet_relabelto_pxe_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_pyzor_port',`
+interface(`corenet_tcp_sendrecv_radsec_port',`
 	gen_require(`
-		type pyzor_port_t;
+		type radsec_port_t;
 	')
 
-	allow $1 pyzor_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 radsec_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the pyzor port.
+##	Send UDP traffic on the radsec port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69196,17 +72297,17 @@ interface(`corenet_tcp_sendrecv_pyzor_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_pyzor_port',`
+interface(`corenet_udp_send_radsec_port',`
 	gen_require(`
-		type pyzor_port_t;
+		type radsec_port_t;
 	')
 
-	allow $1 pyzor_port_t:udp_socket send_msg;
+	allow $1 radsec_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the pyzor port.
+##	Do not audit attempts to send UDP traffic on the radsec port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69215,17 +72316,17 @@ interface(`corenet_udp_send_pyzor_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_pyzor_port',`
+interface(`corenet_dontaudit_udp_send_radsec_port',`
 	gen_require(`
-		type pyzor_port_t;
+		type radsec_port_t;
 	')
 
-	dontaudit $1 pyzor_port_t:udp_socket send_msg;
+	dontaudit $1 radsec_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the pyzor port.
+##	Receive UDP traffic on the radsec port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69234,17 +72335,17 @@ interface(`corenet_dontaudit_udp_send_pyzor_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_pyzor_port',`
+interface(`corenet_udp_receive_radsec_port',`
 	gen_require(`
-		type pyzor_port_t;
+		type radsec_port_t;
 	')
 
-	allow $1 pyzor_port_t:udp_socket recv_msg;
+	allow $1 radsec_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the pyzor port.
+##	Do not audit attempts to receive UDP traffic on the radsec port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69253,17 +72354,17 @@ interface(`corenet_udp_receive_pyzor_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_pyzor_port',`
+interface(`corenet_dontaudit_udp_receive_radsec_port',`
 	gen_require(`
-		type pyzor_port_t;
+		type radsec_port_t;
 	')
 
-	dontaudit $1 pyzor_port_t:udp_socket recv_msg;
+	dontaudit $1 radsec_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the pyzor port.
+##	Send and receive UDP traffic on the radsec port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69272,15 +72373,15 @@ interface(`corenet_dontaudit_udp_receive_pyzor_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_pyzor_port',`
-	corenet_udp_send_pyzor_port($1)
-	corenet_udp_receive_pyzor_port($1)
+interface(`corenet_udp_sendrecv_radsec_port',`
+	corenet_udp_send_radsec_port($1)
+	corenet_udp_receive_radsec_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the pyzor port.
+##	UDP traffic on the radsec port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69289,14 +72390,14 @@ interface(`corenet_udp_sendrecv_pyzor_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_pyzor_port',`
-	corenet_dontaudit_udp_send_pyzor_port($1)
-	corenet_dontaudit_udp_receive_pyzor_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_radsec_port',`
+	corenet_dontaudit_udp_send_radsec_port($1)
+	corenet_dontaudit_udp_receive_radsec_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the pyzor port.
+##	Bind TCP sockets to the radsec port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69305,18 +72406,18 @@ interface(`corenet_dontaudit_udp_sendrecv_pyzor_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_pyzor_port',`
+interface(`corenet_tcp_bind_radsec_port',`
 	gen_require(`
-		type pyzor_port_t;
+		type radsec_port_t;
 	')
 
-	allow $1 pyzor_port_t:tcp_socket name_bind;
+	allow $1 radsec_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the pyzor port.
+##	Bind UDP sockets to the radsec port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69325,18 +72426,18 @@ interface(`corenet_tcp_bind_pyzor_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_pyzor_port',`
+interface(`corenet_udp_bind_radsec_port',`
 	gen_require(`
-		type pyzor_port_t;
+		type radsec_port_t;
 	')
 
-	allow $1 pyzor_port_t:udp_socket name_bind;
+	allow $1 radsec_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the pyzor port.
+##	Make a TCP connection to the radsec port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69344,18 +72445,18 @@ interface(`corenet_udp_bind_pyzor_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_pyzor_port',`
+interface(`corenet_tcp_connect_radsec_port',`
 	gen_require(`
-		type pyzor_port_t;
+		type radsec_port_t;
 	')
 
-	allow $1 pyzor_port_t:tcp_socket name_connect;
+	allow $1 radsec_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pyzor_client packets.
+##	Send radsec_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69364,17 +72465,17 @@ interface(`corenet_tcp_connect_pyzor_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pyzor_client_packets',`
+interface(`corenet_send_radsec_client_packets',`
 	gen_require(`
-		type pyzor_client_packet_t;
+		type radsec_client_packet_t;
 	')
 
-	allow $1 pyzor_client_packet_t:packet send;
+	allow $1 radsec_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pyzor_client packets.
+##	Do not audit attempts to send radsec_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69383,17 +72484,17 @@ interface(`corenet_send_pyzor_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pyzor_client_packets',`
+interface(`corenet_dontaudit_send_radsec_client_packets',`
 	gen_require(`
-		type pyzor_client_packet_t;
+		type radsec_client_packet_t;
 	')
 
-	dontaudit $1 pyzor_client_packet_t:packet send;
+	dontaudit $1 radsec_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pyzor_client packets.
+##	Receive radsec_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69402,17 +72503,17 @@ interface(`corenet_dontaudit_send_pyzor_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pyzor_client_packets',`
+interface(`corenet_receive_radsec_client_packets',`
 	gen_require(`
-		type pyzor_client_packet_t;
+		type radsec_client_packet_t;
 	')
 
-	allow $1 pyzor_client_packet_t:packet recv;
+	allow $1 radsec_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pyzor_client packets.
+##	Do not audit attempts to receive radsec_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69421,17 +72522,17 @@ interface(`corenet_receive_pyzor_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pyzor_client_packets',`
+interface(`corenet_dontaudit_receive_radsec_client_packets',`
 	gen_require(`
-		type pyzor_client_packet_t;
+		type radsec_client_packet_t;
 	')
 
-	dontaudit $1 pyzor_client_packet_t:packet recv;
+	dontaudit $1 radsec_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pyzor_client packets.
+##	Send and receive radsec_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69440,14 +72541,14 @@ interface(`corenet_dontaudit_receive_pyzor_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pyzor_client_packets',`
-	corenet_send_pyzor_client_packets($1)
-	corenet_receive_pyzor_client_packets($1)
+interface(`corenet_sendrecv_radsec_client_packets',`
+	corenet_send_radsec_client_packets($1)
+	corenet_receive_radsec_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pyzor_client packets.
+##	Do not audit attempts to send and receive radsec_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69456,14 +72557,14 @@ interface(`corenet_sendrecv_pyzor_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pyzor_client_packets',`
-	corenet_dontaudit_send_pyzor_client_packets($1)
-	corenet_dontaudit_receive_pyzor_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_radsec_client_packets',`
+	corenet_dontaudit_send_radsec_client_packets($1)
+	corenet_dontaudit_receive_radsec_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pyzor_client the packet type.
+##	Relabel packets to radsec_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69471,18 +72572,18 @@ interface(`corenet_dontaudit_sendrecv_pyzor_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pyzor_client_packets',`
+interface(`corenet_relabelto_radsec_client_packets',`
 	gen_require(`
-		type pyzor_client_packet_t;
+		type radsec_client_packet_t;
 	')
 
-	allow $1 pyzor_client_packet_t:packet relabelto;
+	allow $1 radsec_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send pyzor_server packets.
+##	Send radsec_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69491,17 +72592,17 @@ interface(`corenet_relabelto_pyzor_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_pyzor_server_packets',`
+interface(`corenet_send_radsec_server_packets',`
 	gen_require(`
-		type pyzor_server_packet_t;
+		type radsec_server_packet_t;
 	')
 
-	allow $1 pyzor_server_packet_t:packet send;
+	allow $1 radsec_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send pyzor_server packets.
+##	Do not audit attempts to send radsec_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69510,17 +72611,17 @@ interface(`corenet_send_pyzor_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_pyzor_server_packets',`
+interface(`corenet_dontaudit_send_radsec_server_packets',`
 	gen_require(`
-		type pyzor_server_packet_t;
+		type radsec_server_packet_t;
 	')
 
-	dontaudit $1 pyzor_server_packet_t:packet send;
+	dontaudit $1 radsec_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive pyzor_server packets.
+##	Receive radsec_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69529,17 +72630,17 @@ interface(`corenet_dontaudit_send_pyzor_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_pyzor_server_packets',`
+interface(`corenet_receive_radsec_server_packets',`
 	gen_require(`
-		type pyzor_server_packet_t;
+		type radsec_server_packet_t;
 	')
 
-	allow $1 pyzor_server_packet_t:packet recv;
+	allow $1 radsec_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive pyzor_server packets.
+##	Do not audit attempts to receive radsec_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69548,17 +72649,17 @@ interface(`corenet_receive_pyzor_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_pyzor_server_packets',`
+interface(`corenet_dontaudit_receive_radsec_server_packets',`
 	gen_require(`
-		type pyzor_server_packet_t;
+		type radsec_server_packet_t;
 	')
 
-	dontaudit $1 pyzor_server_packet_t:packet recv;
+	dontaudit $1 radsec_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive pyzor_server packets.
+##	Send and receive radsec_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69567,14 +72668,14 @@ interface(`corenet_dontaudit_receive_pyzor_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_pyzor_server_packets',`
-	corenet_send_pyzor_server_packets($1)
-	corenet_receive_pyzor_server_packets($1)
+interface(`corenet_sendrecv_radsec_server_packets',`
+	corenet_send_radsec_server_packets($1)
+	corenet_receive_radsec_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive pyzor_server packets.
+##	Do not audit attempts to send and receive radsec_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69583,14 +72684,14 @@ interface(`corenet_sendrecv_pyzor_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_pyzor_server_packets',`
-	corenet_dontaudit_send_pyzor_server_packets($1)
-	corenet_dontaudit_receive_pyzor_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_radsec_server_packets',`
+	corenet_dontaudit_send_radsec_server_packets($1)
+	corenet_dontaudit_receive_radsec_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to pyzor_server the packet type.
+##	Relabel packets to radsec_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69598,12 +72699,12 @@ interface(`corenet_dontaudit_sendrecv_pyzor_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_pyzor_server_packets',`
+interface(`corenet_relabelto_radsec_server_packets',`
 	gen_require(`
-		type pyzor_server_packet_t;
+		type radsec_server_packet_t;
 	')
 
-	allow $1 pyzor_server_packet_t:packet relabelto;
+	allow $1 radsec_server_packet_t:packet relabelto;
 ')
 
 
@@ -69611,7 +72712,7 @@ interface(`corenet_relabelto_pyzor_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the radacct port.
+##	Send and receive TCP traffic on the razor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69620,17 +72721,17 @@ interface(`corenet_relabelto_pyzor_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_radacct_port',`
+interface(`corenet_tcp_sendrecv_razor_port',`
 	gen_require(`
-		type radacct_port_t;
+		type razor_port_t;
 	')
 
-	allow $1 radacct_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 razor_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the radacct port.
+##	Send UDP traffic on the razor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69639,17 +72740,17 @@ interface(`corenet_tcp_sendrecv_radacct_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_radacct_port',`
+interface(`corenet_udp_send_razor_port',`
 	gen_require(`
-		type radacct_port_t;
+		type razor_port_t;
 	')
 
-	allow $1 radacct_port_t:udp_socket send_msg;
+	allow $1 razor_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the radacct port.
+##	Do not audit attempts to send UDP traffic on the razor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69658,17 +72759,17 @@ interface(`corenet_udp_send_radacct_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_radacct_port',`
+interface(`corenet_dontaudit_udp_send_razor_port',`
 	gen_require(`
-		type radacct_port_t;
+		type razor_port_t;
 	')
 
-	dontaudit $1 radacct_port_t:udp_socket send_msg;
+	dontaudit $1 razor_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the radacct port.
+##	Receive UDP traffic on the razor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69677,17 +72778,17 @@ interface(`corenet_dontaudit_udp_send_radacct_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_radacct_port',`
+interface(`corenet_udp_receive_razor_port',`
 	gen_require(`
-		type radacct_port_t;
+		type razor_port_t;
 	')
 
-	allow $1 radacct_port_t:udp_socket recv_msg;
+	allow $1 razor_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the radacct port.
+##	Do not audit attempts to receive UDP traffic on the razor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69696,17 +72797,17 @@ interface(`corenet_udp_receive_radacct_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_radacct_port',`
+interface(`corenet_dontaudit_udp_receive_razor_port',`
 	gen_require(`
-		type radacct_port_t;
+		type razor_port_t;
 	')
 
-	dontaudit $1 radacct_port_t:udp_socket recv_msg;
+	dontaudit $1 razor_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the radacct port.
+##	Send and receive UDP traffic on the razor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69715,15 +72816,15 @@ interface(`corenet_dontaudit_udp_receive_radacct_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_radacct_port',`
-	corenet_udp_send_radacct_port($1)
-	corenet_udp_receive_radacct_port($1)
+interface(`corenet_udp_sendrecv_razor_port',`
+	corenet_udp_send_razor_port($1)
+	corenet_udp_receive_razor_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the radacct port.
+##	UDP traffic on the razor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69732,14 +72833,14 @@ interface(`corenet_udp_sendrecv_radacct_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_radacct_port',`
-	corenet_dontaudit_udp_send_radacct_port($1)
-	corenet_dontaudit_udp_receive_radacct_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_razor_port',`
+	corenet_dontaudit_udp_send_razor_port($1)
+	corenet_dontaudit_udp_receive_razor_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the radacct port.
+##	Bind TCP sockets to the razor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69748,18 +72849,18 @@ interface(`corenet_dontaudit_udp_sendrecv_radacct_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_radacct_port',`
+interface(`corenet_tcp_bind_razor_port',`
 	gen_require(`
-		type radacct_port_t;
+		type razor_port_t;
 	')
 
-	allow $1 radacct_port_t:tcp_socket name_bind;
+	allow $1 razor_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the radacct port.
+##	Bind UDP sockets to the razor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69768,18 +72869,18 @@ interface(`corenet_tcp_bind_radacct_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_radacct_port',`
+interface(`corenet_udp_bind_razor_port',`
 	gen_require(`
-		type radacct_port_t;
+		type razor_port_t;
 	')
 
-	allow $1 radacct_port_t:udp_socket name_bind;
+	allow $1 razor_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the radacct port.
+##	Make a TCP connection to the razor port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69787,18 +72888,18 @@ interface(`corenet_udp_bind_radacct_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_radacct_port',`
+interface(`corenet_tcp_connect_razor_port',`
 	gen_require(`
-		type radacct_port_t;
+		type razor_port_t;
 	')
 
-	allow $1 radacct_port_t:tcp_socket name_connect;
+	allow $1 razor_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send radacct_client packets.
+##	Send razor_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69807,17 +72908,17 @@ interface(`corenet_tcp_connect_radacct_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_radacct_client_packets',`
+interface(`corenet_send_razor_client_packets',`
 	gen_require(`
-		type radacct_client_packet_t;
+		type razor_client_packet_t;
 	')
 
-	allow $1 radacct_client_packet_t:packet send;
+	allow $1 razor_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send radacct_client packets.
+##	Do not audit attempts to send razor_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69826,17 +72927,17 @@ interface(`corenet_send_radacct_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_radacct_client_packets',`
+interface(`corenet_dontaudit_send_razor_client_packets',`
 	gen_require(`
-		type radacct_client_packet_t;
+		type razor_client_packet_t;
 	')
 
-	dontaudit $1 radacct_client_packet_t:packet send;
+	dontaudit $1 razor_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive radacct_client packets.
+##	Receive razor_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69845,17 +72946,17 @@ interface(`corenet_dontaudit_send_radacct_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_radacct_client_packets',`
+interface(`corenet_receive_razor_client_packets',`
 	gen_require(`
-		type radacct_client_packet_t;
+		type razor_client_packet_t;
 	')
 
-	allow $1 radacct_client_packet_t:packet recv;
+	allow $1 razor_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive radacct_client packets.
+##	Do not audit attempts to receive razor_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69864,17 +72965,17 @@ interface(`corenet_receive_radacct_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_radacct_client_packets',`
+interface(`corenet_dontaudit_receive_razor_client_packets',`
 	gen_require(`
-		type radacct_client_packet_t;
+		type razor_client_packet_t;
 	')
 
-	dontaudit $1 radacct_client_packet_t:packet recv;
+	dontaudit $1 razor_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive radacct_client packets.
+##	Send and receive razor_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69883,14 +72984,14 @@ interface(`corenet_dontaudit_receive_radacct_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_radacct_client_packets',`
-	corenet_send_radacct_client_packets($1)
-	corenet_receive_radacct_client_packets($1)
+interface(`corenet_sendrecv_razor_client_packets',`
+	corenet_send_razor_client_packets($1)
+	corenet_receive_razor_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive radacct_client packets.
+##	Do not audit attempts to send and receive razor_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69899,14 +73000,14 @@ interface(`corenet_sendrecv_radacct_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_radacct_client_packets',`
-	corenet_dontaudit_send_radacct_client_packets($1)
-	corenet_dontaudit_receive_radacct_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_razor_client_packets',`
+	corenet_dontaudit_send_razor_client_packets($1)
+	corenet_dontaudit_receive_razor_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to radacct_client the packet type.
+##	Relabel packets to razor_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69914,18 +73015,18 @@ interface(`corenet_dontaudit_sendrecv_radacct_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_radacct_client_packets',`
+interface(`corenet_relabelto_razor_client_packets',`
 	gen_require(`
-		type radacct_client_packet_t;
+		type razor_client_packet_t;
 	')
 
-	allow $1 radacct_client_packet_t:packet relabelto;
+	allow $1 razor_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send radacct_server packets.
+##	Send razor_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69934,17 +73035,17 @@ interface(`corenet_relabelto_radacct_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_radacct_server_packets',`
+interface(`corenet_send_razor_server_packets',`
 	gen_require(`
-		type radacct_server_packet_t;
+		type razor_server_packet_t;
 	')
 
-	allow $1 radacct_server_packet_t:packet send;
+	allow $1 razor_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send radacct_server packets.
+##	Do not audit attempts to send razor_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69953,17 +73054,17 @@ interface(`corenet_send_radacct_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_radacct_server_packets',`
+interface(`corenet_dontaudit_send_razor_server_packets',`
 	gen_require(`
-		type radacct_server_packet_t;
+		type razor_server_packet_t;
 	')
 
-	dontaudit $1 radacct_server_packet_t:packet send;
+	dontaudit $1 razor_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive radacct_server packets.
+##	Receive razor_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69972,17 +73073,17 @@ interface(`corenet_dontaudit_send_radacct_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_radacct_server_packets',`
+interface(`corenet_receive_razor_server_packets',`
 	gen_require(`
-		type radacct_server_packet_t;
+		type razor_server_packet_t;
 	')
 
-	allow $1 radacct_server_packet_t:packet recv;
+	allow $1 razor_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive radacct_server packets.
+##	Do not audit attempts to receive razor_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -69991,17 +73092,17 @@ interface(`corenet_receive_radacct_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_radacct_server_packets',`
+interface(`corenet_dontaudit_receive_razor_server_packets',`
 	gen_require(`
-		type radacct_server_packet_t;
+		type razor_server_packet_t;
 	')
 
-	dontaudit $1 radacct_server_packet_t:packet recv;
+	dontaudit $1 razor_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive radacct_server packets.
+##	Send and receive razor_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70010,14 +73111,14 @@ interface(`corenet_dontaudit_receive_radacct_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_radacct_server_packets',`
-	corenet_send_radacct_server_packets($1)
-	corenet_receive_radacct_server_packets($1)
+interface(`corenet_sendrecv_razor_server_packets',`
+	corenet_send_razor_server_packets($1)
+	corenet_receive_razor_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive radacct_server packets.
+##	Do not audit attempts to send and receive razor_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70026,14 +73127,14 @@ interface(`corenet_sendrecv_radacct_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_radacct_server_packets',`
-	corenet_dontaudit_send_radacct_server_packets($1)
-	corenet_dontaudit_receive_radacct_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_razor_server_packets',`
+	corenet_dontaudit_send_razor_server_packets($1)
+	corenet_dontaudit_receive_razor_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to radacct_server the packet type.
+##	Relabel packets to razor_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70041,12 +73142,12 @@ interface(`corenet_dontaudit_sendrecv_radacct_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_radacct_server_packets',`
+interface(`corenet_relabelto_razor_server_packets',`
 	gen_require(`
-		type radacct_server_packet_t;
+		type razor_server_packet_t;
 	')
 
-	allow $1 radacct_server_packet_t:packet relabelto;
+	allow $1 razor_server_packet_t:packet relabelto;
 ')
 
 
@@ -70054,7 +73155,7 @@ interface(`corenet_relabelto_radacct_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the radius port.
+##	Send and receive TCP traffic on the redis port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70063,17 +73164,17 @@ interface(`corenet_relabelto_radacct_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_radius_port',`
+interface(`corenet_tcp_sendrecv_redis_port',`
 	gen_require(`
-		type radius_port_t;
+		type redis_port_t;
 	')
 
-	allow $1 radius_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 redis_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the radius port.
+##	Send UDP traffic on the redis port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70082,17 +73183,17 @@ interface(`corenet_tcp_sendrecv_radius_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_radius_port',`
+interface(`corenet_udp_send_redis_port',`
 	gen_require(`
-		type radius_port_t;
+		type redis_port_t;
 	')
 
-	allow $1 radius_port_t:udp_socket send_msg;
+	allow $1 redis_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the radius port.
+##	Do not audit attempts to send UDP traffic on the redis port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70101,17 +73202,17 @@ interface(`corenet_udp_send_radius_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_radius_port',`
+interface(`corenet_dontaudit_udp_send_redis_port',`
 	gen_require(`
-		type radius_port_t;
+		type redis_port_t;
 	')
 
-	dontaudit $1 radius_port_t:udp_socket send_msg;
+	dontaudit $1 redis_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the radius port.
+##	Receive UDP traffic on the redis port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70120,17 +73221,17 @@ interface(`corenet_dontaudit_udp_send_radius_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_radius_port',`
+interface(`corenet_udp_receive_redis_port',`
 	gen_require(`
-		type radius_port_t;
+		type redis_port_t;
 	')
 
-	allow $1 radius_port_t:udp_socket recv_msg;
+	allow $1 redis_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the radius port.
+##	Do not audit attempts to receive UDP traffic on the redis port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70139,17 +73240,17 @@ interface(`corenet_udp_receive_radius_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_radius_port',`
+interface(`corenet_dontaudit_udp_receive_redis_port',`
 	gen_require(`
-		type radius_port_t;
+		type redis_port_t;
 	')
 
-	dontaudit $1 radius_port_t:udp_socket recv_msg;
+	dontaudit $1 redis_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the radius port.
+##	Send and receive UDP traffic on the redis port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70158,15 +73259,15 @@ interface(`corenet_dontaudit_udp_receive_radius_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_radius_port',`
-	corenet_udp_send_radius_port($1)
-	corenet_udp_receive_radius_port($1)
+interface(`corenet_udp_sendrecv_redis_port',`
+	corenet_udp_send_redis_port($1)
+	corenet_udp_receive_redis_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the radius port.
+##	UDP traffic on the redis port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70175,14 +73276,14 @@ interface(`corenet_udp_sendrecv_radius_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_radius_port',`
-	corenet_dontaudit_udp_send_radius_port($1)
-	corenet_dontaudit_udp_receive_radius_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_redis_port',`
+	corenet_dontaudit_udp_send_redis_port($1)
+	corenet_dontaudit_udp_receive_redis_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the radius port.
+##	Bind TCP sockets to the redis port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70191,18 +73292,18 @@ interface(`corenet_dontaudit_udp_sendrecv_radius_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_radius_port',`
+interface(`corenet_tcp_bind_redis_port',`
 	gen_require(`
-		type radius_port_t;
+		type redis_port_t;
 	')
 
-	allow $1 radius_port_t:tcp_socket name_bind;
+	allow $1 redis_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the radius port.
+##	Bind UDP sockets to the redis port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70211,18 +73312,18 @@ interface(`corenet_tcp_bind_radius_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_radius_port',`
+interface(`corenet_udp_bind_redis_port',`
 	gen_require(`
-		type radius_port_t;
+		type redis_port_t;
 	')
 
-	allow $1 radius_port_t:udp_socket name_bind;
+	allow $1 redis_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the radius port.
+##	Make a TCP connection to the redis port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70230,18 +73331,18 @@ interface(`corenet_udp_bind_radius_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_radius_port',`
+interface(`corenet_tcp_connect_redis_port',`
 	gen_require(`
-		type radius_port_t;
+		type redis_port_t;
 	')
 
-	allow $1 radius_port_t:tcp_socket name_connect;
+	allow $1 redis_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send radius_client packets.
+##	Send redis_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70250,17 +73351,17 @@ interface(`corenet_tcp_connect_radius_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_radius_client_packets',`
+interface(`corenet_send_redis_client_packets',`
 	gen_require(`
-		type radius_client_packet_t;
+		type redis_client_packet_t;
 	')
 
-	allow $1 radius_client_packet_t:packet send;
+	allow $1 redis_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send radius_client packets.
+##	Do not audit attempts to send redis_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70269,17 +73370,17 @@ interface(`corenet_send_radius_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_radius_client_packets',`
+interface(`corenet_dontaudit_send_redis_client_packets',`
 	gen_require(`
-		type radius_client_packet_t;
+		type redis_client_packet_t;
 	')
 
-	dontaudit $1 radius_client_packet_t:packet send;
+	dontaudit $1 redis_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive radius_client packets.
+##	Receive redis_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70288,17 +73389,17 @@ interface(`corenet_dontaudit_send_radius_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_radius_client_packets',`
+interface(`corenet_receive_redis_client_packets',`
 	gen_require(`
-		type radius_client_packet_t;
+		type redis_client_packet_t;
 	')
 
-	allow $1 radius_client_packet_t:packet recv;
+	allow $1 redis_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive radius_client packets.
+##	Do not audit attempts to receive redis_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70307,17 +73408,17 @@ interface(`corenet_receive_radius_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_radius_client_packets',`
+interface(`corenet_dontaudit_receive_redis_client_packets',`
 	gen_require(`
-		type radius_client_packet_t;
+		type redis_client_packet_t;
 	')
 
-	dontaudit $1 radius_client_packet_t:packet recv;
+	dontaudit $1 redis_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive radius_client packets.
+##	Send and receive redis_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70326,14 +73427,14 @@ interface(`corenet_dontaudit_receive_radius_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_radius_client_packets',`
-	corenet_send_radius_client_packets($1)
-	corenet_receive_radius_client_packets($1)
+interface(`corenet_sendrecv_redis_client_packets',`
+	corenet_send_redis_client_packets($1)
+	corenet_receive_redis_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive radius_client packets.
+##	Do not audit attempts to send and receive redis_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70342,14 +73443,14 @@ interface(`corenet_sendrecv_radius_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_radius_client_packets',`
-	corenet_dontaudit_send_radius_client_packets($1)
-	corenet_dontaudit_receive_radius_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_redis_client_packets',`
+	corenet_dontaudit_send_redis_client_packets($1)
+	corenet_dontaudit_receive_redis_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to radius_client the packet type.
+##	Relabel packets to redis_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70357,18 +73458,18 @@ interface(`corenet_dontaudit_sendrecv_radius_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_radius_client_packets',`
+interface(`corenet_relabelto_redis_client_packets',`
 	gen_require(`
-		type radius_client_packet_t;
+		type redis_client_packet_t;
 	')
 
-	allow $1 radius_client_packet_t:packet relabelto;
+	allow $1 redis_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send radius_server packets.
+##	Send redis_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70377,17 +73478,17 @@ interface(`corenet_relabelto_radius_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_radius_server_packets',`
+interface(`corenet_send_redis_server_packets',`
 	gen_require(`
-		type radius_server_packet_t;
+		type redis_server_packet_t;
 	')
 
-	allow $1 radius_server_packet_t:packet send;
+	allow $1 redis_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send radius_server packets.
+##	Do not audit attempts to send redis_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70396,17 +73497,17 @@ interface(`corenet_send_radius_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_radius_server_packets',`
+interface(`corenet_dontaudit_send_redis_server_packets',`
 	gen_require(`
-		type radius_server_packet_t;
+		type redis_server_packet_t;
 	')
 
-	dontaudit $1 radius_server_packet_t:packet send;
+	dontaudit $1 redis_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive radius_server packets.
+##	Receive redis_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70415,17 +73516,17 @@ interface(`corenet_dontaudit_send_radius_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_radius_server_packets',`
+interface(`corenet_receive_redis_server_packets',`
 	gen_require(`
-		type radius_server_packet_t;
+		type redis_server_packet_t;
 	')
 
-	allow $1 radius_server_packet_t:packet recv;
+	allow $1 redis_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive radius_server packets.
+##	Do not audit attempts to receive redis_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70434,17 +73535,17 @@ interface(`corenet_receive_radius_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_radius_server_packets',`
+interface(`corenet_dontaudit_receive_redis_server_packets',`
 	gen_require(`
-		type radius_server_packet_t;
+		type redis_server_packet_t;
 	')
 
-	dontaudit $1 radius_server_packet_t:packet recv;
+	dontaudit $1 redis_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive radius_server packets.
+##	Send and receive redis_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70453,14 +73554,14 @@ interface(`corenet_dontaudit_receive_radius_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_radius_server_packets',`
-	corenet_send_radius_server_packets($1)
-	corenet_receive_radius_server_packets($1)
+interface(`corenet_sendrecv_redis_server_packets',`
+	corenet_send_redis_server_packets($1)
+	corenet_receive_redis_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive radius_server packets.
+##	Do not audit attempts to send and receive redis_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70469,14 +73570,14 @@ interface(`corenet_sendrecv_radius_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_radius_server_packets',`
-	corenet_dontaudit_send_radius_server_packets($1)
-	corenet_dontaudit_receive_radius_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_redis_server_packets',`
+	corenet_dontaudit_send_redis_server_packets($1)
+	corenet_dontaudit_receive_redis_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to radius_server the packet type.
+##	Relabel packets to redis_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70484,12 +73585,12 @@ interface(`corenet_dontaudit_sendrecv_radius_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_radius_server_packets',`
+interface(`corenet_relabelto_redis_server_packets',`
 	gen_require(`
-		type radius_server_packet_t;
+		type redis_server_packet_t;
 	')
 
-	allow $1 radius_server_packet_t:packet relabelto;
+	allow $1 redis_server_packet_t:packet relabelto;
 ')
 
 
@@ -70497,7 +73598,7 @@ interface(`corenet_relabelto_radius_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the radsec port.
+##	Send and receive TCP traffic on the repository port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70506,17 +73607,17 @@ interface(`corenet_relabelto_radius_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_radsec_port',`
+interface(`corenet_tcp_sendrecv_repository_port',`
 	gen_require(`
-		type radsec_port_t;
+		type repository_port_t;
 	')
 
-	allow $1 radsec_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 repository_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the radsec port.
+##	Send UDP traffic on the repository port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70525,17 +73626,17 @@ interface(`corenet_tcp_sendrecv_radsec_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_radsec_port',`
+interface(`corenet_udp_send_repository_port',`
 	gen_require(`
-		type radsec_port_t;
+		type repository_port_t;
 	')
 
-	allow $1 radsec_port_t:udp_socket send_msg;
+	allow $1 repository_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the radsec port.
+##	Do not audit attempts to send UDP traffic on the repository port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70544,17 +73645,17 @@ interface(`corenet_udp_send_radsec_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_radsec_port',`
+interface(`corenet_dontaudit_udp_send_repository_port',`
 	gen_require(`
-		type radsec_port_t;
+		type repository_port_t;
 	')
 
-	dontaudit $1 radsec_port_t:udp_socket send_msg;
+	dontaudit $1 repository_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the radsec port.
+##	Receive UDP traffic on the repository port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70563,17 +73664,17 @@ interface(`corenet_dontaudit_udp_send_radsec_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_radsec_port',`
+interface(`corenet_udp_receive_repository_port',`
 	gen_require(`
-		type radsec_port_t;
+		type repository_port_t;
 	')
 
-	allow $1 radsec_port_t:udp_socket recv_msg;
+	allow $1 repository_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the radsec port.
+##	Do not audit attempts to receive UDP traffic on the repository port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70582,17 +73683,17 @@ interface(`corenet_udp_receive_radsec_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_radsec_port',`
+interface(`corenet_dontaudit_udp_receive_repository_port',`
 	gen_require(`
-		type radsec_port_t;
+		type repository_port_t;
 	')
 
-	dontaudit $1 radsec_port_t:udp_socket recv_msg;
+	dontaudit $1 repository_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the radsec port.
+##	Send and receive UDP traffic on the repository port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70601,15 +73702,15 @@ interface(`corenet_dontaudit_udp_receive_radsec_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_radsec_port',`
-	corenet_udp_send_radsec_port($1)
-	corenet_udp_receive_radsec_port($1)
+interface(`corenet_udp_sendrecv_repository_port',`
+	corenet_udp_send_repository_port($1)
+	corenet_udp_receive_repository_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the radsec port.
+##	UDP traffic on the repository port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70618,14 +73719,14 @@ interface(`corenet_udp_sendrecv_radsec_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_radsec_port',`
-	corenet_dontaudit_udp_send_radsec_port($1)
-	corenet_dontaudit_udp_receive_radsec_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_repository_port',`
+	corenet_dontaudit_udp_send_repository_port($1)
+	corenet_dontaudit_udp_receive_repository_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the radsec port.
+##	Bind TCP sockets to the repository port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70634,18 +73735,18 @@ interface(`corenet_dontaudit_udp_sendrecv_radsec_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_radsec_port',`
+interface(`corenet_tcp_bind_repository_port',`
 	gen_require(`
-		type radsec_port_t;
+		type repository_port_t;
 	')
 
-	allow $1 radsec_port_t:tcp_socket name_bind;
+	allow $1 repository_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the radsec port.
+##	Bind UDP sockets to the repository port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70654,18 +73755,18 @@ interface(`corenet_tcp_bind_radsec_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_radsec_port',`
+interface(`corenet_udp_bind_repository_port',`
 	gen_require(`
-		type radsec_port_t;
+		type repository_port_t;
 	')
 
-	allow $1 radsec_port_t:udp_socket name_bind;
+	allow $1 repository_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the radsec port.
+##	Make a TCP connection to the repository port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70673,18 +73774,18 @@ interface(`corenet_udp_bind_radsec_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_radsec_port',`
+interface(`corenet_tcp_connect_repository_port',`
 	gen_require(`
-		type radsec_port_t;
+		type repository_port_t;
 	')
 
-	allow $1 radsec_port_t:tcp_socket name_connect;
+	allow $1 repository_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send radsec_client packets.
+##	Send repository_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70693,17 +73794,17 @@ interface(`corenet_tcp_connect_radsec_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_radsec_client_packets',`
+interface(`corenet_send_repository_client_packets',`
 	gen_require(`
-		type radsec_client_packet_t;
+		type repository_client_packet_t;
 	')
 
-	allow $1 radsec_client_packet_t:packet send;
+	allow $1 repository_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send radsec_client packets.
+##	Do not audit attempts to send repository_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70712,17 +73813,17 @@ interface(`corenet_send_radsec_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_radsec_client_packets',`
+interface(`corenet_dontaudit_send_repository_client_packets',`
 	gen_require(`
-		type radsec_client_packet_t;
+		type repository_client_packet_t;
 	')
 
-	dontaudit $1 radsec_client_packet_t:packet send;
+	dontaudit $1 repository_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive radsec_client packets.
+##	Receive repository_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70731,17 +73832,17 @@ interface(`corenet_dontaudit_send_radsec_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_radsec_client_packets',`
+interface(`corenet_receive_repository_client_packets',`
 	gen_require(`
-		type radsec_client_packet_t;
+		type repository_client_packet_t;
 	')
 
-	allow $1 radsec_client_packet_t:packet recv;
+	allow $1 repository_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive radsec_client packets.
+##	Do not audit attempts to receive repository_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70750,17 +73851,17 @@ interface(`corenet_receive_radsec_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_radsec_client_packets',`
+interface(`corenet_dontaudit_receive_repository_client_packets',`
 	gen_require(`
-		type radsec_client_packet_t;
+		type repository_client_packet_t;
 	')
 
-	dontaudit $1 radsec_client_packet_t:packet recv;
+	dontaudit $1 repository_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive radsec_client packets.
+##	Send and receive repository_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70769,14 +73870,14 @@ interface(`corenet_dontaudit_receive_radsec_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_radsec_client_packets',`
-	corenet_send_radsec_client_packets($1)
-	corenet_receive_radsec_client_packets($1)
+interface(`corenet_sendrecv_repository_client_packets',`
+	corenet_send_repository_client_packets($1)
+	corenet_receive_repository_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive radsec_client packets.
+##	Do not audit attempts to send and receive repository_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70785,14 +73886,14 @@ interface(`corenet_sendrecv_radsec_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_radsec_client_packets',`
-	corenet_dontaudit_send_radsec_client_packets($1)
-	corenet_dontaudit_receive_radsec_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_repository_client_packets',`
+	corenet_dontaudit_send_repository_client_packets($1)
+	corenet_dontaudit_receive_repository_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to radsec_client the packet type.
+##	Relabel packets to repository_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70800,18 +73901,18 @@ interface(`corenet_dontaudit_sendrecv_radsec_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_radsec_client_packets',`
+interface(`corenet_relabelto_repository_client_packets',`
 	gen_require(`
-		type radsec_client_packet_t;
+		type repository_client_packet_t;
 	')
 
-	allow $1 radsec_client_packet_t:packet relabelto;
+	allow $1 repository_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send radsec_server packets.
+##	Send repository_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70820,17 +73921,17 @@ interface(`corenet_relabelto_radsec_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_radsec_server_packets',`
+interface(`corenet_send_repository_server_packets',`
 	gen_require(`
-		type radsec_server_packet_t;
+		type repository_server_packet_t;
 	')
 
-	allow $1 radsec_server_packet_t:packet send;
+	allow $1 repository_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send radsec_server packets.
+##	Do not audit attempts to send repository_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70839,17 +73940,17 @@ interface(`corenet_send_radsec_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_radsec_server_packets',`
+interface(`corenet_dontaudit_send_repository_server_packets',`
 	gen_require(`
-		type radsec_server_packet_t;
+		type repository_server_packet_t;
 	')
 
-	dontaudit $1 radsec_server_packet_t:packet send;
+	dontaudit $1 repository_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive radsec_server packets.
+##	Receive repository_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70858,17 +73959,17 @@ interface(`corenet_dontaudit_send_radsec_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_radsec_server_packets',`
+interface(`corenet_receive_repository_server_packets',`
 	gen_require(`
-		type radsec_server_packet_t;
+		type repository_server_packet_t;
 	')
 
-	allow $1 radsec_server_packet_t:packet recv;
+	allow $1 repository_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive radsec_server packets.
+##	Do not audit attempts to receive repository_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70877,17 +73978,17 @@ interface(`corenet_receive_radsec_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_radsec_server_packets',`
+interface(`corenet_dontaudit_receive_repository_server_packets',`
 	gen_require(`
-		type radsec_server_packet_t;
+		type repository_server_packet_t;
 	')
 
-	dontaudit $1 radsec_server_packet_t:packet recv;
+	dontaudit $1 repository_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive radsec_server packets.
+##	Send and receive repository_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70896,14 +73997,14 @@ interface(`corenet_dontaudit_receive_radsec_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_radsec_server_packets',`
-	corenet_send_radsec_server_packets($1)
-	corenet_receive_radsec_server_packets($1)
+interface(`corenet_sendrecv_repository_server_packets',`
+	corenet_send_repository_server_packets($1)
+	corenet_receive_repository_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive radsec_server packets.
+##	Do not audit attempts to send and receive repository_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70912,14 +74013,14 @@ interface(`corenet_sendrecv_radsec_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_radsec_server_packets',`
-	corenet_dontaudit_send_radsec_server_packets($1)
-	corenet_dontaudit_receive_radsec_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_repository_server_packets',`
+	corenet_dontaudit_send_repository_server_packets($1)
+	corenet_dontaudit_receive_repository_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to radsec_server the packet type.
+##	Relabel packets to repository_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70927,12 +74028,12 @@ interface(`corenet_dontaudit_sendrecv_radsec_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_radsec_server_packets',`
+interface(`corenet_relabelto_repository_server_packets',`
 	gen_require(`
-		type radsec_server_packet_t;
+		type repository_server_packet_t;
 	')
 
-	allow $1 radsec_server_packet_t:packet relabelto;
+	allow $1 repository_server_packet_t:packet relabelto;
 ')
 
 
@@ -70940,7 +74041,7 @@ interface(`corenet_relabelto_radsec_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the razor port.
+##	Send and receive TCP traffic on the ricci port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70949,17 +74050,17 @@ interface(`corenet_relabelto_radsec_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_razor_port',`
+interface(`corenet_tcp_sendrecv_ricci_port',`
 	gen_require(`
-		type razor_port_t;
+		type ricci_port_t;
 	')
 
-	allow $1 razor_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 ricci_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the razor port.
+##	Send UDP traffic on the ricci port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70968,17 +74069,17 @@ interface(`corenet_tcp_sendrecv_razor_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_razor_port',`
+interface(`corenet_udp_send_ricci_port',`
 	gen_require(`
-		type razor_port_t;
+		type ricci_port_t;
 	')
 
-	allow $1 razor_port_t:udp_socket send_msg;
+	allow $1 ricci_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the razor port.
+##	Do not audit attempts to send UDP traffic on the ricci port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -70987,17 +74088,17 @@ interface(`corenet_udp_send_razor_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_razor_port',`
+interface(`corenet_dontaudit_udp_send_ricci_port',`
 	gen_require(`
-		type razor_port_t;
+		type ricci_port_t;
 	')
 
-	dontaudit $1 razor_port_t:udp_socket send_msg;
+	dontaudit $1 ricci_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the razor port.
+##	Receive UDP traffic on the ricci port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71006,17 +74107,17 @@ interface(`corenet_dontaudit_udp_send_razor_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_razor_port',`
+interface(`corenet_udp_receive_ricci_port',`
 	gen_require(`
-		type razor_port_t;
+		type ricci_port_t;
 	')
 
-	allow $1 razor_port_t:udp_socket recv_msg;
+	allow $1 ricci_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the razor port.
+##	Do not audit attempts to receive UDP traffic on the ricci port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71025,17 +74126,17 @@ interface(`corenet_udp_receive_razor_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_razor_port',`
+interface(`corenet_dontaudit_udp_receive_ricci_port',`
 	gen_require(`
-		type razor_port_t;
+		type ricci_port_t;
 	')
 
-	dontaudit $1 razor_port_t:udp_socket recv_msg;
+	dontaudit $1 ricci_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the razor port.
+##	Send and receive UDP traffic on the ricci port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71044,15 +74145,15 @@ interface(`corenet_dontaudit_udp_receive_razor_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_razor_port',`
-	corenet_udp_send_razor_port($1)
-	corenet_udp_receive_razor_port($1)
+interface(`corenet_udp_sendrecv_ricci_port',`
+	corenet_udp_send_ricci_port($1)
+	corenet_udp_receive_ricci_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the razor port.
+##	UDP traffic on the ricci port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71061,14 +74162,14 @@ interface(`corenet_udp_sendrecv_razor_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_razor_port',`
-	corenet_dontaudit_udp_send_razor_port($1)
-	corenet_dontaudit_udp_receive_razor_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_ricci_port',`
+	corenet_dontaudit_udp_send_ricci_port($1)
+	corenet_dontaudit_udp_receive_ricci_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the razor port.
+##	Bind TCP sockets to the ricci port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71077,18 +74178,18 @@ interface(`corenet_dontaudit_udp_sendrecv_razor_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_razor_port',`
+interface(`corenet_tcp_bind_ricci_port',`
 	gen_require(`
-		type razor_port_t;
+		type ricci_port_t;
 	')
 
-	allow $1 razor_port_t:tcp_socket name_bind;
+	allow $1 ricci_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the razor port.
+##	Bind UDP sockets to the ricci port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71097,18 +74198,18 @@ interface(`corenet_tcp_bind_razor_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_razor_port',`
+interface(`corenet_udp_bind_ricci_port',`
 	gen_require(`
-		type razor_port_t;
+		type ricci_port_t;
 	')
 
-	allow $1 razor_port_t:udp_socket name_bind;
+	allow $1 ricci_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the razor port.
+##	Make a TCP connection to the ricci port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71116,18 +74217,18 @@ interface(`corenet_udp_bind_razor_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_razor_port',`
+interface(`corenet_tcp_connect_ricci_port',`
 	gen_require(`
-		type razor_port_t;
+		type ricci_port_t;
 	')
 
-	allow $1 razor_port_t:tcp_socket name_connect;
+	allow $1 ricci_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send razor_client packets.
+##	Send ricci_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71136,17 +74237,17 @@ interface(`corenet_tcp_connect_razor_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_razor_client_packets',`
+interface(`corenet_send_ricci_client_packets',`
 	gen_require(`
-		type razor_client_packet_t;
+		type ricci_client_packet_t;
 	')
 
-	allow $1 razor_client_packet_t:packet send;
+	allow $1 ricci_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send razor_client packets.
+##	Do not audit attempts to send ricci_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71155,17 +74256,17 @@ interface(`corenet_send_razor_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_razor_client_packets',`
+interface(`corenet_dontaudit_send_ricci_client_packets',`
 	gen_require(`
-		type razor_client_packet_t;
+		type ricci_client_packet_t;
 	')
 
-	dontaudit $1 razor_client_packet_t:packet send;
+	dontaudit $1 ricci_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive razor_client packets.
+##	Receive ricci_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71174,17 +74275,17 @@ interface(`corenet_dontaudit_send_razor_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_razor_client_packets',`
+interface(`corenet_receive_ricci_client_packets',`
 	gen_require(`
-		type razor_client_packet_t;
+		type ricci_client_packet_t;
 	')
 
-	allow $1 razor_client_packet_t:packet recv;
+	allow $1 ricci_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive razor_client packets.
+##	Do not audit attempts to receive ricci_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71193,17 +74294,17 @@ interface(`corenet_receive_razor_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_razor_client_packets',`
+interface(`corenet_dontaudit_receive_ricci_client_packets',`
 	gen_require(`
-		type razor_client_packet_t;
+		type ricci_client_packet_t;
 	')
 
-	dontaudit $1 razor_client_packet_t:packet recv;
+	dontaudit $1 ricci_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive razor_client packets.
+##	Send and receive ricci_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71212,14 +74313,14 @@ interface(`corenet_dontaudit_receive_razor_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_razor_client_packets',`
-	corenet_send_razor_client_packets($1)
-	corenet_receive_razor_client_packets($1)
+interface(`corenet_sendrecv_ricci_client_packets',`
+	corenet_send_ricci_client_packets($1)
+	corenet_receive_ricci_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive razor_client packets.
+##	Do not audit attempts to send and receive ricci_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71228,14 +74329,14 @@ interface(`corenet_sendrecv_razor_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_razor_client_packets',`
-	corenet_dontaudit_send_razor_client_packets($1)
-	corenet_dontaudit_receive_razor_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_ricci_client_packets',`
+	corenet_dontaudit_send_ricci_client_packets($1)
+	corenet_dontaudit_receive_ricci_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to razor_client the packet type.
+##	Relabel packets to ricci_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71243,18 +74344,18 @@ interface(`corenet_dontaudit_sendrecv_razor_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_razor_client_packets',`
+interface(`corenet_relabelto_ricci_client_packets',`
 	gen_require(`
-		type razor_client_packet_t;
+		type ricci_client_packet_t;
 	')
 
-	allow $1 razor_client_packet_t:packet relabelto;
+	allow $1 ricci_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send razor_server packets.
+##	Send ricci_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71263,17 +74364,17 @@ interface(`corenet_relabelto_razor_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_razor_server_packets',`
+interface(`corenet_send_ricci_server_packets',`
 	gen_require(`
-		type razor_server_packet_t;
+		type ricci_server_packet_t;
 	')
 
-	allow $1 razor_server_packet_t:packet send;
+	allow $1 ricci_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send razor_server packets.
+##	Do not audit attempts to send ricci_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71282,17 +74383,17 @@ interface(`corenet_send_razor_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_razor_server_packets',`
+interface(`corenet_dontaudit_send_ricci_server_packets',`
 	gen_require(`
-		type razor_server_packet_t;
+		type ricci_server_packet_t;
 	')
 
-	dontaudit $1 razor_server_packet_t:packet send;
+	dontaudit $1 ricci_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive razor_server packets.
+##	Receive ricci_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71301,17 +74402,17 @@ interface(`corenet_dontaudit_send_razor_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_razor_server_packets',`
+interface(`corenet_receive_ricci_server_packets',`
 	gen_require(`
-		type razor_server_packet_t;
+		type ricci_server_packet_t;
 	')
 
-	allow $1 razor_server_packet_t:packet recv;
+	allow $1 ricci_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive razor_server packets.
+##	Do not audit attempts to receive ricci_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71320,17 +74421,17 @@ interface(`corenet_receive_razor_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_razor_server_packets',`
+interface(`corenet_dontaudit_receive_ricci_server_packets',`
 	gen_require(`
-		type razor_server_packet_t;
+		type ricci_server_packet_t;
 	')
 
-	dontaudit $1 razor_server_packet_t:packet recv;
+	dontaudit $1 ricci_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive razor_server packets.
+##	Send and receive ricci_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71339,14 +74440,14 @@ interface(`corenet_dontaudit_receive_razor_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_razor_server_packets',`
-	corenet_send_razor_server_packets($1)
-	corenet_receive_razor_server_packets($1)
+interface(`corenet_sendrecv_ricci_server_packets',`
+	corenet_send_ricci_server_packets($1)
+	corenet_receive_ricci_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive razor_server packets.
+##	Do not audit attempts to send and receive ricci_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71355,14 +74456,14 @@ interface(`corenet_sendrecv_razor_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_razor_server_packets',`
-	corenet_dontaudit_send_razor_server_packets($1)
-	corenet_dontaudit_receive_razor_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_ricci_server_packets',`
+	corenet_dontaudit_send_ricci_server_packets($1)
+	corenet_dontaudit_receive_ricci_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to razor_server the packet type.
+##	Relabel packets to ricci_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71370,12 +74471,12 @@ interface(`corenet_dontaudit_sendrecv_razor_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_razor_server_packets',`
+interface(`corenet_relabelto_ricci_server_packets',`
 	gen_require(`
-		type razor_server_packet_t;
+		type ricci_server_packet_t;
 	')
 
-	allow $1 razor_server_packet_t:packet relabelto;
+	allow $1 ricci_server_packet_t:packet relabelto;
 ')
 
 
@@ -71383,7 +74484,7 @@ interface(`corenet_relabelto_razor_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the redis port.
+##	Send and receive TCP traffic on the ricci_modcluster port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71392,17 +74493,17 @@ interface(`corenet_relabelto_razor_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_redis_port',`
+interface(`corenet_tcp_sendrecv_ricci_modcluster_port',`
 	gen_require(`
-		type redis_port_t;
+		type ricci_modcluster_port_t;
 	')
 
-	allow $1 redis_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 ricci_modcluster_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the redis port.
+##	Send UDP traffic on the ricci_modcluster port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71411,17 +74512,17 @@ interface(`corenet_tcp_sendrecv_redis_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_redis_port',`
+interface(`corenet_udp_send_ricci_modcluster_port',`
 	gen_require(`
-		type redis_port_t;
+		type ricci_modcluster_port_t;
 	')
 
-	allow $1 redis_port_t:udp_socket send_msg;
+	allow $1 ricci_modcluster_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the redis port.
+##	Do not audit attempts to send UDP traffic on the ricci_modcluster port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71430,17 +74531,17 @@ interface(`corenet_udp_send_redis_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_redis_port',`
+interface(`corenet_dontaudit_udp_send_ricci_modcluster_port',`
 	gen_require(`
-		type redis_port_t;
+		type ricci_modcluster_port_t;
 	')
 
-	dontaudit $1 redis_port_t:udp_socket send_msg;
+	dontaudit $1 ricci_modcluster_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the redis port.
+##	Receive UDP traffic on the ricci_modcluster port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71449,17 +74550,17 @@ interface(`corenet_dontaudit_udp_send_redis_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_redis_port',`
+interface(`corenet_udp_receive_ricci_modcluster_port',`
 	gen_require(`
-		type redis_port_t;
+		type ricci_modcluster_port_t;
 	')
 
-	allow $1 redis_port_t:udp_socket recv_msg;
+	allow $1 ricci_modcluster_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the redis port.
+##	Do not audit attempts to receive UDP traffic on the ricci_modcluster port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71468,17 +74569,17 @@ interface(`corenet_udp_receive_redis_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_redis_port',`
+interface(`corenet_dontaudit_udp_receive_ricci_modcluster_port',`
 	gen_require(`
-		type redis_port_t;
+		type ricci_modcluster_port_t;
 	')
 
-	dontaudit $1 redis_port_t:udp_socket recv_msg;
+	dontaudit $1 ricci_modcluster_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the redis port.
+##	Send and receive UDP traffic on the ricci_modcluster port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71487,15 +74588,15 @@ interface(`corenet_dontaudit_udp_receive_redis_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_redis_port',`
-	corenet_udp_send_redis_port($1)
-	corenet_udp_receive_redis_port($1)
+interface(`corenet_udp_sendrecv_ricci_modcluster_port',`
+	corenet_udp_send_ricci_modcluster_port($1)
+	corenet_udp_receive_ricci_modcluster_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the redis port.
+##	UDP traffic on the ricci_modcluster port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71504,14 +74605,14 @@ interface(`corenet_udp_sendrecv_redis_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_redis_port',`
-	corenet_dontaudit_udp_send_redis_port($1)
-	corenet_dontaudit_udp_receive_redis_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_ricci_modcluster_port',`
+	corenet_dontaudit_udp_send_ricci_modcluster_port($1)
+	corenet_dontaudit_udp_receive_ricci_modcluster_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the redis port.
+##	Bind TCP sockets to the ricci_modcluster port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71520,18 +74621,18 @@ interface(`corenet_dontaudit_udp_sendrecv_redis_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_redis_port',`
+interface(`corenet_tcp_bind_ricci_modcluster_port',`
 	gen_require(`
-		type redis_port_t;
+		type ricci_modcluster_port_t;
 	')
 
-	allow $1 redis_port_t:tcp_socket name_bind;
+	allow $1 ricci_modcluster_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the redis port.
+##	Bind UDP sockets to the ricci_modcluster port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71540,18 +74641,18 @@ interface(`corenet_tcp_bind_redis_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_redis_port',`
+interface(`corenet_udp_bind_ricci_modcluster_port',`
 	gen_require(`
-		type redis_port_t;
+		type ricci_modcluster_port_t;
 	')
 
-	allow $1 redis_port_t:udp_socket name_bind;
+	allow $1 ricci_modcluster_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the redis port.
+##	Make a TCP connection to the ricci_modcluster port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71559,18 +74660,18 @@ interface(`corenet_udp_bind_redis_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_redis_port',`
+interface(`corenet_tcp_connect_ricci_modcluster_port',`
 	gen_require(`
-		type redis_port_t;
+		type ricci_modcluster_port_t;
 	')
 
-	allow $1 redis_port_t:tcp_socket name_connect;
+	allow $1 ricci_modcluster_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send redis_client packets.
+##	Send ricci_modcluster_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71579,17 +74680,17 @@ interface(`corenet_tcp_connect_redis_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_redis_client_packets',`
+interface(`corenet_send_ricci_modcluster_client_packets',`
 	gen_require(`
-		type redis_client_packet_t;
+		type ricci_modcluster_client_packet_t;
 	')
 
-	allow $1 redis_client_packet_t:packet send;
+	allow $1 ricci_modcluster_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send redis_client packets.
+##	Do not audit attempts to send ricci_modcluster_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71598,17 +74699,17 @@ interface(`corenet_send_redis_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_redis_client_packets',`
+interface(`corenet_dontaudit_send_ricci_modcluster_client_packets',`
 	gen_require(`
-		type redis_client_packet_t;
+		type ricci_modcluster_client_packet_t;
 	')
 
-	dontaudit $1 redis_client_packet_t:packet send;
+	dontaudit $1 ricci_modcluster_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive redis_client packets.
+##	Receive ricci_modcluster_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71617,17 +74718,17 @@ interface(`corenet_dontaudit_send_redis_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_redis_client_packets',`
+interface(`corenet_receive_ricci_modcluster_client_packets',`
 	gen_require(`
-		type redis_client_packet_t;
+		type ricci_modcluster_client_packet_t;
 	')
 
-	allow $1 redis_client_packet_t:packet recv;
+	allow $1 ricci_modcluster_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive redis_client packets.
+##	Do not audit attempts to receive ricci_modcluster_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71636,17 +74737,17 @@ interface(`corenet_receive_redis_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_redis_client_packets',`
+interface(`corenet_dontaudit_receive_ricci_modcluster_client_packets',`
 	gen_require(`
-		type redis_client_packet_t;
+		type ricci_modcluster_client_packet_t;
 	')
 
-	dontaudit $1 redis_client_packet_t:packet recv;
+	dontaudit $1 ricci_modcluster_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive redis_client packets.
+##	Send and receive ricci_modcluster_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71655,14 +74756,14 @@ interface(`corenet_dontaudit_receive_redis_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_redis_client_packets',`
-	corenet_send_redis_client_packets($1)
-	corenet_receive_redis_client_packets($1)
+interface(`corenet_sendrecv_ricci_modcluster_client_packets',`
+	corenet_send_ricci_modcluster_client_packets($1)
+	corenet_receive_ricci_modcluster_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive redis_client packets.
+##	Do not audit attempts to send and receive ricci_modcluster_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71671,14 +74772,14 @@ interface(`corenet_sendrecv_redis_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_redis_client_packets',`
-	corenet_dontaudit_send_redis_client_packets($1)
-	corenet_dontaudit_receive_redis_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_ricci_modcluster_client_packets',`
+	corenet_dontaudit_send_ricci_modcluster_client_packets($1)
+	corenet_dontaudit_receive_ricci_modcluster_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to redis_client the packet type.
+##	Relabel packets to ricci_modcluster_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71686,18 +74787,18 @@ interface(`corenet_dontaudit_sendrecv_redis_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_redis_client_packets',`
+interface(`corenet_relabelto_ricci_modcluster_client_packets',`
 	gen_require(`
-		type redis_client_packet_t;
+		type ricci_modcluster_client_packet_t;
 	')
 
-	allow $1 redis_client_packet_t:packet relabelto;
+	allow $1 ricci_modcluster_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send redis_server packets.
+##	Send ricci_modcluster_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71706,17 +74807,17 @@ interface(`corenet_relabelto_redis_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_redis_server_packets',`
+interface(`corenet_send_ricci_modcluster_server_packets',`
 	gen_require(`
-		type redis_server_packet_t;
+		type ricci_modcluster_server_packet_t;
 	')
 
-	allow $1 redis_server_packet_t:packet send;
+	allow $1 ricci_modcluster_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send redis_server packets.
+##	Do not audit attempts to send ricci_modcluster_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71725,17 +74826,17 @@ interface(`corenet_send_redis_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_redis_server_packets',`
+interface(`corenet_dontaudit_send_ricci_modcluster_server_packets',`
 	gen_require(`
-		type redis_server_packet_t;
+		type ricci_modcluster_server_packet_t;
 	')
 
-	dontaudit $1 redis_server_packet_t:packet send;
+	dontaudit $1 ricci_modcluster_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive redis_server packets.
+##	Receive ricci_modcluster_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71744,17 +74845,17 @@ interface(`corenet_dontaudit_send_redis_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_redis_server_packets',`
+interface(`corenet_receive_ricci_modcluster_server_packets',`
 	gen_require(`
-		type redis_server_packet_t;
+		type ricci_modcluster_server_packet_t;
 	')
 
-	allow $1 redis_server_packet_t:packet recv;
+	allow $1 ricci_modcluster_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive redis_server packets.
+##	Do not audit attempts to receive ricci_modcluster_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71763,17 +74864,17 @@ interface(`corenet_receive_redis_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_redis_server_packets',`
+interface(`corenet_dontaudit_receive_ricci_modcluster_server_packets',`
 	gen_require(`
-		type redis_server_packet_t;
+		type ricci_modcluster_server_packet_t;
 	')
 
-	dontaudit $1 redis_server_packet_t:packet recv;
+	dontaudit $1 ricci_modcluster_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive redis_server packets.
+##	Send and receive ricci_modcluster_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71782,14 +74883,14 @@ interface(`corenet_dontaudit_receive_redis_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_redis_server_packets',`
-	corenet_send_redis_server_packets($1)
-	corenet_receive_redis_server_packets($1)
+interface(`corenet_sendrecv_ricci_modcluster_server_packets',`
+	corenet_send_ricci_modcluster_server_packets($1)
+	corenet_receive_ricci_modcluster_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive redis_server packets.
+##	Do not audit attempts to send and receive ricci_modcluster_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71798,14 +74899,14 @@ interface(`corenet_sendrecv_redis_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_redis_server_packets',`
-	corenet_dontaudit_send_redis_server_packets($1)
-	corenet_dontaudit_receive_redis_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_ricci_modcluster_server_packets',`
+	corenet_dontaudit_send_ricci_modcluster_server_packets($1)
+	corenet_dontaudit_receive_ricci_modcluster_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to redis_server the packet type.
+##	Relabel packets to ricci_modcluster_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71813,12 +74914,12 @@ interface(`corenet_dontaudit_sendrecv_redis_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_redis_server_packets',`
+interface(`corenet_relabelto_ricci_modcluster_server_packets',`
 	gen_require(`
-		type redis_server_packet_t;
+		type ricci_modcluster_server_packet_t;
 	')
 
-	allow $1 redis_server_packet_t:packet relabelto;
+	allow $1 ricci_modcluster_server_packet_t:packet relabelto;
 ')
 
 
@@ -71826,7 +74927,7 @@ interface(`corenet_relabelto_redis_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the repository port.
+##	Send and receive TCP traffic on the rlogind port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71835,17 +74936,17 @@ interface(`corenet_relabelto_redis_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_repository_port',`
+interface(`corenet_tcp_sendrecv_rlogind_port',`
 	gen_require(`
-		type repository_port_t;
+		type rlogind_port_t;
 	')
 
-	allow $1 repository_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 rlogind_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the repository port.
+##	Send UDP traffic on the rlogind port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71854,17 +74955,17 @@ interface(`corenet_tcp_sendrecv_repository_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_repository_port',`
+interface(`corenet_udp_send_rlogind_port',`
 	gen_require(`
-		type repository_port_t;
+		type rlogind_port_t;
 	')
 
-	allow $1 repository_port_t:udp_socket send_msg;
+	allow $1 rlogind_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the repository port.
+##	Do not audit attempts to send UDP traffic on the rlogind port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71873,17 +74974,17 @@ interface(`corenet_udp_send_repository_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_repository_port',`
+interface(`corenet_dontaudit_udp_send_rlogind_port',`
 	gen_require(`
-		type repository_port_t;
+		type rlogind_port_t;
 	')
 
-	dontaudit $1 repository_port_t:udp_socket send_msg;
+	dontaudit $1 rlogind_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the repository port.
+##	Receive UDP traffic on the rlogind port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71892,17 +74993,17 @@ interface(`corenet_dontaudit_udp_send_repository_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_repository_port',`
+interface(`corenet_udp_receive_rlogind_port',`
 	gen_require(`
-		type repository_port_t;
+		type rlogind_port_t;
 	')
 
-	allow $1 repository_port_t:udp_socket recv_msg;
+	allow $1 rlogind_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the repository port.
+##	Do not audit attempts to receive UDP traffic on the rlogind port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71911,17 +75012,17 @@ interface(`corenet_udp_receive_repository_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_repository_port',`
+interface(`corenet_dontaudit_udp_receive_rlogind_port',`
 	gen_require(`
-		type repository_port_t;
+		type rlogind_port_t;
 	')
 
-	dontaudit $1 repository_port_t:udp_socket recv_msg;
+	dontaudit $1 rlogind_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the repository port.
+##	Send and receive UDP traffic on the rlogind port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71930,15 +75031,15 @@ interface(`corenet_dontaudit_udp_receive_repository_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_repository_port',`
-	corenet_udp_send_repository_port($1)
-	corenet_udp_receive_repository_port($1)
+interface(`corenet_udp_sendrecv_rlogind_port',`
+	corenet_udp_send_rlogind_port($1)
+	corenet_udp_receive_rlogind_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the repository port.
+##	UDP traffic on the rlogind port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71947,14 +75048,14 @@ interface(`corenet_udp_sendrecv_repository_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_repository_port',`
-	corenet_dontaudit_udp_send_repository_port($1)
-	corenet_dontaudit_udp_receive_repository_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_rlogind_port',`
+	corenet_dontaudit_udp_send_rlogind_port($1)
+	corenet_dontaudit_udp_receive_rlogind_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the repository port.
+##	Bind TCP sockets to the rlogind port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71963,18 +75064,18 @@ interface(`corenet_dontaudit_udp_sendrecv_repository_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_repository_port',`
+interface(`corenet_tcp_bind_rlogind_port',`
 	gen_require(`
-		type repository_port_t;
+		type rlogind_port_t;
 	')
 
-	allow $1 repository_port_t:tcp_socket name_bind;
-	
+	allow $1 rlogind_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the repository port.
+##	Bind UDP sockets to the rlogind port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -71983,18 +75084,18 @@ interface(`corenet_tcp_bind_repository_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_repository_port',`
+interface(`corenet_udp_bind_rlogind_port',`
 	gen_require(`
-		type repository_port_t;
+		type rlogind_port_t;
 	')
 
-	allow $1 repository_port_t:udp_socket name_bind;
-	
+	allow $1 rlogind_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the repository port.
+##	Make a TCP connection to the rlogind port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72002,18 +75103,18 @@ interface(`corenet_udp_bind_repository_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_repository_port',`
+interface(`corenet_tcp_connect_rlogind_port',`
 	gen_require(`
-		type repository_port_t;
+		type rlogind_port_t;
 	')
 
-	allow $1 repository_port_t:tcp_socket name_connect;
+	allow $1 rlogind_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send repository_client packets.
+##	Send rlogind_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72022,17 +75123,17 @@ interface(`corenet_tcp_connect_repository_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_repository_client_packets',`
+interface(`corenet_send_rlogind_client_packets',`
 	gen_require(`
-		type repository_client_packet_t;
+		type rlogind_client_packet_t;
 	')
 
-	allow $1 repository_client_packet_t:packet send;
+	allow $1 rlogind_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send repository_client packets.
+##	Do not audit attempts to send rlogind_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72041,17 +75142,17 @@ interface(`corenet_send_repository_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_repository_client_packets',`
+interface(`corenet_dontaudit_send_rlogind_client_packets',`
 	gen_require(`
-		type repository_client_packet_t;
+		type rlogind_client_packet_t;
 	')
 
-	dontaudit $1 repository_client_packet_t:packet send;
+	dontaudit $1 rlogind_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive repository_client packets.
+##	Receive rlogind_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72060,17 +75161,17 @@ interface(`corenet_dontaudit_send_repository_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_repository_client_packets',`
+interface(`corenet_receive_rlogind_client_packets',`
 	gen_require(`
-		type repository_client_packet_t;
+		type rlogind_client_packet_t;
 	')
 
-	allow $1 repository_client_packet_t:packet recv;
+	allow $1 rlogind_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive repository_client packets.
+##	Do not audit attempts to receive rlogind_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72079,17 +75180,17 @@ interface(`corenet_receive_repository_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_repository_client_packets',`
+interface(`corenet_dontaudit_receive_rlogind_client_packets',`
 	gen_require(`
-		type repository_client_packet_t;
+		type rlogind_client_packet_t;
 	')
 
-	dontaudit $1 repository_client_packet_t:packet recv;
+	dontaudit $1 rlogind_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive repository_client packets.
+##	Send and receive rlogind_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72098,14 +75199,14 @@ interface(`corenet_dontaudit_receive_repository_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_repository_client_packets',`
-	corenet_send_repository_client_packets($1)
-	corenet_receive_repository_client_packets($1)
+interface(`corenet_sendrecv_rlogind_client_packets',`
+	corenet_send_rlogind_client_packets($1)
+	corenet_receive_rlogind_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive repository_client packets.
+##	Do not audit attempts to send and receive rlogind_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72114,14 +75215,14 @@ interface(`corenet_sendrecv_repository_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_repository_client_packets',`
-	corenet_dontaudit_send_repository_client_packets($1)
-	corenet_dontaudit_receive_repository_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_rlogind_client_packets',`
+	corenet_dontaudit_send_rlogind_client_packets($1)
+	corenet_dontaudit_receive_rlogind_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to repository_client the packet type.
+##	Relabel packets to rlogind_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72129,18 +75230,18 @@ interface(`corenet_dontaudit_sendrecv_repository_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_repository_client_packets',`
+interface(`corenet_relabelto_rlogind_client_packets',`
 	gen_require(`
-		type repository_client_packet_t;
+		type rlogind_client_packet_t;
 	')
 
-	allow $1 repository_client_packet_t:packet relabelto;
+	allow $1 rlogind_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send repository_server packets.
+##	Send rlogind_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72149,17 +75250,17 @@ interface(`corenet_relabelto_repository_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_repository_server_packets',`
+interface(`corenet_send_rlogind_server_packets',`
 	gen_require(`
-		type repository_server_packet_t;
+		type rlogind_server_packet_t;
 	')
 
-	allow $1 repository_server_packet_t:packet send;
+	allow $1 rlogind_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send repository_server packets.
+##	Do not audit attempts to send rlogind_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72168,17 +75269,17 @@ interface(`corenet_send_repository_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_repository_server_packets',`
+interface(`corenet_dontaudit_send_rlogind_server_packets',`
 	gen_require(`
-		type repository_server_packet_t;
+		type rlogind_server_packet_t;
 	')
 
-	dontaudit $1 repository_server_packet_t:packet send;
+	dontaudit $1 rlogind_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive repository_server packets.
+##	Receive rlogind_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72187,17 +75288,17 @@ interface(`corenet_dontaudit_send_repository_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_repository_server_packets',`
+interface(`corenet_receive_rlogind_server_packets',`
 	gen_require(`
-		type repository_server_packet_t;
+		type rlogind_server_packet_t;
 	')
 
-	allow $1 repository_server_packet_t:packet recv;
+	allow $1 rlogind_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive repository_server packets.
+##	Do not audit attempts to receive rlogind_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72206,17 +75307,17 @@ interface(`corenet_receive_repository_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_repository_server_packets',`
+interface(`corenet_dontaudit_receive_rlogind_server_packets',`
 	gen_require(`
-		type repository_server_packet_t;
+		type rlogind_server_packet_t;
 	')
 
-	dontaudit $1 repository_server_packet_t:packet recv;
+	dontaudit $1 rlogind_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive repository_server packets.
+##	Send and receive rlogind_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72225,14 +75326,14 @@ interface(`corenet_dontaudit_receive_repository_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_repository_server_packets',`
-	corenet_send_repository_server_packets($1)
-	corenet_receive_repository_server_packets($1)
+interface(`corenet_sendrecv_rlogind_server_packets',`
+	corenet_send_rlogind_server_packets($1)
+	corenet_receive_rlogind_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive repository_server packets.
+##	Do not audit attempts to send and receive rlogind_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72241,14 +75342,14 @@ interface(`corenet_sendrecv_repository_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_repository_server_packets',`
-	corenet_dontaudit_send_repository_server_packets($1)
-	corenet_dontaudit_receive_repository_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_rlogind_server_packets',`
+	corenet_dontaudit_send_rlogind_server_packets($1)
+	corenet_dontaudit_receive_rlogind_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to repository_server the packet type.
+##	Relabel packets to rlogind_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72256,12 +75357,12 @@ interface(`corenet_dontaudit_sendrecv_repository_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_repository_server_packets',`
+interface(`corenet_relabelto_rlogind_server_packets',`
 	gen_require(`
-		type repository_server_packet_t;
+		type rlogind_server_packet_t;
 	')
 
-	allow $1 repository_server_packet_t:packet relabelto;
+	allow $1 rlogind_server_packet_t:packet relabelto;
 ')
 
 
@@ -72269,7 +75370,7 @@ interface(`corenet_relabelto_repository_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the ricci port.
+##	Send and receive TCP traffic on the rndc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72278,17 +75379,17 @@ interface(`corenet_relabelto_repository_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_ricci_port',`
+interface(`corenet_tcp_sendrecv_rndc_port',`
 	gen_require(`
-		type ricci_port_t;
+		type rndc_port_t;
 	')
 
-	allow $1 ricci_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 rndc_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the ricci port.
+##	Send UDP traffic on the rndc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72297,17 +75398,17 @@ interface(`corenet_tcp_sendrecv_ricci_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_ricci_port',`
+interface(`corenet_udp_send_rndc_port',`
 	gen_require(`
-		type ricci_port_t;
+		type rndc_port_t;
 	')
 
-	allow $1 ricci_port_t:udp_socket send_msg;
+	allow $1 rndc_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the ricci port.
+##	Do not audit attempts to send UDP traffic on the rndc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72316,17 +75417,17 @@ interface(`corenet_udp_send_ricci_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_ricci_port',`
+interface(`corenet_dontaudit_udp_send_rndc_port',`
 	gen_require(`
-		type ricci_port_t;
+		type rndc_port_t;
 	')
 
-	dontaudit $1 ricci_port_t:udp_socket send_msg;
+	dontaudit $1 rndc_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the ricci port.
+##	Receive UDP traffic on the rndc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72335,17 +75436,17 @@ interface(`corenet_dontaudit_udp_send_ricci_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_ricci_port',`
+interface(`corenet_udp_receive_rndc_port',`
 	gen_require(`
-		type ricci_port_t;
+		type rndc_port_t;
 	')
 
-	allow $1 ricci_port_t:udp_socket recv_msg;
+	allow $1 rndc_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the ricci port.
+##	Do not audit attempts to receive UDP traffic on the rndc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72354,17 +75455,17 @@ interface(`corenet_udp_receive_ricci_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_ricci_port',`
+interface(`corenet_dontaudit_udp_receive_rndc_port',`
 	gen_require(`
-		type ricci_port_t;
+		type rndc_port_t;
 	')
 
-	dontaudit $1 ricci_port_t:udp_socket recv_msg;
+	dontaudit $1 rndc_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the ricci port.
+##	Send and receive UDP traffic on the rndc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72373,15 +75474,15 @@ interface(`corenet_dontaudit_udp_receive_ricci_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_ricci_port',`
-	corenet_udp_send_ricci_port($1)
-	corenet_udp_receive_ricci_port($1)
+interface(`corenet_udp_sendrecv_rndc_port',`
+	corenet_udp_send_rndc_port($1)
+	corenet_udp_receive_rndc_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the ricci port.
+##	UDP traffic on the rndc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72390,14 +75491,14 @@ interface(`corenet_udp_sendrecv_ricci_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_ricci_port',`
-	corenet_dontaudit_udp_send_ricci_port($1)
-	corenet_dontaudit_udp_receive_ricci_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_rndc_port',`
+	corenet_dontaudit_udp_send_rndc_port($1)
+	corenet_dontaudit_udp_receive_rndc_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the ricci port.
+##	Bind TCP sockets to the rndc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72406,18 +75507,18 @@ interface(`corenet_dontaudit_udp_sendrecv_ricci_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_ricci_port',`
+interface(`corenet_tcp_bind_rndc_port',`
 	gen_require(`
-		type ricci_port_t;
+		type rndc_port_t;
 	')
 
-	allow $1 ricci_port_t:tcp_socket name_bind;
-	
+	allow $1 rndc_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the ricci port.
+##	Bind UDP sockets to the rndc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72426,18 +75527,18 @@ interface(`corenet_tcp_bind_ricci_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_ricci_port',`
+interface(`corenet_udp_bind_rndc_port',`
 	gen_require(`
-		type ricci_port_t;
+		type rndc_port_t;
 	')
 
-	allow $1 ricci_port_t:udp_socket name_bind;
-	
+	allow $1 rndc_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the ricci port.
+##	Make a TCP connection to the rndc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72445,18 +75546,18 @@ interface(`corenet_udp_bind_ricci_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_ricci_port',`
+interface(`corenet_tcp_connect_rndc_port',`
 	gen_require(`
-		type ricci_port_t;
+		type rndc_port_t;
 	')
 
-	allow $1 ricci_port_t:tcp_socket name_connect;
+	allow $1 rndc_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ricci_client packets.
+##	Send rndc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72465,17 +75566,17 @@ interface(`corenet_tcp_connect_ricci_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ricci_client_packets',`
+interface(`corenet_send_rndc_client_packets',`
 	gen_require(`
-		type ricci_client_packet_t;
+		type rndc_client_packet_t;
 	')
 
-	allow $1 ricci_client_packet_t:packet send;
+	allow $1 rndc_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ricci_client packets.
+##	Do not audit attempts to send rndc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72484,17 +75585,17 @@ interface(`corenet_send_ricci_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ricci_client_packets',`
+interface(`corenet_dontaudit_send_rndc_client_packets',`
 	gen_require(`
-		type ricci_client_packet_t;
+		type rndc_client_packet_t;
 	')
 
-	dontaudit $1 ricci_client_packet_t:packet send;
+	dontaudit $1 rndc_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ricci_client packets.
+##	Receive rndc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72503,17 +75604,17 @@ interface(`corenet_dontaudit_send_ricci_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ricci_client_packets',`
+interface(`corenet_receive_rndc_client_packets',`
 	gen_require(`
-		type ricci_client_packet_t;
+		type rndc_client_packet_t;
 	')
 
-	allow $1 ricci_client_packet_t:packet recv;
+	allow $1 rndc_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ricci_client packets.
+##	Do not audit attempts to receive rndc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72522,17 +75623,17 @@ interface(`corenet_receive_ricci_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ricci_client_packets',`
+interface(`corenet_dontaudit_receive_rndc_client_packets',`
 	gen_require(`
-		type ricci_client_packet_t;
+		type rndc_client_packet_t;
 	')
 
-	dontaudit $1 ricci_client_packet_t:packet recv;
+	dontaudit $1 rndc_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ricci_client packets.
+##	Send and receive rndc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72541,14 +75642,14 @@ interface(`corenet_dontaudit_receive_ricci_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ricci_client_packets',`
-	corenet_send_ricci_client_packets($1)
-	corenet_receive_ricci_client_packets($1)
+interface(`corenet_sendrecv_rndc_client_packets',`
+	corenet_send_rndc_client_packets($1)
+	corenet_receive_rndc_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ricci_client packets.
+##	Do not audit attempts to send and receive rndc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72557,14 +75658,14 @@ interface(`corenet_sendrecv_ricci_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ricci_client_packets',`
-	corenet_dontaudit_send_ricci_client_packets($1)
-	corenet_dontaudit_receive_ricci_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_rndc_client_packets',`
+	corenet_dontaudit_send_rndc_client_packets($1)
+	corenet_dontaudit_receive_rndc_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ricci_client the packet type.
+##	Relabel packets to rndc_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72572,18 +75673,18 @@ interface(`corenet_dontaudit_sendrecv_ricci_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ricci_client_packets',`
+interface(`corenet_relabelto_rndc_client_packets',`
 	gen_require(`
-		type ricci_client_packet_t;
+		type rndc_client_packet_t;
 	')
 
-	allow $1 ricci_client_packet_t:packet relabelto;
+	allow $1 rndc_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ricci_server packets.
+##	Send rndc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72592,17 +75693,17 @@ interface(`corenet_relabelto_ricci_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ricci_server_packets',`
+interface(`corenet_send_rndc_server_packets',`
 	gen_require(`
-		type ricci_server_packet_t;
+		type rndc_server_packet_t;
 	')
 
-	allow $1 ricci_server_packet_t:packet send;
+	allow $1 rndc_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ricci_server packets.
+##	Do not audit attempts to send rndc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72611,17 +75712,17 @@ interface(`corenet_send_ricci_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ricci_server_packets',`
+interface(`corenet_dontaudit_send_rndc_server_packets',`
 	gen_require(`
-		type ricci_server_packet_t;
+		type rndc_server_packet_t;
 	')
 
-	dontaudit $1 ricci_server_packet_t:packet send;
+	dontaudit $1 rndc_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ricci_server packets.
+##	Receive rndc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72630,17 +75731,17 @@ interface(`corenet_dontaudit_send_ricci_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ricci_server_packets',`
+interface(`corenet_receive_rndc_server_packets',`
 	gen_require(`
-		type ricci_server_packet_t;
+		type rndc_server_packet_t;
 	')
 
-	allow $1 ricci_server_packet_t:packet recv;
+	allow $1 rndc_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ricci_server packets.
+##	Do not audit attempts to receive rndc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72649,17 +75750,17 @@ interface(`corenet_receive_ricci_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ricci_server_packets',`
+interface(`corenet_dontaudit_receive_rndc_server_packets',`
 	gen_require(`
-		type ricci_server_packet_t;
+		type rndc_server_packet_t;
 	')
 
-	dontaudit $1 ricci_server_packet_t:packet recv;
+	dontaudit $1 rndc_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ricci_server packets.
+##	Send and receive rndc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72668,14 +75769,14 @@ interface(`corenet_dontaudit_receive_ricci_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ricci_server_packets',`
-	corenet_send_ricci_server_packets($1)
-	corenet_receive_ricci_server_packets($1)
+interface(`corenet_sendrecv_rndc_server_packets',`
+	corenet_send_rndc_server_packets($1)
+	corenet_receive_rndc_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ricci_server packets.
+##	Do not audit attempts to send and receive rndc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72684,14 +75785,14 @@ interface(`corenet_sendrecv_ricci_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ricci_server_packets',`
-	corenet_dontaudit_send_ricci_server_packets($1)
-	corenet_dontaudit_receive_ricci_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_rndc_server_packets',`
+	corenet_dontaudit_send_rndc_server_packets($1)
+	corenet_dontaudit_receive_rndc_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ricci_server the packet type.
+##	Relabel packets to rndc_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72699,12 +75800,12 @@ interface(`corenet_dontaudit_sendrecv_ricci_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ricci_server_packets',`
+interface(`corenet_relabelto_rndc_server_packets',`
 	gen_require(`
-		type ricci_server_packet_t;
+		type rndc_server_packet_t;
 	')
 
-	allow $1 ricci_server_packet_t:packet relabelto;
+	allow $1 rndc_server_packet_t:packet relabelto;
 ')
 
 
@@ -72712,7 +75813,7 @@ interface(`corenet_relabelto_ricci_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the ricci_modcluster port.
+##	Send and receive TCP traffic on the router port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72721,17 +75822,17 @@ interface(`corenet_relabelto_ricci_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_ricci_modcluster_port',`
+interface(`corenet_tcp_sendrecv_router_port',`
 	gen_require(`
-		type ricci_modcluster_port_t;
+		type router_port_t;
 	')
 
-	allow $1 ricci_modcluster_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 router_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the ricci_modcluster port.
+##	Send UDP traffic on the router port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72740,17 +75841,17 @@ interface(`corenet_tcp_sendrecv_ricci_modcluster_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_ricci_modcluster_port',`
+interface(`corenet_udp_send_router_port',`
 	gen_require(`
-		type ricci_modcluster_port_t;
+		type router_port_t;
 	')
 
-	allow $1 ricci_modcluster_port_t:udp_socket send_msg;
+	allow $1 router_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the ricci_modcluster port.
+##	Do not audit attempts to send UDP traffic on the router port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72759,17 +75860,17 @@ interface(`corenet_udp_send_ricci_modcluster_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_ricci_modcluster_port',`
+interface(`corenet_dontaudit_udp_send_router_port',`
 	gen_require(`
-		type ricci_modcluster_port_t;
+		type router_port_t;
 	')
 
-	dontaudit $1 ricci_modcluster_port_t:udp_socket send_msg;
+	dontaudit $1 router_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the ricci_modcluster port.
+##	Receive UDP traffic on the router port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72778,17 +75879,17 @@ interface(`corenet_dontaudit_udp_send_ricci_modcluster_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_ricci_modcluster_port',`
+interface(`corenet_udp_receive_router_port',`
 	gen_require(`
-		type ricci_modcluster_port_t;
+		type router_port_t;
 	')
 
-	allow $1 ricci_modcluster_port_t:udp_socket recv_msg;
+	allow $1 router_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the ricci_modcluster port.
+##	Do not audit attempts to receive UDP traffic on the router port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72797,17 +75898,17 @@ interface(`corenet_udp_receive_ricci_modcluster_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_ricci_modcluster_port',`
+interface(`corenet_dontaudit_udp_receive_router_port',`
 	gen_require(`
-		type ricci_modcluster_port_t;
+		type router_port_t;
 	')
 
-	dontaudit $1 ricci_modcluster_port_t:udp_socket recv_msg;
+	dontaudit $1 router_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the ricci_modcluster port.
+##	Send and receive UDP traffic on the router port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72816,15 +75917,15 @@ interface(`corenet_dontaudit_udp_receive_ricci_modcluster_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_ricci_modcluster_port',`
-	corenet_udp_send_ricci_modcluster_port($1)
-	corenet_udp_receive_ricci_modcluster_port($1)
+interface(`corenet_udp_sendrecv_router_port',`
+	corenet_udp_send_router_port($1)
+	corenet_udp_receive_router_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the ricci_modcluster port.
+##	UDP traffic on the router port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72833,14 +75934,14 @@ interface(`corenet_udp_sendrecv_ricci_modcluster_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_ricci_modcluster_port',`
-	corenet_dontaudit_udp_send_ricci_modcluster_port($1)
-	corenet_dontaudit_udp_receive_ricci_modcluster_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_router_port',`
+	corenet_dontaudit_udp_send_router_port($1)
+	corenet_dontaudit_udp_receive_router_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the ricci_modcluster port.
+##	Bind TCP sockets to the router port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72849,18 +75950,18 @@ interface(`corenet_dontaudit_udp_sendrecv_ricci_modcluster_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_ricci_modcluster_port',`
+interface(`corenet_tcp_bind_router_port',`
 	gen_require(`
-		type ricci_modcluster_port_t;
+		type router_port_t;
 	')
 
-	allow $1 ricci_modcluster_port_t:tcp_socket name_bind;
-	
+	allow $1 router_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the ricci_modcluster port.
+##	Bind UDP sockets to the router port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72869,18 +75970,18 @@ interface(`corenet_tcp_bind_ricci_modcluster_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_ricci_modcluster_port',`
+interface(`corenet_udp_bind_router_port',`
 	gen_require(`
-		type ricci_modcluster_port_t;
+		type router_port_t;
 	')
 
-	allow $1 ricci_modcluster_port_t:udp_socket name_bind;
-	
+	allow $1 router_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the ricci_modcluster port.
+##	Make a TCP connection to the router port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72888,18 +75989,18 @@ interface(`corenet_udp_bind_ricci_modcluster_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_ricci_modcluster_port',`
+interface(`corenet_tcp_connect_router_port',`
 	gen_require(`
-		type ricci_modcluster_port_t;
+		type router_port_t;
 	')
 
-	allow $1 ricci_modcluster_port_t:tcp_socket name_connect;
+	allow $1 router_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ricci_modcluster_client packets.
+##	Send router_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72908,17 +76009,17 @@ interface(`corenet_tcp_connect_ricci_modcluster_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ricci_modcluster_client_packets',`
+interface(`corenet_send_router_client_packets',`
 	gen_require(`
-		type ricci_modcluster_client_packet_t;
+		type router_client_packet_t;
 	')
 
-	allow $1 ricci_modcluster_client_packet_t:packet send;
+	allow $1 router_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ricci_modcluster_client packets.
+##	Do not audit attempts to send router_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72927,17 +76028,17 @@ interface(`corenet_send_ricci_modcluster_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ricci_modcluster_client_packets',`
+interface(`corenet_dontaudit_send_router_client_packets',`
 	gen_require(`
-		type ricci_modcluster_client_packet_t;
+		type router_client_packet_t;
 	')
 
-	dontaudit $1 ricci_modcluster_client_packet_t:packet send;
+	dontaudit $1 router_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ricci_modcluster_client packets.
+##	Receive router_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72946,17 +76047,17 @@ interface(`corenet_dontaudit_send_ricci_modcluster_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ricci_modcluster_client_packets',`
+interface(`corenet_receive_router_client_packets',`
 	gen_require(`
-		type ricci_modcluster_client_packet_t;
+		type router_client_packet_t;
 	')
 
-	allow $1 ricci_modcluster_client_packet_t:packet recv;
+	allow $1 router_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ricci_modcluster_client packets.
+##	Do not audit attempts to receive router_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72965,17 +76066,17 @@ interface(`corenet_receive_ricci_modcluster_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ricci_modcluster_client_packets',`
+interface(`corenet_dontaudit_receive_router_client_packets',`
 	gen_require(`
-		type ricci_modcluster_client_packet_t;
+		type router_client_packet_t;
 	')
 
-	dontaudit $1 ricci_modcluster_client_packet_t:packet recv;
+	dontaudit $1 router_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ricci_modcluster_client packets.
+##	Send and receive router_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -72984,14 +76085,14 @@ interface(`corenet_dontaudit_receive_ricci_modcluster_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ricci_modcluster_client_packets',`
-	corenet_send_ricci_modcluster_client_packets($1)
-	corenet_receive_ricci_modcluster_client_packets($1)
+interface(`corenet_sendrecv_router_client_packets',`
+	corenet_send_router_client_packets($1)
+	corenet_receive_router_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ricci_modcluster_client packets.
+##	Do not audit attempts to send and receive router_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73000,14 +76101,14 @@ interface(`corenet_sendrecv_ricci_modcluster_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ricci_modcluster_client_packets',`
-	corenet_dontaudit_send_ricci_modcluster_client_packets($1)
-	corenet_dontaudit_receive_ricci_modcluster_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_router_client_packets',`
+	corenet_dontaudit_send_router_client_packets($1)
+	corenet_dontaudit_receive_router_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ricci_modcluster_client the packet type.
+##	Relabel packets to router_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73015,18 +76116,18 @@ interface(`corenet_dontaudit_sendrecv_ricci_modcluster_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ricci_modcluster_client_packets',`
+interface(`corenet_relabelto_router_client_packets',`
 	gen_require(`
-		type ricci_modcluster_client_packet_t;
+		type router_client_packet_t;
 	')
 
-	allow $1 ricci_modcluster_client_packet_t:packet relabelto;
+	allow $1 router_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ricci_modcluster_server packets.
+##	Send router_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73035,17 +76136,17 @@ interface(`corenet_relabelto_ricci_modcluster_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ricci_modcluster_server_packets',`
+interface(`corenet_send_router_server_packets',`
 	gen_require(`
-		type ricci_modcluster_server_packet_t;
+		type router_server_packet_t;
 	')
 
-	allow $1 ricci_modcluster_server_packet_t:packet send;
+	allow $1 router_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ricci_modcluster_server packets.
+##	Do not audit attempts to send router_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73054,17 +76155,17 @@ interface(`corenet_send_ricci_modcluster_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ricci_modcluster_server_packets',`
+interface(`corenet_dontaudit_send_router_server_packets',`
 	gen_require(`
-		type ricci_modcluster_server_packet_t;
+		type router_server_packet_t;
 	')
 
-	dontaudit $1 ricci_modcluster_server_packet_t:packet send;
+	dontaudit $1 router_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ricci_modcluster_server packets.
+##	Receive router_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73073,17 +76174,17 @@ interface(`corenet_dontaudit_send_ricci_modcluster_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ricci_modcluster_server_packets',`
+interface(`corenet_receive_router_server_packets',`
 	gen_require(`
-		type ricci_modcluster_server_packet_t;
+		type router_server_packet_t;
 	')
 
-	allow $1 ricci_modcluster_server_packet_t:packet recv;
+	allow $1 router_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ricci_modcluster_server packets.
+##	Do not audit attempts to receive router_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73092,17 +76193,17 @@ interface(`corenet_receive_ricci_modcluster_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ricci_modcluster_server_packets',`
+interface(`corenet_dontaudit_receive_router_server_packets',`
 	gen_require(`
-		type ricci_modcluster_server_packet_t;
+		type router_server_packet_t;
 	')
 
-	dontaudit $1 ricci_modcluster_server_packet_t:packet recv;
+	dontaudit $1 router_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ricci_modcluster_server packets.
+##	Send and receive router_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73111,14 +76212,14 @@ interface(`corenet_dontaudit_receive_ricci_modcluster_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ricci_modcluster_server_packets',`
-	corenet_send_ricci_modcluster_server_packets($1)
-	corenet_receive_ricci_modcluster_server_packets($1)
+interface(`corenet_sendrecv_router_server_packets',`
+	corenet_send_router_server_packets($1)
+	corenet_receive_router_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ricci_modcluster_server packets.
+##	Do not audit attempts to send and receive router_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73127,14 +76228,14 @@ interface(`corenet_sendrecv_ricci_modcluster_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ricci_modcluster_server_packets',`
-	corenet_dontaudit_send_ricci_modcluster_server_packets($1)
-	corenet_dontaudit_receive_ricci_modcluster_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_router_server_packets',`
+	corenet_dontaudit_send_router_server_packets($1)
+	corenet_dontaudit_receive_router_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ricci_modcluster_server the packet type.
+##	Relabel packets to router_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73142,12 +76243,12 @@ interface(`corenet_dontaudit_sendrecv_ricci_modcluster_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ricci_modcluster_server_packets',`
+interface(`corenet_relabelto_router_server_packets',`
 	gen_require(`
-		type ricci_modcluster_server_packet_t;
+		type router_server_packet_t;
 	')
 
-	allow $1 ricci_modcluster_server_packet_t:packet relabelto;
+	allow $1 router_server_packet_t:packet relabelto;
 ')
 
 
@@ -73155,7 +76256,7 @@ interface(`corenet_relabelto_ricci_modcluster_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the rlogind port.
+##	Send and receive TCP traffic on the rsh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73164,17 +76265,17 @@ interface(`corenet_relabelto_ricci_modcluster_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_rlogind_port',`
+interface(`corenet_tcp_sendrecv_rsh_port',`
 	gen_require(`
-		type rlogind_port_t;
+		type rsh_port_t;
 	')
 
-	allow $1 rlogind_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 rsh_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the rlogind port.
+##	Send UDP traffic on the rsh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73183,17 +76284,17 @@ interface(`corenet_tcp_sendrecv_rlogind_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_rlogind_port',`
+interface(`corenet_udp_send_rsh_port',`
 	gen_require(`
-		type rlogind_port_t;
+		type rsh_port_t;
 	')
 
-	allow $1 rlogind_port_t:udp_socket send_msg;
+	allow $1 rsh_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the rlogind port.
+##	Do not audit attempts to send UDP traffic on the rsh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73202,17 +76303,17 @@ interface(`corenet_udp_send_rlogind_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_rlogind_port',`
+interface(`corenet_dontaudit_udp_send_rsh_port',`
 	gen_require(`
-		type rlogind_port_t;
+		type rsh_port_t;
 	')
 
-	dontaudit $1 rlogind_port_t:udp_socket send_msg;
+	dontaudit $1 rsh_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the rlogind port.
+##	Receive UDP traffic on the rsh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73221,17 +76322,17 @@ interface(`corenet_dontaudit_udp_send_rlogind_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_rlogind_port',`
+interface(`corenet_udp_receive_rsh_port',`
 	gen_require(`
-		type rlogind_port_t;
+		type rsh_port_t;
 	')
 
-	allow $1 rlogind_port_t:udp_socket recv_msg;
+	allow $1 rsh_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the rlogind port.
+##	Do not audit attempts to receive UDP traffic on the rsh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73240,17 +76341,17 @@ interface(`corenet_udp_receive_rlogind_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_rlogind_port',`
+interface(`corenet_dontaudit_udp_receive_rsh_port',`
 	gen_require(`
-		type rlogind_port_t;
+		type rsh_port_t;
 	')
 
-	dontaudit $1 rlogind_port_t:udp_socket recv_msg;
+	dontaudit $1 rsh_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the rlogind port.
+##	Send and receive UDP traffic on the rsh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73259,15 +76360,15 @@ interface(`corenet_dontaudit_udp_receive_rlogind_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_rlogind_port',`
-	corenet_udp_send_rlogind_port($1)
-	corenet_udp_receive_rlogind_port($1)
+interface(`corenet_udp_sendrecv_rsh_port',`
+	corenet_udp_send_rsh_port($1)
+	corenet_udp_receive_rsh_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the rlogind port.
+##	UDP traffic on the rsh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73276,14 +76377,14 @@ interface(`corenet_udp_sendrecv_rlogind_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_rlogind_port',`
-	corenet_dontaudit_udp_send_rlogind_port($1)
-	corenet_dontaudit_udp_receive_rlogind_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_rsh_port',`
+	corenet_dontaudit_udp_send_rsh_port($1)
+	corenet_dontaudit_udp_receive_rsh_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the rlogind port.
+##	Bind TCP sockets to the rsh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73292,18 +76393,18 @@ interface(`corenet_dontaudit_udp_sendrecv_rlogind_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_rlogind_port',`
+interface(`corenet_tcp_bind_rsh_port',`
 	gen_require(`
-		type rlogind_port_t;
+		type rsh_port_t;
 	')
 
-	allow $1 rlogind_port_t:tcp_socket name_bind;
+	allow $1 rsh_port_t:tcp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the rlogind port.
+##	Bind UDP sockets to the rsh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73312,18 +76413,18 @@ interface(`corenet_tcp_bind_rlogind_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_rlogind_port',`
+interface(`corenet_udp_bind_rsh_port',`
 	gen_require(`
-		type rlogind_port_t;
+		type rsh_port_t;
 	')
 
-	allow $1 rlogind_port_t:udp_socket name_bind;
+	allow $1 rsh_port_t:udp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the rlogind port.
+##	Make a TCP connection to the rsh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73331,18 +76432,18 @@ interface(`corenet_udp_bind_rlogind_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_rlogind_port',`
+interface(`corenet_tcp_connect_rsh_port',`
 	gen_require(`
-		type rlogind_port_t;
+		type rsh_port_t;
 	')
 
-	allow $1 rlogind_port_t:tcp_socket name_connect;
+	allow $1 rsh_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send rlogind_client packets.
+##	Send rsh_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73351,17 +76452,17 @@ interface(`corenet_tcp_connect_rlogind_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_rlogind_client_packets',`
+interface(`corenet_send_rsh_client_packets',`
 	gen_require(`
-		type rlogind_client_packet_t;
+		type rsh_client_packet_t;
 	')
 
-	allow $1 rlogind_client_packet_t:packet send;
+	allow $1 rsh_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send rlogind_client packets.
+##	Do not audit attempts to send rsh_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73370,17 +76471,17 @@ interface(`corenet_send_rlogind_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_rlogind_client_packets',`
+interface(`corenet_dontaudit_send_rsh_client_packets',`
 	gen_require(`
-		type rlogind_client_packet_t;
+		type rsh_client_packet_t;
 	')
 
-	dontaudit $1 rlogind_client_packet_t:packet send;
+	dontaudit $1 rsh_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive rlogind_client packets.
+##	Receive rsh_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73389,17 +76490,17 @@ interface(`corenet_dontaudit_send_rlogind_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_rlogind_client_packets',`
+interface(`corenet_receive_rsh_client_packets',`
 	gen_require(`
-		type rlogind_client_packet_t;
+		type rsh_client_packet_t;
 	')
 
-	allow $1 rlogind_client_packet_t:packet recv;
+	allow $1 rsh_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive rlogind_client packets.
+##	Do not audit attempts to receive rsh_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73408,17 +76509,17 @@ interface(`corenet_receive_rlogind_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_rlogind_client_packets',`
+interface(`corenet_dontaudit_receive_rsh_client_packets',`
 	gen_require(`
-		type rlogind_client_packet_t;
+		type rsh_client_packet_t;
 	')
 
-	dontaudit $1 rlogind_client_packet_t:packet recv;
+	dontaudit $1 rsh_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive rlogind_client packets.
+##	Send and receive rsh_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73427,14 +76528,14 @@ interface(`corenet_dontaudit_receive_rlogind_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_rlogind_client_packets',`
-	corenet_send_rlogind_client_packets($1)
-	corenet_receive_rlogind_client_packets($1)
+interface(`corenet_sendrecv_rsh_client_packets',`
+	corenet_send_rsh_client_packets($1)
+	corenet_receive_rsh_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive rlogind_client packets.
+##	Do not audit attempts to send and receive rsh_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73443,14 +76544,14 @@ interface(`corenet_sendrecv_rlogind_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_rlogind_client_packets',`
-	corenet_dontaudit_send_rlogind_client_packets($1)
-	corenet_dontaudit_receive_rlogind_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_rsh_client_packets',`
+	corenet_dontaudit_send_rsh_client_packets($1)
+	corenet_dontaudit_receive_rsh_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to rlogind_client the packet type.
+##	Relabel packets to rsh_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73458,18 +76559,18 @@ interface(`corenet_dontaudit_sendrecv_rlogind_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_rlogind_client_packets',`
+interface(`corenet_relabelto_rsh_client_packets',`
 	gen_require(`
-		type rlogind_client_packet_t;
+		type rsh_client_packet_t;
 	')
 
-	allow $1 rlogind_client_packet_t:packet relabelto;
+	allow $1 rsh_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send rlogind_server packets.
+##	Send rsh_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73478,17 +76579,17 @@ interface(`corenet_relabelto_rlogind_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_rlogind_server_packets',`
+interface(`corenet_send_rsh_server_packets',`
 	gen_require(`
-		type rlogind_server_packet_t;
+		type rsh_server_packet_t;
 	')
 
-	allow $1 rlogind_server_packet_t:packet send;
+	allow $1 rsh_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send rlogind_server packets.
+##	Do not audit attempts to send rsh_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73497,17 +76598,17 @@ interface(`corenet_send_rlogind_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_rlogind_server_packets',`
+interface(`corenet_dontaudit_send_rsh_server_packets',`
 	gen_require(`
-		type rlogind_server_packet_t;
+		type rsh_server_packet_t;
 	')
 
-	dontaudit $1 rlogind_server_packet_t:packet send;
+	dontaudit $1 rsh_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive rlogind_server packets.
+##	Receive rsh_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73516,17 +76617,17 @@ interface(`corenet_dontaudit_send_rlogind_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_rlogind_server_packets',`
+interface(`corenet_receive_rsh_server_packets',`
 	gen_require(`
-		type rlogind_server_packet_t;
+		type rsh_server_packet_t;
 	')
 
-	allow $1 rlogind_server_packet_t:packet recv;
+	allow $1 rsh_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive rlogind_server packets.
+##	Do not audit attempts to receive rsh_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73535,17 +76636,17 @@ interface(`corenet_receive_rlogind_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_rlogind_server_packets',`
+interface(`corenet_dontaudit_receive_rsh_server_packets',`
 	gen_require(`
-		type rlogind_server_packet_t;
+		type rsh_server_packet_t;
 	')
 
-	dontaudit $1 rlogind_server_packet_t:packet recv;
+	dontaudit $1 rsh_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive rlogind_server packets.
+##	Send and receive rsh_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73554,14 +76655,14 @@ interface(`corenet_dontaudit_receive_rlogind_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_rlogind_server_packets',`
-	corenet_send_rlogind_server_packets($1)
-	corenet_receive_rlogind_server_packets($1)
+interface(`corenet_sendrecv_rsh_server_packets',`
+	corenet_send_rsh_server_packets($1)
+	corenet_receive_rsh_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive rlogind_server packets.
+##	Do not audit attempts to send and receive rsh_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73570,14 +76671,14 @@ interface(`corenet_sendrecv_rlogind_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_rlogind_server_packets',`
-	corenet_dontaudit_send_rlogind_server_packets($1)
-	corenet_dontaudit_receive_rlogind_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_rsh_server_packets',`
+	corenet_dontaudit_send_rsh_server_packets($1)
+	corenet_dontaudit_receive_rsh_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to rlogind_server the packet type.
+##	Relabel packets to rsh_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73585,12 +76686,12 @@ interface(`corenet_dontaudit_sendrecv_rlogind_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_rlogind_server_packets',`
+interface(`corenet_relabelto_rsh_server_packets',`
 	gen_require(`
-		type rlogind_server_packet_t;
+		type rsh_server_packet_t;
 	')
 
-	allow $1 rlogind_server_packet_t:packet relabelto;
+	allow $1 rsh_server_packet_t:packet relabelto;
 ')
 
 
@@ -73598,7 +76699,7 @@ interface(`corenet_relabelto_rlogind_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the rndc port.
+##	Send and receive TCP traffic on the rsync port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73607,17 +76708,17 @@ interface(`corenet_relabelto_rlogind_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_rndc_port',`
+interface(`corenet_tcp_sendrecv_rsync_port',`
 	gen_require(`
-		type rndc_port_t;
+		type rsync_port_t;
 	')
 
-	allow $1 rndc_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 rsync_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the rndc port.
+##	Send UDP traffic on the rsync port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73626,17 +76727,17 @@ interface(`corenet_tcp_sendrecv_rndc_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_rndc_port',`
+interface(`corenet_udp_send_rsync_port',`
 	gen_require(`
-		type rndc_port_t;
+		type rsync_port_t;
 	')
 
-	allow $1 rndc_port_t:udp_socket send_msg;
+	allow $1 rsync_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the rndc port.
+##	Do not audit attempts to send UDP traffic on the rsync port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73645,17 +76746,17 @@ interface(`corenet_udp_send_rndc_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_rndc_port',`
+interface(`corenet_dontaudit_udp_send_rsync_port',`
 	gen_require(`
-		type rndc_port_t;
+		type rsync_port_t;
 	')
 
-	dontaudit $1 rndc_port_t:udp_socket send_msg;
+	dontaudit $1 rsync_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the rndc port.
+##	Receive UDP traffic on the rsync port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73664,17 +76765,17 @@ interface(`corenet_dontaudit_udp_send_rndc_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_rndc_port',`
+interface(`corenet_udp_receive_rsync_port',`
 	gen_require(`
-		type rndc_port_t;
+		type rsync_port_t;
 	')
 
-	allow $1 rndc_port_t:udp_socket recv_msg;
+	allow $1 rsync_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the rndc port.
+##	Do not audit attempts to receive UDP traffic on the rsync port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73683,17 +76784,17 @@ interface(`corenet_udp_receive_rndc_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_rndc_port',`
+interface(`corenet_dontaudit_udp_receive_rsync_port',`
 	gen_require(`
-		type rndc_port_t;
+		type rsync_port_t;
 	')
 
-	dontaudit $1 rndc_port_t:udp_socket recv_msg;
+	dontaudit $1 rsync_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the rndc port.
+##	Send and receive UDP traffic on the rsync port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73702,15 +76803,15 @@ interface(`corenet_dontaudit_udp_receive_rndc_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_rndc_port',`
-	corenet_udp_send_rndc_port($1)
-	corenet_udp_receive_rndc_port($1)
+interface(`corenet_udp_sendrecv_rsync_port',`
+	corenet_udp_send_rsync_port($1)
+	corenet_udp_receive_rsync_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the rndc port.
+##	UDP traffic on the rsync port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73719,14 +76820,14 @@ interface(`corenet_udp_sendrecv_rndc_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_rndc_port',`
-	corenet_dontaudit_udp_send_rndc_port($1)
-	corenet_dontaudit_udp_receive_rndc_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_rsync_port',`
+	corenet_dontaudit_udp_send_rsync_port($1)
+	corenet_dontaudit_udp_receive_rsync_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the rndc port.
+##	Bind TCP sockets to the rsync port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73735,18 +76836,18 @@ interface(`corenet_dontaudit_udp_sendrecv_rndc_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_rndc_port',`
+interface(`corenet_tcp_bind_rsync_port',`
 	gen_require(`
-		type rndc_port_t;
+		type rsync_port_t;
 	')
 
-	allow $1 rndc_port_t:tcp_socket name_bind;
+	allow $1 rsync_port_t:tcp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the rndc port.
+##	Bind UDP sockets to the rsync port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73755,18 +76856,18 @@ interface(`corenet_tcp_bind_rndc_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_rndc_port',`
+interface(`corenet_udp_bind_rsync_port',`
 	gen_require(`
-		type rndc_port_t;
+		type rsync_port_t;
 	')
 
-	allow $1 rndc_port_t:udp_socket name_bind;
+	allow $1 rsync_port_t:udp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the rndc port.
+##	Make a TCP connection to the rsync port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73774,18 +76875,18 @@ interface(`corenet_udp_bind_rndc_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_rndc_port',`
+interface(`corenet_tcp_connect_rsync_port',`
 	gen_require(`
-		type rndc_port_t;
+		type rsync_port_t;
 	')
 
-	allow $1 rndc_port_t:tcp_socket name_connect;
+	allow $1 rsync_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send rndc_client packets.
+##	Send rsync_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73794,17 +76895,17 @@ interface(`corenet_tcp_connect_rndc_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_rndc_client_packets',`
+interface(`corenet_send_rsync_client_packets',`
 	gen_require(`
-		type rndc_client_packet_t;
+		type rsync_client_packet_t;
 	')
 
-	allow $1 rndc_client_packet_t:packet send;
+	allow $1 rsync_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send rndc_client packets.
+##	Do not audit attempts to send rsync_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73813,17 +76914,17 @@ interface(`corenet_send_rndc_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_rndc_client_packets',`
+interface(`corenet_dontaudit_send_rsync_client_packets',`
 	gen_require(`
-		type rndc_client_packet_t;
+		type rsync_client_packet_t;
 	')
 
-	dontaudit $1 rndc_client_packet_t:packet send;
+	dontaudit $1 rsync_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive rndc_client packets.
+##	Receive rsync_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73832,17 +76933,17 @@ interface(`corenet_dontaudit_send_rndc_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_rndc_client_packets',`
+interface(`corenet_receive_rsync_client_packets',`
 	gen_require(`
-		type rndc_client_packet_t;
+		type rsync_client_packet_t;
 	')
 
-	allow $1 rndc_client_packet_t:packet recv;
+	allow $1 rsync_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive rndc_client packets.
+##	Do not audit attempts to receive rsync_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73851,17 +76952,17 @@ interface(`corenet_receive_rndc_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_rndc_client_packets',`
+interface(`corenet_dontaudit_receive_rsync_client_packets',`
 	gen_require(`
-		type rndc_client_packet_t;
+		type rsync_client_packet_t;
 	')
 
-	dontaudit $1 rndc_client_packet_t:packet recv;
+	dontaudit $1 rsync_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive rndc_client packets.
+##	Send and receive rsync_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73870,14 +76971,14 @@ interface(`corenet_dontaudit_receive_rndc_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_rndc_client_packets',`
-	corenet_send_rndc_client_packets($1)
-	corenet_receive_rndc_client_packets($1)
+interface(`corenet_sendrecv_rsync_client_packets',`
+	corenet_send_rsync_client_packets($1)
+	corenet_receive_rsync_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive rndc_client packets.
+##	Do not audit attempts to send and receive rsync_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73886,14 +76987,14 @@ interface(`corenet_sendrecv_rndc_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_rndc_client_packets',`
-	corenet_dontaudit_send_rndc_client_packets($1)
-	corenet_dontaudit_receive_rndc_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_rsync_client_packets',`
+	corenet_dontaudit_send_rsync_client_packets($1)
+	corenet_dontaudit_receive_rsync_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to rndc_client the packet type.
+##	Relabel packets to rsync_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73901,18 +77002,18 @@ interface(`corenet_dontaudit_sendrecv_rndc_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_rndc_client_packets',`
+interface(`corenet_relabelto_rsync_client_packets',`
 	gen_require(`
-		type rndc_client_packet_t;
+		type rsync_client_packet_t;
 	')
 
-	allow $1 rndc_client_packet_t:packet relabelto;
+	allow $1 rsync_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send rndc_server packets.
+##	Send rsync_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73921,17 +77022,17 @@ interface(`corenet_relabelto_rndc_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_rndc_server_packets',`
+interface(`corenet_send_rsync_server_packets',`
 	gen_require(`
-		type rndc_server_packet_t;
+		type rsync_server_packet_t;
 	')
 
-	allow $1 rndc_server_packet_t:packet send;
+	allow $1 rsync_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send rndc_server packets.
+##	Do not audit attempts to send rsync_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73940,17 +77041,17 @@ interface(`corenet_send_rndc_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_rndc_server_packets',`
+interface(`corenet_dontaudit_send_rsync_server_packets',`
 	gen_require(`
-		type rndc_server_packet_t;
+		type rsync_server_packet_t;
 	')
 
-	dontaudit $1 rndc_server_packet_t:packet send;
+	dontaudit $1 rsync_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive rndc_server packets.
+##	Receive rsync_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73959,17 +77060,17 @@ interface(`corenet_dontaudit_send_rndc_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_rndc_server_packets',`
+interface(`corenet_receive_rsync_server_packets',`
 	gen_require(`
-		type rndc_server_packet_t;
+		type rsync_server_packet_t;
 	')
 
-	allow $1 rndc_server_packet_t:packet recv;
+	allow $1 rsync_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive rndc_server packets.
+##	Do not audit attempts to receive rsync_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73978,17 +77079,17 @@ interface(`corenet_receive_rndc_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_rndc_server_packets',`
+interface(`corenet_dontaudit_receive_rsync_server_packets',`
 	gen_require(`
-		type rndc_server_packet_t;
+		type rsync_server_packet_t;
 	')
 
-	dontaudit $1 rndc_server_packet_t:packet recv;
+	dontaudit $1 rsync_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive rndc_server packets.
+##	Send and receive rsync_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -73997,14 +77098,14 @@ interface(`corenet_dontaudit_receive_rndc_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_rndc_server_packets',`
-	corenet_send_rndc_server_packets($1)
-	corenet_receive_rndc_server_packets($1)
+interface(`corenet_sendrecv_rsync_server_packets',`
+	corenet_send_rsync_server_packets($1)
+	corenet_receive_rsync_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive rndc_server packets.
+##	Do not audit attempts to send and receive rsync_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74013,14 +77114,14 @@ interface(`corenet_sendrecv_rndc_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_rndc_server_packets',`
-	corenet_dontaudit_send_rndc_server_packets($1)
-	corenet_dontaudit_receive_rndc_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_rsync_server_packets',`
+	corenet_dontaudit_send_rsync_server_packets($1)
+	corenet_dontaudit_receive_rsync_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to rndc_server the packet type.
+##	Relabel packets to rsync_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74028,12 +77129,12 @@ interface(`corenet_dontaudit_sendrecv_rndc_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_rndc_server_packets',`
+interface(`corenet_relabelto_rsync_server_packets',`
 	gen_require(`
-		type rndc_server_packet_t;
+		type rsync_server_packet_t;
 	')
 
-	allow $1 rndc_server_packet_t:packet relabelto;
+	allow $1 rsync_server_packet_t:packet relabelto;
 ')
 
 
@@ -74041,7 +77142,7 @@ interface(`corenet_relabelto_rndc_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the router port.
+##	Send and receive TCP traffic on the rtorrent port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74050,17 +77151,17 @@ interface(`corenet_relabelto_rndc_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_router_port',`
+interface(`corenet_tcp_sendrecv_rtorrent_port',`
 	gen_require(`
-		type router_port_t;
+		type rtorrent_port_t;
 	')
 
-	allow $1 router_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 rtorrent_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the router port.
+##	Send UDP traffic on the rtorrent port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74069,17 +77170,17 @@ interface(`corenet_tcp_sendrecv_router_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_router_port',`
+interface(`corenet_udp_send_rtorrent_port',`
 	gen_require(`
-		type router_port_t;
+		type rtorrent_port_t;
 	')
 
-	allow $1 router_port_t:udp_socket send_msg;
+	allow $1 rtorrent_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the router port.
+##	Do not audit attempts to send UDP traffic on the rtorrent port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74088,17 +77189,17 @@ interface(`corenet_udp_send_router_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_router_port',`
+interface(`corenet_dontaudit_udp_send_rtorrent_port',`
 	gen_require(`
-		type router_port_t;
+		type rtorrent_port_t;
 	')
 
-	dontaudit $1 router_port_t:udp_socket send_msg;
+	dontaudit $1 rtorrent_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the router port.
+##	Receive UDP traffic on the rtorrent port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74107,17 +77208,17 @@ interface(`corenet_dontaudit_udp_send_router_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_router_port',`
+interface(`corenet_udp_receive_rtorrent_port',`
 	gen_require(`
-		type router_port_t;
+		type rtorrent_port_t;
 	')
 
-	allow $1 router_port_t:udp_socket recv_msg;
+	allow $1 rtorrent_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the router port.
+##	Do not audit attempts to receive UDP traffic on the rtorrent port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74126,17 +77227,17 @@ interface(`corenet_udp_receive_router_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_router_port',`
+interface(`corenet_dontaudit_udp_receive_rtorrent_port',`
 	gen_require(`
-		type router_port_t;
+		type rtorrent_port_t;
 	')
 
-	dontaudit $1 router_port_t:udp_socket recv_msg;
+	dontaudit $1 rtorrent_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the router port.
+##	Send and receive UDP traffic on the rtorrent port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74145,15 +77246,15 @@ interface(`corenet_dontaudit_udp_receive_router_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_router_port',`
-	corenet_udp_send_router_port($1)
-	corenet_udp_receive_router_port($1)
+interface(`corenet_udp_sendrecv_rtorrent_port',`
+	corenet_udp_send_rtorrent_port($1)
+	corenet_udp_receive_rtorrent_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the router port.
+##	UDP traffic on the rtorrent port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74162,14 +77263,14 @@ interface(`corenet_udp_sendrecv_router_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_router_port',`
-	corenet_dontaudit_udp_send_router_port($1)
-	corenet_dontaudit_udp_receive_router_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_rtorrent_port',`
+	corenet_dontaudit_udp_send_rtorrent_port($1)
+	corenet_dontaudit_udp_receive_rtorrent_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the router port.
+##	Bind TCP sockets to the rtorrent port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74178,18 +77279,18 @@ interface(`corenet_dontaudit_udp_sendrecv_router_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_router_port',`
+interface(`corenet_tcp_bind_rtorrent_port',`
 	gen_require(`
-		type router_port_t;
+		type rtorrent_port_t;
 	')
 
-	allow $1 router_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 rtorrent_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the router port.
+##	Bind UDP sockets to the rtorrent port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74198,18 +77299,18 @@ interface(`corenet_tcp_bind_router_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_router_port',`
+interface(`corenet_udp_bind_rtorrent_port',`
 	gen_require(`
-		type router_port_t;
+		type rtorrent_port_t;
 	')
 
-	allow $1 router_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 rtorrent_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the router port.
+##	Make a TCP connection to the rtorrent port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74217,18 +77318,18 @@ interface(`corenet_udp_bind_router_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_router_port',`
+interface(`corenet_tcp_connect_rtorrent_port',`
 	gen_require(`
-		type router_port_t;
+		type rtorrent_port_t;
 	')
 
-	allow $1 router_port_t:tcp_socket name_connect;
+	allow $1 rtorrent_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send router_client packets.
+##	Send rtorrent_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74237,17 +77338,17 @@ interface(`corenet_tcp_connect_router_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_router_client_packets',`
+interface(`corenet_send_rtorrent_client_packets',`
 	gen_require(`
-		type router_client_packet_t;
+		type rtorrent_client_packet_t;
 	')
 
-	allow $1 router_client_packet_t:packet send;
+	allow $1 rtorrent_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send router_client packets.
+##	Do not audit attempts to send rtorrent_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74256,17 +77357,17 @@ interface(`corenet_send_router_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_router_client_packets',`
+interface(`corenet_dontaudit_send_rtorrent_client_packets',`
 	gen_require(`
-		type router_client_packet_t;
+		type rtorrent_client_packet_t;
 	')
 
-	dontaudit $1 router_client_packet_t:packet send;
+	dontaudit $1 rtorrent_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive router_client packets.
+##	Receive rtorrent_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74275,17 +77376,17 @@ interface(`corenet_dontaudit_send_router_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_router_client_packets',`
+interface(`corenet_receive_rtorrent_client_packets',`
 	gen_require(`
-		type router_client_packet_t;
+		type rtorrent_client_packet_t;
 	')
 
-	allow $1 router_client_packet_t:packet recv;
+	allow $1 rtorrent_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive router_client packets.
+##	Do not audit attempts to receive rtorrent_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74294,17 +77395,17 @@ interface(`corenet_receive_router_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_router_client_packets',`
+interface(`corenet_dontaudit_receive_rtorrent_client_packets',`
 	gen_require(`
-		type router_client_packet_t;
+		type rtorrent_client_packet_t;
 	')
 
-	dontaudit $1 router_client_packet_t:packet recv;
+	dontaudit $1 rtorrent_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive router_client packets.
+##	Send and receive rtorrent_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74313,14 +77414,14 @@ interface(`corenet_dontaudit_receive_router_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_router_client_packets',`
-	corenet_send_router_client_packets($1)
-	corenet_receive_router_client_packets($1)
+interface(`corenet_sendrecv_rtorrent_client_packets',`
+	corenet_send_rtorrent_client_packets($1)
+	corenet_receive_rtorrent_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive router_client packets.
+##	Do not audit attempts to send and receive rtorrent_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74329,14 +77430,14 @@ interface(`corenet_sendrecv_router_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_router_client_packets',`
-	corenet_dontaudit_send_router_client_packets($1)
-	corenet_dontaudit_receive_router_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_rtorrent_client_packets',`
+	corenet_dontaudit_send_rtorrent_client_packets($1)
+	corenet_dontaudit_receive_rtorrent_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to router_client the packet type.
+##	Relabel packets to rtorrent_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74344,18 +77445,18 @@ interface(`corenet_dontaudit_sendrecv_router_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_router_client_packets',`
+interface(`corenet_relabelto_rtorrent_client_packets',`
 	gen_require(`
-		type router_client_packet_t;
+		type rtorrent_client_packet_t;
 	')
 
-	allow $1 router_client_packet_t:packet relabelto;
+	allow $1 rtorrent_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send router_server packets.
+##	Send rtorrent_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74364,17 +77465,17 @@ interface(`corenet_relabelto_router_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_router_server_packets',`
+interface(`corenet_send_rtorrent_server_packets',`
 	gen_require(`
-		type router_server_packet_t;
+		type rtorrent_server_packet_t;
 	')
 
-	allow $1 router_server_packet_t:packet send;
+	allow $1 rtorrent_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send router_server packets.
+##	Do not audit attempts to send rtorrent_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74383,17 +77484,17 @@ interface(`corenet_send_router_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_router_server_packets',`
+interface(`corenet_dontaudit_send_rtorrent_server_packets',`
 	gen_require(`
-		type router_server_packet_t;
+		type rtorrent_server_packet_t;
 	')
 
-	dontaudit $1 router_server_packet_t:packet send;
+	dontaudit $1 rtorrent_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive router_server packets.
+##	Receive rtorrent_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74402,17 +77503,17 @@ interface(`corenet_dontaudit_send_router_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_router_server_packets',`
+interface(`corenet_receive_rtorrent_server_packets',`
 	gen_require(`
-		type router_server_packet_t;
+		type rtorrent_server_packet_t;
 	')
 
-	allow $1 router_server_packet_t:packet recv;
+	allow $1 rtorrent_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive router_server packets.
+##	Do not audit attempts to receive rtorrent_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74421,17 +77522,17 @@ interface(`corenet_receive_router_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_router_server_packets',`
+interface(`corenet_dontaudit_receive_rtorrent_server_packets',`
 	gen_require(`
-		type router_server_packet_t;
+		type rtorrent_server_packet_t;
 	')
 
-	dontaudit $1 router_server_packet_t:packet recv;
+	dontaudit $1 rtorrent_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive router_server packets.
+##	Send and receive rtorrent_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74440,14 +77541,14 @@ interface(`corenet_dontaudit_receive_router_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_router_server_packets',`
-	corenet_send_router_server_packets($1)
-	corenet_receive_router_server_packets($1)
+interface(`corenet_sendrecv_rtorrent_server_packets',`
+	corenet_send_rtorrent_server_packets($1)
+	corenet_receive_rtorrent_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive router_server packets.
+##	Do not audit attempts to send and receive rtorrent_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74456,14 +77557,14 @@ interface(`corenet_sendrecv_router_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_router_server_packets',`
-	corenet_dontaudit_send_router_server_packets($1)
-	corenet_dontaudit_receive_router_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_rtorrent_server_packets',`
+	corenet_dontaudit_send_rtorrent_server_packets($1)
+	corenet_dontaudit_receive_rtorrent_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to router_server the packet type.
+##	Relabel packets to rtorrent_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74471,12 +77572,12 @@ interface(`corenet_dontaudit_sendrecv_router_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_router_server_packets',`
+interface(`corenet_relabelto_rtorrent_server_packets',`
 	gen_require(`
-		type router_server_packet_t;
+		type rtorrent_server_packet_t;
 	')
 
-	allow $1 router_server_packet_t:packet relabelto;
+	allow $1 rtorrent_server_packet_t:packet relabelto;
 ')
 
 
@@ -74484,7 +77585,7 @@ interface(`corenet_relabelto_router_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the rsh port.
+##	Send and receive TCP traffic on the rtsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74493,17 +77594,17 @@ interface(`corenet_relabelto_router_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_rsh_port',`
+interface(`corenet_tcp_sendrecv_rtsp_port',`
 	gen_require(`
-		type rsh_port_t;
+		type rtsp_port_t;
 	')
 
-	allow $1 rsh_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 rtsp_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the rsh port.
+##	Send UDP traffic on the rtsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74512,17 +77613,17 @@ interface(`corenet_tcp_sendrecv_rsh_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_rsh_port',`
+interface(`corenet_udp_send_rtsp_port',`
 	gen_require(`
-		type rsh_port_t;
+		type rtsp_port_t;
 	')
 
-	allow $1 rsh_port_t:udp_socket send_msg;
+	allow $1 rtsp_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the rsh port.
+##	Do not audit attempts to send UDP traffic on the rtsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74531,17 +77632,17 @@ interface(`corenet_udp_send_rsh_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_rsh_port',`
+interface(`corenet_dontaudit_udp_send_rtsp_port',`
 	gen_require(`
-		type rsh_port_t;
+		type rtsp_port_t;
 	')
 
-	dontaudit $1 rsh_port_t:udp_socket send_msg;
+	dontaudit $1 rtsp_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the rsh port.
+##	Receive UDP traffic on the rtsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74550,17 +77651,17 @@ interface(`corenet_dontaudit_udp_send_rsh_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_rsh_port',`
+interface(`corenet_udp_receive_rtsp_port',`
 	gen_require(`
-		type rsh_port_t;
+		type rtsp_port_t;
 	')
 
-	allow $1 rsh_port_t:udp_socket recv_msg;
+	allow $1 rtsp_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the rsh port.
+##	Do not audit attempts to receive UDP traffic on the rtsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74569,17 +77670,17 @@ interface(`corenet_udp_receive_rsh_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_rsh_port',`
+interface(`corenet_dontaudit_udp_receive_rtsp_port',`
 	gen_require(`
-		type rsh_port_t;
+		type rtsp_port_t;
 	')
 
-	dontaudit $1 rsh_port_t:udp_socket recv_msg;
+	dontaudit $1 rtsp_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the rsh port.
+##	Send and receive UDP traffic on the rtsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74588,15 +77689,15 @@ interface(`corenet_dontaudit_udp_receive_rsh_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_rsh_port',`
-	corenet_udp_send_rsh_port($1)
-	corenet_udp_receive_rsh_port($1)
+interface(`corenet_udp_sendrecv_rtsp_port',`
+	corenet_udp_send_rtsp_port($1)
+	corenet_udp_receive_rtsp_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the rsh port.
+##	UDP traffic on the rtsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74605,14 +77706,14 @@ interface(`corenet_udp_sendrecv_rsh_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_rsh_port',`
-	corenet_dontaudit_udp_send_rsh_port($1)
-	corenet_dontaudit_udp_receive_rsh_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_rtsp_port',`
+	corenet_dontaudit_udp_send_rtsp_port($1)
+	corenet_dontaudit_udp_receive_rtsp_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the rsh port.
+##	Bind TCP sockets to the rtsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74621,18 +77722,18 @@ interface(`corenet_dontaudit_udp_sendrecv_rsh_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_rsh_port',`
+interface(`corenet_tcp_bind_rtsp_port',`
 	gen_require(`
-		type rsh_port_t;
+		type rtsp_port_t;
 	')
 
-	allow $1 rsh_port_t:tcp_socket name_bind;
+	allow $1 rtsp_port_t:tcp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the rsh port.
+##	Bind UDP sockets to the rtsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74641,18 +77742,18 @@ interface(`corenet_tcp_bind_rsh_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_rsh_port',`
+interface(`corenet_udp_bind_rtsp_port',`
 	gen_require(`
-		type rsh_port_t;
+		type rtsp_port_t;
 	')
 
-	allow $1 rsh_port_t:udp_socket name_bind;
+	allow $1 rtsp_port_t:udp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the rsh port.
+##	Make a TCP connection to the rtsp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74660,18 +77761,18 @@ interface(`corenet_udp_bind_rsh_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_rsh_port',`
+interface(`corenet_tcp_connect_rtsp_port',`
 	gen_require(`
-		type rsh_port_t;
+		type rtsp_port_t;
 	')
 
-	allow $1 rsh_port_t:tcp_socket name_connect;
+	allow $1 rtsp_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send rsh_client packets.
+##	Send rtsp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74680,17 +77781,17 @@ interface(`corenet_tcp_connect_rsh_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_rsh_client_packets',`
+interface(`corenet_send_rtsp_client_packets',`
 	gen_require(`
-		type rsh_client_packet_t;
+		type rtsp_client_packet_t;
 	')
 
-	allow $1 rsh_client_packet_t:packet send;
+	allow $1 rtsp_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send rsh_client packets.
+##	Do not audit attempts to send rtsp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74699,17 +77800,17 @@ interface(`corenet_send_rsh_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_rsh_client_packets',`
+interface(`corenet_dontaudit_send_rtsp_client_packets',`
 	gen_require(`
-		type rsh_client_packet_t;
+		type rtsp_client_packet_t;
 	')
 
-	dontaudit $1 rsh_client_packet_t:packet send;
+	dontaudit $1 rtsp_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive rsh_client packets.
+##	Receive rtsp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74718,17 +77819,17 @@ interface(`corenet_dontaudit_send_rsh_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_rsh_client_packets',`
+interface(`corenet_receive_rtsp_client_packets',`
 	gen_require(`
-		type rsh_client_packet_t;
+		type rtsp_client_packet_t;
 	')
 
-	allow $1 rsh_client_packet_t:packet recv;
+	allow $1 rtsp_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive rsh_client packets.
+##	Do not audit attempts to receive rtsp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74737,17 +77838,17 @@ interface(`corenet_receive_rsh_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_rsh_client_packets',`
+interface(`corenet_dontaudit_receive_rtsp_client_packets',`
 	gen_require(`
-		type rsh_client_packet_t;
+		type rtsp_client_packet_t;
 	')
 
-	dontaudit $1 rsh_client_packet_t:packet recv;
+	dontaudit $1 rtsp_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive rsh_client packets.
+##	Send and receive rtsp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74756,14 +77857,14 @@ interface(`corenet_dontaudit_receive_rsh_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_rsh_client_packets',`
-	corenet_send_rsh_client_packets($1)
-	corenet_receive_rsh_client_packets($1)
+interface(`corenet_sendrecv_rtsp_client_packets',`
+	corenet_send_rtsp_client_packets($1)
+	corenet_receive_rtsp_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive rsh_client packets.
+##	Do not audit attempts to send and receive rtsp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74772,14 +77873,14 @@ interface(`corenet_sendrecv_rsh_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_rsh_client_packets',`
-	corenet_dontaudit_send_rsh_client_packets($1)
-	corenet_dontaudit_receive_rsh_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_rtsp_client_packets',`
+	corenet_dontaudit_send_rtsp_client_packets($1)
+	corenet_dontaudit_receive_rtsp_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to rsh_client the packet type.
+##	Relabel packets to rtsp_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74787,18 +77888,18 @@ interface(`corenet_dontaudit_sendrecv_rsh_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_rsh_client_packets',`
+interface(`corenet_relabelto_rtsp_client_packets',`
 	gen_require(`
-		type rsh_client_packet_t;
+		type rtsp_client_packet_t;
 	')
 
-	allow $1 rsh_client_packet_t:packet relabelto;
+	allow $1 rtsp_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send rsh_server packets.
+##	Send rtsp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74807,17 +77908,17 @@ interface(`corenet_relabelto_rsh_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_rsh_server_packets',`
+interface(`corenet_send_rtsp_server_packets',`
 	gen_require(`
-		type rsh_server_packet_t;
+		type rtsp_server_packet_t;
 	')
 
-	allow $1 rsh_server_packet_t:packet send;
+	allow $1 rtsp_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send rsh_server packets.
+##	Do not audit attempts to send rtsp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74826,17 +77927,17 @@ interface(`corenet_send_rsh_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_rsh_server_packets',`
+interface(`corenet_dontaudit_send_rtsp_server_packets',`
 	gen_require(`
-		type rsh_server_packet_t;
+		type rtsp_server_packet_t;
 	')
 
-	dontaudit $1 rsh_server_packet_t:packet send;
+	dontaudit $1 rtsp_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive rsh_server packets.
+##	Receive rtsp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74845,17 +77946,17 @@ interface(`corenet_dontaudit_send_rsh_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_rsh_server_packets',`
+interface(`corenet_receive_rtsp_server_packets',`
 	gen_require(`
-		type rsh_server_packet_t;
+		type rtsp_server_packet_t;
 	')
 
-	allow $1 rsh_server_packet_t:packet recv;
+	allow $1 rtsp_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive rsh_server packets.
+##	Do not audit attempts to receive rtsp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74864,17 +77965,17 @@ interface(`corenet_receive_rsh_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_rsh_server_packets',`
+interface(`corenet_dontaudit_receive_rtsp_server_packets',`
 	gen_require(`
-		type rsh_server_packet_t;
+		type rtsp_server_packet_t;
 	')
 
-	dontaudit $1 rsh_server_packet_t:packet recv;
+	dontaudit $1 rtsp_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive rsh_server packets.
+##	Send and receive rtsp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74883,14 +77984,14 @@ interface(`corenet_dontaudit_receive_rsh_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_rsh_server_packets',`
-	corenet_send_rsh_server_packets($1)
-	corenet_receive_rsh_server_packets($1)
+interface(`corenet_sendrecv_rtsp_server_packets',`
+	corenet_send_rtsp_server_packets($1)
+	corenet_receive_rtsp_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive rsh_server packets.
+##	Do not audit attempts to send and receive rtsp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74899,14 +78000,14 @@ interface(`corenet_sendrecv_rsh_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_rsh_server_packets',`
-	corenet_dontaudit_send_rsh_server_packets($1)
-	corenet_dontaudit_receive_rsh_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_rtsp_server_packets',`
+	corenet_dontaudit_send_rtsp_server_packets($1)
+	corenet_dontaudit_receive_rtsp_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to rsh_server the packet type.
+##	Relabel packets to rtsp_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74914,12 +78015,12 @@ interface(`corenet_dontaudit_sendrecv_rsh_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_rsh_server_packets',`
+interface(`corenet_relabelto_rtsp_server_packets',`
 	gen_require(`
-		type rsh_server_packet_t;
+		type rtsp_server_packet_t;
 	')
 
-	allow $1 rsh_server_packet_t:packet relabelto;
+	allow $1 rtsp_server_packet_t:packet relabelto;
 ')
 
 
@@ -74927,7 +78028,7 @@ interface(`corenet_relabelto_rsh_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the rsync port.
+##	Send and receive TCP traffic on the rwho port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74936,17 +78037,17 @@ interface(`corenet_relabelto_rsh_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_rsync_port',`
+interface(`corenet_tcp_sendrecv_rwho_port',`
 	gen_require(`
-		type rsync_port_t;
+		type rwho_port_t;
 	')
 
-	allow $1 rsync_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 rwho_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the rsync port.
+##	Send UDP traffic on the rwho port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74955,17 +78056,17 @@ interface(`corenet_tcp_sendrecv_rsync_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_rsync_port',`
+interface(`corenet_udp_send_rwho_port',`
 	gen_require(`
-		type rsync_port_t;
+		type rwho_port_t;
 	')
 
-	allow $1 rsync_port_t:udp_socket send_msg;
+	allow $1 rwho_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the rsync port.
+##	Do not audit attempts to send UDP traffic on the rwho port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74974,17 +78075,17 @@ interface(`corenet_udp_send_rsync_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_rsync_port',`
+interface(`corenet_dontaudit_udp_send_rwho_port',`
 	gen_require(`
-		type rsync_port_t;
+		type rwho_port_t;
 	')
 
-	dontaudit $1 rsync_port_t:udp_socket send_msg;
+	dontaudit $1 rwho_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the rsync port.
+##	Receive UDP traffic on the rwho port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -74993,17 +78094,17 @@ interface(`corenet_dontaudit_udp_send_rsync_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_rsync_port',`
+interface(`corenet_udp_receive_rwho_port',`
 	gen_require(`
-		type rsync_port_t;
+		type rwho_port_t;
 	')
 
-	allow $1 rsync_port_t:udp_socket recv_msg;
+	allow $1 rwho_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the rsync port.
+##	Do not audit attempts to receive UDP traffic on the rwho port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75012,17 +78113,17 @@ interface(`corenet_udp_receive_rsync_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_rsync_port',`
+interface(`corenet_dontaudit_udp_receive_rwho_port',`
 	gen_require(`
-		type rsync_port_t;
+		type rwho_port_t;
 	')
 
-	dontaudit $1 rsync_port_t:udp_socket recv_msg;
+	dontaudit $1 rwho_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the rsync port.
+##	Send and receive UDP traffic on the rwho port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75031,15 +78132,15 @@ interface(`corenet_dontaudit_udp_receive_rsync_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_rsync_port',`
-	corenet_udp_send_rsync_port($1)
-	corenet_udp_receive_rsync_port($1)
+interface(`corenet_udp_sendrecv_rwho_port',`
+	corenet_udp_send_rwho_port($1)
+	corenet_udp_receive_rwho_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the rsync port.
+##	UDP traffic on the rwho port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75048,14 +78149,14 @@ interface(`corenet_udp_sendrecv_rsync_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_rsync_port',`
-	corenet_dontaudit_udp_send_rsync_port($1)
-	corenet_dontaudit_udp_receive_rsync_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_rwho_port',`
+	corenet_dontaudit_udp_send_rwho_port($1)
+	corenet_dontaudit_udp_receive_rwho_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the rsync port.
+##	Bind TCP sockets to the rwho port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75064,18 +78165,18 @@ interface(`corenet_dontaudit_udp_sendrecv_rsync_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_rsync_port',`
+interface(`corenet_tcp_bind_rwho_port',`
 	gen_require(`
-		type rsync_port_t;
+		type rwho_port_t;
 	')
 
-	allow $1 rsync_port_t:tcp_socket name_bind;
+	allow $1 rwho_port_t:tcp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the rsync port.
+##	Bind UDP sockets to the rwho port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75084,18 +78185,18 @@ interface(`corenet_tcp_bind_rsync_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_rsync_port',`
+interface(`corenet_udp_bind_rwho_port',`
 	gen_require(`
-		type rsync_port_t;
+		type rwho_port_t;
 	')
 
-	allow $1 rsync_port_t:udp_socket name_bind;
+	allow $1 rwho_port_t:udp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the rsync port.
+##	Make a TCP connection to the rwho port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75103,18 +78204,18 @@ interface(`corenet_udp_bind_rsync_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_rsync_port',`
+interface(`corenet_tcp_connect_rwho_port',`
 	gen_require(`
-		type rsync_port_t;
+		type rwho_port_t;
 	')
 
-	allow $1 rsync_port_t:tcp_socket name_connect;
+	allow $1 rwho_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send rsync_client packets.
+##	Send rwho_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75123,17 +78224,17 @@ interface(`corenet_tcp_connect_rsync_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_rsync_client_packets',`
+interface(`corenet_send_rwho_client_packets',`
 	gen_require(`
-		type rsync_client_packet_t;
+		type rwho_client_packet_t;
 	')
 
-	allow $1 rsync_client_packet_t:packet send;
+	allow $1 rwho_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send rsync_client packets.
+##	Do not audit attempts to send rwho_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75142,17 +78243,17 @@ interface(`corenet_send_rsync_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_rsync_client_packets',`
+interface(`corenet_dontaudit_send_rwho_client_packets',`
 	gen_require(`
-		type rsync_client_packet_t;
+		type rwho_client_packet_t;
 	')
 
-	dontaudit $1 rsync_client_packet_t:packet send;
+	dontaudit $1 rwho_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive rsync_client packets.
+##	Receive rwho_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75161,17 +78262,17 @@ interface(`corenet_dontaudit_send_rsync_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_rsync_client_packets',`
+interface(`corenet_receive_rwho_client_packets',`
 	gen_require(`
-		type rsync_client_packet_t;
+		type rwho_client_packet_t;
 	')
 
-	allow $1 rsync_client_packet_t:packet recv;
+	allow $1 rwho_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive rsync_client packets.
+##	Do not audit attempts to receive rwho_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75180,17 +78281,17 @@ interface(`corenet_receive_rsync_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_rsync_client_packets',`
+interface(`corenet_dontaudit_receive_rwho_client_packets',`
 	gen_require(`
-		type rsync_client_packet_t;
+		type rwho_client_packet_t;
 	')
 
-	dontaudit $1 rsync_client_packet_t:packet recv;
+	dontaudit $1 rwho_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive rsync_client packets.
+##	Send and receive rwho_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75199,14 +78300,14 @@ interface(`corenet_dontaudit_receive_rsync_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_rsync_client_packets',`
-	corenet_send_rsync_client_packets($1)
-	corenet_receive_rsync_client_packets($1)
+interface(`corenet_sendrecv_rwho_client_packets',`
+	corenet_send_rwho_client_packets($1)
+	corenet_receive_rwho_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive rsync_client packets.
+##	Do not audit attempts to send and receive rwho_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75215,14 +78316,14 @@ interface(`corenet_sendrecv_rsync_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_rsync_client_packets',`
-	corenet_dontaudit_send_rsync_client_packets($1)
-	corenet_dontaudit_receive_rsync_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_rwho_client_packets',`
+	corenet_dontaudit_send_rwho_client_packets($1)
+	corenet_dontaudit_receive_rwho_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to rsync_client the packet type.
+##	Relabel packets to rwho_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75230,18 +78331,18 @@ interface(`corenet_dontaudit_sendrecv_rsync_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_rsync_client_packets',`
+interface(`corenet_relabelto_rwho_client_packets',`
 	gen_require(`
-		type rsync_client_packet_t;
+		type rwho_client_packet_t;
 	')
 
-	allow $1 rsync_client_packet_t:packet relabelto;
+	allow $1 rwho_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send rsync_server packets.
+##	Send rwho_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75250,17 +78351,17 @@ interface(`corenet_relabelto_rsync_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_rsync_server_packets',`
+interface(`corenet_send_rwho_server_packets',`
 	gen_require(`
-		type rsync_server_packet_t;
+		type rwho_server_packet_t;
 	')
 
-	allow $1 rsync_server_packet_t:packet send;
+	allow $1 rwho_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send rsync_server packets.
+##	Do not audit attempts to send rwho_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75269,17 +78370,17 @@ interface(`corenet_send_rsync_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_rsync_server_packets',`
+interface(`corenet_dontaudit_send_rwho_server_packets',`
 	gen_require(`
-		type rsync_server_packet_t;
+		type rwho_server_packet_t;
 	')
 
-	dontaudit $1 rsync_server_packet_t:packet send;
+	dontaudit $1 rwho_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive rsync_server packets.
+##	Receive rwho_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75288,17 +78389,17 @@ interface(`corenet_dontaudit_send_rsync_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_rsync_server_packets',`
+interface(`corenet_receive_rwho_server_packets',`
 	gen_require(`
-		type rsync_server_packet_t;
+		type rwho_server_packet_t;
 	')
 
-	allow $1 rsync_server_packet_t:packet recv;
+	allow $1 rwho_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive rsync_server packets.
+##	Do not audit attempts to receive rwho_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75307,17 +78408,17 @@ interface(`corenet_receive_rsync_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_rsync_server_packets',`
+interface(`corenet_dontaudit_receive_rwho_server_packets',`
 	gen_require(`
-		type rsync_server_packet_t;
+		type rwho_server_packet_t;
 	')
 
-	dontaudit $1 rsync_server_packet_t:packet recv;
+	dontaudit $1 rwho_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive rsync_server packets.
+##	Send and receive rwho_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75326,14 +78427,14 @@ interface(`corenet_dontaudit_receive_rsync_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_rsync_server_packets',`
-	corenet_send_rsync_server_packets($1)
-	corenet_receive_rsync_server_packets($1)
+interface(`corenet_sendrecv_rwho_server_packets',`
+	corenet_send_rwho_server_packets($1)
+	corenet_receive_rwho_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive rsync_server packets.
+##	Do not audit attempts to send and receive rwho_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75342,14 +78443,14 @@ interface(`corenet_sendrecv_rsync_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_rsync_server_packets',`
-	corenet_dontaudit_send_rsync_server_packets($1)
-	corenet_dontaudit_receive_rsync_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_rwho_server_packets',`
+	corenet_dontaudit_send_rwho_server_packets($1)
+	corenet_dontaudit_receive_rwho_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to rsync_server the packet type.
+##	Relabel packets to rwho_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75357,12 +78458,12 @@ interface(`corenet_dontaudit_sendrecv_rsync_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_rsync_server_packets',`
+interface(`corenet_relabelto_rwho_server_packets',`
 	gen_require(`
-		type rsync_server_packet_t;
+		type rwho_server_packet_t;
 	')
 
-	allow $1 rsync_server_packet_t:packet relabelto;
+	allow $1 rwho_server_packet_t:packet relabelto;
 ')
 
 
@@ -75370,7 +78471,7 @@ interface(`corenet_relabelto_rsync_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the rtorrent port.
+##	Send and receive TCP traffic on the salt port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75379,17 +78480,17 @@ interface(`corenet_relabelto_rsync_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_rtorrent_port',`
+interface(`corenet_tcp_sendrecv_salt_port',`
 	gen_require(`
-		type rtorrent_port_t;
+		type salt_port_t;
 	')
 
-	allow $1 rtorrent_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 salt_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the rtorrent port.
+##	Send UDP traffic on the salt port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75398,17 +78499,17 @@ interface(`corenet_tcp_sendrecv_rtorrent_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_rtorrent_port',`
+interface(`corenet_udp_send_salt_port',`
 	gen_require(`
-		type rtorrent_port_t;
+		type salt_port_t;
 	')
 
-	allow $1 rtorrent_port_t:udp_socket send_msg;
+	allow $1 salt_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the rtorrent port.
+##	Do not audit attempts to send UDP traffic on the salt port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75417,17 +78518,17 @@ interface(`corenet_udp_send_rtorrent_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_rtorrent_port',`
+interface(`corenet_dontaudit_udp_send_salt_port',`
 	gen_require(`
-		type rtorrent_port_t;
+		type salt_port_t;
 	')
 
-	dontaudit $1 rtorrent_port_t:udp_socket send_msg;
+	dontaudit $1 salt_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the rtorrent port.
+##	Receive UDP traffic on the salt port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75436,17 +78537,17 @@ interface(`corenet_dontaudit_udp_send_rtorrent_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_rtorrent_port',`
+interface(`corenet_udp_receive_salt_port',`
 	gen_require(`
-		type rtorrent_port_t;
+		type salt_port_t;
 	')
 
-	allow $1 rtorrent_port_t:udp_socket recv_msg;
+	allow $1 salt_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the rtorrent port.
+##	Do not audit attempts to receive UDP traffic on the salt port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75455,17 +78556,17 @@ interface(`corenet_udp_receive_rtorrent_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_rtorrent_port',`
+interface(`corenet_dontaudit_udp_receive_salt_port',`
 	gen_require(`
-		type rtorrent_port_t;
+		type salt_port_t;
 	')
 
-	dontaudit $1 rtorrent_port_t:udp_socket recv_msg;
+	dontaudit $1 salt_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the rtorrent port.
+##	Send and receive UDP traffic on the salt port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75474,15 +78575,15 @@ interface(`corenet_dontaudit_udp_receive_rtorrent_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_rtorrent_port',`
-	corenet_udp_send_rtorrent_port($1)
-	corenet_udp_receive_rtorrent_port($1)
+interface(`corenet_udp_sendrecv_salt_port',`
+	corenet_udp_send_salt_port($1)
+	corenet_udp_receive_salt_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the rtorrent port.
+##	UDP traffic on the salt port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75491,14 +78592,14 @@ interface(`corenet_udp_sendrecv_rtorrent_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_rtorrent_port',`
-	corenet_dontaudit_udp_send_rtorrent_port($1)
-	corenet_dontaudit_udp_receive_rtorrent_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_salt_port',`
+	corenet_dontaudit_udp_send_salt_port($1)
+	corenet_dontaudit_udp_receive_salt_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the rtorrent port.
+##	Bind TCP sockets to the salt port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75507,18 +78608,18 @@ interface(`corenet_dontaudit_udp_sendrecv_rtorrent_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_rtorrent_port',`
+interface(`corenet_tcp_bind_salt_port',`
 	gen_require(`
-		type rtorrent_port_t;
+		type salt_port_t;
 	')
 
-	allow $1 rtorrent_port_t:tcp_socket name_bind;
+	allow $1 salt_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the rtorrent port.
+##	Bind UDP sockets to the salt port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75527,18 +78628,18 @@ interface(`corenet_tcp_bind_rtorrent_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_rtorrent_port',`
+interface(`corenet_udp_bind_salt_port',`
 	gen_require(`
-		type rtorrent_port_t;
+		type salt_port_t;
 	')
 
-	allow $1 rtorrent_port_t:udp_socket name_bind;
+	allow $1 salt_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the rtorrent port.
+##	Make a TCP connection to the salt port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75546,18 +78647,18 @@ interface(`corenet_udp_bind_rtorrent_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_rtorrent_port',`
+interface(`corenet_tcp_connect_salt_port',`
 	gen_require(`
-		type rtorrent_port_t;
+		type salt_port_t;
 	')
 
-	allow $1 rtorrent_port_t:tcp_socket name_connect;
+	allow $1 salt_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send rtorrent_client packets.
+##	Send salt_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75566,17 +78667,17 @@ interface(`corenet_tcp_connect_rtorrent_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_rtorrent_client_packets',`
+interface(`corenet_send_salt_client_packets',`
 	gen_require(`
-		type rtorrent_client_packet_t;
+		type salt_client_packet_t;
 	')
 
-	allow $1 rtorrent_client_packet_t:packet send;
+	allow $1 salt_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send rtorrent_client packets.
+##	Do not audit attempts to send salt_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75585,17 +78686,17 @@ interface(`corenet_send_rtorrent_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_rtorrent_client_packets',`
+interface(`corenet_dontaudit_send_salt_client_packets',`
 	gen_require(`
-		type rtorrent_client_packet_t;
+		type salt_client_packet_t;
 	')
 
-	dontaudit $1 rtorrent_client_packet_t:packet send;
+	dontaudit $1 salt_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive rtorrent_client packets.
+##	Receive salt_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75604,17 +78705,17 @@ interface(`corenet_dontaudit_send_rtorrent_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_rtorrent_client_packets',`
+interface(`corenet_receive_salt_client_packets',`
 	gen_require(`
-		type rtorrent_client_packet_t;
+		type salt_client_packet_t;
 	')
 
-	allow $1 rtorrent_client_packet_t:packet recv;
+	allow $1 salt_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive rtorrent_client packets.
+##	Do not audit attempts to receive salt_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75623,17 +78724,17 @@ interface(`corenet_receive_rtorrent_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_rtorrent_client_packets',`
+interface(`corenet_dontaudit_receive_salt_client_packets',`
 	gen_require(`
-		type rtorrent_client_packet_t;
+		type salt_client_packet_t;
 	')
 
-	dontaudit $1 rtorrent_client_packet_t:packet recv;
+	dontaudit $1 salt_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive rtorrent_client packets.
+##	Send and receive salt_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75642,14 +78743,14 @@ interface(`corenet_dontaudit_receive_rtorrent_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_rtorrent_client_packets',`
-	corenet_send_rtorrent_client_packets($1)
-	corenet_receive_rtorrent_client_packets($1)
+interface(`corenet_sendrecv_salt_client_packets',`
+	corenet_send_salt_client_packets($1)
+	corenet_receive_salt_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive rtorrent_client packets.
+##	Do not audit attempts to send and receive salt_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75658,14 +78759,14 @@ interface(`corenet_sendrecv_rtorrent_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_rtorrent_client_packets',`
-	corenet_dontaudit_send_rtorrent_client_packets($1)
-	corenet_dontaudit_receive_rtorrent_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_salt_client_packets',`
+	corenet_dontaudit_send_salt_client_packets($1)
+	corenet_dontaudit_receive_salt_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to rtorrent_client the packet type.
+##	Relabel packets to salt_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75673,18 +78774,18 @@ interface(`corenet_dontaudit_sendrecv_rtorrent_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_rtorrent_client_packets',`
+interface(`corenet_relabelto_salt_client_packets',`
 	gen_require(`
-		type rtorrent_client_packet_t;
+		type salt_client_packet_t;
 	')
 
-	allow $1 rtorrent_client_packet_t:packet relabelto;
+	allow $1 salt_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send rtorrent_server packets.
+##	Send salt_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75693,17 +78794,17 @@ interface(`corenet_relabelto_rtorrent_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_rtorrent_server_packets',`
+interface(`corenet_send_salt_server_packets',`
 	gen_require(`
-		type rtorrent_server_packet_t;
+		type salt_server_packet_t;
 	')
 
-	allow $1 rtorrent_server_packet_t:packet send;
+	allow $1 salt_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send rtorrent_server packets.
+##	Do not audit attempts to send salt_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75712,17 +78813,17 @@ interface(`corenet_send_rtorrent_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_rtorrent_server_packets',`
+interface(`corenet_dontaudit_send_salt_server_packets',`
 	gen_require(`
-		type rtorrent_server_packet_t;
+		type salt_server_packet_t;
 	')
 
-	dontaudit $1 rtorrent_server_packet_t:packet send;
+	dontaudit $1 salt_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive rtorrent_server packets.
+##	Receive salt_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75731,17 +78832,17 @@ interface(`corenet_dontaudit_send_rtorrent_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_rtorrent_server_packets',`
+interface(`corenet_receive_salt_server_packets',`
 	gen_require(`
-		type rtorrent_server_packet_t;
+		type salt_server_packet_t;
 	')
 
-	allow $1 rtorrent_server_packet_t:packet recv;
+	allow $1 salt_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive rtorrent_server packets.
+##	Do not audit attempts to receive salt_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75750,17 +78851,17 @@ interface(`corenet_receive_rtorrent_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_rtorrent_server_packets',`
+interface(`corenet_dontaudit_receive_salt_server_packets',`
 	gen_require(`
-		type rtorrent_server_packet_t;
+		type salt_server_packet_t;
 	')
 
-	dontaudit $1 rtorrent_server_packet_t:packet recv;
+	dontaudit $1 salt_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive rtorrent_server packets.
+##	Send and receive salt_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75769,14 +78870,14 @@ interface(`corenet_dontaudit_receive_rtorrent_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_rtorrent_server_packets',`
-	corenet_send_rtorrent_server_packets($1)
-	corenet_receive_rtorrent_server_packets($1)
+interface(`corenet_sendrecv_salt_server_packets',`
+	corenet_send_salt_server_packets($1)
+	corenet_receive_salt_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive rtorrent_server packets.
+##	Do not audit attempts to send and receive salt_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75785,14 +78886,14 @@ interface(`corenet_sendrecv_rtorrent_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_rtorrent_server_packets',`
-	corenet_dontaudit_send_rtorrent_server_packets($1)
-	corenet_dontaudit_receive_rtorrent_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_salt_server_packets',`
+	corenet_dontaudit_send_salt_server_packets($1)
+	corenet_dontaudit_receive_salt_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to rtorrent_server the packet type.
+##	Relabel packets to salt_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75800,12 +78901,12 @@ interface(`corenet_dontaudit_sendrecv_rtorrent_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_rtorrent_server_packets',`
+interface(`corenet_relabelto_salt_server_packets',`
 	gen_require(`
-		type rtorrent_server_packet_t;
+		type salt_server_packet_t;
 	')
 
-	allow $1 rtorrent_server_packet_t:packet relabelto;
+	allow $1 salt_server_packet_t:packet relabelto;
 ')
 
 
@@ -75813,7 +78914,7 @@ interface(`corenet_relabelto_rtorrent_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the rtsp port.
+##	Send and receive TCP traffic on the sap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75822,17 +78923,17 @@ interface(`corenet_relabelto_rtorrent_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_rtsp_port',`
+interface(`corenet_tcp_sendrecv_sap_port',`
 	gen_require(`
-		type rtsp_port_t;
+		type sap_port_t;
 	')
 
-	allow $1 rtsp_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 sap_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the rtsp port.
+##	Send UDP traffic on the sap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75841,17 +78942,17 @@ interface(`corenet_tcp_sendrecv_rtsp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_rtsp_port',`
+interface(`corenet_udp_send_sap_port',`
 	gen_require(`
-		type rtsp_port_t;
+		type sap_port_t;
 	')
 
-	allow $1 rtsp_port_t:udp_socket send_msg;
+	allow $1 sap_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the rtsp port.
+##	Do not audit attempts to send UDP traffic on the sap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75860,17 +78961,17 @@ interface(`corenet_udp_send_rtsp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_rtsp_port',`
+interface(`corenet_dontaudit_udp_send_sap_port',`
 	gen_require(`
-		type rtsp_port_t;
+		type sap_port_t;
 	')
 
-	dontaudit $1 rtsp_port_t:udp_socket send_msg;
+	dontaudit $1 sap_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the rtsp port.
+##	Receive UDP traffic on the sap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75879,17 +78980,17 @@ interface(`corenet_dontaudit_udp_send_rtsp_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_rtsp_port',`
+interface(`corenet_udp_receive_sap_port',`
 	gen_require(`
-		type rtsp_port_t;
+		type sap_port_t;
 	')
 
-	allow $1 rtsp_port_t:udp_socket recv_msg;
+	allow $1 sap_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the rtsp port.
+##	Do not audit attempts to receive UDP traffic on the sap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75898,17 +78999,17 @@ interface(`corenet_udp_receive_rtsp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_rtsp_port',`
+interface(`corenet_dontaudit_udp_receive_sap_port',`
 	gen_require(`
-		type rtsp_port_t;
+		type sap_port_t;
 	')
 
-	dontaudit $1 rtsp_port_t:udp_socket recv_msg;
+	dontaudit $1 sap_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the rtsp port.
+##	Send and receive UDP traffic on the sap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75917,15 +79018,15 @@ interface(`corenet_dontaudit_udp_receive_rtsp_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_rtsp_port',`
-	corenet_udp_send_rtsp_port($1)
-	corenet_udp_receive_rtsp_port($1)
+interface(`corenet_udp_sendrecv_sap_port',`
+	corenet_udp_send_sap_port($1)
+	corenet_udp_receive_sap_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the rtsp port.
+##	UDP traffic on the sap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75934,14 +79035,14 @@ interface(`corenet_udp_sendrecv_rtsp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_rtsp_port',`
-	corenet_dontaudit_udp_send_rtsp_port($1)
-	corenet_dontaudit_udp_receive_rtsp_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_sap_port',`
+	corenet_dontaudit_udp_send_sap_port($1)
+	corenet_dontaudit_udp_receive_sap_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the rtsp port.
+##	Bind TCP sockets to the sap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75950,18 +79051,18 @@ interface(`corenet_dontaudit_udp_sendrecv_rtsp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_rtsp_port',`
+interface(`corenet_tcp_bind_sap_port',`
 	gen_require(`
-		type rtsp_port_t;
+		type sap_port_t;
 	')
 
-	allow $1 rtsp_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 sap_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the rtsp port.
+##	Bind UDP sockets to the sap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75970,18 +79071,18 @@ interface(`corenet_tcp_bind_rtsp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_rtsp_port',`
+interface(`corenet_udp_bind_sap_port',`
 	gen_require(`
-		type rtsp_port_t;
+		type sap_port_t;
 	')
 
-	allow $1 rtsp_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 sap_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the rtsp port.
+##	Make a TCP connection to the sap port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -75989,18 +79090,18 @@ interface(`corenet_udp_bind_rtsp_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_rtsp_port',`
+interface(`corenet_tcp_connect_sap_port',`
 	gen_require(`
-		type rtsp_port_t;
+		type sap_port_t;
 	')
 
-	allow $1 rtsp_port_t:tcp_socket name_connect;
+	allow $1 sap_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send rtsp_client packets.
+##	Send sap_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76009,17 +79110,17 @@ interface(`corenet_tcp_connect_rtsp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_rtsp_client_packets',`
+interface(`corenet_send_sap_client_packets',`
 	gen_require(`
-		type rtsp_client_packet_t;
+		type sap_client_packet_t;
 	')
 
-	allow $1 rtsp_client_packet_t:packet send;
+	allow $1 sap_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send rtsp_client packets.
+##	Do not audit attempts to send sap_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76028,17 +79129,17 @@ interface(`corenet_send_rtsp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_rtsp_client_packets',`
+interface(`corenet_dontaudit_send_sap_client_packets',`
 	gen_require(`
-		type rtsp_client_packet_t;
+		type sap_client_packet_t;
 	')
 
-	dontaudit $1 rtsp_client_packet_t:packet send;
+	dontaudit $1 sap_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive rtsp_client packets.
+##	Receive sap_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76047,17 +79148,17 @@ interface(`corenet_dontaudit_send_rtsp_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_rtsp_client_packets',`
+interface(`corenet_receive_sap_client_packets',`
 	gen_require(`
-		type rtsp_client_packet_t;
+		type sap_client_packet_t;
 	')
 
-	allow $1 rtsp_client_packet_t:packet recv;
+	allow $1 sap_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive rtsp_client packets.
+##	Do not audit attempts to receive sap_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76066,17 +79167,17 @@ interface(`corenet_receive_rtsp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_rtsp_client_packets',`
+interface(`corenet_dontaudit_receive_sap_client_packets',`
 	gen_require(`
-		type rtsp_client_packet_t;
+		type sap_client_packet_t;
 	')
 
-	dontaudit $1 rtsp_client_packet_t:packet recv;
+	dontaudit $1 sap_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive rtsp_client packets.
+##	Send and receive sap_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76085,14 +79186,14 @@ interface(`corenet_dontaudit_receive_rtsp_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_rtsp_client_packets',`
-	corenet_send_rtsp_client_packets($1)
-	corenet_receive_rtsp_client_packets($1)
+interface(`corenet_sendrecv_sap_client_packets',`
+	corenet_send_sap_client_packets($1)
+	corenet_receive_sap_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive rtsp_client packets.
+##	Do not audit attempts to send and receive sap_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76101,14 +79202,14 @@ interface(`corenet_sendrecv_rtsp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_rtsp_client_packets',`
-	corenet_dontaudit_send_rtsp_client_packets($1)
-	corenet_dontaudit_receive_rtsp_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_sap_client_packets',`
+	corenet_dontaudit_send_sap_client_packets($1)
+	corenet_dontaudit_receive_sap_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to rtsp_client the packet type.
+##	Relabel packets to sap_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76116,18 +79217,18 @@ interface(`corenet_dontaudit_sendrecv_rtsp_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_rtsp_client_packets',`
+interface(`corenet_relabelto_sap_client_packets',`
 	gen_require(`
-		type rtsp_client_packet_t;
+		type sap_client_packet_t;
 	')
 
-	allow $1 rtsp_client_packet_t:packet relabelto;
+	allow $1 sap_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send rtsp_server packets.
+##	Send sap_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76136,17 +79237,17 @@ interface(`corenet_relabelto_rtsp_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_rtsp_server_packets',`
+interface(`corenet_send_sap_server_packets',`
 	gen_require(`
-		type rtsp_server_packet_t;
+		type sap_server_packet_t;
 	')
 
-	allow $1 rtsp_server_packet_t:packet send;
+	allow $1 sap_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send rtsp_server packets.
+##	Do not audit attempts to send sap_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76155,17 +79256,17 @@ interface(`corenet_send_rtsp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_rtsp_server_packets',`
+interface(`corenet_dontaudit_send_sap_server_packets',`
 	gen_require(`
-		type rtsp_server_packet_t;
+		type sap_server_packet_t;
 	')
 
-	dontaudit $1 rtsp_server_packet_t:packet send;
+	dontaudit $1 sap_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive rtsp_server packets.
+##	Receive sap_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76174,17 +79275,17 @@ interface(`corenet_dontaudit_send_rtsp_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_rtsp_server_packets',`
+interface(`corenet_receive_sap_server_packets',`
 	gen_require(`
-		type rtsp_server_packet_t;
+		type sap_server_packet_t;
 	')
 
-	allow $1 rtsp_server_packet_t:packet recv;
+	allow $1 sap_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive rtsp_server packets.
+##	Do not audit attempts to receive sap_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76193,17 +79294,17 @@ interface(`corenet_receive_rtsp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_rtsp_server_packets',`
+interface(`corenet_dontaudit_receive_sap_server_packets',`
 	gen_require(`
-		type rtsp_server_packet_t;
+		type sap_server_packet_t;
 	')
 
-	dontaudit $1 rtsp_server_packet_t:packet recv;
+	dontaudit $1 sap_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive rtsp_server packets.
+##	Send and receive sap_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76212,14 +79313,14 @@ interface(`corenet_dontaudit_receive_rtsp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_rtsp_server_packets',`
-	corenet_send_rtsp_server_packets($1)
-	corenet_receive_rtsp_server_packets($1)
+interface(`corenet_sendrecv_sap_server_packets',`
+	corenet_send_sap_server_packets($1)
+	corenet_receive_sap_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive rtsp_server packets.
+##	Do not audit attempts to send and receive sap_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76228,14 +79329,14 @@ interface(`corenet_sendrecv_rtsp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_rtsp_server_packets',`
-	corenet_dontaudit_send_rtsp_server_packets($1)
-	corenet_dontaudit_receive_rtsp_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_sap_server_packets',`
+	corenet_dontaudit_send_sap_server_packets($1)
+	corenet_dontaudit_receive_sap_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to rtsp_server the packet type.
+##	Relabel packets to sap_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76243,12 +79344,12 @@ interface(`corenet_dontaudit_sendrecv_rtsp_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_rtsp_server_packets',`
+interface(`corenet_relabelto_sap_server_packets',`
 	gen_require(`
-		type rtsp_server_packet_t;
+		type sap_server_packet_t;
 	')
 
-	allow $1 rtsp_server_packet_t:packet relabelto;
+	allow $1 sap_server_packet_t:packet relabelto;
 ')
 
 
@@ -76256,7 +79357,7 @@ interface(`corenet_relabelto_rtsp_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the rwho port.
+##	Send and receive TCP traffic on the servistaitsm port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76265,17 +79366,17 @@ interface(`corenet_relabelto_rtsp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_rwho_port',`
+interface(`corenet_tcp_sendrecv_servistaitsm_port',`
 	gen_require(`
-		type rwho_port_t;
+		type servistaitsm_port_t;
 	')
 
-	allow $1 rwho_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 servistaitsm_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the rwho port.
+##	Send UDP traffic on the servistaitsm port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76284,17 +79385,17 @@ interface(`corenet_tcp_sendrecv_rwho_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_rwho_port',`
+interface(`corenet_udp_send_servistaitsm_port',`
 	gen_require(`
-		type rwho_port_t;
+		type servistaitsm_port_t;
 	')
 
-	allow $1 rwho_port_t:udp_socket send_msg;
+	allow $1 servistaitsm_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the rwho port.
+##	Do not audit attempts to send UDP traffic on the servistaitsm port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76303,17 +79404,17 @@ interface(`corenet_udp_send_rwho_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_rwho_port',`
+interface(`corenet_dontaudit_udp_send_servistaitsm_port',`
 	gen_require(`
-		type rwho_port_t;
+		type servistaitsm_port_t;
 	')
 
-	dontaudit $1 rwho_port_t:udp_socket send_msg;
+	dontaudit $1 servistaitsm_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the rwho port.
+##	Receive UDP traffic on the servistaitsm port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76322,17 +79423,17 @@ interface(`corenet_dontaudit_udp_send_rwho_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_rwho_port',`
+interface(`corenet_udp_receive_servistaitsm_port',`
 	gen_require(`
-		type rwho_port_t;
+		type servistaitsm_port_t;
 	')
 
-	allow $1 rwho_port_t:udp_socket recv_msg;
+	allow $1 servistaitsm_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the rwho port.
+##	Do not audit attempts to receive UDP traffic on the servistaitsm port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76341,17 +79442,17 @@ interface(`corenet_udp_receive_rwho_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_rwho_port',`
+interface(`corenet_dontaudit_udp_receive_servistaitsm_port',`
 	gen_require(`
-		type rwho_port_t;
+		type servistaitsm_port_t;
 	')
 
-	dontaudit $1 rwho_port_t:udp_socket recv_msg;
+	dontaudit $1 servistaitsm_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the rwho port.
+##	Send and receive UDP traffic on the servistaitsm port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76360,15 +79461,15 @@ interface(`corenet_dontaudit_udp_receive_rwho_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_rwho_port',`
-	corenet_udp_send_rwho_port($1)
-	corenet_udp_receive_rwho_port($1)
+interface(`corenet_udp_sendrecv_servistaitsm_port',`
+	corenet_udp_send_servistaitsm_port($1)
+	corenet_udp_receive_servistaitsm_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the rwho port.
+##	UDP traffic on the servistaitsm port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76377,14 +79478,14 @@ interface(`corenet_udp_sendrecv_rwho_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_rwho_port',`
-	corenet_dontaudit_udp_send_rwho_port($1)
-	corenet_dontaudit_udp_receive_rwho_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_servistaitsm_port',`
+	corenet_dontaudit_udp_send_servistaitsm_port($1)
+	corenet_dontaudit_udp_receive_servistaitsm_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the rwho port.
+##	Bind TCP sockets to the servistaitsm port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76393,18 +79494,18 @@ interface(`corenet_dontaudit_udp_sendrecv_rwho_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_rwho_port',`
+interface(`corenet_tcp_bind_servistaitsm_port',`
 	gen_require(`
-		type rwho_port_t;
+		type servistaitsm_port_t;
 	')
 
-	allow $1 rwho_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 servistaitsm_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the rwho port.
+##	Bind UDP sockets to the servistaitsm port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76413,18 +79514,18 @@ interface(`corenet_tcp_bind_rwho_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_rwho_port',`
+interface(`corenet_udp_bind_servistaitsm_port',`
 	gen_require(`
-		type rwho_port_t;
+		type servistaitsm_port_t;
 	')
 
-	allow $1 rwho_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 servistaitsm_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the rwho port.
+##	Make a TCP connection to the servistaitsm port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76432,18 +79533,18 @@ interface(`corenet_udp_bind_rwho_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_rwho_port',`
+interface(`corenet_tcp_connect_servistaitsm_port',`
 	gen_require(`
-		type rwho_port_t;
+		type servistaitsm_port_t;
 	')
 
-	allow $1 rwho_port_t:tcp_socket name_connect;
+	allow $1 servistaitsm_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send rwho_client packets.
+##	Send servistaitsm_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76452,17 +79553,17 @@ interface(`corenet_tcp_connect_rwho_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_rwho_client_packets',`
+interface(`corenet_send_servistaitsm_client_packets',`
 	gen_require(`
-		type rwho_client_packet_t;
+		type servistaitsm_client_packet_t;
 	')
 
-	allow $1 rwho_client_packet_t:packet send;
+	allow $1 servistaitsm_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send rwho_client packets.
+##	Do not audit attempts to send servistaitsm_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76471,17 +79572,17 @@ interface(`corenet_send_rwho_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_rwho_client_packets',`
+interface(`corenet_dontaudit_send_servistaitsm_client_packets',`
 	gen_require(`
-		type rwho_client_packet_t;
+		type servistaitsm_client_packet_t;
 	')
 
-	dontaudit $1 rwho_client_packet_t:packet send;
+	dontaudit $1 servistaitsm_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive rwho_client packets.
+##	Receive servistaitsm_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76490,17 +79591,17 @@ interface(`corenet_dontaudit_send_rwho_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_rwho_client_packets',`
+interface(`corenet_receive_servistaitsm_client_packets',`
 	gen_require(`
-		type rwho_client_packet_t;
+		type servistaitsm_client_packet_t;
 	')
 
-	allow $1 rwho_client_packet_t:packet recv;
+	allow $1 servistaitsm_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive rwho_client packets.
+##	Do not audit attempts to receive servistaitsm_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76509,17 +79610,17 @@ interface(`corenet_receive_rwho_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_rwho_client_packets',`
+interface(`corenet_dontaudit_receive_servistaitsm_client_packets',`
 	gen_require(`
-		type rwho_client_packet_t;
+		type servistaitsm_client_packet_t;
 	')
 
-	dontaudit $1 rwho_client_packet_t:packet recv;
+	dontaudit $1 servistaitsm_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive rwho_client packets.
+##	Send and receive servistaitsm_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76528,14 +79629,14 @@ interface(`corenet_dontaudit_receive_rwho_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_rwho_client_packets',`
-	corenet_send_rwho_client_packets($1)
-	corenet_receive_rwho_client_packets($1)
+interface(`corenet_sendrecv_servistaitsm_client_packets',`
+	corenet_send_servistaitsm_client_packets($1)
+	corenet_receive_servistaitsm_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive rwho_client packets.
+##	Do not audit attempts to send and receive servistaitsm_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76544,14 +79645,14 @@ interface(`corenet_sendrecv_rwho_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_rwho_client_packets',`
-	corenet_dontaudit_send_rwho_client_packets($1)
-	corenet_dontaudit_receive_rwho_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_servistaitsm_client_packets',`
+	corenet_dontaudit_send_servistaitsm_client_packets($1)
+	corenet_dontaudit_receive_servistaitsm_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to rwho_client the packet type.
+##	Relabel packets to servistaitsm_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76559,18 +79660,18 @@ interface(`corenet_dontaudit_sendrecv_rwho_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_rwho_client_packets',`
+interface(`corenet_relabelto_servistaitsm_client_packets',`
 	gen_require(`
-		type rwho_client_packet_t;
+		type servistaitsm_client_packet_t;
 	')
 
-	allow $1 rwho_client_packet_t:packet relabelto;
+	allow $1 servistaitsm_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send rwho_server packets.
+##	Send servistaitsm_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76579,17 +79680,17 @@ interface(`corenet_relabelto_rwho_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_rwho_server_packets',`
+interface(`corenet_send_servistaitsm_server_packets',`
 	gen_require(`
-		type rwho_server_packet_t;
+		type servistaitsm_server_packet_t;
 	')
 
-	allow $1 rwho_server_packet_t:packet send;
+	allow $1 servistaitsm_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send rwho_server packets.
+##	Do not audit attempts to send servistaitsm_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76598,17 +79699,17 @@ interface(`corenet_send_rwho_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_rwho_server_packets',`
+interface(`corenet_dontaudit_send_servistaitsm_server_packets',`
 	gen_require(`
-		type rwho_server_packet_t;
+		type servistaitsm_server_packet_t;
 	')
 
-	dontaudit $1 rwho_server_packet_t:packet send;
+	dontaudit $1 servistaitsm_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive rwho_server packets.
+##	Receive servistaitsm_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76617,17 +79718,17 @@ interface(`corenet_dontaudit_send_rwho_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_rwho_server_packets',`
+interface(`corenet_receive_servistaitsm_server_packets',`
 	gen_require(`
-		type rwho_server_packet_t;
+		type servistaitsm_server_packet_t;
 	')
 
-	allow $1 rwho_server_packet_t:packet recv;
+	allow $1 servistaitsm_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive rwho_server packets.
+##	Do not audit attempts to receive servistaitsm_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76636,17 +79737,17 @@ interface(`corenet_receive_rwho_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_rwho_server_packets',`
+interface(`corenet_dontaudit_receive_servistaitsm_server_packets',`
 	gen_require(`
-		type rwho_server_packet_t;
+		type servistaitsm_server_packet_t;
 	')
 
-	dontaudit $1 rwho_server_packet_t:packet recv;
+	dontaudit $1 servistaitsm_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive rwho_server packets.
+##	Send and receive servistaitsm_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76655,14 +79756,14 @@ interface(`corenet_dontaudit_receive_rwho_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_rwho_server_packets',`
-	corenet_send_rwho_server_packets($1)
-	corenet_receive_rwho_server_packets($1)
+interface(`corenet_sendrecv_servistaitsm_server_packets',`
+	corenet_send_servistaitsm_server_packets($1)
+	corenet_receive_servistaitsm_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive rwho_server packets.
+##	Do not audit attempts to send and receive servistaitsm_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76671,14 +79772,14 @@ interface(`corenet_sendrecv_rwho_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_rwho_server_packets',`
-	corenet_dontaudit_send_rwho_server_packets($1)
-	corenet_dontaudit_receive_rwho_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_servistaitsm_server_packets',`
+	corenet_dontaudit_send_servistaitsm_server_packets($1)
+	corenet_dontaudit_receive_servistaitsm_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to rwho_server the packet type.
+##	Relabel packets to servistaitsm_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76686,12 +79787,12 @@ interface(`corenet_dontaudit_sendrecv_rwho_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_rwho_server_packets',`
+interface(`corenet_relabelto_servistaitsm_server_packets',`
 	gen_require(`
-		type rwho_server_packet_t;
+		type servistaitsm_server_packet_t;
 	')
 
-	allow $1 rwho_server_packet_t:packet relabelto;
+	allow $1 servistaitsm_server_packet_t:packet relabelto;
 ')
 
 
@@ -76699,7 +79800,7 @@ interface(`corenet_relabelto_rwho_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the salt port.
+##	Send and receive TCP traffic on the sieve port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76708,17 +79809,17 @@ interface(`corenet_relabelto_rwho_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_salt_port',`
+interface(`corenet_tcp_sendrecv_sieve_port',`
 	gen_require(`
-		type salt_port_t;
+		type sieve_port_t;
 	')
 
-	allow $1 salt_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 sieve_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the salt port.
+##	Send UDP traffic on the sieve port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76727,17 +79828,17 @@ interface(`corenet_tcp_sendrecv_salt_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_salt_port',`
+interface(`corenet_udp_send_sieve_port',`
 	gen_require(`
-		type salt_port_t;
+		type sieve_port_t;
 	')
 
-	allow $1 salt_port_t:udp_socket send_msg;
+	allow $1 sieve_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the salt port.
+##	Do not audit attempts to send UDP traffic on the sieve port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76746,17 +79847,17 @@ interface(`corenet_udp_send_salt_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_salt_port',`
+interface(`corenet_dontaudit_udp_send_sieve_port',`
 	gen_require(`
-		type salt_port_t;
+		type sieve_port_t;
 	')
 
-	dontaudit $1 salt_port_t:udp_socket send_msg;
+	dontaudit $1 sieve_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the salt port.
+##	Receive UDP traffic on the sieve port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76765,17 +79866,17 @@ interface(`corenet_dontaudit_udp_send_salt_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_salt_port',`
+interface(`corenet_udp_receive_sieve_port',`
 	gen_require(`
-		type salt_port_t;
+		type sieve_port_t;
 	')
 
-	allow $1 salt_port_t:udp_socket recv_msg;
+	allow $1 sieve_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the salt port.
+##	Do not audit attempts to receive UDP traffic on the sieve port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76784,17 +79885,17 @@ interface(`corenet_udp_receive_salt_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_salt_port',`
+interface(`corenet_dontaudit_udp_receive_sieve_port',`
 	gen_require(`
-		type salt_port_t;
+		type sieve_port_t;
 	')
 
-	dontaudit $1 salt_port_t:udp_socket recv_msg;
+	dontaudit $1 sieve_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the salt port.
+##	Send and receive UDP traffic on the sieve port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76803,15 +79904,15 @@ interface(`corenet_dontaudit_udp_receive_salt_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_salt_port',`
-	corenet_udp_send_salt_port($1)
-	corenet_udp_receive_salt_port($1)
+interface(`corenet_udp_sendrecv_sieve_port',`
+	corenet_udp_send_sieve_port($1)
+	corenet_udp_receive_sieve_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the salt port.
+##	UDP traffic on the sieve port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76820,14 +79921,14 @@ interface(`corenet_udp_sendrecv_salt_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_salt_port',`
-	corenet_dontaudit_udp_send_salt_port($1)
-	corenet_dontaudit_udp_receive_salt_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_sieve_port',`
+	corenet_dontaudit_udp_send_sieve_port($1)
+	corenet_dontaudit_udp_receive_sieve_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the salt port.
+##	Bind TCP sockets to the sieve port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76836,18 +79937,18 @@ interface(`corenet_dontaudit_udp_sendrecv_salt_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_salt_port',`
+interface(`corenet_tcp_bind_sieve_port',`
 	gen_require(`
-		type salt_port_t;
+		type sieve_port_t;
 	')
 
-	allow $1 salt_port_t:tcp_socket name_bind;
+	allow $1 sieve_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the salt port.
+##	Bind UDP sockets to the sieve port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76856,18 +79957,18 @@ interface(`corenet_tcp_bind_salt_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_salt_port',`
+interface(`corenet_udp_bind_sieve_port',`
 	gen_require(`
-		type salt_port_t;
+		type sieve_port_t;
 	')
 
-	allow $1 salt_port_t:udp_socket name_bind;
+	allow $1 sieve_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the salt port.
+##	Make a TCP connection to the sieve port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76875,18 +79976,18 @@ interface(`corenet_udp_bind_salt_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_salt_port',`
+interface(`corenet_tcp_connect_sieve_port',`
 	gen_require(`
-		type salt_port_t;
+		type sieve_port_t;
 	')
 
-	allow $1 salt_port_t:tcp_socket name_connect;
+	allow $1 sieve_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send salt_client packets.
+##	Send sieve_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76895,17 +79996,17 @@ interface(`corenet_tcp_connect_salt_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_salt_client_packets',`
+interface(`corenet_send_sieve_client_packets',`
 	gen_require(`
-		type salt_client_packet_t;
+		type sieve_client_packet_t;
 	')
 
-	allow $1 salt_client_packet_t:packet send;
+	allow $1 sieve_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send salt_client packets.
+##	Do not audit attempts to send sieve_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76914,17 +80015,17 @@ interface(`corenet_send_salt_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_salt_client_packets',`
+interface(`corenet_dontaudit_send_sieve_client_packets',`
 	gen_require(`
-		type salt_client_packet_t;
+		type sieve_client_packet_t;
 	')
 
-	dontaudit $1 salt_client_packet_t:packet send;
+	dontaudit $1 sieve_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive salt_client packets.
+##	Receive sieve_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76933,17 +80034,17 @@ interface(`corenet_dontaudit_send_salt_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_salt_client_packets',`
+interface(`corenet_receive_sieve_client_packets',`
 	gen_require(`
-		type salt_client_packet_t;
+		type sieve_client_packet_t;
 	')
 
-	allow $1 salt_client_packet_t:packet recv;
+	allow $1 sieve_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive salt_client packets.
+##	Do not audit attempts to receive sieve_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76952,17 +80053,17 @@ interface(`corenet_receive_salt_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_salt_client_packets',`
+interface(`corenet_dontaudit_receive_sieve_client_packets',`
 	gen_require(`
-		type salt_client_packet_t;
+		type sieve_client_packet_t;
 	')
 
-	dontaudit $1 salt_client_packet_t:packet recv;
+	dontaudit $1 sieve_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive salt_client packets.
+##	Send and receive sieve_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76971,14 +80072,14 @@ interface(`corenet_dontaudit_receive_salt_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_salt_client_packets',`
-	corenet_send_salt_client_packets($1)
-	corenet_receive_salt_client_packets($1)
+interface(`corenet_sendrecv_sieve_client_packets',`
+	corenet_send_sieve_client_packets($1)
+	corenet_receive_sieve_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive salt_client packets.
+##	Do not audit attempts to send and receive sieve_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -76987,14 +80088,14 @@ interface(`corenet_sendrecv_salt_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_salt_client_packets',`
-	corenet_dontaudit_send_salt_client_packets($1)
-	corenet_dontaudit_receive_salt_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_sieve_client_packets',`
+	corenet_dontaudit_send_sieve_client_packets($1)
+	corenet_dontaudit_receive_sieve_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to salt_client the packet type.
+##	Relabel packets to sieve_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77002,18 +80103,18 @@ interface(`corenet_dontaudit_sendrecv_salt_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_salt_client_packets',`
+interface(`corenet_relabelto_sieve_client_packets',`
 	gen_require(`
-		type salt_client_packet_t;
+		type sieve_client_packet_t;
 	')
 
-	allow $1 salt_client_packet_t:packet relabelto;
+	allow $1 sieve_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send salt_server packets.
+##	Send sieve_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77022,17 +80123,17 @@ interface(`corenet_relabelto_salt_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_salt_server_packets',`
+interface(`corenet_send_sieve_server_packets',`
 	gen_require(`
-		type salt_server_packet_t;
+		type sieve_server_packet_t;
 	')
 
-	allow $1 salt_server_packet_t:packet send;
+	allow $1 sieve_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send salt_server packets.
+##	Do not audit attempts to send sieve_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77041,17 +80142,17 @@ interface(`corenet_send_salt_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_salt_server_packets',`
+interface(`corenet_dontaudit_send_sieve_server_packets',`
 	gen_require(`
-		type salt_server_packet_t;
+		type sieve_server_packet_t;
 	')
 
-	dontaudit $1 salt_server_packet_t:packet send;
+	dontaudit $1 sieve_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive salt_server packets.
+##	Receive sieve_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77060,17 +80161,17 @@ interface(`corenet_dontaudit_send_salt_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_salt_server_packets',`
+interface(`corenet_receive_sieve_server_packets',`
 	gen_require(`
-		type salt_server_packet_t;
+		type sieve_server_packet_t;
 	')
 
-	allow $1 salt_server_packet_t:packet recv;
+	allow $1 sieve_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive salt_server packets.
+##	Do not audit attempts to receive sieve_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77079,17 +80180,17 @@ interface(`corenet_receive_salt_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_salt_server_packets',`
+interface(`corenet_dontaudit_receive_sieve_server_packets',`
 	gen_require(`
-		type salt_server_packet_t;
+		type sieve_server_packet_t;
 	')
 
-	dontaudit $1 salt_server_packet_t:packet recv;
+	dontaudit $1 sieve_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive salt_server packets.
+##	Send and receive sieve_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77098,14 +80199,14 @@ interface(`corenet_dontaudit_receive_salt_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_salt_server_packets',`
-	corenet_send_salt_server_packets($1)
-	corenet_receive_salt_server_packets($1)
+interface(`corenet_sendrecv_sieve_server_packets',`
+	corenet_send_sieve_server_packets($1)
+	corenet_receive_sieve_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive salt_server packets.
+##	Do not audit attempts to send and receive sieve_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77114,14 +80215,14 @@ interface(`corenet_sendrecv_salt_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_salt_server_packets',`
-	corenet_dontaudit_send_salt_server_packets($1)
-	corenet_dontaudit_receive_salt_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_sieve_server_packets',`
+	corenet_dontaudit_send_sieve_server_packets($1)
+	corenet_dontaudit_receive_sieve_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to salt_server the packet type.
+##	Relabel packets to sieve_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77129,12 +80230,12 @@ interface(`corenet_dontaudit_sendrecv_salt_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_salt_server_packets',`
+interface(`corenet_relabelto_sieve_server_packets',`
 	gen_require(`
-		type salt_server_packet_t;
+		type sieve_server_packet_t;
 	')
 
-	allow $1 salt_server_packet_t:packet relabelto;
+	allow $1 sieve_server_packet_t:packet relabelto;
 ')
 
 
@@ -77142,7 +80243,7 @@ interface(`corenet_relabelto_salt_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the sap port.
+##	Send and receive TCP traffic on the sip port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77151,17 +80252,17 @@ interface(`corenet_relabelto_salt_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_sap_port',`
+interface(`corenet_tcp_sendrecv_sip_port',`
 	gen_require(`
-		type sap_port_t;
+		type sip_port_t;
 	')
 
-	allow $1 sap_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 sip_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the sap port.
+##	Send UDP traffic on the sip port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77170,17 +80271,17 @@ interface(`corenet_tcp_sendrecv_sap_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_sap_port',`
+interface(`corenet_udp_send_sip_port',`
 	gen_require(`
-		type sap_port_t;
+		type sip_port_t;
 	')
 
-	allow $1 sap_port_t:udp_socket send_msg;
+	allow $1 sip_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the sap port.
+##	Do not audit attempts to send UDP traffic on the sip port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77189,17 +80290,17 @@ interface(`corenet_udp_send_sap_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_sap_port',`
+interface(`corenet_dontaudit_udp_send_sip_port',`
 	gen_require(`
-		type sap_port_t;
+		type sip_port_t;
 	')
 
-	dontaudit $1 sap_port_t:udp_socket send_msg;
+	dontaudit $1 sip_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the sap port.
+##	Receive UDP traffic on the sip port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77208,17 +80309,17 @@ interface(`corenet_dontaudit_udp_send_sap_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_sap_port',`
+interface(`corenet_udp_receive_sip_port',`
 	gen_require(`
-		type sap_port_t;
+		type sip_port_t;
 	')
 
-	allow $1 sap_port_t:udp_socket recv_msg;
+	allow $1 sip_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the sap port.
+##	Do not audit attempts to receive UDP traffic on the sip port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77227,17 +80328,17 @@ interface(`corenet_udp_receive_sap_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_sap_port',`
+interface(`corenet_dontaudit_udp_receive_sip_port',`
 	gen_require(`
-		type sap_port_t;
+		type sip_port_t;
 	')
 
-	dontaudit $1 sap_port_t:udp_socket recv_msg;
+	dontaudit $1 sip_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the sap port.
+##	Send and receive UDP traffic on the sip port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77246,15 +80347,15 @@ interface(`corenet_dontaudit_udp_receive_sap_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_sap_port',`
-	corenet_udp_send_sap_port($1)
-	corenet_udp_receive_sap_port($1)
+interface(`corenet_udp_sendrecv_sip_port',`
+	corenet_udp_send_sip_port($1)
+	corenet_udp_receive_sip_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the sap port.
+##	UDP traffic on the sip port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77263,14 +80364,14 @@ interface(`corenet_udp_sendrecv_sap_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_sap_port',`
-	corenet_dontaudit_udp_send_sap_port($1)
-	corenet_dontaudit_udp_receive_sap_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_sip_port',`
+	corenet_dontaudit_udp_send_sip_port($1)
+	corenet_dontaudit_udp_receive_sip_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the sap port.
+##	Bind TCP sockets to the sip port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77279,18 +80380,18 @@ interface(`corenet_dontaudit_udp_sendrecv_sap_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_sap_port',`
+interface(`corenet_tcp_bind_sip_port',`
 	gen_require(`
-		type sap_port_t;
+		type sip_port_t;
 	')
 
-	allow $1 sap_port_t:tcp_socket name_bind;
+	allow $1 sip_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the sap port.
+##	Bind UDP sockets to the sip port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77299,18 +80400,18 @@ interface(`corenet_tcp_bind_sap_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_sap_port',`
+interface(`corenet_udp_bind_sip_port',`
 	gen_require(`
-		type sap_port_t;
+		type sip_port_t;
 	')
 
-	allow $1 sap_port_t:udp_socket name_bind;
+	allow $1 sip_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the sap port.
+##	Make a TCP connection to the sip port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77318,18 +80419,18 @@ interface(`corenet_udp_bind_sap_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_sap_port',`
+interface(`corenet_tcp_connect_sip_port',`
 	gen_require(`
-		type sap_port_t;
+		type sip_port_t;
 	')
 
-	allow $1 sap_port_t:tcp_socket name_connect;
+	allow $1 sip_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send sap_client packets.
+##	Send sip_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77338,17 +80439,17 @@ interface(`corenet_tcp_connect_sap_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_sap_client_packets',`
+interface(`corenet_send_sip_client_packets',`
 	gen_require(`
-		type sap_client_packet_t;
+		type sip_client_packet_t;
 	')
 
-	allow $1 sap_client_packet_t:packet send;
+	allow $1 sip_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send sap_client packets.
+##	Do not audit attempts to send sip_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77357,17 +80458,17 @@ interface(`corenet_send_sap_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_sap_client_packets',`
+interface(`corenet_dontaudit_send_sip_client_packets',`
 	gen_require(`
-		type sap_client_packet_t;
+		type sip_client_packet_t;
 	')
 
-	dontaudit $1 sap_client_packet_t:packet send;
+	dontaudit $1 sip_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive sap_client packets.
+##	Receive sip_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77376,17 +80477,17 @@ interface(`corenet_dontaudit_send_sap_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_sap_client_packets',`
+interface(`corenet_receive_sip_client_packets',`
 	gen_require(`
-		type sap_client_packet_t;
+		type sip_client_packet_t;
 	')
 
-	allow $1 sap_client_packet_t:packet recv;
+	allow $1 sip_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive sap_client packets.
+##	Do not audit attempts to receive sip_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77395,17 +80496,17 @@ interface(`corenet_receive_sap_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_sap_client_packets',`
+interface(`corenet_dontaudit_receive_sip_client_packets',`
 	gen_require(`
-		type sap_client_packet_t;
+		type sip_client_packet_t;
 	')
 
-	dontaudit $1 sap_client_packet_t:packet recv;
+	dontaudit $1 sip_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive sap_client packets.
+##	Send and receive sip_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77414,14 +80515,14 @@ interface(`corenet_dontaudit_receive_sap_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_sap_client_packets',`
-	corenet_send_sap_client_packets($1)
-	corenet_receive_sap_client_packets($1)
+interface(`corenet_sendrecv_sip_client_packets',`
+	corenet_send_sip_client_packets($1)
+	corenet_receive_sip_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive sap_client packets.
+##	Do not audit attempts to send and receive sip_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77430,14 +80531,14 @@ interface(`corenet_sendrecv_sap_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_sap_client_packets',`
-	corenet_dontaudit_send_sap_client_packets($1)
-	corenet_dontaudit_receive_sap_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_sip_client_packets',`
+	corenet_dontaudit_send_sip_client_packets($1)
+	corenet_dontaudit_receive_sip_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to sap_client the packet type.
+##	Relabel packets to sip_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77445,18 +80546,18 @@ interface(`corenet_dontaudit_sendrecv_sap_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_sap_client_packets',`
+interface(`corenet_relabelto_sip_client_packets',`
 	gen_require(`
-		type sap_client_packet_t;
+		type sip_client_packet_t;
 	')
 
-	allow $1 sap_client_packet_t:packet relabelto;
+	allow $1 sip_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send sap_server packets.
+##	Send sip_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77465,17 +80566,17 @@ interface(`corenet_relabelto_sap_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_sap_server_packets',`
+interface(`corenet_send_sip_server_packets',`
 	gen_require(`
-		type sap_server_packet_t;
+		type sip_server_packet_t;
 	')
 
-	allow $1 sap_server_packet_t:packet send;
+	allow $1 sip_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send sap_server packets.
+##	Do not audit attempts to send sip_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77484,17 +80585,17 @@ interface(`corenet_send_sap_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_sap_server_packets',`
+interface(`corenet_dontaudit_send_sip_server_packets',`
 	gen_require(`
-		type sap_server_packet_t;
+		type sip_server_packet_t;
 	')
 
-	dontaudit $1 sap_server_packet_t:packet send;
+	dontaudit $1 sip_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive sap_server packets.
+##	Receive sip_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77503,17 +80604,17 @@ interface(`corenet_dontaudit_send_sap_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_sap_server_packets',`
+interface(`corenet_receive_sip_server_packets',`
 	gen_require(`
-		type sap_server_packet_t;
+		type sip_server_packet_t;
 	')
 
-	allow $1 sap_server_packet_t:packet recv;
+	allow $1 sip_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive sap_server packets.
+##	Do not audit attempts to receive sip_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77522,17 +80623,17 @@ interface(`corenet_receive_sap_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_sap_server_packets',`
+interface(`corenet_dontaudit_receive_sip_server_packets',`
 	gen_require(`
-		type sap_server_packet_t;
+		type sip_server_packet_t;
 	')
 
-	dontaudit $1 sap_server_packet_t:packet recv;
+	dontaudit $1 sip_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive sap_server packets.
+##	Send and receive sip_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77541,14 +80642,14 @@ interface(`corenet_dontaudit_receive_sap_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_sap_server_packets',`
-	corenet_send_sap_server_packets($1)
-	corenet_receive_sap_server_packets($1)
+interface(`corenet_sendrecv_sip_server_packets',`
+	corenet_send_sip_server_packets($1)
+	corenet_receive_sip_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive sap_server packets.
+##	Do not audit attempts to send and receive sip_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77557,14 +80658,14 @@ interface(`corenet_sendrecv_sap_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_sap_server_packets',`
-	corenet_dontaudit_send_sap_server_packets($1)
-	corenet_dontaudit_receive_sap_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_sip_server_packets',`
+	corenet_dontaudit_send_sip_server_packets($1)
+	corenet_dontaudit_receive_sip_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to sap_server the packet type.
+##	Relabel packets to sip_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77572,12 +80673,12 @@ interface(`corenet_dontaudit_sendrecv_sap_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_sap_server_packets',`
+interface(`corenet_relabelto_sip_server_packets',`
 	gen_require(`
-		type sap_server_packet_t;
+		type sip_server_packet_t;
 	')
 
-	allow $1 sap_server_packet_t:packet relabelto;
+	allow $1 sip_server_packet_t:packet relabelto;
 ')
 
 
@@ -77585,7 +80686,7 @@ interface(`corenet_relabelto_sap_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the servistaitsm port.
+##	Send and receive TCP traffic on the sixxsconfig port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77594,17 +80695,17 @@ interface(`corenet_relabelto_sap_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_servistaitsm_port',`
+interface(`corenet_tcp_sendrecv_sixxsconfig_port',`
 	gen_require(`
-		type servistaitsm_port_t;
+		type sixxsconfig_port_t;
 	')
 
-	allow $1 servistaitsm_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 sixxsconfig_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the servistaitsm port.
+##	Send UDP traffic on the sixxsconfig port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77613,17 +80714,17 @@ interface(`corenet_tcp_sendrecv_servistaitsm_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_servistaitsm_port',`
+interface(`corenet_udp_send_sixxsconfig_port',`
 	gen_require(`
-		type servistaitsm_port_t;
+		type sixxsconfig_port_t;
 	')
 
-	allow $1 servistaitsm_port_t:udp_socket send_msg;
+	allow $1 sixxsconfig_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the servistaitsm port.
+##	Do not audit attempts to send UDP traffic on the sixxsconfig port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77632,17 +80733,17 @@ interface(`corenet_udp_send_servistaitsm_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_servistaitsm_port',`
+interface(`corenet_dontaudit_udp_send_sixxsconfig_port',`
 	gen_require(`
-		type servistaitsm_port_t;
+		type sixxsconfig_port_t;
 	')
 
-	dontaudit $1 servistaitsm_port_t:udp_socket send_msg;
+	dontaudit $1 sixxsconfig_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the servistaitsm port.
+##	Receive UDP traffic on the sixxsconfig port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77651,17 +80752,17 @@ interface(`corenet_dontaudit_udp_send_servistaitsm_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_servistaitsm_port',`
+interface(`corenet_udp_receive_sixxsconfig_port',`
 	gen_require(`
-		type servistaitsm_port_t;
+		type sixxsconfig_port_t;
 	')
 
-	allow $1 servistaitsm_port_t:udp_socket recv_msg;
+	allow $1 sixxsconfig_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the servistaitsm port.
+##	Do not audit attempts to receive UDP traffic on the sixxsconfig port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77670,17 +80771,17 @@ interface(`corenet_udp_receive_servistaitsm_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_servistaitsm_port',`
+interface(`corenet_dontaudit_udp_receive_sixxsconfig_port',`
 	gen_require(`
-		type servistaitsm_port_t;
+		type sixxsconfig_port_t;
 	')
 
-	dontaudit $1 servistaitsm_port_t:udp_socket recv_msg;
+	dontaudit $1 sixxsconfig_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the servistaitsm port.
+##	Send and receive UDP traffic on the sixxsconfig port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77689,15 +80790,15 @@ interface(`corenet_dontaudit_udp_receive_servistaitsm_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_servistaitsm_port',`
-	corenet_udp_send_servistaitsm_port($1)
-	corenet_udp_receive_servistaitsm_port($1)
+interface(`corenet_udp_sendrecv_sixxsconfig_port',`
+	corenet_udp_send_sixxsconfig_port($1)
+	corenet_udp_receive_sixxsconfig_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the servistaitsm port.
+##	UDP traffic on the sixxsconfig port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77706,14 +80807,14 @@ interface(`corenet_udp_sendrecv_servistaitsm_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_servistaitsm_port',`
-	corenet_dontaudit_udp_send_servistaitsm_port($1)
-	corenet_dontaudit_udp_receive_servistaitsm_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_sixxsconfig_port',`
+	corenet_dontaudit_udp_send_sixxsconfig_port($1)
+	corenet_dontaudit_udp_receive_sixxsconfig_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the servistaitsm port.
+##	Bind TCP sockets to the sixxsconfig port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77722,18 +80823,18 @@ interface(`corenet_dontaudit_udp_sendrecv_servistaitsm_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_servistaitsm_port',`
+interface(`corenet_tcp_bind_sixxsconfig_port',`
 	gen_require(`
-		type servistaitsm_port_t;
+		type sixxsconfig_port_t;
 	')
 
-	allow $1 servistaitsm_port_t:tcp_socket name_bind;
+	allow $1 sixxsconfig_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the servistaitsm port.
+##	Bind UDP sockets to the sixxsconfig port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77742,18 +80843,18 @@ interface(`corenet_tcp_bind_servistaitsm_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_servistaitsm_port',`
+interface(`corenet_udp_bind_sixxsconfig_port',`
 	gen_require(`
-		type servistaitsm_port_t;
+		type sixxsconfig_port_t;
 	')
 
-	allow $1 servistaitsm_port_t:udp_socket name_bind;
+	allow $1 sixxsconfig_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the servistaitsm port.
+##	Make a TCP connection to the sixxsconfig port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77761,18 +80862,18 @@ interface(`corenet_udp_bind_servistaitsm_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_servistaitsm_port',`
+interface(`corenet_tcp_connect_sixxsconfig_port',`
 	gen_require(`
-		type servistaitsm_port_t;
+		type sixxsconfig_port_t;
 	')
 
-	allow $1 servistaitsm_port_t:tcp_socket name_connect;
+	allow $1 sixxsconfig_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send servistaitsm_client packets.
+##	Send sixxsconfig_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77781,17 +80882,17 @@ interface(`corenet_tcp_connect_servistaitsm_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_servistaitsm_client_packets',`
+interface(`corenet_send_sixxsconfig_client_packets',`
 	gen_require(`
-		type servistaitsm_client_packet_t;
+		type sixxsconfig_client_packet_t;
 	')
 
-	allow $1 servistaitsm_client_packet_t:packet send;
+	allow $1 sixxsconfig_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send servistaitsm_client packets.
+##	Do not audit attempts to send sixxsconfig_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77800,17 +80901,17 @@ interface(`corenet_send_servistaitsm_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_servistaitsm_client_packets',`
+interface(`corenet_dontaudit_send_sixxsconfig_client_packets',`
 	gen_require(`
-		type servistaitsm_client_packet_t;
+		type sixxsconfig_client_packet_t;
 	')
 
-	dontaudit $1 servistaitsm_client_packet_t:packet send;
+	dontaudit $1 sixxsconfig_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive servistaitsm_client packets.
+##	Receive sixxsconfig_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77819,17 +80920,17 @@ interface(`corenet_dontaudit_send_servistaitsm_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_servistaitsm_client_packets',`
+interface(`corenet_receive_sixxsconfig_client_packets',`
 	gen_require(`
-		type servistaitsm_client_packet_t;
+		type sixxsconfig_client_packet_t;
 	')
 
-	allow $1 servistaitsm_client_packet_t:packet recv;
+	allow $1 sixxsconfig_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive servistaitsm_client packets.
+##	Do not audit attempts to receive sixxsconfig_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77838,17 +80939,17 @@ interface(`corenet_receive_servistaitsm_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_servistaitsm_client_packets',`
+interface(`corenet_dontaudit_receive_sixxsconfig_client_packets',`
 	gen_require(`
-		type servistaitsm_client_packet_t;
+		type sixxsconfig_client_packet_t;
 	')
 
-	dontaudit $1 servistaitsm_client_packet_t:packet recv;
+	dontaudit $1 sixxsconfig_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive servistaitsm_client packets.
+##	Send and receive sixxsconfig_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77857,14 +80958,14 @@ interface(`corenet_dontaudit_receive_servistaitsm_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_servistaitsm_client_packets',`
-	corenet_send_servistaitsm_client_packets($1)
-	corenet_receive_servistaitsm_client_packets($1)
+interface(`corenet_sendrecv_sixxsconfig_client_packets',`
+	corenet_send_sixxsconfig_client_packets($1)
+	corenet_receive_sixxsconfig_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive servistaitsm_client packets.
+##	Do not audit attempts to send and receive sixxsconfig_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77873,14 +80974,14 @@ interface(`corenet_sendrecv_servistaitsm_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_servistaitsm_client_packets',`
-	corenet_dontaudit_send_servistaitsm_client_packets($1)
-	corenet_dontaudit_receive_servistaitsm_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_sixxsconfig_client_packets',`
+	corenet_dontaudit_send_sixxsconfig_client_packets($1)
+	corenet_dontaudit_receive_sixxsconfig_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to servistaitsm_client the packet type.
+##	Relabel packets to sixxsconfig_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77888,18 +80989,18 @@ interface(`corenet_dontaudit_sendrecv_servistaitsm_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_servistaitsm_client_packets',`
+interface(`corenet_relabelto_sixxsconfig_client_packets',`
 	gen_require(`
-		type servistaitsm_client_packet_t;
+		type sixxsconfig_client_packet_t;
 	')
 
-	allow $1 servistaitsm_client_packet_t:packet relabelto;
+	allow $1 sixxsconfig_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send servistaitsm_server packets.
+##	Send sixxsconfig_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77908,17 +81009,17 @@ interface(`corenet_relabelto_servistaitsm_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_servistaitsm_server_packets',`
+interface(`corenet_send_sixxsconfig_server_packets',`
 	gen_require(`
-		type servistaitsm_server_packet_t;
+		type sixxsconfig_server_packet_t;
 	')
 
-	allow $1 servistaitsm_server_packet_t:packet send;
+	allow $1 sixxsconfig_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send servistaitsm_server packets.
+##	Do not audit attempts to send sixxsconfig_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77927,17 +81028,17 @@ interface(`corenet_send_servistaitsm_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_servistaitsm_server_packets',`
+interface(`corenet_dontaudit_send_sixxsconfig_server_packets',`
 	gen_require(`
-		type servistaitsm_server_packet_t;
+		type sixxsconfig_server_packet_t;
 	')
 
-	dontaudit $1 servistaitsm_server_packet_t:packet send;
+	dontaudit $1 sixxsconfig_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive servistaitsm_server packets.
+##	Receive sixxsconfig_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77946,17 +81047,17 @@ interface(`corenet_dontaudit_send_servistaitsm_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_servistaitsm_server_packets',`
+interface(`corenet_receive_sixxsconfig_server_packets',`
 	gen_require(`
-		type servistaitsm_server_packet_t;
+		type sixxsconfig_server_packet_t;
 	')
 
-	allow $1 servistaitsm_server_packet_t:packet recv;
+	allow $1 sixxsconfig_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive servistaitsm_server packets.
+##	Do not audit attempts to receive sixxsconfig_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77965,17 +81066,17 @@ interface(`corenet_receive_servistaitsm_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_servistaitsm_server_packets',`
+interface(`corenet_dontaudit_receive_sixxsconfig_server_packets',`
 	gen_require(`
-		type servistaitsm_server_packet_t;
+		type sixxsconfig_server_packet_t;
 	')
 
-	dontaudit $1 servistaitsm_server_packet_t:packet recv;
+	dontaudit $1 sixxsconfig_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive servistaitsm_server packets.
+##	Send and receive sixxsconfig_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -77984,14 +81085,14 @@ interface(`corenet_dontaudit_receive_servistaitsm_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_servistaitsm_server_packets',`
-	corenet_send_servistaitsm_server_packets($1)
-	corenet_receive_servistaitsm_server_packets($1)
+interface(`corenet_sendrecv_sixxsconfig_server_packets',`
+	corenet_send_sixxsconfig_server_packets($1)
+	corenet_receive_sixxsconfig_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive servistaitsm_server packets.
+##	Do not audit attempts to send and receive sixxsconfig_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78000,14 +81101,14 @@ interface(`corenet_sendrecv_servistaitsm_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_servistaitsm_server_packets',`
-	corenet_dontaudit_send_servistaitsm_server_packets($1)
-	corenet_dontaudit_receive_servistaitsm_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_sixxsconfig_server_packets',`
+	corenet_dontaudit_send_sixxsconfig_server_packets($1)
+	corenet_dontaudit_receive_sixxsconfig_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to servistaitsm_server the packet type.
+##	Relabel packets to sixxsconfig_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78015,12 +81116,12 @@ interface(`corenet_dontaudit_sendrecv_servistaitsm_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_servistaitsm_server_packets',`
+interface(`corenet_relabelto_sixxsconfig_server_packets',`
 	gen_require(`
-		type servistaitsm_server_packet_t;
+		type sixxsconfig_server_packet_t;
 	')
 
-	allow $1 servistaitsm_server_packet_t:packet relabelto;
+	allow $1 sixxsconfig_server_packet_t:packet relabelto;
 ')
 
 
@@ -78028,7 +81129,7 @@ interface(`corenet_relabelto_servistaitsm_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the sieve port.
+##	Send and receive TCP traffic on the smbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78037,17 +81138,17 @@ interface(`corenet_relabelto_servistaitsm_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_sieve_port',`
+interface(`corenet_tcp_sendrecv_smbd_port',`
 	gen_require(`
-		type sieve_port_t;
+		type smbd_port_t;
 	')
 
-	allow $1 sieve_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 smbd_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the sieve port.
+##	Send UDP traffic on the smbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78056,17 +81157,17 @@ interface(`corenet_tcp_sendrecv_sieve_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_sieve_port',`
+interface(`corenet_udp_send_smbd_port',`
 	gen_require(`
-		type sieve_port_t;
+		type smbd_port_t;
 	')
 
-	allow $1 sieve_port_t:udp_socket send_msg;
+	allow $1 smbd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the sieve port.
+##	Do not audit attempts to send UDP traffic on the smbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78075,17 +81176,17 @@ interface(`corenet_udp_send_sieve_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_sieve_port',`
+interface(`corenet_dontaudit_udp_send_smbd_port',`
 	gen_require(`
-		type sieve_port_t;
+		type smbd_port_t;
 	')
 
-	dontaudit $1 sieve_port_t:udp_socket send_msg;
+	dontaudit $1 smbd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the sieve port.
+##	Receive UDP traffic on the smbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78094,17 +81195,17 @@ interface(`corenet_dontaudit_udp_send_sieve_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_sieve_port',`
+interface(`corenet_udp_receive_smbd_port',`
 	gen_require(`
-		type sieve_port_t;
+		type smbd_port_t;
 	')
 
-	allow $1 sieve_port_t:udp_socket recv_msg;
+	allow $1 smbd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the sieve port.
+##	Do not audit attempts to receive UDP traffic on the smbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78113,17 +81214,17 @@ interface(`corenet_udp_receive_sieve_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_sieve_port',`
+interface(`corenet_dontaudit_udp_receive_smbd_port',`
 	gen_require(`
-		type sieve_port_t;
+		type smbd_port_t;
 	')
 
-	dontaudit $1 sieve_port_t:udp_socket recv_msg;
+	dontaudit $1 smbd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the sieve port.
+##	Send and receive UDP traffic on the smbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78132,15 +81233,15 @@ interface(`corenet_dontaudit_udp_receive_sieve_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_sieve_port',`
-	corenet_udp_send_sieve_port($1)
-	corenet_udp_receive_sieve_port($1)
+interface(`corenet_udp_sendrecv_smbd_port',`
+	corenet_udp_send_smbd_port($1)
+	corenet_udp_receive_smbd_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the sieve port.
+##	UDP traffic on the smbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78149,14 +81250,14 @@ interface(`corenet_udp_sendrecv_sieve_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_sieve_port',`
-	corenet_dontaudit_udp_send_sieve_port($1)
-	corenet_dontaudit_udp_receive_sieve_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_smbd_port',`
+	corenet_dontaudit_udp_send_smbd_port($1)
+	corenet_dontaudit_udp_receive_smbd_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the sieve port.
+##	Bind TCP sockets to the smbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78165,18 +81266,18 @@ interface(`corenet_dontaudit_udp_sendrecv_sieve_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_sieve_port',`
+interface(`corenet_tcp_bind_smbd_port',`
 	gen_require(`
-		type sieve_port_t;
+		type smbd_port_t;
 	')
 
-	allow $1 sieve_port_t:tcp_socket name_bind;
-	
+	allow $1 smbd_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the sieve port.
+##	Bind UDP sockets to the smbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78185,18 +81286,18 @@ interface(`corenet_tcp_bind_sieve_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_sieve_port',`
+interface(`corenet_udp_bind_smbd_port',`
 	gen_require(`
-		type sieve_port_t;
+		type smbd_port_t;
 	')
 
-	allow $1 sieve_port_t:udp_socket name_bind;
-	
+	allow $1 smbd_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the sieve port.
+##	Make a TCP connection to the smbd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78204,18 +81305,18 @@ interface(`corenet_udp_bind_sieve_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_sieve_port',`
+interface(`corenet_tcp_connect_smbd_port',`
 	gen_require(`
-		type sieve_port_t;
+		type smbd_port_t;
 	')
 
-	allow $1 sieve_port_t:tcp_socket name_connect;
+	allow $1 smbd_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send sieve_client packets.
+##	Send smbd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78224,17 +81325,17 @@ interface(`corenet_tcp_connect_sieve_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_sieve_client_packets',`
+interface(`corenet_send_smbd_client_packets',`
 	gen_require(`
-		type sieve_client_packet_t;
+		type smbd_client_packet_t;
 	')
 
-	allow $1 sieve_client_packet_t:packet send;
+	allow $1 smbd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send sieve_client packets.
+##	Do not audit attempts to send smbd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78243,17 +81344,17 @@ interface(`corenet_send_sieve_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_sieve_client_packets',`
+interface(`corenet_dontaudit_send_smbd_client_packets',`
 	gen_require(`
-		type sieve_client_packet_t;
+		type smbd_client_packet_t;
 	')
 
-	dontaudit $1 sieve_client_packet_t:packet send;
+	dontaudit $1 smbd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive sieve_client packets.
+##	Receive smbd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78262,17 +81363,17 @@ interface(`corenet_dontaudit_send_sieve_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_sieve_client_packets',`
+interface(`corenet_receive_smbd_client_packets',`
 	gen_require(`
-		type sieve_client_packet_t;
+		type smbd_client_packet_t;
 	')
 
-	allow $1 sieve_client_packet_t:packet recv;
+	allow $1 smbd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive sieve_client packets.
+##	Do not audit attempts to receive smbd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78281,17 +81382,17 @@ interface(`corenet_receive_sieve_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_sieve_client_packets',`
+interface(`corenet_dontaudit_receive_smbd_client_packets',`
 	gen_require(`
-		type sieve_client_packet_t;
+		type smbd_client_packet_t;
 	')
 
-	dontaudit $1 sieve_client_packet_t:packet recv;
+	dontaudit $1 smbd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive sieve_client packets.
+##	Send and receive smbd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78300,14 +81401,14 @@ interface(`corenet_dontaudit_receive_sieve_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_sieve_client_packets',`
-	corenet_send_sieve_client_packets($1)
-	corenet_receive_sieve_client_packets($1)
+interface(`corenet_sendrecv_smbd_client_packets',`
+	corenet_send_smbd_client_packets($1)
+	corenet_receive_smbd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive sieve_client packets.
+##	Do not audit attempts to send and receive smbd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78316,14 +81417,14 @@ interface(`corenet_sendrecv_sieve_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_sieve_client_packets',`
-	corenet_dontaudit_send_sieve_client_packets($1)
-	corenet_dontaudit_receive_sieve_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_smbd_client_packets',`
+	corenet_dontaudit_send_smbd_client_packets($1)
+	corenet_dontaudit_receive_smbd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to sieve_client the packet type.
+##	Relabel packets to smbd_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78331,18 +81432,18 @@ interface(`corenet_dontaudit_sendrecv_sieve_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_sieve_client_packets',`
+interface(`corenet_relabelto_smbd_client_packets',`
 	gen_require(`
-		type sieve_client_packet_t;
+		type smbd_client_packet_t;
 	')
 
-	allow $1 sieve_client_packet_t:packet relabelto;
+	allow $1 smbd_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send sieve_server packets.
+##	Send smbd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78351,17 +81452,17 @@ interface(`corenet_relabelto_sieve_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_sieve_server_packets',`
+interface(`corenet_send_smbd_server_packets',`
 	gen_require(`
-		type sieve_server_packet_t;
+		type smbd_server_packet_t;
 	')
 
-	allow $1 sieve_server_packet_t:packet send;
+	allow $1 smbd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send sieve_server packets.
+##	Do not audit attempts to send smbd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78370,17 +81471,17 @@ interface(`corenet_send_sieve_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_sieve_server_packets',`
+interface(`corenet_dontaudit_send_smbd_server_packets',`
 	gen_require(`
-		type sieve_server_packet_t;
+		type smbd_server_packet_t;
 	')
 
-	dontaudit $1 sieve_server_packet_t:packet send;
+	dontaudit $1 smbd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive sieve_server packets.
+##	Receive smbd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78389,17 +81490,17 @@ interface(`corenet_dontaudit_send_sieve_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_sieve_server_packets',`
+interface(`corenet_receive_smbd_server_packets',`
 	gen_require(`
-		type sieve_server_packet_t;
+		type smbd_server_packet_t;
 	')
 
-	allow $1 sieve_server_packet_t:packet recv;
+	allow $1 smbd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive sieve_server packets.
+##	Do not audit attempts to receive smbd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78408,17 +81509,17 @@ interface(`corenet_receive_sieve_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_sieve_server_packets',`
+interface(`corenet_dontaudit_receive_smbd_server_packets',`
 	gen_require(`
-		type sieve_server_packet_t;
+		type smbd_server_packet_t;
 	')
 
-	dontaudit $1 sieve_server_packet_t:packet recv;
+	dontaudit $1 smbd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive sieve_server packets.
+##	Send and receive smbd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78427,14 +81528,14 @@ interface(`corenet_dontaudit_receive_sieve_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_sieve_server_packets',`
-	corenet_send_sieve_server_packets($1)
-	corenet_receive_sieve_server_packets($1)
+interface(`corenet_sendrecv_smbd_server_packets',`
+	corenet_send_smbd_server_packets($1)
+	corenet_receive_smbd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive sieve_server packets.
+##	Do not audit attempts to send and receive smbd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78443,14 +81544,14 @@ interface(`corenet_sendrecv_sieve_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_sieve_server_packets',`
-	corenet_dontaudit_send_sieve_server_packets($1)
-	corenet_dontaudit_receive_sieve_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_smbd_server_packets',`
+	corenet_dontaudit_send_smbd_server_packets($1)
+	corenet_dontaudit_receive_smbd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to sieve_server the packet type.
+##	Relabel packets to smbd_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78458,12 +81559,12 @@ interface(`corenet_dontaudit_sendrecv_sieve_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_sieve_server_packets',`
+interface(`corenet_relabelto_smbd_server_packets',`
 	gen_require(`
-		type sieve_server_packet_t;
+		type smbd_server_packet_t;
 	')
 
-	allow $1 sieve_server_packet_t:packet relabelto;
+	allow $1 smbd_server_packet_t:packet relabelto;
 ')
 
 
@@ -78471,7 +81572,7 @@ interface(`corenet_relabelto_sieve_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the sip port.
+##	Send and receive TCP traffic on the smtp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78480,17 +81581,17 @@ interface(`corenet_relabelto_sieve_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_sip_port',`
+interface(`corenet_tcp_sendrecv_smtp_port',`
 	gen_require(`
-		type sip_port_t;
+		type smtp_port_t;
 	')
 
-	allow $1 sip_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 smtp_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the sip port.
+##	Send UDP traffic on the smtp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78499,17 +81600,17 @@ interface(`corenet_tcp_sendrecv_sip_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_sip_port',`
+interface(`corenet_udp_send_smtp_port',`
 	gen_require(`
-		type sip_port_t;
+		type smtp_port_t;
 	')
 
-	allow $1 sip_port_t:udp_socket send_msg;
+	allow $1 smtp_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the sip port.
+##	Do not audit attempts to send UDP traffic on the smtp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78518,17 +81619,17 @@ interface(`corenet_udp_send_sip_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_sip_port',`
+interface(`corenet_dontaudit_udp_send_smtp_port',`
 	gen_require(`
-		type sip_port_t;
+		type smtp_port_t;
 	')
 
-	dontaudit $1 sip_port_t:udp_socket send_msg;
+	dontaudit $1 smtp_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the sip port.
+##	Receive UDP traffic on the smtp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78537,17 +81638,17 @@ interface(`corenet_dontaudit_udp_send_sip_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_sip_port',`
+interface(`corenet_udp_receive_smtp_port',`
 	gen_require(`
-		type sip_port_t;
+		type smtp_port_t;
 	')
 
-	allow $1 sip_port_t:udp_socket recv_msg;
+	allow $1 smtp_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the sip port.
+##	Do not audit attempts to receive UDP traffic on the smtp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78556,17 +81657,17 @@ interface(`corenet_udp_receive_sip_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_sip_port',`
+interface(`corenet_dontaudit_udp_receive_smtp_port',`
 	gen_require(`
-		type sip_port_t;
+		type smtp_port_t;
 	')
 
-	dontaudit $1 sip_port_t:udp_socket recv_msg;
+	dontaudit $1 smtp_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the sip port.
+##	Send and receive UDP traffic on the smtp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78575,15 +81676,15 @@ interface(`corenet_dontaudit_udp_receive_sip_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_sip_port',`
-	corenet_udp_send_sip_port($1)
-	corenet_udp_receive_sip_port($1)
+interface(`corenet_udp_sendrecv_smtp_port',`
+	corenet_udp_send_smtp_port($1)
+	corenet_udp_receive_smtp_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the sip port.
+##	UDP traffic on the smtp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78592,14 +81693,14 @@ interface(`corenet_udp_sendrecv_sip_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_sip_port',`
-	corenet_dontaudit_udp_send_sip_port($1)
-	corenet_dontaudit_udp_receive_sip_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_smtp_port',`
+	corenet_dontaudit_udp_send_smtp_port($1)
+	corenet_dontaudit_udp_receive_smtp_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the sip port.
+##	Bind TCP sockets to the smtp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78608,18 +81709,18 @@ interface(`corenet_dontaudit_udp_sendrecv_sip_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_sip_port',`
+interface(`corenet_tcp_bind_smtp_port',`
 	gen_require(`
-		type sip_port_t;
+		type smtp_port_t;
 	')
 
-	allow $1 sip_port_t:tcp_socket name_bind;
-	
+	allow $1 smtp_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the sip port.
+##	Bind UDP sockets to the smtp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78628,18 +81729,18 @@ interface(`corenet_tcp_bind_sip_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_sip_port',`
+interface(`corenet_udp_bind_smtp_port',`
 	gen_require(`
-		type sip_port_t;
+		type smtp_port_t;
 	')
 
-	allow $1 sip_port_t:udp_socket name_bind;
-	
+	allow $1 smtp_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the sip port.
+##	Make a TCP connection to the smtp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78647,18 +81748,18 @@ interface(`corenet_udp_bind_sip_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_sip_port',`
+interface(`corenet_tcp_connect_smtp_port',`
 	gen_require(`
-		type sip_port_t;
+		type smtp_port_t;
 	')
 
-	allow $1 sip_port_t:tcp_socket name_connect;
+	allow $1 smtp_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send sip_client packets.
+##	Send smtp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78667,17 +81768,17 @@ interface(`corenet_tcp_connect_sip_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_sip_client_packets',`
+interface(`corenet_send_smtp_client_packets',`
 	gen_require(`
-		type sip_client_packet_t;
+		type smtp_client_packet_t;
 	')
 
-	allow $1 sip_client_packet_t:packet send;
+	allow $1 smtp_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send sip_client packets.
+##	Do not audit attempts to send smtp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78686,17 +81787,17 @@ interface(`corenet_send_sip_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_sip_client_packets',`
+interface(`corenet_dontaudit_send_smtp_client_packets',`
 	gen_require(`
-		type sip_client_packet_t;
+		type smtp_client_packet_t;
 	')
 
-	dontaudit $1 sip_client_packet_t:packet send;
+	dontaudit $1 smtp_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive sip_client packets.
+##	Receive smtp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78705,17 +81806,17 @@ interface(`corenet_dontaudit_send_sip_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_sip_client_packets',`
+interface(`corenet_receive_smtp_client_packets',`
 	gen_require(`
-		type sip_client_packet_t;
+		type smtp_client_packet_t;
 	')
 
-	allow $1 sip_client_packet_t:packet recv;
+	allow $1 smtp_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive sip_client packets.
+##	Do not audit attempts to receive smtp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78724,17 +81825,17 @@ interface(`corenet_receive_sip_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_sip_client_packets',`
+interface(`corenet_dontaudit_receive_smtp_client_packets',`
 	gen_require(`
-		type sip_client_packet_t;
+		type smtp_client_packet_t;
 	')
 
-	dontaudit $1 sip_client_packet_t:packet recv;
+	dontaudit $1 smtp_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive sip_client packets.
+##	Send and receive smtp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78743,14 +81844,14 @@ interface(`corenet_dontaudit_receive_sip_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_sip_client_packets',`
-	corenet_send_sip_client_packets($1)
-	corenet_receive_sip_client_packets($1)
+interface(`corenet_sendrecv_smtp_client_packets',`
+	corenet_send_smtp_client_packets($1)
+	corenet_receive_smtp_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive sip_client packets.
+##	Do not audit attempts to send and receive smtp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78759,14 +81860,14 @@ interface(`corenet_sendrecv_sip_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_sip_client_packets',`
-	corenet_dontaudit_send_sip_client_packets($1)
-	corenet_dontaudit_receive_sip_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_smtp_client_packets',`
+	corenet_dontaudit_send_smtp_client_packets($1)
+	corenet_dontaudit_receive_smtp_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to sip_client the packet type.
+##	Relabel packets to smtp_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78774,18 +81875,18 @@ interface(`corenet_dontaudit_sendrecv_sip_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_sip_client_packets',`
+interface(`corenet_relabelto_smtp_client_packets',`
 	gen_require(`
-		type sip_client_packet_t;
+		type smtp_client_packet_t;
 	')
 
-	allow $1 sip_client_packet_t:packet relabelto;
+	allow $1 smtp_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send sip_server packets.
+##	Send smtp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78794,17 +81895,17 @@ interface(`corenet_relabelto_sip_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_sip_server_packets',`
+interface(`corenet_send_smtp_server_packets',`
 	gen_require(`
-		type sip_server_packet_t;
+		type smtp_server_packet_t;
 	')
 
-	allow $1 sip_server_packet_t:packet send;
+	allow $1 smtp_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send sip_server packets.
+##	Do not audit attempts to send smtp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78813,17 +81914,17 @@ interface(`corenet_send_sip_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_sip_server_packets',`
+interface(`corenet_dontaudit_send_smtp_server_packets',`
 	gen_require(`
-		type sip_server_packet_t;
+		type smtp_server_packet_t;
 	')
 
-	dontaudit $1 sip_server_packet_t:packet send;
+	dontaudit $1 smtp_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive sip_server packets.
+##	Receive smtp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78832,17 +81933,17 @@ interface(`corenet_dontaudit_send_sip_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_sip_server_packets',`
+interface(`corenet_receive_smtp_server_packets',`
 	gen_require(`
-		type sip_server_packet_t;
+		type smtp_server_packet_t;
 	')
 
-	allow $1 sip_server_packet_t:packet recv;
+	allow $1 smtp_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive sip_server packets.
+##	Do not audit attempts to receive smtp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78851,17 +81952,17 @@ interface(`corenet_receive_sip_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_sip_server_packets',`
+interface(`corenet_dontaudit_receive_smtp_server_packets',`
 	gen_require(`
-		type sip_server_packet_t;
+		type smtp_server_packet_t;
 	')
 
-	dontaudit $1 sip_server_packet_t:packet recv;
+	dontaudit $1 smtp_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive sip_server packets.
+##	Send and receive smtp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78870,14 +81971,14 @@ interface(`corenet_dontaudit_receive_sip_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_sip_server_packets',`
-	corenet_send_sip_server_packets($1)
-	corenet_receive_sip_server_packets($1)
+interface(`corenet_sendrecv_smtp_server_packets',`
+	corenet_send_smtp_server_packets($1)
+	corenet_receive_smtp_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive sip_server packets.
+##	Do not audit attempts to send and receive smtp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78886,14 +81987,14 @@ interface(`corenet_sendrecv_sip_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_sip_server_packets',`
-	corenet_dontaudit_send_sip_server_packets($1)
-	corenet_dontaudit_receive_sip_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_smtp_server_packets',`
+	corenet_dontaudit_send_smtp_server_packets($1)
+	corenet_dontaudit_receive_smtp_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to sip_server the packet type.
+##	Relabel packets to smtp_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78901,12 +82002,12 @@ interface(`corenet_dontaudit_sendrecv_sip_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_sip_server_packets',`
+interface(`corenet_relabelto_smtp_server_packets',`
 	gen_require(`
-		type sip_server_packet_t;
+		type smtp_server_packet_t;
 	')
 
-	allow $1 sip_server_packet_t:packet relabelto;
+	allow $1 smtp_server_packet_t:packet relabelto;
 ')
 
 
@@ -78914,7 +82015,7 @@ interface(`corenet_relabelto_sip_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the sixxsconfig port.
+##	Send and receive TCP traffic on the snmp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78923,17 +82024,17 @@ interface(`corenet_relabelto_sip_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_sixxsconfig_port',`
+interface(`corenet_tcp_sendrecv_snmp_port',`
 	gen_require(`
-		type sixxsconfig_port_t;
+		type snmp_port_t;
 	')
 
-	allow $1 sixxsconfig_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 snmp_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the sixxsconfig port.
+##	Send UDP traffic on the snmp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78942,17 +82043,17 @@ interface(`corenet_tcp_sendrecv_sixxsconfig_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_sixxsconfig_port',`
+interface(`corenet_udp_send_snmp_port',`
 	gen_require(`
-		type sixxsconfig_port_t;
+		type snmp_port_t;
 	')
 
-	allow $1 sixxsconfig_port_t:udp_socket send_msg;
+	allow $1 snmp_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the sixxsconfig port.
+##	Do not audit attempts to send UDP traffic on the snmp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78961,17 +82062,17 @@ interface(`corenet_udp_send_sixxsconfig_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_sixxsconfig_port',`
+interface(`corenet_dontaudit_udp_send_snmp_port',`
 	gen_require(`
-		type sixxsconfig_port_t;
+		type snmp_port_t;
 	')
 
-	dontaudit $1 sixxsconfig_port_t:udp_socket send_msg;
+	dontaudit $1 snmp_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the sixxsconfig port.
+##	Receive UDP traffic on the snmp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78980,17 +82081,17 @@ interface(`corenet_dontaudit_udp_send_sixxsconfig_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_sixxsconfig_port',`
+interface(`corenet_udp_receive_snmp_port',`
 	gen_require(`
-		type sixxsconfig_port_t;
+		type snmp_port_t;
 	')
 
-	allow $1 sixxsconfig_port_t:udp_socket recv_msg;
+	allow $1 snmp_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the sixxsconfig port.
+##	Do not audit attempts to receive UDP traffic on the snmp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -78999,17 +82100,17 @@ interface(`corenet_udp_receive_sixxsconfig_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_sixxsconfig_port',`
+interface(`corenet_dontaudit_udp_receive_snmp_port',`
 	gen_require(`
-		type sixxsconfig_port_t;
+		type snmp_port_t;
 	')
 
-	dontaudit $1 sixxsconfig_port_t:udp_socket recv_msg;
+	dontaudit $1 snmp_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the sixxsconfig port.
+##	Send and receive UDP traffic on the snmp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79018,15 +82119,15 @@ interface(`corenet_dontaudit_udp_receive_sixxsconfig_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_sixxsconfig_port',`
-	corenet_udp_send_sixxsconfig_port($1)
-	corenet_udp_receive_sixxsconfig_port($1)
+interface(`corenet_udp_sendrecv_snmp_port',`
+	corenet_udp_send_snmp_port($1)
+	corenet_udp_receive_snmp_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the sixxsconfig port.
+##	UDP traffic on the snmp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79035,14 +82136,14 @@ interface(`corenet_udp_sendrecv_sixxsconfig_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_sixxsconfig_port',`
-	corenet_dontaudit_udp_send_sixxsconfig_port($1)
-	corenet_dontaudit_udp_receive_sixxsconfig_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_snmp_port',`
+	corenet_dontaudit_udp_send_snmp_port($1)
+	corenet_dontaudit_udp_receive_snmp_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the sixxsconfig port.
+##	Bind TCP sockets to the snmp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79051,18 +82152,18 @@ interface(`corenet_dontaudit_udp_sendrecv_sixxsconfig_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_sixxsconfig_port',`
+interface(`corenet_tcp_bind_snmp_port',`
 	gen_require(`
-		type sixxsconfig_port_t;
+		type snmp_port_t;
 	')
 
-	allow $1 sixxsconfig_port_t:tcp_socket name_bind;
-	
+	allow $1 snmp_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the sixxsconfig port.
+##	Bind UDP sockets to the snmp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79071,18 +82172,18 @@ interface(`corenet_tcp_bind_sixxsconfig_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_sixxsconfig_port',`
+interface(`corenet_udp_bind_snmp_port',`
 	gen_require(`
-		type sixxsconfig_port_t;
+		type snmp_port_t;
 	')
 
-	allow $1 sixxsconfig_port_t:udp_socket name_bind;
-	
+	allow $1 snmp_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the sixxsconfig port.
+##	Make a TCP connection to the snmp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79090,18 +82191,18 @@ interface(`corenet_udp_bind_sixxsconfig_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_sixxsconfig_port',`
+interface(`corenet_tcp_connect_snmp_port',`
 	gen_require(`
-		type sixxsconfig_port_t;
+		type snmp_port_t;
 	')
 
-	allow $1 sixxsconfig_port_t:tcp_socket name_connect;
+	allow $1 snmp_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send sixxsconfig_client packets.
+##	Send snmp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79110,17 +82211,17 @@ interface(`corenet_tcp_connect_sixxsconfig_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_sixxsconfig_client_packets',`
+interface(`corenet_send_snmp_client_packets',`
 	gen_require(`
-		type sixxsconfig_client_packet_t;
+		type snmp_client_packet_t;
 	')
 
-	allow $1 sixxsconfig_client_packet_t:packet send;
+	allow $1 snmp_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send sixxsconfig_client packets.
+##	Do not audit attempts to send snmp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79129,17 +82230,17 @@ interface(`corenet_send_sixxsconfig_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_sixxsconfig_client_packets',`
+interface(`corenet_dontaudit_send_snmp_client_packets',`
 	gen_require(`
-		type sixxsconfig_client_packet_t;
+		type snmp_client_packet_t;
 	')
 
-	dontaudit $1 sixxsconfig_client_packet_t:packet send;
+	dontaudit $1 snmp_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive sixxsconfig_client packets.
+##	Receive snmp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79148,17 +82249,17 @@ interface(`corenet_dontaudit_send_sixxsconfig_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_sixxsconfig_client_packets',`
+interface(`corenet_receive_snmp_client_packets',`
 	gen_require(`
-		type sixxsconfig_client_packet_t;
+		type snmp_client_packet_t;
 	')
 
-	allow $1 sixxsconfig_client_packet_t:packet recv;
+	allow $1 snmp_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive sixxsconfig_client packets.
+##	Do not audit attempts to receive snmp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79167,17 +82268,17 @@ interface(`corenet_receive_sixxsconfig_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_sixxsconfig_client_packets',`
+interface(`corenet_dontaudit_receive_snmp_client_packets',`
 	gen_require(`
-		type sixxsconfig_client_packet_t;
+		type snmp_client_packet_t;
 	')
 
-	dontaudit $1 sixxsconfig_client_packet_t:packet recv;
+	dontaudit $1 snmp_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive sixxsconfig_client packets.
+##	Send and receive snmp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79186,14 +82287,14 @@ interface(`corenet_dontaudit_receive_sixxsconfig_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_sixxsconfig_client_packets',`
-	corenet_send_sixxsconfig_client_packets($1)
-	corenet_receive_sixxsconfig_client_packets($1)
+interface(`corenet_sendrecv_snmp_client_packets',`
+	corenet_send_snmp_client_packets($1)
+	corenet_receive_snmp_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive sixxsconfig_client packets.
+##	Do not audit attempts to send and receive snmp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79202,14 +82303,14 @@ interface(`corenet_sendrecv_sixxsconfig_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_sixxsconfig_client_packets',`
-	corenet_dontaudit_send_sixxsconfig_client_packets($1)
-	corenet_dontaudit_receive_sixxsconfig_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_snmp_client_packets',`
+	corenet_dontaudit_send_snmp_client_packets($1)
+	corenet_dontaudit_receive_snmp_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to sixxsconfig_client the packet type.
+##	Relabel packets to snmp_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79217,18 +82318,18 @@ interface(`corenet_dontaudit_sendrecv_sixxsconfig_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_sixxsconfig_client_packets',`
+interface(`corenet_relabelto_snmp_client_packets',`
 	gen_require(`
-		type sixxsconfig_client_packet_t;
+		type snmp_client_packet_t;
 	')
 
-	allow $1 sixxsconfig_client_packet_t:packet relabelto;
+	allow $1 snmp_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send sixxsconfig_server packets.
+##	Send snmp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79237,17 +82338,17 @@ interface(`corenet_relabelto_sixxsconfig_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_sixxsconfig_server_packets',`
+interface(`corenet_send_snmp_server_packets',`
 	gen_require(`
-		type sixxsconfig_server_packet_t;
+		type snmp_server_packet_t;
 	')
 
-	allow $1 sixxsconfig_server_packet_t:packet send;
+	allow $1 snmp_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send sixxsconfig_server packets.
+##	Do not audit attempts to send snmp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79256,17 +82357,17 @@ interface(`corenet_send_sixxsconfig_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_sixxsconfig_server_packets',`
+interface(`corenet_dontaudit_send_snmp_server_packets',`
 	gen_require(`
-		type sixxsconfig_server_packet_t;
+		type snmp_server_packet_t;
 	')
 
-	dontaudit $1 sixxsconfig_server_packet_t:packet send;
+	dontaudit $1 snmp_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive sixxsconfig_server packets.
+##	Receive snmp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79275,17 +82376,17 @@ interface(`corenet_dontaudit_send_sixxsconfig_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_sixxsconfig_server_packets',`
+interface(`corenet_receive_snmp_server_packets',`
 	gen_require(`
-		type sixxsconfig_server_packet_t;
+		type snmp_server_packet_t;
 	')
 
-	allow $1 sixxsconfig_server_packet_t:packet recv;
+	allow $1 snmp_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive sixxsconfig_server packets.
+##	Do not audit attempts to receive snmp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79294,17 +82395,17 @@ interface(`corenet_receive_sixxsconfig_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_sixxsconfig_server_packets',`
+interface(`corenet_dontaudit_receive_snmp_server_packets',`
 	gen_require(`
-		type sixxsconfig_server_packet_t;
+		type snmp_server_packet_t;
 	')
 
-	dontaudit $1 sixxsconfig_server_packet_t:packet recv;
+	dontaudit $1 snmp_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive sixxsconfig_server packets.
+##	Send and receive snmp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79313,14 +82414,14 @@ interface(`corenet_dontaudit_receive_sixxsconfig_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_sixxsconfig_server_packets',`
-	corenet_send_sixxsconfig_server_packets($1)
-	corenet_receive_sixxsconfig_server_packets($1)
+interface(`corenet_sendrecv_snmp_server_packets',`
+	corenet_send_snmp_server_packets($1)
+	corenet_receive_snmp_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive sixxsconfig_server packets.
+##	Do not audit attempts to send and receive snmp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79329,14 +82430,14 @@ interface(`corenet_sendrecv_sixxsconfig_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_sixxsconfig_server_packets',`
-	corenet_dontaudit_send_sixxsconfig_server_packets($1)
-	corenet_dontaudit_receive_sixxsconfig_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_snmp_server_packets',`
+	corenet_dontaudit_send_snmp_server_packets($1)
+	corenet_dontaudit_receive_snmp_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to sixxsconfig_server the packet type.
+##	Relabel packets to snmp_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79344,12 +82445,12 @@ interface(`corenet_dontaudit_sendrecv_sixxsconfig_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_sixxsconfig_server_packets',`
+interface(`corenet_relabelto_snmp_server_packets',`
 	gen_require(`
-		type sixxsconfig_server_packet_t;
+		type snmp_server_packet_t;
 	')
 
-	allow $1 sixxsconfig_server_packet_t:packet relabelto;
+	allow $1 snmp_server_packet_t:packet relabelto;
 ')
 
 
@@ -79357,7 +82458,7 @@ interface(`corenet_relabelto_sixxsconfig_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the smbd port.
+##	Send and receive TCP traffic on the socks port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79366,17 +82467,17 @@ interface(`corenet_relabelto_sixxsconfig_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_smbd_port',`
+interface(`corenet_tcp_sendrecv_socks_port',`
 	gen_require(`
-		type smbd_port_t;
+		type socks_port_t;
 	')
 
-	allow $1 smbd_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 socks_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the smbd port.
+##	Send UDP traffic on the socks port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79385,17 +82486,17 @@ interface(`corenet_tcp_sendrecv_smbd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_smbd_port',`
+interface(`corenet_udp_send_socks_port',`
 	gen_require(`
-		type smbd_port_t;
+		type socks_port_t;
 	')
 
-	allow $1 smbd_port_t:udp_socket send_msg;
+	allow $1 socks_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the smbd port.
+##	Do not audit attempts to send UDP traffic on the socks port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79404,17 +82505,17 @@ interface(`corenet_udp_send_smbd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_smbd_port',`
+interface(`corenet_dontaudit_udp_send_socks_port',`
 	gen_require(`
-		type smbd_port_t;
+		type socks_port_t;
 	')
 
-	dontaudit $1 smbd_port_t:udp_socket send_msg;
+	dontaudit $1 socks_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the smbd port.
+##	Receive UDP traffic on the socks port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79423,17 +82524,17 @@ interface(`corenet_dontaudit_udp_send_smbd_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_smbd_port',`
+interface(`corenet_udp_receive_socks_port',`
 	gen_require(`
-		type smbd_port_t;
+		type socks_port_t;
 	')
 
-	allow $1 smbd_port_t:udp_socket recv_msg;
+	allow $1 socks_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the smbd port.
+##	Do not audit attempts to receive UDP traffic on the socks port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79442,17 +82543,17 @@ interface(`corenet_udp_receive_smbd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_smbd_port',`
+interface(`corenet_dontaudit_udp_receive_socks_port',`
 	gen_require(`
-		type smbd_port_t;
+		type socks_port_t;
 	')
 
-	dontaudit $1 smbd_port_t:udp_socket recv_msg;
+	dontaudit $1 socks_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the smbd port.
+##	Send and receive UDP traffic on the socks port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79461,15 +82562,15 @@ interface(`corenet_dontaudit_udp_receive_smbd_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_smbd_port',`
-	corenet_udp_send_smbd_port($1)
-	corenet_udp_receive_smbd_port($1)
+interface(`corenet_udp_sendrecv_socks_port',`
+	corenet_udp_send_socks_port($1)
+	corenet_udp_receive_socks_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the smbd port.
+##	UDP traffic on the socks port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79478,14 +82579,14 @@ interface(`corenet_udp_sendrecv_smbd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_smbd_port',`
-	corenet_dontaudit_udp_send_smbd_port($1)
-	corenet_dontaudit_udp_receive_smbd_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_socks_port',`
+	corenet_dontaudit_udp_send_socks_port($1)
+	corenet_dontaudit_udp_receive_socks_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the smbd port.
+##	Bind TCP sockets to the socks port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79494,18 +82595,18 @@ interface(`corenet_dontaudit_udp_sendrecv_smbd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_smbd_port',`
+interface(`corenet_tcp_bind_socks_port',`
 	gen_require(`
-		type smbd_port_t;
+		type socks_port_t;
 	')
 
-	allow $1 smbd_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 socks_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the smbd port.
+##	Bind UDP sockets to the socks port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79514,18 +82615,18 @@ interface(`corenet_tcp_bind_smbd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_smbd_port',`
+interface(`corenet_udp_bind_socks_port',`
 	gen_require(`
-		type smbd_port_t;
+		type socks_port_t;
 	')
 
-	allow $1 smbd_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 socks_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the smbd port.
+##	Make a TCP connection to the socks port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79533,18 +82634,18 @@ interface(`corenet_udp_bind_smbd_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_smbd_port',`
+interface(`corenet_tcp_connect_socks_port',`
 	gen_require(`
-		type smbd_port_t;
+		type socks_port_t;
 	')
 
-	allow $1 smbd_port_t:tcp_socket name_connect;
+	allow $1 socks_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send smbd_client packets.
+##	Send socks_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79553,17 +82654,17 @@ interface(`corenet_tcp_connect_smbd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_smbd_client_packets',`
+interface(`corenet_send_socks_client_packets',`
 	gen_require(`
-		type smbd_client_packet_t;
+		type socks_client_packet_t;
 	')
 
-	allow $1 smbd_client_packet_t:packet send;
+	allow $1 socks_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send smbd_client packets.
+##	Do not audit attempts to send socks_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79572,17 +82673,17 @@ interface(`corenet_send_smbd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_smbd_client_packets',`
+interface(`corenet_dontaudit_send_socks_client_packets',`
 	gen_require(`
-		type smbd_client_packet_t;
+		type socks_client_packet_t;
 	')
 
-	dontaudit $1 smbd_client_packet_t:packet send;
+	dontaudit $1 socks_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive smbd_client packets.
+##	Receive socks_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79591,17 +82692,17 @@ interface(`corenet_dontaudit_send_smbd_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_smbd_client_packets',`
+interface(`corenet_receive_socks_client_packets',`
 	gen_require(`
-		type smbd_client_packet_t;
+		type socks_client_packet_t;
 	')
 
-	allow $1 smbd_client_packet_t:packet recv;
+	allow $1 socks_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive smbd_client packets.
+##	Do not audit attempts to receive socks_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79610,17 +82711,17 @@ interface(`corenet_receive_smbd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_smbd_client_packets',`
+interface(`corenet_dontaudit_receive_socks_client_packets',`
 	gen_require(`
-		type smbd_client_packet_t;
+		type socks_client_packet_t;
 	')
 
-	dontaudit $1 smbd_client_packet_t:packet recv;
+	dontaudit $1 socks_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive smbd_client packets.
+##	Send and receive socks_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79629,14 +82730,14 @@ interface(`corenet_dontaudit_receive_smbd_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_smbd_client_packets',`
-	corenet_send_smbd_client_packets($1)
-	corenet_receive_smbd_client_packets($1)
+interface(`corenet_sendrecv_socks_client_packets',`
+	corenet_send_socks_client_packets($1)
+	corenet_receive_socks_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive smbd_client packets.
+##	Do not audit attempts to send and receive socks_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79645,14 +82746,14 @@ interface(`corenet_sendrecv_smbd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_smbd_client_packets',`
-	corenet_dontaudit_send_smbd_client_packets($1)
-	corenet_dontaudit_receive_smbd_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_socks_client_packets',`
+	corenet_dontaudit_send_socks_client_packets($1)
+	corenet_dontaudit_receive_socks_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to smbd_client the packet type.
+##	Relabel packets to socks_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79660,18 +82761,18 @@ interface(`corenet_dontaudit_sendrecv_smbd_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_smbd_client_packets',`
+interface(`corenet_relabelto_socks_client_packets',`
 	gen_require(`
-		type smbd_client_packet_t;
+		type socks_client_packet_t;
 	')
 
-	allow $1 smbd_client_packet_t:packet relabelto;
+	allow $1 socks_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send smbd_server packets.
+##	Send socks_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79680,17 +82781,17 @@ interface(`corenet_relabelto_smbd_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_smbd_server_packets',`
+interface(`corenet_send_socks_server_packets',`
 	gen_require(`
-		type smbd_server_packet_t;
+		type socks_server_packet_t;
 	')
 
-	allow $1 smbd_server_packet_t:packet send;
+	allow $1 socks_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send smbd_server packets.
+##	Do not audit attempts to send socks_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79699,17 +82800,17 @@ interface(`corenet_send_smbd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_smbd_server_packets',`
+interface(`corenet_dontaudit_send_socks_server_packets',`
 	gen_require(`
-		type smbd_server_packet_t;
+		type socks_server_packet_t;
 	')
 
-	dontaudit $1 smbd_server_packet_t:packet send;
+	dontaudit $1 socks_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive smbd_server packets.
+##	Receive socks_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79718,17 +82819,17 @@ interface(`corenet_dontaudit_send_smbd_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_smbd_server_packets',`
+interface(`corenet_receive_socks_server_packets',`
 	gen_require(`
-		type smbd_server_packet_t;
+		type socks_server_packet_t;
 	')
 
-	allow $1 smbd_server_packet_t:packet recv;
+	allow $1 socks_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive smbd_server packets.
+##	Do not audit attempts to receive socks_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79737,17 +82838,17 @@ interface(`corenet_receive_smbd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_smbd_server_packets',`
+interface(`corenet_dontaudit_receive_socks_server_packets',`
 	gen_require(`
-		type smbd_server_packet_t;
+		type socks_server_packet_t;
 	')
 
-	dontaudit $1 smbd_server_packet_t:packet recv;
+	dontaudit $1 socks_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive smbd_server packets.
+##	Send and receive socks_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79756,14 +82857,14 @@ interface(`corenet_dontaudit_receive_smbd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_smbd_server_packets',`
-	corenet_send_smbd_server_packets($1)
-	corenet_receive_smbd_server_packets($1)
+interface(`corenet_sendrecv_socks_server_packets',`
+	corenet_send_socks_server_packets($1)
+	corenet_receive_socks_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive smbd_server packets.
+##	Do not audit attempts to send and receive socks_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79772,14 +82873,14 @@ interface(`corenet_sendrecv_smbd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_smbd_server_packets',`
-	corenet_dontaudit_send_smbd_server_packets($1)
-	corenet_dontaudit_receive_smbd_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_socks_server_packets',`
+	corenet_dontaudit_send_socks_server_packets($1)
+	corenet_dontaudit_receive_socks_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to smbd_server the packet type.
+##	Relabel packets to socks_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79787,20 +82888,20 @@ interface(`corenet_dontaudit_sendrecv_smbd_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_smbd_server_packets',`
+interface(`corenet_relabelto_socks_server_packets',`
 	gen_require(`
-		type smbd_server_packet_t;
+		type socks_server_packet_t;
 	')
 
-	allow $1 smbd_server_packet_t:packet relabelto;
+	allow $1 socks_server_packet_t:packet relabelto;
 ')
 
-
+ # no defined portcon
 
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the smtp port.
+##	Send and receive TCP traffic on the soundd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79809,17 +82910,17 @@ interface(`corenet_relabelto_smbd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_smtp_port',`
+interface(`corenet_tcp_sendrecv_soundd_port',`
 	gen_require(`
-		type smtp_port_t;
+		type soundd_port_t;
 	')
 
-	allow $1 smtp_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 soundd_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the smtp port.
+##	Send UDP traffic on the soundd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79828,17 +82929,17 @@ interface(`corenet_tcp_sendrecv_smtp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_smtp_port',`
+interface(`corenet_udp_send_soundd_port',`
 	gen_require(`
-		type smtp_port_t;
+		type soundd_port_t;
 	')
 
-	allow $1 smtp_port_t:udp_socket send_msg;
+	allow $1 soundd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the smtp port.
+##	Do not audit attempts to send UDP traffic on the soundd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79847,17 +82948,17 @@ interface(`corenet_udp_send_smtp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_smtp_port',`
+interface(`corenet_dontaudit_udp_send_soundd_port',`
 	gen_require(`
-		type smtp_port_t;
+		type soundd_port_t;
 	')
 
-	dontaudit $1 smtp_port_t:udp_socket send_msg;
+	dontaudit $1 soundd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the smtp port.
+##	Receive UDP traffic on the soundd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79866,17 +82967,17 @@ interface(`corenet_dontaudit_udp_send_smtp_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_smtp_port',`
+interface(`corenet_udp_receive_soundd_port',`
 	gen_require(`
-		type smtp_port_t;
+		type soundd_port_t;
 	')
 
-	allow $1 smtp_port_t:udp_socket recv_msg;
+	allow $1 soundd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the smtp port.
+##	Do not audit attempts to receive UDP traffic on the soundd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79885,17 +82986,17 @@ interface(`corenet_udp_receive_smtp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_smtp_port',`
+interface(`corenet_dontaudit_udp_receive_soundd_port',`
 	gen_require(`
-		type smtp_port_t;
+		type soundd_port_t;
 	')
 
-	dontaudit $1 smtp_port_t:udp_socket recv_msg;
+	dontaudit $1 soundd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the smtp port.
+##	Send and receive UDP traffic on the soundd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79904,15 +83005,15 @@ interface(`corenet_dontaudit_udp_receive_smtp_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_smtp_port',`
-	corenet_udp_send_smtp_port($1)
-	corenet_udp_receive_smtp_port($1)
+interface(`corenet_udp_sendrecv_soundd_port',`
+	corenet_udp_send_soundd_port($1)
+	corenet_udp_receive_soundd_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the smtp port.
+##	UDP traffic on the soundd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79921,14 +83022,14 @@ interface(`corenet_udp_sendrecv_smtp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_smtp_port',`
-	corenet_dontaudit_udp_send_smtp_port($1)
-	corenet_dontaudit_udp_receive_smtp_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_soundd_port',`
+	corenet_dontaudit_udp_send_soundd_port($1)
+	corenet_dontaudit_udp_receive_soundd_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the smtp port.
+##	Bind TCP sockets to the soundd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79937,18 +83038,18 @@ interface(`corenet_dontaudit_udp_sendrecv_smtp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_smtp_port',`
+interface(`corenet_tcp_bind_soundd_port',`
 	gen_require(`
-		type smtp_port_t;
+		type soundd_port_t;
 	')
 
-	allow $1 smtp_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 soundd_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the smtp port.
+##	Bind UDP sockets to the soundd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79957,18 +83058,18 @@ interface(`corenet_tcp_bind_smtp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_smtp_port',`
+interface(`corenet_udp_bind_soundd_port',`
 	gen_require(`
-		type smtp_port_t;
+		type soundd_port_t;
 	')
 
-	allow $1 smtp_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 soundd_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the smtp port.
+##	Make a TCP connection to the soundd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79976,18 +83077,18 @@ interface(`corenet_udp_bind_smtp_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_smtp_port',`
+interface(`corenet_tcp_connect_soundd_port',`
 	gen_require(`
-		type smtp_port_t;
+		type soundd_port_t;
 	')
 
-	allow $1 smtp_port_t:tcp_socket name_connect;
+	allow $1 soundd_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send smtp_client packets.
+##	Send soundd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -79996,17 +83097,17 @@ interface(`corenet_tcp_connect_smtp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_smtp_client_packets',`
+interface(`corenet_send_soundd_client_packets',`
 	gen_require(`
-		type smtp_client_packet_t;
+		type soundd_client_packet_t;
 	')
 
-	allow $1 smtp_client_packet_t:packet send;
+	allow $1 soundd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send smtp_client packets.
+##	Do not audit attempts to send soundd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80015,17 +83116,17 @@ interface(`corenet_send_smtp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_smtp_client_packets',`
+interface(`corenet_dontaudit_send_soundd_client_packets',`
 	gen_require(`
-		type smtp_client_packet_t;
+		type soundd_client_packet_t;
 	')
 
-	dontaudit $1 smtp_client_packet_t:packet send;
+	dontaudit $1 soundd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive smtp_client packets.
+##	Receive soundd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80034,17 +83135,17 @@ interface(`corenet_dontaudit_send_smtp_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_smtp_client_packets',`
+interface(`corenet_receive_soundd_client_packets',`
 	gen_require(`
-		type smtp_client_packet_t;
+		type soundd_client_packet_t;
 	')
 
-	allow $1 smtp_client_packet_t:packet recv;
+	allow $1 soundd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive smtp_client packets.
+##	Do not audit attempts to receive soundd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80053,17 +83154,17 @@ interface(`corenet_receive_smtp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_smtp_client_packets',`
+interface(`corenet_dontaudit_receive_soundd_client_packets',`
 	gen_require(`
-		type smtp_client_packet_t;
+		type soundd_client_packet_t;
 	')
 
-	dontaudit $1 smtp_client_packet_t:packet recv;
+	dontaudit $1 soundd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive smtp_client packets.
+##	Send and receive soundd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80072,14 +83173,14 @@ interface(`corenet_dontaudit_receive_smtp_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_smtp_client_packets',`
-	corenet_send_smtp_client_packets($1)
-	corenet_receive_smtp_client_packets($1)
+interface(`corenet_sendrecv_soundd_client_packets',`
+	corenet_send_soundd_client_packets($1)
+	corenet_receive_soundd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive smtp_client packets.
+##	Do not audit attempts to send and receive soundd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80088,14 +83189,14 @@ interface(`corenet_sendrecv_smtp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_smtp_client_packets',`
-	corenet_dontaudit_send_smtp_client_packets($1)
-	corenet_dontaudit_receive_smtp_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_soundd_client_packets',`
+	corenet_dontaudit_send_soundd_client_packets($1)
+	corenet_dontaudit_receive_soundd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to smtp_client the packet type.
+##	Relabel packets to soundd_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80103,18 +83204,18 @@ interface(`corenet_dontaudit_sendrecv_smtp_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_smtp_client_packets',`
+interface(`corenet_relabelto_soundd_client_packets',`
 	gen_require(`
-		type smtp_client_packet_t;
+		type soundd_client_packet_t;
 	')
 
-	allow $1 smtp_client_packet_t:packet relabelto;
+	allow $1 soundd_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send smtp_server packets.
+##	Send soundd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80123,17 +83224,17 @@ interface(`corenet_relabelto_smtp_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_smtp_server_packets',`
+interface(`corenet_send_soundd_server_packets',`
 	gen_require(`
-		type smtp_server_packet_t;
+		type soundd_server_packet_t;
 	')
 
-	allow $1 smtp_server_packet_t:packet send;
+	allow $1 soundd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send smtp_server packets.
+##	Do not audit attempts to send soundd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80142,17 +83243,17 @@ interface(`corenet_send_smtp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_smtp_server_packets',`
+interface(`corenet_dontaudit_send_soundd_server_packets',`
 	gen_require(`
-		type smtp_server_packet_t;
+		type soundd_server_packet_t;
 	')
 
-	dontaudit $1 smtp_server_packet_t:packet send;
+	dontaudit $1 soundd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive smtp_server packets.
+##	Receive soundd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80161,17 +83262,17 @@ interface(`corenet_dontaudit_send_smtp_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_smtp_server_packets',`
+interface(`corenet_receive_soundd_server_packets',`
 	gen_require(`
-		type smtp_server_packet_t;
+		type soundd_server_packet_t;
 	')
 
-	allow $1 smtp_server_packet_t:packet recv;
+	allow $1 soundd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive smtp_server packets.
+##	Do not audit attempts to receive soundd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80180,17 +83281,17 @@ interface(`corenet_receive_smtp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_smtp_server_packets',`
+interface(`corenet_dontaudit_receive_soundd_server_packets',`
 	gen_require(`
-		type smtp_server_packet_t;
+		type soundd_server_packet_t;
 	')
 
-	dontaudit $1 smtp_server_packet_t:packet recv;
+	dontaudit $1 soundd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive smtp_server packets.
+##	Send and receive soundd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80199,14 +83300,14 @@ interface(`corenet_dontaudit_receive_smtp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_smtp_server_packets',`
-	corenet_send_smtp_server_packets($1)
-	corenet_receive_smtp_server_packets($1)
+interface(`corenet_sendrecv_soundd_server_packets',`
+	corenet_send_soundd_server_packets($1)
+	corenet_receive_soundd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive smtp_server packets.
+##	Do not audit attempts to send and receive soundd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80215,14 +83316,14 @@ interface(`corenet_sendrecv_smtp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_smtp_server_packets',`
-	corenet_dontaudit_send_smtp_server_packets($1)
-	corenet_dontaudit_receive_smtp_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_soundd_server_packets',`
+	corenet_dontaudit_send_soundd_server_packets($1)
+	corenet_dontaudit_receive_soundd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to smtp_server the packet type.
+##	Relabel packets to soundd_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80230,12 +83331,12 @@ interface(`corenet_dontaudit_sendrecv_smtp_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_smtp_server_packets',`
+interface(`corenet_relabelto_soundd_server_packets',`
 	gen_require(`
-		type smtp_server_packet_t;
+		type soundd_server_packet_t;
 	')
 
-	allow $1 smtp_server_packet_t:packet relabelto;
+	allow $1 soundd_server_packet_t:packet relabelto;
 ')
 
 
@@ -80243,7 +83344,7 @@ interface(`corenet_relabelto_smtp_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the snmp port.
+##	Send and receive TCP traffic on the spamd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80252,17 +83353,17 @@ interface(`corenet_relabelto_smtp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_snmp_port',`
+interface(`corenet_tcp_sendrecv_spamd_port',`
 	gen_require(`
-		type snmp_port_t;
+		type spamd_port_t;
 	')
 
-	allow $1 snmp_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 spamd_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the snmp port.
+##	Send UDP traffic on the spamd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80271,17 +83372,17 @@ interface(`corenet_tcp_sendrecv_snmp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_snmp_port',`
+interface(`corenet_udp_send_spamd_port',`
 	gen_require(`
-		type snmp_port_t;
+		type spamd_port_t;
 	')
 
-	allow $1 snmp_port_t:udp_socket send_msg;
+	allow $1 spamd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the snmp port.
+##	Do not audit attempts to send UDP traffic on the spamd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80290,17 +83391,17 @@ interface(`corenet_udp_send_snmp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_snmp_port',`
+interface(`corenet_dontaudit_udp_send_spamd_port',`
 	gen_require(`
-		type snmp_port_t;
+		type spamd_port_t;
 	')
 
-	dontaudit $1 snmp_port_t:udp_socket send_msg;
+	dontaudit $1 spamd_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the snmp port.
+##	Receive UDP traffic on the spamd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80309,17 +83410,17 @@ interface(`corenet_dontaudit_udp_send_snmp_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_snmp_port',`
+interface(`corenet_udp_receive_spamd_port',`
 	gen_require(`
-		type snmp_port_t;
+		type spamd_port_t;
 	')
 
-	allow $1 snmp_port_t:udp_socket recv_msg;
+	allow $1 spamd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the snmp port.
+##	Do not audit attempts to receive UDP traffic on the spamd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80328,17 +83429,17 @@ interface(`corenet_udp_receive_snmp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_snmp_port',`
+interface(`corenet_dontaudit_udp_receive_spamd_port',`
 	gen_require(`
-		type snmp_port_t;
+		type spamd_port_t;
 	')
 
-	dontaudit $1 snmp_port_t:udp_socket recv_msg;
+	dontaudit $1 spamd_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the snmp port.
+##	Send and receive UDP traffic on the spamd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80347,15 +83448,15 @@ interface(`corenet_dontaudit_udp_receive_snmp_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_snmp_port',`
-	corenet_udp_send_snmp_port($1)
-	corenet_udp_receive_snmp_port($1)
+interface(`corenet_udp_sendrecv_spamd_port',`
+	corenet_udp_send_spamd_port($1)
+	corenet_udp_receive_spamd_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the snmp port.
+##	UDP traffic on the spamd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80364,14 +83465,14 @@ interface(`corenet_udp_sendrecv_snmp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_snmp_port',`
-	corenet_dontaudit_udp_send_snmp_port($1)
-	corenet_dontaudit_udp_receive_snmp_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_spamd_port',`
+	corenet_dontaudit_udp_send_spamd_port($1)
+	corenet_dontaudit_udp_receive_spamd_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the snmp port.
+##	Bind TCP sockets to the spamd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80380,18 +83481,18 @@ interface(`corenet_dontaudit_udp_sendrecv_snmp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_snmp_port',`
+interface(`corenet_tcp_bind_spamd_port',`
 	gen_require(`
-		type snmp_port_t;
+		type spamd_port_t;
 	')
 
-	allow $1 snmp_port_t:tcp_socket name_bind;
+	allow $1 spamd_port_t:tcp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the snmp port.
+##	Bind UDP sockets to the spamd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80400,18 +83501,18 @@ interface(`corenet_tcp_bind_snmp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_snmp_port',`
+interface(`corenet_udp_bind_spamd_port',`
 	gen_require(`
-		type snmp_port_t;
+		type spamd_port_t;
 	')
 
-	allow $1 snmp_port_t:udp_socket name_bind;
+	allow $1 spamd_port_t:udp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the snmp port.
+##	Make a TCP connection to the spamd port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80419,18 +83520,18 @@ interface(`corenet_udp_bind_snmp_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_snmp_port',`
+interface(`corenet_tcp_connect_spamd_port',`
 	gen_require(`
-		type snmp_port_t;
+		type spamd_port_t;
 	')
 
-	allow $1 snmp_port_t:tcp_socket name_connect;
+	allow $1 spamd_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send snmp_client packets.
+##	Send spamd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80439,17 +83540,17 @@ interface(`corenet_tcp_connect_snmp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_snmp_client_packets',`
+interface(`corenet_send_spamd_client_packets',`
 	gen_require(`
-		type snmp_client_packet_t;
+		type spamd_client_packet_t;
 	')
 
-	allow $1 snmp_client_packet_t:packet send;
+	allow $1 spamd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send snmp_client packets.
+##	Do not audit attempts to send spamd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80458,17 +83559,17 @@ interface(`corenet_send_snmp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_snmp_client_packets',`
+interface(`corenet_dontaudit_send_spamd_client_packets',`
 	gen_require(`
-		type snmp_client_packet_t;
+		type spamd_client_packet_t;
 	')
 
-	dontaudit $1 snmp_client_packet_t:packet send;
+	dontaudit $1 spamd_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive snmp_client packets.
+##	Receive spamd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80477,17 +83578,17 @@ interface(`corenet_dontaudit_send_snmp_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_snmp_client_packets',`
+interface(`corenet_receive_spamd_client_packets',`
 	gen_require(`
-		type snmp_client_packet_t;
+		type spamd_client_packet_t;
 	')
 
-	allow $1 snmp_client_packet_t:packet recv;
+	allow $1 spamd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive snmp_client packets.
+##	Do not audit attempts to receive spamd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80496,17 +83597,17 @@ interface(`corenet_receive_snmp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_snmp_client_packets',`
+interface(`corenet_dontaudit_receive_spamd_client_packets',`
 	gen_require(`
-		type snmp_client_packet_t;
+		type spamd_client_packet_t;
 	')
 
-	dontaudit $1 snmp_client_packet_t:packet recv;
+	dontaudit $1 spamd_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive snmp_client packets.
+##	Send and receive spamd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80515,14 +83616,14 @@ interface(`corenet_dontaudit_receive_snmp_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_snmp_client_packets',`
-	corenet_send_snmp_client_packets($1)
-	corenet_receive_snmp_client_packets($1)
+interface(`corenet_sendrecv_spamd_client_packets',`
+	corenet_send_spamd_client_packets($1)
+	corenet_receive_spamd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive snmp_client packets.
+##	Do not audit attempts to send and receive spamd_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80531,14 +83632,14 @@ interface(`corenet_sendrecv_snmp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_snmp_client_packets',`
-	corenet_dontaudit_send_snmp_client_packets($1)
-	corenet_dontaudit_receive_snmp_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_spamd_client_packets',`
+	corenet_dontaudit_send_spamd_client_packets($1)
+	corenet_dontaudit_receive_spamd_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to snmp_client the packet type.
+##	Relabel packets to spamd_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80546,18 +83647,18 @@ interface(`corenet_dontaudit_sendrecv_snmp_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_snmp_client_packets',`
+interface(`corenet_relabelto_spamd_client_packets',`
 	gen_require(`
-		type snmp_client_packet_t;
+		type spamd_client_packet_t;
 	')
 
-	allow $1 snmp_client_packet_t:packet relabelto;
+	allow $1 spamd_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send snmp_server packets.
+##	Send spamd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80566,17 +83667,17 @@ interface(`corenet_relabelto_snmp_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_snmp_server_packets',`
+interface(`corenet_send_spamd_server_packets',`
 	gen_require(`
-		type snmp_server_packet_t;
+		type spamd_server_packet_t;
 	')
 
-	allow $1 snmp_server_packet_t:packet send;
+	allow $1 spamd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send snmp_server packets.
+##	Do not audit attempts to send spamd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80585,17 +83686,17 @@ interface(`corenet_send_snmp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_snmp_server_packets',`
+interface(`corenet_dontaudit_send_spamd_server_packets',`
 	gen_require(`
-		type snmp_server_packet_t;
+		type spamd_server_packet_t;
 	')
 
-	dontaudit $1 snmp_server_packet_t:packet send;
+	dontaudit $1 spamd_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive snmp_server packets.
+##	Receive spamd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80604,17 +83705,17 @@ interface(`corenet_dontaudit_send_snmp_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_snmp_server_packets',`
+interface(`corenet_receive_spamd_server_packets',`
 	gen_require(`
-		type snmp_server_packet_t;
+		type spamd_server_packet_t;
 	')
 
-	allow $1 snmp_server_packet_t:packet recv;
+	allow $1 spamd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive snmp_server packets.
+##	Do not audit attempts to receive spamd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80623,17 +83724,17 @@ interface(`corenet_receive_snmp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_snmp_server_packets',`
+interface(`corenet_dontaudit_receive_spamd_server_packets',`
 	gen_require(`
-		type snmp_server_packet_t;
+		type spamd_server_packet_t;
 	')
 
-	dontaudit $1 snmp_server_packet_t:packet recv;
+	dontaudit $1 spamd_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive snmp_server packets.
+##	Send and receive spamd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80642,14 +83743,14 @@ interface(`corenet_dontaudit_receive_snmp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_snmp_server_packets',`
-	corenet_send_snmp_server_packets($1)
-	corenet_receive_snmp_server_packets($1)
+interface(`corenet_sendrecv_spamd_server_packets',`
+	corenet_send_spamd_server_packets($1)
+	corenet_receive_spamd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive snmp_server packets.
+##	Do not audit attempts to send and receive spamd_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80658,14 +83759,14 @@ interface(`corenet_sendrecv_snmp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_snmp_server_packets',`
-	corenet_dontaudit_send_snmp_server_packets($1)
-	corenet_dontaudit_receive_snmp_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_spamd_server_packets',`
+	corenet_dontaudit_send_spamd_server_packets($1)
+	corenet_dontaudit_receive_spamd_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to snmp_server the packet type.
+##	Relabel packets to spamd_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80673,12 +83774,12 @@ interface(`corenet_dontaudit_sendrecv_snmp_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_snmp_server_packets',`
+interface(`corenet_relabelto_spamd_server_packets',`
 	gen_require(`
-		type snmp_server_packet_t;
+		type spamd_server_packet_t;
 	')
 
-	allow $1 snmp_server_packet_t:packet relabelto;
+	allow $1 spamd_server_packet_t:packet relabelto;
 ')
 
 
@@ -80686,7 +83787,7 @@ interface(`corenet_relabelto_snmp_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the socks port.
+##	Send and receive TCP traffic on the speech port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80695,17 +83796,17 @@ interface(`corenet_relabelto_snmp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_socks_port',`
+interface(`corenet_tcp_sendrecv_speech_port',`
 	gen_require(`
-		type socks_port_t;
+		type speech_port_t;
 	')
 
-	allow $1 socks_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 speech_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the socks port.
+##	Send UDP traffic on the speech port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80714,17 +83815,17 @@ interface(`corenet_tcp_sendrecv_socks_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_socks_port',`
+interface(`corenet_udp_send_speech_port',`
 	gen_require(`
-		type socks_port_t;
+		type speech_port_t;
 	')
 
-	allow $1 socks_port_t:udp_socket send_msg;
+	allow $1 speech_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the socks port.
+##	Do not audit attempts to send UDP traffic on the speech port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80733,17 +83834,17 @@ interface(`corenet_udp_send_socks_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_socks_port',`
+interface(`corenet_dontaudit_udp_send_speech_port',`
 	gen_require(`
-		type socks_port_t;
+		type speech_port_t;
 	')
 
-	dontaudit $1 socks_port_t:udp_socket send_msg;
+	dontaudit $1 speech_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the socks port.
+##	Receive UDP traffic on the speech port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80752,17 +83853,17 @@ interface(`corenet_dontaudit_udp_send_socks_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_socks_port',`
+interface(`corenet_udp_receive_speech_port',`
 	gen_require(`
-		type socks_port_t;
+		type speech_port_t;
 	')
 
-	allow $1 socks_port_t:udp_socket recv_msg;
+	allow $1 speech_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the socks port.
+##	Do not audit attempts to receive UDP traffic on the speech port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80771,17 +83872,17 @@ interface(`corenet_udp_receive_socks_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_socks_port',`
+interface(`corenet_dontaudit_udp_receive_speech_port',`
 	gen_require(`
-		type socks_port_t;
+		type speech_port_t;
 	')
 
-	dontaudit $1 socks_port_t:udp_socket recv_msg;
+	dontaudit $1 speech_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the socks port.
+##	Send and receive UDP traffic on the speech port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80790,15 +83891,15 @@ interface(`corenet_dontaudit_udp_receive_socks_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_socks_port',`
-	corenet_udp_send_socks_port($1)
-	corenet_udp_receive_socks_port($1)
+interface(`corenet_udp_sendrecv_speech_port',`
+	corenet_udp_send_speech_port($1)
+	corenet_udp_receive_speech_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the socks port.
+##	UDP traffic on the speech port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80807,14 +83908,14 @@ interface(`corenet_udp_sendrecv_socks_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_socks_port',`
-	corenet_dontaudit_udp_send_socks_port($1)
-	corenet_dontaudit_udp_receive_socks_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_speech_port',`
+	corenet_dontaudit_udp_send_speech_port($1)
+	corenet_dontaudit_udp_receive_speech_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the socks port.
+##	Bind TCP sockets to the speech port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80823,18 +83924,18 @@ interface(`corenet_dontaudit_udp_sendrecv_socks_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_socks_port',`
+interface(`corenet_tcp_bind_speech_port',`
 	gen_require(`
-		type socks_port_t;
+		type speech_port_t;
 	')
 
-	allow $1 socks_port_t:tcp_socket name_bind;
+	allow $1 speech_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the socks port.
+##	Bind UDP sockets to the speech port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80843,18 +83944,18 @@ interface(`corenet_tcp_bind_socks_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_socks_port',`
+interface(`corenet_udp_bind_speech_port',`
 	gen_require(`
-		type socks_port_t;
+		type speech_port_t;
 	')
 
-	allow $1 socks_port_t:udp_socket name_bind;
+	allow $1 speech_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the socks port.
+##	Make a TCP connection to the speech port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80862,18 +83963,18 @@ interface(`corenet_udp_bind_socks_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_socks_port',`
+interface(`corenet_tcp_connect_speech_port',`
 	gen_require(`
-		type socks_port_t;
+		type speech_port_t;
 	')
 
-	allow $1 socks_port_t:tcp_socket name_connect;
+	allow $1 speech_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send socks_client packets.
+##	Send speech_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80882,17 +83983,17 @@ interface(`corenet_tcp_connect_socks_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_socks_client_packets',`
+interface(`corenet_send_speech_client_packets',`
 	gen_require(`
-		type socks_client_packet_t;
+		type speech_client_packet_t;
 	')
 
-	allow $1 socks_client_packet_t:packet send;
+	allow $1 speech_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send socks_client packets.
+##	Do not audit attempts to send speech_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80901,17 +84002,17 @@ interface(`corenet_send_socks_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_socks_client_packets',`
+interface(`corenet_dontaudit_send_speech_client_packets',`
 	gen_require(`
-		type socks_client_packet_t;
+		type speech_client_packet_t;
 	')
 
-	dontaudit $1 socks_client_packet_t:packet send;
+	dontaudit $1 speech_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive socks_client packets.
+##	Receive speech_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80920,17 +84021,17 @@ interface(`corenet_dontaudit_send_socks_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_socks_client_packets',`
+interface(`corenet_receive_speech_client_packets',`
 	gen_require(`
-		type socks_client_packet_t;
+		type speech_client_packet_t;
 	')
 
-	allow $1 socks_client_packet_t:packet recv;
+	allow $1 speech_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive socks_client packets.
+##	Do not audit attempts to receive speech_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80939,17 +84040,17 @@ interface(`corenet_receive_socks_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_socks_client_packets',`
+interface(`corenet_dontaudit_receive_speech_client_packets',`
 	gen_require(`
-		type socks_client_packet_t;
+		type speech_client_packet_t;
 	')
 
-	dontaudit $1 socks_client_packet_t:packet recv;
+	dontaudit $1 speech_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive socks_client packets.
+##	Send and receive speech_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80958,14 +84059,14 @@ interface(`corenet_dontaudit_receive_socks_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_socks_client_packets',`
-	corenet_send_socks_client_packets($1)
-	corenet_receive_socks_client_packets($1)
+interface(`corenet_sendrecv_speech_client_packets',`
+	corenet_send_speech_client_packets($1)
+	corenet_receive_speech_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive socks_client packets.
+##	Do not audit attempts to send and receive speech_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80974,14 +84075,14 @@ interface(`corenet_sendrecv_socks_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_socks_client_packets',`
-	corenet_dontaudit_send_socks_client_packets($1)
-	corenet_dontaudit_receive_socks_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_speech_client_packets',`
+	corenet_dontaudit_send_speech_client_packets($1)
+	corenet_dontaudit_receive_speech_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to socks_client the packet type.
+##	Relabel packets to speech_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -80989,18 +84090,18 @@ interface(`corenet_dontaudit_sendrecv_socks_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_socks_client_packets',`
+interface(`corenet_relabelto_speech_client_packets',`
 	gen_require(`
-		type socks_client_packet_t;
+		type speech_client_packet_t;
 	')
 
-	allow $1 socks_client_packet_t:packet relabelto;
+	allow $1 speech_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send socks_server packets.
+##	Send speech_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81009,17 +84110,17 @@ interface(`corenet_relabelto_socks_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_socks_server_packets',`
+interface(`corenet_send_speech_server_packets',`
 	gen_require(`
-		type socks_server_packet_t;
+		type speech_server_packet_t;
 	')
 
-	allow $1 socks_server_packet_t:packet send;
+	allow $1 speech_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send socks_server packets.
+##	Do not audit attempts to send speech_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81028,17 +84129,17 @@ interface(`corenet_send_socks_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_socks_server_packets',`
+interface(`corenet_dontaudit_send_speech_server_packets',`
 	gen_require(`
-		type socks_server_packet_t;
+		type speech_server_packet_t;
 	')
 
-	dontaudit $1 socks_server_packet_t:packet send;
+	dontaudit $1 speech_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive socks_server packets.
+##	Receive speech_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81047,17 +84148,17 @@ interface(`corenet_dontaudit_send_socks_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_socks_server_packets',`
+interface(`corenet_receive_speech_server_packets',`
 	gen_require(`
-		type socks_server_packet_t;
+		type speech_server_packet_t;
 	')
 
-	allow $1 socks_server_packet_t:packet recv;
+	allow $1 speech_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive socks_server packets.
+##	Do not audit attempts to receive speech_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81066,17 +84167,17 @@ interface(`corenet_receive_socks_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_socks_server_packets',`
+interface(`corenet_dontaudit_receive_speech_server_packets',`
 	gen_require(`
-		type socks_server_packet_t;
+		type speech_server_packet_t;
 	')
 
-	dontaudit $1 socks_server_packet_t:packet recv;
+	dontaudit $1 speech_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive socks_server packets.
+##	Send and receive speech_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81085,14 +84186,14 @@ interface(`corenet_dontaudit_receive_socks_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_socks_server_packets',`
-	corenet_send_socks_server_packets($1)
-	corenet_receive_socks_server_packets($1)
+interface(`corenet_sendrecv_speech_server_packets',`
+	corenet_send_speech_server_packets($1)
+	corenet_receive_speech_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive socks_server packets.
+##	Do not audit attempts to send and receive speech_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81101,14 +84202,14 @@ interface(`corenet_sendrecv_socks_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_socks_server_packets',`
-	corenet_dontaudit_send_socks_server_packets($1)
-	corenet_dontaudit_receive_socks_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_speech_server_packets',`
+	corenet_dontaudit_send_speech_server_packets($1)
+	corenet_dontaudit_receive_speech_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to socks_server the packet type.
+##	Relabel packets to speech_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81116,20 +84217,20 @@ interface(`corenet_dontaudit_sendrecv_socks_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_socks_server_packets',`
+interface(`corenet_relabelto_speech_server_packets',`
 	gen_require(`
-		type socks_server_packet_t;
+		type speech_server_packet_t;
 	')
 
-	allow $1 socks_server_packet_t:packet relabelto;
+	allow $1 speech_server_packet_t:packet relabelto;
 ')
 
- # no defined portcon
+
 
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the soundd port.
+##	Send and receive TCP traffic on the squid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81138,17 +84239,17 @@ interface(`corenet_relabelto_socks_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_soundd_port',`
+interface(`corenet_tcp_sendrecv_squid_port',`
 	gen_require(`
-		type soundd_port_t;
+		type squid_port_t;
 	')
 
-	allow $1 soundd_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 squid_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the soundd port.
+##	Send UDP traffic on the squid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81157,17 +84258,17 @@ interface(`corenet_tcp_sendrecv_soundd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_soundd_port',`
+interface(`corenet_udp_send_squid_port',`
 	gen_require(`
-		type soundd_port_t;
+		type squid_port_t;
 	')
 
-	allow $1 soundd_port_t:udp_socket send_msg;
+	allow $1 squid_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the soundd port.
+##	Do not audit attempts to send UDP traffic on the squid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81176,17 +84277,17 @@ interface(`corenet_udp_send_soundd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_soundd_port',`
+interface(`corenet_dontaudit_udp_send_squid_port',`
 	gen_require(`
-		type soundd_port_t;
+		type squid_port_t;
 	')
 
-	dontaudit $1 soundd_port_t:udp_socket send_msg;
+	dontaudit $1 squid_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the soundd port.
+##	Receive UDP traffic on the squid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81195,17 +84296,17 @@ interface(`corenet_dontaudit_udp_send_soundd_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_soundd_port',`
+interface(`corenet_udp_receive_squid_port',`
 	gen_require(`
-		type soundd_port_t;
+		type squid_port_t;
 	')
 
-	allow $1 soundd_port_t:udp_socket recv_msg;
+	allow $1 squid_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the soundd port.
+##	Do not audit attempts to receive UDP traffic on the squid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81214,17 +84315,17 @@ interface(`corenet_udp_receive_soundd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_soundd_port',`
+interface(`corenet_dontaudit_udp_receive_squid_port',`
 	gen_require(`
-		type soundd_port_t;
+		type squid_port_t;
 	')
 
-	dontaudit $1 soundd_port_t:udp_socket recv_msg;
+	dontaudit $1 squid_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the soundd port.
+##	Send and receive UDP traffic on the squid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81233,15 +84334,15 @@ interface(`corenet_dontaudit_udp_receive_soundd_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_soundd_port',`
-	corenet_udp_send_soundd_port($1)
-	corenet_udp_receive_soundd_port($1)
+interface(`corenet_udp_sendrecv_squid_port',`
+	corenet_udp_send_squid_port($1)
+	corenet_udp_receive_squid_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the soundd port.
+##	UDP traffic on the squid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81250,14 +84351,14 @@ interface(`corenet_udp_sendrecv_soundd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_soundd_port',`
-	corenet_dontaudit_udp_send_soundd_port($1)
-	corenet_dontaudit_udp_receive_soundd_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_squid_port',`
+	corenet_dontaudit_udp_send_squid_port($1)
+	corenet_dontaudit_udp_receive_squid_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the soundd port.
+##	Bind TCP sockets to the squid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81266,18 +84367,18 @@ interface(`corenet_dontaudit_udp_sendrecv_soundd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_soundd_port',`
+interface(`corenet_tcp_bind_squid_port',`
 	gen_require(`
-		type soundd_port_t;
+		type squid_port_t;
 	')
 
-	allow $1 soundd_port_t:tcp_socket name_bind;
+	allow $1 squid_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the soundd port.
+##	Bind UDP sockets to the squid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81286,18 +84387,18 @@ interface(`corenet_tcp_bind_soundd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_soundd_port',`
+interface(`corenet_udp_bind_squid_port',`
 	gen_require(`
-		type soundd_port_t;
+		type squid_port_t;
 	')
 
-	allow $1 soundd_port_t:udp_socket name_bind;
+	allow $1 squid_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the soundd port.
+##	Make a TCP connection to the squid port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81305,18 +84406,18 @@ interface(`corenet_udp_bind_soundd_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_soundd_port',`
+interface(`corenet_tcp_connect_squid_port',`
 	gen_require(`
-		type soundd_port_t;
+		type squid_port_t;
 	')
 
-	allow $1 soundd_port_t:tcp_socket name_connect;
+	allow $1 squid_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send soundd_client packets.
+##	Send squid_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81325,17 +84426,17 @@ interface(`corenet_tcp_connect_soundd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_soundd_client_packets',`
+interface(`corenet_send_squid_client_packets',`
 	gen_require(`
-		type soundd_client_packet_t;
+		type squid_client_packet_t;
 	')
 
-	allow $1 soundd_client_packet_t:packet send;
+	allow $1 squid_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send soundd_client packets.
+##	Do not audit attempts to send squid_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81344,17 +84445,17 @@ interface(`corenet_send_soundd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_soundd_client_packets',`
+interface(`corenet_dontaudit_send_squid_client_packets',`
 	gen_require(`
-		type soundd_client_packet_t;
+		type squid_client_packet_t;
 	')
 
-	dontaudit $1 soundd_client_packet_t:packet send;
+	dontaudit $1 squid_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive soundd_client packets.
+##	Receive squid_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81363,17 +84464,17 @@ interface(`corenet_dontaudit_send_soundd_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_soundd_client_packets',`
+interface(`corenet_receive_squid_client_packets',`
 	gen_require(`
-		type soundd_client_packet_t;
+		type squid_client_packet_t;
 	')
 
-	allow $1 soundd_client_packet_t:packet recv;
+	allow $1 squid_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive soundd_client packets.
+##	Do not audit attempts to receive squid_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81382,17 +84483,17 @@ interface(`corenet_receive_soundd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_soundd_client_packets',`
+interface(`corenet_dontaudit_receive_squid_client_packets',`
 	gen_require(`
-		type soundd_client_packet_t;
+		type squid_client_packet_t;
 	')
 
-	dontaudit $1 soundd_client_packet_t:packet recv;
+	dontaudit $1 squid_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive soundd_client packets.
+##	Send and receive squid_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81401,14 +84502,14 @@ interface(`corenet_dontaudit_receive_soundd_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_soundd_client_packets',`
-	corenet_send_soundd_client_packets($1)
-	corenet_receive_soundd_client_packets($1)
+interface(`corenet_sendrecv_squid_client_packets',`
+	corenet_send_squid_client_packets($1)
+	corenet_receive_squid_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive soundd_client packets.
+##	Do not audit attempts to send and receive squid_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81417,14 +84518,14 @@ interface(`corenet_sendrecv_soundd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_soundd_client_packets',`
-	corenet_dontaudit_send_soundd_client_packets($1)
-	corenet_dontaudit_receive_soundd_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_squid_client_packets',`
+	corenet_dontaudit_send_squid_client_packets($1)
+	corenet_dontaudit_receive_squid_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to soundd_client the packet type.
+##	Relabel packets to squid_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81432,18 +84533,18 @@ interface(`corenet_dontaudit_sendrecv_soundd_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_soundd_client_packets',`
+interface(`corenet_relabelto_squid_client_packets',`
 	gen_require(`
-		type soundd_client_packet_t;
+		type squid_client_packet_t;
 	')
 
-	allow $1 soundd_client_packet_t:packet relabelto;
+	allow $1 squid_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send soundd_server packets.
+##	Send squid_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81452,17 +84553,17 @@ interface(`corenet_relabelto_soundd_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_soundd_server_packets',`
+interface(`corenet_send_squid_server_packets',`
 	gen_require(`
-		type soundd_server_packet_t;
+		type squid_server_packet_t;
 	')
 
-	allow $1 soundd_server_packet_t:packet send;
+	allow $1 squid_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send soundd_server packets.
+##	Do not audit attempts to send squid_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81471,17 +84572,17 @@ interface(`corenet_send_soundd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_soundd_server_packets',`
+interface(`corenet_dontaudit_send_squid_server_packets',`
 	gen_require(`
-		type soundd_server_packet_t;
+		type squid_server_packet_t;
 	')
 
-	dontaudit $1 soundd_server_packet_t:packet send;
+	dontaudit $1 squid_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive soundd_server packets.
+##	Receive squid_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81490,17 +84591,17 @@ interface(`corenet_dontaudit_send_soundd_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_soundd_server_packets',`
+interface(`corenet_receive_squid_server_packets',`
 	gen_require(`
-		type soundd_server_packet_t;
+		type squid_server_packet_t;
 	')
 
-	allow $1 soundd_server_packet_t:packet recv;
+	allow $1 squid_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive soundd_server packets.
+##	Do not audit attempts to receive squid_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81509,17 +84610,17 @@ interface(`corenet_receive_soundd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_soundd_server_packets',`
+interface(`corenet_dontaudit_receive_squid_server_packets',`
 	gen_require(`
-		type soundd_server_packet_t;
+		type squid_server_packet_t;
 	')
 
-	dontaudit $1 soundd_server_packet_t:packet recv;
+	dontaudit $1 squid_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive soundd_server packets.
+##	Send and receive squid_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81528,14 +84629,14 @@ interface(`corenet_dontaudit_receive_soundd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_soundd_server_packets',`
-	corenet_send_soundd_server_packets($1)
-	corenet_receive_soundd_server_packets($1)
+interface(`corenet_sendrecv_squid_server_packets',`
+	corenet_send_squid_server_packets($1)
+	corenet_receive_squid_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive soundd_server packets.
+##	Do not audit attempts to send and receive squid_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81544,14 +84645,14 @@ interface(`corenet_sendrecv_soundd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_soundd_server_packets',`
-	corenet_dontaudit_send_soundd_server_packets($1)
-	corenet_dontaudit_receive_soundd_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_squid_server_packets',`
+	corenet_dontaudit_send_squid_server_packets($1)
+	corenet_dontaudit_receive_squid_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to soundd_server the packet type.
+##	Relabel packets to squid_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81559,20 +84660,20 @@ interface(`corenet_dontaudit_sendrecv_soundd_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_soundd_server_packets',`
+interface(`corenet_relabelto_squid_server_packets',`
 	gen_require(`
-		type soundd_server_packet_t;
+		type squid_server_packet_t;
 	')
 
-	allow $1 soundd_server_packet_t:packet relabelto;
+	allow $1 squid_server_packet_t:packet relabelto;
 ')
 
-
+ # snmp and htcp
 
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the spamd port.
+##	Send and receive TCP traffic on the ssdp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81581,17 +84682,17 @@ interface(`corenet_relabelto_soundd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_spamd_port',`
+interface(`corenet_tcp_sendrecv_ssdp_port',`
 	gen_require(`
-		type spamd_port_t;
+		type ssdp_port_t;
 	')
 
-	allow $1 spamd_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 ssdp_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the spamd port.
+##	Send UDP traffic on the ssdp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81600,17 +84701,17 @@ interface(`corenet_tcp_sendrecv_spamd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_spamd_port',`
+interface(`corenet_udp_send_ssdp_port',`
 	gen_require(`
-		type spamd_port_t;
+		type ssdp_port_t;
 	')
 
-	allow $1 spamd_port_t:udp_socket send_msg;
+	allow $1 ssdp_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the spamd port.
+##	Do not audit attempts to send UDP traffic on the ssdp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81619,17 +84720,17 @@ interface(`corenet_udp_send_spamd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_spamd_port',`
+interface(`corenet_dontaudit_udp_send_ssdp_port',`
 	gen_require(`
-		type spamd_port_t;
+		type ssdp_port_t;
 	')
 
-	dontaudit $1 spamd_port_t:udp_socket send_msg;
+	dontaudit $1 ssdp_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the spamd port.
+##	Receive UDP traffic on the ssdp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81638,17 +84739,17 @@ interface(`corenet_dontaudit_udp_send_spamd_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_spamd_port',`
+interface(`corenet_udp_receive_ssdp_port',`
 	gen_require(`
-		type spamd_port_t;
+		type ssdp_port_t;
 	')
 
-	allow $1 spamd_port_t:udp_socket recv_msg;
+	allow $1 ssdp_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the spamd port.
+##	Do not audit attempts to receive UDP traffic on the ssdp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81657,17 +84758,17 @@ interface(`corenet_udp_receive_spamd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_spamd_port',`
+interface(`corenet_dontaudit_udp_receive_ssdp_port',`
 	gen_require(`
-		type spamd_port_t;
+		type ssdp_port_t;
 	')
 
-	dontaudit $1 spamd_port_t:udp_socket recv_msg;
+	dontaudit $1 ssdp_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the spamd port.
+##	Send and receive UDP traffic on the ssdp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81676,15 +84777,15 @@ interface(`corenet_dontaudit_udp_receive_spamd_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_spamd_port',`
-	corenet_udp_send_spamd_port($1)
-	corenet_udp_receive_spamd_port($1)
+interface(`corenet_udp_sendrecv_ssdp_port',`
+	corenet_udp_send_ssdp_port($1)
+	corenet_udp_receive_ssdp_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the spamd port.
+##	UDP traffic on the ssdp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81693,14 +84794,14 @@ interface(`corenet_udp_sendrecv_spamd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_spamd_port',`
-	corenet_dontaudit_udp_send_spamd_port($1)
-	corenet_dontaudit_udp_receive_spamd_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_ssdp_port',`
+	corenet_dontaudit_udp_send_ssdp_port($1)
+	corenet_dontaudit_udp_receive_ssdp_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the spamd port.
+##	Bind TCP sockets to the ssdp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81709,18 +84810,18 @@ interface(`corenet_dontaudit_udp_sendrecv_spamd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_spamd_port',`
+interface(`corenet_tcp_bind_ssdp_port',`
 	gen_require(`
-		type spamd_port_t;
+		type ssdp_port_t;
 	')
 
-	allow $1 spamd_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 ssdp_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the spamd port.
+##	Bind UDP sockets to the ssdp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81729,18 +84830,18 @@ interface(`corenet_tcp_bind_spamd_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_spamd_port',`
+interface(`corenet_udp_bind_ssdp_port',`
 	gen_require(`
-		type spamd_port_t;
+		type ssdp_port_t;
 	')
 
-	allow $1 spamd_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 ssdp_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the spamd port.
+##	Make a TCP connection to the ssdp port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81748,18 +84849,18 @@ interface(`corenet_udp_bind_spamd_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_spamd_port',`
+interface(`corenet_tcp_connect_ssdp_port',`
 	gen_require(`
-		type spamd_port_t;
+		type ssdp_port_t;
 	')
 
-	allow $1 spamd_port_t:tcp_socket name_connect;
+	allow $1 ssdp_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send spamd_client packets.
+##	Send ssdp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81768,17 +84869,17 @@ interface(`corenet_tcp_connect_spamd_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_spamd_client_packets',`
+interface(`corenet_send_ssdp_client_packets',`
 	gen_require(`
-		type spamd_client_packet_t;
+		type ssdp_client_packet_t;
 	')
 
-	allow $1 spamd_client_packet_t:packet send;
+	allow $1 ssdp_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send spamd_client packets.
+##	Do not audit attempts to send ssdp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81787,17 +84888,17 @@ interface(`corenet_send_spamd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_spamd_client_packets',`
+interface(`corenet_dontaudit_send_ssdp_client_packets',`
 	gen_require(`
-		type spamd_client_packet_t;
+		type ssdp_client_packet_t;
 	')
 
-	dontaudit $1 spamd_client_packet_t:packet send;
+	dontaudit $1 ssdp_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive spamd_client packets.
+##	Receive ssdp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81806,17 +84907,17 @@ interface(`corenet_dontaudit_send_spamd_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_spamd_client_packets',`
+interface(`corenet_receive_ssdp_client_packets',`
 	gen_require(`
-		type spamd_client_packet_t;
+		type ssdp_client_packet_t;
 	')
 
-	allow $1 spamd_client_packet_t:packet recv;
+	allow $1 ssdp_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive spamd_client packets.
+##	Do not audit attempts to receive ssdp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81825,17 +84926,17 @@ interface(`corenet_receive_spamd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_spamd_client_packets',`
+interface(`corenet_dontaudit_receive_ssdp_client_packets',`
 	gen_require(`
-		type spamd_client_packet_t;
+		type ssdp_client_packet_t;
 	')
 
-	dontaudit $1 spamd_client_packet_t:packet recv;
+	dontaudit $1 ssdp_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive spamd_client packets.
+##	Send and receive ssdp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81844,14 +84945,14 @@ interface(`corenet_dontaudit_receive_spamd_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_spamd_client_packets',`
-	corenet_send_spamd_client_packets($1)
-	corenet_receive_spamd_client_packets($1)
+interface(`corenet_sendrecv_ssdp_client_packets',`
+	corenet_send_ssdp_client_packets($1)
+	corenet_receive_ssdp_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive spamd_client packets.
+##	Do not audit attempts to send and receive ssdp_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81860,14 +84961,14 @@ interface(`corenet_sendrecv_spamd_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_spamd_client_packets',`
-	corenet_dontaudit_send_spamd_client_packets($1)
-	corenet_dontaudit_receive_spamd_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_ssdp_client_packets',`
+	corenet_dontaudit_send_ssdp_client_packets($1)
+	corenet_dontaudit_receive_ssdp_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to spamd_client the packet type.
+##	Relabel packets to ssdp_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81875,18 +84976,18 @@ interface(`corenet_dontaudit_sendrecv_spamd_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_spamd_client_packets',`
+interface(`corenet_relabelto_ssdp_client_packets',`
 	gen_require(`
-		type spamd_client_packet_t;
+		type ssdp_client_packet_t;
 	')
 
-	allow $1 spamd_client_packet_t:packet relabelto;
+	allow $1 ssdp_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send spamd_server packets.
+##	Send ssdp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81895,17 +84996,17 @@ interface(`corenet_relabelto_spamd_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_spamd_server_packets',`
+interface(`corenet_send_ssdp_server_packets',`
 	gen_require(`
-		type spamd_server_packet_t;
+		type ssdp_server_packet_t;
 	')
 
-	allow $1 spamd_server_packet_t:packet send;
+	allow $1 ssdp_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send spamd_server packets.
+##	Do not audit attempts to send ssdp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81914,17 +85015,17 @@ interface(`corenet_send_spamd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_spamd_server_packets',`
+interface(`corenet_dontaudit_send_ssdp_server_packets',`
 	gen_require(`
-		type spamd_server_packet_t;
+		type ssdp_server_packet_t;
 	')
 
-	dontaudit $1 spamd_server_packet_t:packet send;
+	dontaudit $1 ssdp_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive spamd_server packets.
+##	Receive ssdp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81933,17 +85034,17 @@ interface(`corenet_dontaudit_send_spamd_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_spamd_server_packets',`
+interface(`corenet_receive_ssdp_server_packets',`
 	gen_require(`
-		type spamd_server_packet_t;
+		type ssdp_server_packet_t;
 	')
 
-	allow $1 spamd_server_packet_t:packet recv;
+	allow $1 ssdp_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive spamd_server packets.
+##	Do not audit attempts to receive ssdp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81952,17 +85053,17 @@ interface(`corenet_receive_spamd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_spamd_server_packets',`
+interface(`corenet_dontaudit_receive_ssdp_server_packets',`
 	gen_require(`
-		type spamd_server_packet_t;
+		type ssdp_server_packet_t;
 	')
 
-	dontaudit $1 spamd_server_packet_t:packet recv;
+	dontaudit $1 ssdp_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive spamd_server packets.
+##	Send and receive ssdp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81971,14 +85072,14 @@ interface(`corenet_dontaudit_receive_spamd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_spamd_server_packets',`
-	corenet_send_spamd_server_packets($1)
-	corenet_receive_spamd_server_packets($1)
+interface(`corenet_sendrecv_ssdp_server_packets',`
+	corenet_send_ssdp_server_packets($1)
+	corenet_receive_ssdp_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive spamd_server packets.
+##	Do not audit attempts to send and receive ssdp_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -81987,14 +85088,14 @@ interface(`corenet_sendrecv_spamd_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_spamd_server_packets',`
-	corenet_dontaudit_send_spamd_server_packets($1)
-	corenet_dontaudit_receive_spamd_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_ssdp_server_packets',`
+	corenet_dontaudit_send_ssdp_server_packets($1)
+	corenet_dontaudit_receive_ssdp_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to spamd_server the packet type.
+##	Relabel packets to ssdp_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82002,12 +85103,12 @@ interface(`corenet_dontaudit_sendrecv_spamd_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_spamd_server_packets',`
+interface(`corenet_relabelto_ssdp_server_packets',`
 	gen_require(`
-		type spamd_server_packet_t;
+		type ssdp_server_packet_t;
 	')
 
-	allow $1 spamd_server_packet_t:packet relabelto;
+	allow $1 ssdp_server_packet_t:packet relabelto;
 ')
 
 
@@ -82015,7 +85116,7 @@ interface(`corenet_relabelto_spamd_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the speech port.
+##	Send and receive TCP traffic on the ssh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82024,17 +85125,17 @@ interface(`corenet_relabelto_spamd_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_speech_port',`
+interface(`corenet_tcp_sendrecv_ssh_port',`
 	gen_require(`
-		type speech_port_t;
+		type ssh_port_t;
 	')
 
-	allow $1 speech_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 ssh_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the speech port.
+##	Send UDP traffic on the ssh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82043,17 +85144,17 @@ interface(`corenet_tcp_sendrecv_speech_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_speech_port',`
+interface(`corenet_udp_send_ssh_port',`
 	gen_require(`
-		type speech_port_t;
+		type ssh_port_t;
 	')
 
-	allow $1 speech_port_t:udp_socket send_msg;
+	allow $1 ssh_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the speech port.
+##	Do not audit attempts to send UDP traffic on the ssh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82062,17 +85163,17 @@ interface(`corenet_udp_send_speech_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_speech_port',`
+interface(`corenet_dontaudit_udp_send_ssh_port',`
 	gen_require(`
-		type speech_port_t;
+		type ssh_port_t;
 	')
 
-	dontaudit $1 speech_port_t:udp_socket send_msg;
+	dontaudit $1 ssh_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the speech port.
+##	Receive UDP traffic on the ssh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82081,17 +85182,17 @@ interface(`corenet_dontaudit_udp_send_speech_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_speech_port',`
+interface(`corenet_udp_receive_ssh_port',`
 	gen_require(`
-		type speech_port_t;
+		type ssh_port_t;
 	')
 
-	allow $1 speech_port_t:udp_socket recv_msg;
+	allow $1 ssh_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the speech port.
+##	Do not audit attempts to receive UDP traffic on the ssh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82100,17 +85201,17 @@ interface(`corenet_udp_receive_speech_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_speech_port',`
+interface(`corenet_dontaudit_udp_receive_ssh_port',`
 	gen_require(`
-		type speech_port_t;
+		type ssh_port_t;
 	')
 
-	dontaudit $1 speech_port_t:udp_socket recv_msg;
+	dontaudit $1 ssh_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the speech port.
+##	Send and receive UDP traffic on the ssh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82119,15 +85220,15 @@ interface(`corenet_dontaudit_udp_receive_speech_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_speech_port',`
-	corenet_udp_send_speech_port($1)
-	corenet_udp_receive_speech_port($1)
+interface(`corenet_udp_sendrecv_ssh_port',`
+	corenet_udp_send_ssh_port($1)
+	corenet_udp_receive_ssh_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the speech port.
+##	UDP traffic on the ssh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82136,14 +85237,14 @@ interface(`corenet_udp_sendrecv_speech_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_speech_port',`
-	corenet_dontaudit_udp_send_speech_port($1)
-	corenet_dontaudit_udp_receive_speech_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_ssh_port',`
+	corenet_dontaudit_udp_send_ssh_port($1)
+	corenet_dontaudit_udp_receive_ssh_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the speech port.
+##	Bind TCP sockets to the ssh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82152,18 +85253,18 @@ interface(`corenet_dontaudit_udp_sendrecv_speech_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_speech_port',`
+interface(`corenet_tcp_bind_ssh_port',`
 	gen_require(`
-		type speech_port_t;
+		type ssh_port_t;
 	')
 
-	allow $1 speech_port_t:tcp_socket name_bind;
-	
+	allow $1 ssh_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the speech port.
+##	Bind UDP sockets to the ssh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82172,18 +85273,18 @@ interface(`corenet_tcp_bind_speech_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_speech_port',`
+interface(`corenet_udp_bind_ssh_port',`
 	gen_require(`
-		type speech_port_t;
+		type ssh_port_t;
 	')
 
-	allow $1 speech_port_t:udp_socket name_bind;
-	
+	allow $1 ssh_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the speech port.
+##	Make a TCP connection to the ssh port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82191,18 +85292,18 @@ interface(`corenet_udp_bind_speech_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_speech_port',`
+interface(`corenet_tcp_connect_ssh_port',`
 	gen_require(`
-		type speech_port_t;
+		type ssh_port_t;
 	')
 
-	allow $1 speech_port_t:tcp_socket name_connect;
+	allow $1 ssh_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send speech_client packets.
+##	Send ssh_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82211,17 +85312,17 @@ interface(`corenet_tcp_connect_speech_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_speech_client_packets',`
+interface(`corenet_send_ssh_client_packets',`
 	gen_require(`
-		type speech_client_packet_t;
+		type ssh_client_packet_t;
 	')
 
-	allow $1 speech_client_packet_t:packet send;
+	allow $1 ssh_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send speech_client packets.
+##	Do not audit attempts to send ssh_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82230,17 +85331,17 @@ interface(`corenet_send_speech_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_speech_client_packets',`
+interface(`corenet_dontaudit_send_ssh_client_packets',`
 	gen_require(`
-		type speech_client_packet_t;
+		type ssh_client_packet_t;
 	')
 
-	dontaudit $1 speech_client_packet_t:packet send;
+	dontaudit $1 ssh_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive speech_client packets.
+##	Receive ssh_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82249,17 +85350,17 @@ interface(`corenet_dontaudit_send_speech_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_speech_client_packets',`
+interface(`corenet_receive_ssh_client_packets',`
 	gen_require(`
-		type speech_client_packet_t;
+		type ssh_client_packet_t;
 	')
 
-	allow $1 speech_client_packet_t:packet recv;
+	allow $1 ssh_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive speech_client packets.
+##	Do not audit attempts to receive ssh_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82268,17 +85369,17 @@ interface(`corenet_receive_speech_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_speech_client_packets',`
+interface(`corenet_dontaudit_receive_ssh_client_packets',`
 	gen_require(`
-		type speech_client_packet_t;
+		type ssh_client_packet_t;
 	')
 
-	dontaudit $1 speech_client_packet_t:packet recv;
+	dontaudit $1 ssh_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive speech_client packets.
+##	Send and receive ssh_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82287,14 +85388,14 @@ interface(`corenet_dontaudit_receive_speech_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_speech_client_packets',`
-	corenet_send_speech_client_packets($1)
-	corenet_receive_speech_client_packets($1)
+interface(`corenet_sendrecv_ssh_client_packets',`
+	corenet_send_ssh_client_packets($1)
+	corenet_receive_ssh_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive speech_client packets.
+##	Do not audit attempts to send and receive ssh_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82303,14 +85404,14 @@ interface(`corenet_sendrecv_speech_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_speech_client_packets',`
-	corenet_dontaudit_send_speech_client_packets($1)
-	corenet_dontaudit_receive_speech_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_ssh_client_packets',`
+	corenet_dontaudit_send_ssh_client_packets($1)
+	corenet_dontaudit_receive_ssh_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to speech_client the packet type.
+##	Relabel packets to ssh_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82318,18 +85419,18 @@ interface(`corenet_dontaudit_sendrecv_speech_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_speech_client_packets',`
+interface(`corenet_relabelto_ssh_client_packets',`
 	gen_require(`
-		type speech_client_packet_t;
+		type ssh_client_packet_t;
 	')
 
-	allow $1 speech_client_packet_t:packet relabelto;
+	allow $1 ssh_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send speech_server packets.
+##	Send ssh_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82338,17 +85439,17 @@ interface(`corenet_relabelto_speech_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_speech_server_packets',`
+interface(`corenet_send_ssh_server_packets',`
 	gen_require(`
-		type speech_server_packet_t;
+		type ssh_server_packet_t;
 	')
 
-	allow $1 speech_server_packet_t:packet send;
+	allow $1 ssh_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send speech_server packets.
+##	Do not audit attempts to send ssh_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82357,17 +85458,17 @@ interface(`corenet_send_speech_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_speech_server_packets',`
+interface(`corenet_dontaudit_send_ssh_server_packets',`
 	gen_require(`
-		type speech_server_packet_t;
+		type ssh_server_packet_t;
 	')
 
-	dontaudit $1 speech_server_packet_t:packet send;
+	dontaudit $1 ssh_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive speech_server packets.
+##	Receive ssh_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82376,17 +85477,17 @@ interface(`corenet_dontaudit_send_speech_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_speech_server_packets',`
+interface(`corenet_receive_ssh_server_packets',`
 	gen_require(`
-		type speech_server_packet_t;
+		type ssh_server_packet_t;
 	')
 
-	allow $1 speech_server_packet_t:packet recv;
+	allow $1 ssh_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive speech_server packets.
+##	Do not audit attempts to receive ssh_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82395,17 +85496,17 @@ interface(`corenet_receive_speech_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_speech_server_packets',`
+interface(`corenet_dontaudit_receive_ssh_server_packets',`
 	gen_require(`
-		type speech_server_packet_t;
+		type ssh_server_packet_t;
 	')
 
-	dontaudit $1 speech_server_packet_t:packet recv;
+	dontaudit $1 ssh_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive speech_server packets.
+##	Send and receive ssh_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82414,14 +85515,14 @@ interface(`corenet_dontaudit_receive_speech_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_speech_server_packets',`
-	corenet_send_speech_server_packets($1)
-	corenet_receive_speech_server_packets($1)
+interface(`corenet_sendrecv_ssh_server_packets',`
+	corenet_send_ssh_server_packets($1)
+	corenet_receive_ssh_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive speech_server packets.
+##	Do not audit attempts to send and receive ssh_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82430,14 +85531,14 @@ interface(`corenet_sendrecv_speech_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_speech_server_packets',`
-	corenet_dontaudit_send_speech_server_packets($1)
-	corenet_dontaudit_receive_speech_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_ssh_server_packets',`
+	corenet_dontaudit_send_ssh_server_packets($1)
+	corenet_dontaudit_receive_ssh_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to speech_server the packet type.
+##	Relabel packets to ssh_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82445,12 +85546,12 @@ interface(`corenet_dontaudit_sendrecv_speech_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_speech_server_packets',`
+interface(`corenet_relabelto_ssh_server_packets',`
 	gen_require(`
-		type speech_server_packet_t;
+		type ssh_server_packet_t;
 	')
 
-	allow $1 speech_server_packet_t:packet relabelto;
+	allow $1 ssh_server_packet_t:packet relabelto;
 ')
 
 
@@ -82458,7 +85559,7 @@ interface(`corenet_relabelto_speech_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the squid port.
+##	Send and receive TCP traffic on the stunnel port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82467,17 +85568,17 @@ interface(`corenet_relabelto_speech_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_squid_port',`
+interface(`corenet_tcp_sendrecv_stunnel_port',`
 	gen_require(`
-		type squid_port_t;
+		type stunnel_port_t;
 	')
 
-	allow $1 squid_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 stunnel_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the squid port.
+##	Send UDP traffic on the stunnel port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82486,17 +85587,17 @@ interface(`corenet_tcp_sendrecv_squid_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_squid_port',`
+interface(`corenet_udp_send_stunnel_port',`
 	gen_require(`
-		type squid_port_t;
+		type stunnel_port_t;
 	')
 
-	allow $1 squid_port_t:udp_socket send_msg;
+	allow $1 stunnel_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the squid port.
+##	Do not audit attempts to send UDP traffic on the stunnel port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82505,17 +85606,17 @@ interface(`corenet_udp_send_squid_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_squid_port',`
+interface(`corenet_dontaudit_udp_send_stunnel_port',`
 	gen_require(`
-		type squid_port_t;
+		type stunnel_port_t;
 	')
 
-	dontaudit $1 squid_port_t:udp_socket send_msg;
+	dontaudit $1 stunnel_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the squid port.
+##	Receive UDP traffic on the stunnel port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82524,17 +85625,17 @@ interface(`corenet_dontaudit_udp_send_squid_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_squid_port',`
+interface(`corenet_udp_receive_stunnel_port',`
 	gen_require(`
-		type squid_port_t;
+		type stunnel_port_t;
 	')
 
-	allow $1 squid_port_t:udp_socket recv_msg;
+	allow $1 stunnel_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the squid port.
+##	Do not audit attempts to receive UDP traffic on the stunnel port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82543,17 +85644,17 @@ interface(`corenet_udp_receive_squid_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_squid_port',`
+interface(`corenet_dontaudit_udp_receive_stunnel_port',`
 	gen_require(`
-		type squid_port_t;
+		type stunnel_port_t;
 	')
 
-	dontaudit $1 squid_port_t:udp_socket recv_msg;
+	dontaudit $1 stunnel_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the squid port.
+##	Send and receive UDP traffic on the stunnel port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82562,15 +85663,15 @@ interface(`corenet_dontaudit_udp_receive_squid_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_squid_port',`
-	corenet_udp_send_squid_port($1)
-	corenet_udp_receive_squid_port($1)
+interface(`corenet_udp_sendrecv_stunnel_port',`
+	corenet_udp_send_stunnel_port($1)
+	corenet_udp_receive_stunnel_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the squid port.
+##	UDP traffic on the stunnel port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82579,14 +85680,14 @@ interface(`corenet_udp_sendrecv_squid_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_squid_port',`
-	corenet_dontaudit_udp_send_squid_port($1)
-	corenet_dontaudit_udp_receive_squid_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_stunnel_port',`
+	corenet_dontaudit_udp_send_stunnel_port($1)
+	corenet_dontaudit_udp_receive_stunnel_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the squid port.
+##	Bind TCP sockets to the stunnel port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82595,18 +85696,18 @@ interface(`corenet_dontaudit_udp_sendrecv_squid_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_squid_port',`
+interface(`corenet_tcp_bind_stunnel_port',`
 	gen_require(`
-		type squid_port_t;
+		type stunnel_port_t;
 	')
 
-	allow $1 squid_port_t:tcp_socket name_bind;
+	allow $1 stunnel_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the squid port.
+##	Bind UDP sockets to the stunnel port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82615,18 +85716,18 @@ interface(`corenet_tcp_bind_squid_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_squid_port',`
+interface(`corenet_udp_bind_stunnel_port',`
 	gen_require(`
-		type squid_port_t;
+		type stunnel_port_t;
 	')
 
-	allow $1 squid_port_t:udp_socket name_bind;
+	allow $1 stunnel_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the squid port.
+##	Make a TCP connection to the stunnel port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82634,18 +85735,18 @@ interface(`corenet_udp_bind_squid_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_squid_port',`
+interface(`corenet_tcp_connect_stunnel_port',`
 	gen_require(`
-		type squid_port_t;
+		type stunnel_port_t;
 	')
 
-	allow $1 squid_port_t:tcp_socket name_connect;
+	allow $1 stunnel_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send squid_client packets.
+##	Send stunnel_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82654,17 +85755,17 @@ interface(`corenet_tcp_connect_squid_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_squid_client_packets',`
+interface(`corenet_send_stunnel_client_packets',`
 	gen_require(`
-		type squid_client_packet_t;
+		type stunnel_client_packet_t;
 	')
 
-	allow $1 squid_client_packet_t:packet send;
+	allow $1 stunnel_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send squid_client packets.
+##	Do not audit attempts to send stunnel_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82673,17 +85774,17 @@ interface(`corenet_send_squid_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_squid_client_packets',`
+interface(`corenet_dontaudit_send_stunnel_client_packets',`
 	gen_require(`
-		type squid_client_packet_t;
+		type stunnel_client_packet_t;
 	')
 
-	dontaudit $1 squid_client_packet_t:packet send;
+	dontaudit $1 stunnel_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive squid_client packets.
+##	Receive stunnel_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82692,17 +85793,17 @@ interface(`corenet_dontaudit_send_squid_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_squid_client_packets',`
+interface(`corenet_receive_stunnel_client_packets',`
 	gen_require(`
-		type squid_client_packet_t;
+		type stunnel_client_packet_t;
 	')
 
-	allow $1 squid_client_packet_t:packet recv;
+	allow $1 stunnel_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive squid_client packets.
+##	Do not audit attempts to receive stunnel_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82711,17 +85812,17 @@ interface(`corenet_receive_squid_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_squid_client_packets',`
+interface(`corenet_dontaudit_receive_stunnel_client_packets',`
 	gen_require(`
-		type squid_client_packet_t;
+		type stunnel_client_packet_t;
 	')
 
-	dontaudit $1 squid_client_packet_t:packet recv;
+	dontaudit $1 stunnel_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive squid_client packets.
+##	Send and receive stunnel_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82730,14 +85831,14 @@ interface(`corenet_dontaudit_receive_squid_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_squid_client_packets',`
-	corenet_send_squid_client_packets($1)
-	corenet_receive_squid_client_packets($1)
+interface(`corenet_sendrecv_stunnel_client_packets',`
+	corenet_send_stunnel_client_packets($1)
+	corenet_receive_stunnel_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive squid_client packets.
+##	Do not audit attempts to send and receive stunnel_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82746,14 +85847,14 @@ interface(`corenet_sendrecv_squid_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_squid_client_packets',`
-	corenet_dontaudit_send_squid_client_packets($1)
-	corenet_dontaudit_receive_squid_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_stunnel_client_packets',`
+	corenet_dontaudit_send_stunnel_client_packets($1)
+	corenet_dontaudit_receive_stunnel_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to squid_client the packet type.
+##	Relabel packets to stunnel_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82761,18 +85862,18 @@ interface(`corenet_dontaudit_sendrecv_squid_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_squid_client_packets',`
+interface(`corenet_relabelto_stunnel_client_packets',`
 	gen_require(`
-		type squid_client_packet_t;
+		type stunnel_client_packet_t;
 	')
 
-	allow $1 squid_client_packet_t:packet relabelto;
+	allow $1 stunnel_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send squid_server packets.
+##	Send stunnel_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82781,17 +85882,17 @@ interface(`corenet_relabelto_squid_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_squid_server_packets',`
+interface(`corenet_send_stunnel_server_packets',`
 	gen_require(`
-		type squid_server_packet_t;
+		type stunnel_server_packet_t;
 	')
 
-	allow $1 squid_server_packet_t:packet send;
+	allow $1 stunnel_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send squid_server packets.
+##	Do not audit attempts to send stunnel_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82800,17 +85901,17 @@ interface(`corenet_send_squid_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_squid_server_packets',`
+interface(`corenet_dontaudit_send_stunnel_server_packets',`
 	gen_require(`
-		type squid_server_packet_t;
+		type stunnel_server_packet_t;
 	')
 
-	dontaudit $1 squid_server_packet_t:packet send;
+	dontaudit $1 stunnel_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive squid_server packets.
+##	Receive stunnel_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82819,17 +85920,17 @@ interface(`corenet_dontaudit_send_squid_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_squid_server_packets',`
+interface(`corenet_receive_stunnel_server_packets',`
 	gen_require(`
-		type squid_server_packet_t;
+		type stunnel_server_packet_t;
 	')
 
-	allow $1 squid_server_packet_t:packet recv;
+	allow $1 stunnel_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive squid_server packets.
+##	Do not audit attempts to receive stunnel_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82838,17 +85939,17 @@ interface(`corenet_receive_squid_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_squid_server_packets',`
+interface(`corenet_dontaudit_receive_stunnel_server_packets',`
 	gen_require(`
-		type squid_server_packet_t;
+		type stunnel_server_packet_t;
 	')
 
-	dontaudit $1 squid_server_packet_t:packet recv;
+	dontaudit $1 stunnel_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive squid_server packets.
+##	Send and receive stunnel_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82857,14 +85958,14 @@ interface(`corenet_dontaudit_receive_squid_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_squid_server_packets',`
-	corenet_send_squid_server_packets($1)
-	corenet_receive_squid_server_packets($1)
+interface(`corenet_sendrecv_stunnel_server_packets',`
+	corenet_send_stunnel_server_packets($1)
+	corenet_receive_stunnel_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive squid_server packets.
+##	Do not audit attempts to send and receive stunnel_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82873,14 +85974,14 @@ interface(`corenet_sendrecv_squid_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_squid_server_packets',`
-	corenet_dontaudit_send_squid_server_packets($1)
-	corenet_dontaudit_receive_squid_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_stunnel_server_packets',`
+	corenet_dontaudit_send_stunnel_server_packets($1)
+	corenet_dontaudit_receive_stunnel_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to squid_server the packet type.
+##	Relabel packets to stunnel_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82888,20 +85989,20 @@ interface(`corenet_dontaudit_sendrecv_squid_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_squid_server_packets',`
+interface(`corenet_relabelto_stunnel_server_packets',`
 	gen_require(`
-		type squid_server_packet_t;
+		type stunnel_server_packet_t;
 	')
 
-	allow $1 squid_server_packet_t:packet relabelto;
+	allow $1 stunnel_server_packet_t:packet relabelto;
 ')
 
- # snmp and htcp
+ # no defined portcon
 
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the ssdp port.
+##	Send and receive TCP traffic on the svn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82910,17 +86011,17 @@ interface(`corenet_relabelto_squid_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_ssdp_port',`
+interface(`corenet_tcp_sendrecv_svn_port',`
 	gen_require(`
-		type ssdp_port_t;
+		type svn_port_t;
 	')
 
-	allow $1 ssdp_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 svn_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the ssdp port.
+##	Send UDP traffic on the svn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82929,17 +86030,17 @@ interface(`corenet_tcp_sendrecv_ssdp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_ssdp_port',`
+interface(`corenet_udp_send_svn_port',`
 	gen_require(`
-		type ssdp_port_t;
+		type svn_port_t;
 	')
 
-	allow $1 ssdp_port_t:udp_socket send_msg;
+	allow $1 svn_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the ssdp port.
+##	Do not audit attempts to send UDP traffic on the svn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82948,17 +86049,17 @@ interface(`corenet_udp_send_ssdp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_ssdp_port',`
+interface(`corenet_dontaudit_udp_send_svn_port',`
 	gen_require(`
-		type ssdp_port_t;
+		type svn_port_t;
 	')
 
-	dontaudit $1 ssdp_port_t:udp_socket send_msg;
+	dontaudit $1 svn_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the ssdp port.
+##	Receive UDP traffic on the svn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82967,17 +86068,17 @@ interface(`corenet_dontaudit_udp_send_ssdp_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_ssdp_port',`
+interface(`corenet_udp_receive_svn_port',`
 	gen_require(`
-		type ssdp_port_t;
+		type svn_port_t;
 	')
 
-	allow $1 ssdp_port_t:udp_socket recv_msg;
+	allow $1 svn_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the ssdp port.
+##	Do not audit attempts to receive UDP traffic on the svn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -82986,17 +86087,17 @@ interface(`corenet_udp_receive_ssdp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_ssdp_port',`
+interface(`corenet_dontaudit_udp_receive_svn_port',`
 	gen_require(`
-		type ssdp_port_t;
+		type svn_port_t;
 	')
 
-	dontaudit $1 ssdp_port_t:udp_socket recv_msg;
+	dontaudit $1 svn_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the ssdp port.
+##	Send and receive UDP traffic on the svn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83005,15 +86106,15 @@ interface(`corenet_dontaudit_udp_receive_ssdp_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_ssdp_port',`
-	corenet_udp_send_ssdp_port($1)
-	corenet_udp_receive_ssdp_port($1)
+interface(`corenet_udp_sendrecv_svn_port',`
+	corenet_udp_send_svn_port($1)
+	corenet_udp_receive_svn_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the ssdp port.
+##	UDP traffic on the svn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83022,14 +86123,14 @@ interface(`corenet_udp_sendrecv_ssdp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_ssdp_port',`
-	corenet_dontaudit_udp_send_ssdp_port($1)
-	corenet_dontaudit_udp_receive_ssdp_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_svn_port',`
+	corenet_dontaudit_udp_send_svn_port($1)
+	corenet_dontaudit_udp_receive_svn_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the ssdp port.
+##	Bind TCP sockets to the svn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83038,18 +86139,18 @@ interface(`corenet_dontaudit_udp_sendrecv_ssdp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_ssdp_port',`
+interface(`corenet_tcp_bind_svn_port',`
 	gen_require(`
-		type ssdp_port_t;
+		type svn_port_t;
 	')
 
-	allow $1 ssdp_port_t:tcp_socket name_bind;
+	allow $1 svn_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the ssdp port.
+##	Bind UDP sockets to the svn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83058,18 +86159,18 @@ interface(`corenet_tcp_bind_ssdp_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_ssdp_port',`
+interface(`corenet_udp_bind_svn_port',`
 	gen_require(`
-		type ssdp_port_t;
+		type svn_port_t;
 	')
 
-	allow $1 ssdp_port_t:udp_socket name_bind;
+	allow $1 svn_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the ssdp port.
+##	Make a TCP connection to the svn port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83077,18 +86178,18 @@ interface(`corenet_udp_bind_ssdp_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_ssdp_port',`
+interface(`corenet_tcp_connect_svn_port',`
 	gen_require(`
-		type ssdp_port_t;
+		type svn_port_t;
 	')
 
-	allow $1 ssdp_port_t:tcp_socket name_connect;
+	allow $1 svn_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ssdp_client packets.
+##	Send svn_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83097,17 +86198,17 @@ interface(`corenet_tcp_connect_ssdp_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ssdp_client_packets',`
+interface(`corenet_send_svn_client_packets',`
 	gen_require(`
-		type ssdp_client_packet_t;
+		type svn_client_packet_t;
 	')
 
-	allow $1 ssdp_client_packet_t:packet send;
+	allow $1 svn_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ssdp_client packets.
+##	Do not audit attempts to send svn_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83116,17 +86217,17 @@ interface(`corenet_send_ssdp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ssdp_client_packets',`
+interface(`corenet_dontaudit_send_svn_client_packets',`
 	gen_require(`
-		type ssdp_client_packet_t;
+		type svn_client_packet_t;
 	')
 
-	dontaudit $1 ssdp_client_packet_t:packet send;
+	dontaudit $1 svn_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ssdp_client packets.
+##	Receive svn_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83135,17 +86236,17 @@ interface(`corenet_dontaudit_send_ssdp_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ssdp_client_packets',`
+interface(`corenet_receive_svn_client_packets',`
 	gen_require(`
-		type ssdp_client_packet_t;
+		type svn_client_packet_t;
 	')
 
-	allow $1 ssdp_client_packet_t:packet recv;
+	allow $1 svn_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ssdp_client packets.
+##	Do not audit attempts to receive svn_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83154,17 +86255,17 @@ interface(`corenet_receive_ssdp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ssdp_client_packets',`
+interface(`corenet_dontaudit_receive_svn_client_packets',`
 	gen_require(`
-		type ssdp_client_packet_t;
+		type svn_client_packet_t;
 	')
 
-	dontaudit $1 ssdp_client_packet_t:packet recv;
+	dontaudit $1 svn_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ssdp_client packets.
+##	Send and receive svn_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83173,14 +86274,14 @@ interface(`corenet_dontaudit_receive_ssdp_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ssdp_client_packets',`
-	corenet_send_ssdp_client_packets($1)
-	corenet_receive_ssdp_client_packets($1)
+interface(`corenet_sendrecv_svn_client_packets',`
+	corenet_send_svn_client_packets($1)
+	corenet_receive_svn_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ssdp_client packets.
+##	Do not audit attempts to send and receive svn_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83189,14 +86290,14 @@ interface(`corenet_sendrecv_ssdp_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ssdp_client_packets',`
-	corenet_dontaudit_send_ssdp_client_packets($1)
-	corenet_dontaudit_receive_ssdp_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_svn_client_packets',`
+	corenet_dontaudit_send_svn_client_packets($1)
+	corenet_dontaudit_receive_svn_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ssdp_client the packet type.
+##	Relabel packets to svn_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83204,18 +86305,18 @@ interface(`corenet_dontaudit_sendrecv_ssdp_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ssdp_client_packets',`
+interface(`corenet_relabelto_svn_client_packets',`
 	gen_require(`
-		type ssdp_client_packet_t;
+		type svn_client_packet_t;
 	')
 
-	allow $1 ssdp_client_packet_t:packet relabelto;
+	allow $1 svn_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ssdp_server packets.
+##	Send svn_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83224,17 +86325,17 @@ interface(`corenet_relabelto_ssdp_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ssdp_server_packets',`
+interface(`corenet_send_svn_server_packets',`
 	gen_require(`
-		type ssdp_server_packet_t;
+		type svn_server_packet_t;
 	')
 
-	allow $1 ssdp_server_packet_t:packet send;
+	allow $1 svn_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ssdp_server packets.
+##	Do not audit attempts to send svn_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83243,17 +86344,17 @@ interface(`corenet_send_ssdp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ssdp_server_packets',`
+interface(`corenet_dontaudit_send_svn_server_packets',`
 	gen_require(`
-		type ssdp_server_packet_t;
+		type svn_server_packet_t;
 	')
 
-	dontaudit $1 ssdp_server_packet_t:packet send;
+	dontaudit $1 svn_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ssdp_server packets.
+##	Receive svn_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83262,17 +86363,17 @@ interface(`corenet_dontaudit_send_ssdp_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ssdp_server_packets',`
+interface(`corenet_receive_svn_server_packets',`
 	gen_require(`
-		type ssdp_server_packet_t;
+		type svn_server_packet_t;
 	')
 
-	allow $1 ssdp_server_packet_t:packet recv;
+	allow $1 svn_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ssdp_server packets.
+##	Do not audit attempts to receive svn_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83281,17 +86382,17 @@ interface(`corenet_receive_ssdp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ssdp_server_packets',`
+interface(`corenet_dontaudit_receive_svn_server_packets',`
 	gen_require(`
-		type ssdp_server_packet_t;
+		type svn_server_packet_t;
 	')
 
-	dontaudit $1 ssdp_server_packet_t:packet recv;
+	dontaudit $1 svn_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ssdp_server packets.
+##	Send and receive svn_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83300,14 +86401,14 @@ interface(`corenet_dontaudit_receive_ssdp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ssdp_server_packets',`
-	corenet_send_ssdp_server_packets($1)
-	corenet_receive_ssdp_server_packets($1)
+interface(`corenet_sendrecv_svn_server_packets',`
+	corenet_send_svn_server_packets($1)
+	corenet_receive_svn_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ssdp_server packets.
+##	Do not audit attempts to send and receive svn_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83316,14 +86417,14 @@ interface(`corenet_sendrecv_ssdp_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ssdp_server_packets',`
-	corenet_dontaudit_send_ssdp_server_packets($1)
-	corenet_dontaudit_receive_ssdp_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_svn_server_packets',`
+	corenet_dontaudit_send_svn_server_packets($1)
+	corenet_dontaudit_receive_svn_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ssdp_server the packet type.
+##	Relabel packets to svn_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83331,12 +86432,12 @@ interface(`corenet_dontaudit_sendrecv_ssdp_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ssdp_server_packets',`
+interface(`corenet_relabelto_svn_server_packets',`
 	gen_require(`
-		type ssdp_server_packet_t;
+		type svn_server_packet_t;
 	')
 
-	allow $1 ssdp_server_packet_t:packet relabelto;
+	allow $1 svn_server_packet_t:packet relabelto;
 ')
 
 
@@ -83344,7 +86445,7 @@ interface(`corenet_relabelto_ssdp_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the ssh port.
+##	Send and receive TCP traffic on the svrloc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83353,17 +86454,17 @@ interface(`corenet_relabelto_ssdp_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_ssh_port',`
+interface(`corenet_tcp_sendrecv_svrloc_port',`
 	gen_require(`
-		type ssh_port_t;
+		type svrloc_port_t;
 	')
 
-	allow $1 ssh_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 svrloc_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the ssh port.
+##	Send UDP traffic on the svrloc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83372,17 +86473,17 @@ interface(`corenet_tcp_sendrecv_ssh_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_ssh_port',`
+interface(`corenet_udp_send_svrloc_port',`
 	gen_require(`
-		type ssh_port_t;
+		type svrloc_port_t;
 	')
 
-	allow $1 ssh_port_t:udp_socket send_msg;
+	allow $1 svrloc_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the ssh port.
+##	Do not audit attempts to send UDP traffic on the svrloc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83391,17 +86492,17 @@ interface(`corenet_udp_send_ssh_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_ssh_port',`
+interface(`corenet_dontaudit_udp_send_svrloc_port',`
 	gen_require(`
-		type ssh_port_t;
+		type svrloc_port_t;
 	')
 
-	dontaudit $1 ssh_port_t:udp_socket send_msg;
+	dontaudit $1 svrloc_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the ssh port.
+##	Receive UDP traffic on the svrloc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83410,17 +86511,17 @@ interface(`corenet_dontaudit_udp_send_ssh_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_ssh_port',`
+interface(`corenet_udp_receive_svrloc_port',`
 	gen_require(`
-		type ssh_port_t;
+		type svrloc_port_t;
 	')
 
-	allow $1 ssh_port_t:udp_socket recv_msg;
+	allow $1 svrloc_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the ssh port.
+##	Do not audit attempts to receive UDP traffic on the svrloc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83429,17 +86530,17 @@ interface(`corenet_udp_receive_ssh_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_ssh_port',`
+interface(`corenet_dontaudit_udp_receive_svrloc_port',`
 	gen_require(`
-		type ssh_port_t;
+		type svrloc_port_t;
 	')
 
-	dontaudit $1 ssh_port_t:udp_socket recv_msg;
+	dontaudit $1 svrloc_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the ssh port.
+##	Send and receive UDP traffic on the svrloc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83448,15 +86549,15 @@ interface(`corenet_dontaudit_udp_receive_ssh_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_ssh_port',`
-	corenet_udp_send_ssh_port($1)
-	corenet_udp_receive_ssh_port($1)
+interface(`corenet_udp_sendrecv_svrloc_port',`
+	corenet_udp_send_svrloc_port($1)
+	corenet_udp_receive_svrloc_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the ssh port.
+##	UDP traffic on the svrloc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83465,14 +86566,14 @@ interface(`corenet_udp_sendrecv_ssh_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_ssh_port',`
-	corenet_dontaudit_udp_send_ssh_port($1)
-	corenet_dontaudit_udp_receive_ssh_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_svrloc_port',`
+	corenet_dontaudit_udp_send_svrloc_port($1)
+	corenet_dontaudit_udp_receive_svrloc_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the ssh port.
+##	Bind TCP sockets to the svrloc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83481,18 +86582,18 @@ interface(`corenet_dontaudit_udp_sendrecv_ssh_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_ssh_port',`
+interface(`corenet_tcp_bind_svrloc_port',`
 	gen_require(`
-		type ssh_port_t;
+		type svrloc_port_t;
 	')
 
-	allow $1 ssh_port_t:tcp_socket name_bind;
+	allow $1 svrloc_port_t:tcp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the ssh port.
+##	Bind UDP sockets to the svrloc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83501,18 +86602,18 @@ interface(`corenet_tcp_bind_ssh_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_ssh_port',`
+interface(`corenet_udp_bind_svrloc_port',`
 	gen_require(`
-		type ssh_port_t;
+		type svrloc_port_t;
 	')
 
-	allow $1 ssh_port_t:udp_socket name_bind;
+	allow $1 svrloc_port_t:udp_socket name_bind;
 	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the ssh port.
+##	Make a TCP connection to the svrloc port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83520,18 +86621,18 @@ interface(`corenet_udp_bind_ssh_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_ssh_port',`
+interface(`corenet_tcp_connect_svrloc_port',`
 	gen_require(`
-		type ssh_port_t;
+		type svrloc_port_t;
 	')
 
-	allow $1 ssh_port_t:tcp_socket name_connect;
+	allow $1 svrloc_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ssh_client packets.
+##	Send svrloc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83540,17 +86641,17 @@ interface(`corenet_tcp_connect_ssh_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ssh_client_packets',`
+interface(`corenet_send_svrloc_client_packets',`
 	gen_require(`
-		type ssh_client_packet_t;
+		type svrloc_client_packet_t;
 	')
 
-	allow $1 ssh_client_packet_t:packet send;
+	allow $1 svrloc_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ssh_client packets.
+##	Do not audit attempts to send svrloc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83559,17 +86660,17 @@ interface(`corenet_send_ssh_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ssh_client_packets',`
+interface(`corenet_dontaudit_send_svrloc_client_packets',`
 	gen_require(`
-		type ssh_client_packet_t;
+		type svrloc_client_packet_t;
 	')
 
-	dontaudit $1 ssh_client_packet_t:packet send;
+	dontaudit $1 svrloc_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ssh_client packets.
+##	Receive svrloc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83578,17 +86679,17 @@ interface(`corenet_dontaudit_send_ssh_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ssh_client_packets',`
+interface(`corenet_receive_svrloc_client_packets',`
 	gen_require(`
-		type ssh_client_packet_t;
+		type svrloc_client_packet_t;
 	')
 
-	allow $1 ssh_client_packet_t:packet recv;
+	allow $1 svrloc_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ssh_client packets.
+##	Do not audit attempts to receive svrloc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83597,17 +86698,17 @@ interface(`corenet_receive_ssh_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ssh_client_packets',`
+interface(`corenet_dontaudit_receive_svrloc_client_packets',`
 	gen_require(`
-		type ssh_client_packet_t;
+		type svrloc_client_packet_t;
 	')
 
-	dontaudit $1 ssh_client_packet_t:packet recv;
+	dontaudit $1 svrloc_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ssh_client packets.
+##	Send and receive svrloc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83616,14 +86717,14 @@ interface(`corenet_dontaudit_receive_ssh_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ssh_client_packets',`
-	corenet_send_ssh_client_packets($1)
-	corenet_receive_ssh_client_packets($1)
+interface(`corenet_sendrecv_svrloc_client_packets',`
+	corenet_send_svrloc_client_packets($1)
+	corenet_receive_svrloc_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ssh_client packets.
+##	Do not audit attempts to send and receive svrloc_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83632,14 +86733,14 @@ interface(`corenet_sendrecv_ssh_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ssh_client_packets',`
-	corenet_dontaudit_send_ssh_client_packets($1)
-	corenet_dontaudit_receive_ssh_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_svrloc_client_packets',`
+	corenet_dontaudit_send_svrloc_client_packets($1)
+	corenet_dontaudit_receive_svrloc_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ssh_client the packet type.
+##	Relabel packets to svrloc_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83647,18 +86748,18 @@ interface(`corenet_dontaudit_sendrecv_ssh_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ssh_client_packets',`
+interface(`corenet_relabelto_svrloc_client_packets',`
 	gen_require(`
-		type ssh_client_packet_t;
+		type svrloc_client_packet_t;
 	')
 
-	allow $1 ssh_client_packet_t:packet relabelto;
+	allow $1 svrloc_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send ssh_server packets.
+##	Send svrloc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83667,17 +86768,17 @@ interface(`corenet_relabelto_ssh_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_ssh_server_packets',`
+interface(`corenet_send_svrloc_server_packets',`
 	gen_require(`
-		type ssh_server_packet_t;
+		type svrloc_server_packet_t;
 	')
 
-	allow $1 ssh_server_packet_t:packet send;
+	allow $1 svrloc_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send ssh_server packets.
+##	Do not audit attempts to send svrloc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83686,17 +86787,17 @@ interface(`corenet_send_ssh_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_ssh_server_packets',`
+interface(`corenet_dontaudit_send_svrloc_server_packets',`
 	gen_require(`
-		type ssh_server_packet_t;
+		type svrloc_server_packet_t;
 	')
 
-	dontaudit $1 ssh_server_packet_t:packet send;
+	dontaudit $1 svrloc_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive ssh_server packets.
+##	Receive svrloc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83705,17 +86806,17 @@ interface(`corenet_dontaudit_send_ssh_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_ssh_server_packets',`
+interface(`corenet_receive_svrloc_server_packets',`
 	gen_require(`
-		type ssh_server_packet_t;
+		type svrloc_server_packet_t;
 	')
 
-	allow $1 ssh_server_packet_t:packet recv;
+	allow $1 svrloc_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive ssh_server packets.
+##	Do not audit attempts to receive svrloc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83724,17 +86825,17 @@ interface(`corenet_receive_ssh_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_ssh_server_packets',`
+interface(`corenet_dontaudit_receive_svrloc_server_packets',`
 	gen_require(`
-		type ssh_server_packet_t;
+		type svrloc_server_packet_t;
 	')
 
-	dontaudit $1 ssh_server_packet_t:packet recv;
+	dontaudit $1 svrloc_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive ssh_server packets.
+##	Send and receive svrloc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83743,14 +86844,14 @@ interface(`corenet_dontaudit_receive_ssh_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_ssh_server_packets',`
-	corenet_send_ssh_server_packets($1)
-	corenet_receive_ssh_server_packets($1)
+interface(`corenet_sendrecv_svrloc_server_packets',`
+	corenet_send_svrloc_server_packets($1)
+	corenet_receive_svrloc_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive ssh_server packets.
+##	Do not audit attempts to send and receive svrloc_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83759,14 +86860,14 @@ interface(`corenet_sendrecv_ssh_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_ssh_server_packets',`
-	corenet_dontaudit_send_ssh_server_packets($1)
-	corenet_dontaudit_receive_ssh_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_svrloc_server_packets',`
+	corenet_dontaudit_send_svrloc_server_packets($1)
+	corenet_dontaudit_receive_svrloc_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to ssh_server the packet type.
+##	Relabel packets to svrloc_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83774,12 +86875,12 @@ interface(`corenet_dontaudit_sendrecv_ssh_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_ssh_server_packets',`
+interface(`corenet_relabelto_svrloc_server_packets',`
 	gen_require(`
-		type ssh_server_packet_t;
+		type svrloc_server_packet_t;
 	')
 
-	allow $1 ssh_server_packet_t:packet relabelto;
+	allow $1 svrloc_server_packet_t:packet relabelto;
 ')
 
 
@@ -83787,7 +86888,7 @@ interface(`corenet_relabelto_ssh_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the stunnel port.
+##	Send and receive TCP traffic on the swat port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83796,17 +86897,17 @@ interface(`corenet_relabelto_ssh_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_stunnel_port',`
+interface(`corenet_tcp_sendrecv_swat_port',`
 	gen_require(`
-		type stunnel_port_t;
+		type swat_port_t;
 	')
 
-	allow $1 stunnel_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 swat_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the stunnel port.
+##	Send UDP traffic on the swat port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83815,17 +86916,17 @@ interface(`corenet_tcp_sendrecv_stunnel_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_stunnel_port',`
+interface(`corenet_udp_send_swat_port',`
 	gen_require(`
-		type stunnel_port_t;
+		type swat_port_t;
 	')
 
-	allow $1 stunnel_port_t:udp_socket send_msg;
+	allow $1 swat_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the stunnel port.
+##	Do not audit attempts to send UDP traffic on the swat port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83834,17 +86935,17 @@ interface(`corenet_udp_send_stunnel_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_stunnel_port',`
+interface(`corenet_dontaudit_udp_send_swat_port',`
 	gen_require(`
-		type stunnel_port_t;
+		type swat_port_t;
 	')
 
-	dontaudit $1 stunnel_port_t:udp_socket send_msg;
+	dontaudit $1 swat_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the stunnel port.
+##	Receive UDP traffic on the swat port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83853,17 +86954,17 @@ interface(`corenet_dontaudit_udp_send_stunnel_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_stunnel_port',`
+interface(`corenet_udp_receive_swat_port',`
 	gen_require(`
-		type stunnel_port_t;
+		type swat_port_t;
 	')
 
-	allow $1 stunnel_port_t:udp_socket recv_msg;
+	allow $1 swat_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the stunnel port.
+##	Do not audit attempts to receive UDP traffic on the swat port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83872,17 +86973,17 @@ interface(`corenet_udp_receive_stunnel_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_stunnel_port',`
+interface(`corenet_dontaudit_udp_receive_swat_port',`
 	gen_require(`
-		type stunnel_port_t;
+		type swat_port_t;
 	')
 
-	dontaudit $1 stunnel_port_t:udp_socket recv_msg;
+	dontaudit $1 swat_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the stunnel port.
+##	Send and receive UDP traffic on the swat port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83891,15 +86992,15 @@ interface(`corenet_dontaudit_udp_receive_stunnel_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_stunnel_port',`
-	corenet_udp_send_stunnel_port($1)
-	corenet_udp_receive_stunnel_port($1)
+interface(`corenet_udp_sendrecv_swat_port',`
+	corenet_udp_send_swat_port($1)
+	corenet_udp_receive_swat_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the stunnel port.
+##	UDP traffic on the swat port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83908,14 +87009,14 @@ interface(`corenet_udp_sendrecv_stunnel_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_stunnel_port',`
-	corenet_dontaudit_udp_send_stunnel_port($1)
-	corenet_dontaudit_udp_receive_stunnel_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_swat_port',`
+	corenet_dontaudit_udp_send_swat_port($1)
+	corenet_dontaudit_udp_receive_swat_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the stunnel port.
+##	Bind TCP sockets to the swat port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83924,18 +87025,18 @@ interface(`corenet_dontaudit_udp_sendrecv_stunnel_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_stunnel_port',`
+interface(`corenet_tcp_bind_swat_port',`
 	gen_require(`
-		type stunnel_port_t;
+		type swat_port_t;
 	')
 
-	allow $1 stunnel_port_t:tcp_socket name_bind;
-	
+	allow $1 swat_port_t:tcp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the stunnel port.
+##	Bind UDP sockets to the swat port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83944,18 +87045,18 @@ interface(`corenet_tcp_bind_stunnel_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_stunnel_port',`
+interface(`corenet_udp_bind_swat_port',`
 	gen_require(`
-		type stunnel_port_t;
+		type swat_port_t;
 	')
 
-	allow $1 stunnel_port_t:udp_socket name_bind;
-	
+	allow $1 swat_port_t:udp_socket name_bind;
+	allow $1 self:capability net_bind_service;
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the stunnel port.
+##	Make a TCP connection to the swat port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83963,18 +87064,18 @@ interface(`corenet_udp_bind_stunnel_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_stunnel_port',`
+interface(`corenet_tcp_connect_swat_port',`
 	gen_require(`
-		type stunnel_port_t;
+		type swat_port_t;
 	')
 
-	allow $1 stunnel_port_t:tcp_socket name_connect;
+	allow $1 swat_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send stunnel_client packets.
+##	Send swat_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -83983,17 +87084,17 @@ interface(`corenet_tcp_connect_stunnel_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_stunnel_client_packets',`
+interface(`corenet_send_swat_client_packets',`
 	gen_require(`
-		type stunnel_client_packet_t;
+		type swat_client_packet_t;
 	')
 
-	allow $1 stunnel_client_packet_t:packet send;
+	allow $1 swat_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send stunnel_client packets.
+##	Do not audit attempts to send swat_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84002,17 +87103,17 @@ interface(`corenet_send_stunnel_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_stunnel_client_packets',`
+interface(`corenet_dontaudit_send_swat_client_packets',`
 	gen_require(`
-		type stunnel_client_packet_t;
+		type swat_client_packet_t;
 	')
 
-	dontaudit $1 stunnel_client_packet_t:packet send;
+	dontaudit $1 swat_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive stunnel_client packets.
+##	Receive swat_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84021,17 +87122,17 @@ interface(`corenet_dontaudit_send_stunnel_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_stunnel_client_packets',`
+interface(`corenet_receive_swat_client_packets',`
 	gen_require(`
-		type stunnel_client_packet_t;
+		type swat_client_packet_t;
 	')
 
-	allow $1 stunnel_client_packet_t:packet recv;
+	allow $1 swat_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive stunnel_client packets.
+##	Do not audit attempts to receive swat_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84040,17 +87141,17 @@ interface(`corenet_receive_stunnel_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_stunnel_client_packets',`
+interface(`corenet_dontaudit_receive_swat_client_packets',`
 	gen_require(`
-		type stunnel_client_packet_t;
+		type swat_client_packet_t;
 	')
 
-	dontaudit $1 stunnel_client_packet_t:packet recv;
+	dontaudit $1 swat_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive stunnel_client packets.
+##	Send and receive swat_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84059,14 +87160,14 @@ interface(`corenet_dontaudit_receive_stunnel_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_stunnel_client_packets',`
-	corenet_send_stunnel_client_packets($1)
-	corenet_receive_stunnel_client_packets($1)
+interface(`corenet_sendrecv_swat_client_packets',`
+	corenet_send_swat_client_packets($1)
+	corenet_receive_swat_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive stunnel_client packets.
+##	Do not audit attempts to send and receive swat_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84075,14 +87176,14 @@ interface(`corenet_sendrecv_stunnel_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_stunnel_client_packets',`
-	corenet_dontaudit_send_stunnel_client_packets($1)
-	corenet_dontaudit_receive_stunnel_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_swat_client_packets',`
+	corenet_dontaudit_send_swat_client_packets($1)
+	corenet_dontaudit_receive_swat_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to stunnel_client the packet type.
+##	Relabel packets to swat_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84090,18 +87191,18 @@ interface(`corenet_dontaudit_sendrecv_stunnel_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_stunnel_client_packets',`
+interface(`corenet_relabelto_swat_client_packets',`
 	gen_require(`
-		type stunnel_client_packet_t;
+		type swat_client_packet_t;
 	')
 
-	allow $1 stunnel_client_packet_t:packet relabelto;
+	allow $1 swat_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send stunnel_server packets.
+##	Send swat_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84110,17 +87211,17 @@ interface(`corenet_relabelto_stunnel_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_stunnel_server_packets',`
+interface(`corenet_send_swat_server_packets',`
 	gen_require(`
-		type stunnel_server_packet_t;
+		type swat_server_packet_t;
 	')
 
-	allow $1 stunnel_server_packet_t:packet send;
+	allow $1 swat_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send stunnel_server packets.
+##	Do not audit attempts to send swat_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84129,17 +87230,17 @@ interface(`corenet_send_stunnel_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_stunnel_server_packets',`
+interface(`corenet_dontaudit_send_swat_server_packets',`
 	gen_require(`
-		type stunnel_server_packet_t;
+		type swat_server_packet_t;
 	')
 
-	dontaudit $1 stunnel_server_packet_t:packet send;
+	dontaudit $1 swat_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive stunnel_server packets.
+##	Receive swat_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84148,17 +87249,17 @@ interface(`corenet_dontaudit_send_stunnel_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_stunnel_server_packets',`
+interface(`corenet_receive_swat_server_packets',`
 	gen_require(`
-		type stunnel_server_packet_t;
+		type swat_server_packet_t;
 	')
 
-	allow $1 stunnel_server_packet_t:packet recv;
+	allow $1 swat_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive stunnel_server packets.
+##	Do not audit attempts to receive swat_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84167,17 +87268,17 @@ interface(`corenet_receive_stunnel_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_stunnel_server_packets',`
+interface(`corenet_dontaudit_receive_swat_server_packets',`
 	gen_require(`
-		type stunnel_server_packet_t;
+		type swat_server_packet_t;
 	')
 
-	dontaudit $1 stunnel_server_packet_t:packet recv;
+	dontaudit $1 swat_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive stunnel_server packets.
+##	Send and receive swat_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84186,14 +87287,14 @@ interface(`corenet_dontaudit_receive_stunnel_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_stunnel_server_packets',`
-	corenet_send_stunnel_server_packets($1)
-	corenet_receive_stunnel_server_packets($1)
+interface(`corenet_sendrecv_swat_server_packets',`
+	corenet_send_swat_server_packets($1)
+	corenet_receive_swat_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive stunnel_server packets.
+##	Do not audit attempts to send and receive swat_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84202,14 +87303,14 @@ interface(`corenet_sendrecv_stunnel_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_stunnel_server_packets',`
-	corenet_dontaudit_send_stunnel_server_packets($1)
-	corenet_dontaudit_receive_stunnel_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_swat_server_packets',`
+	corenet_dontaudit_send_swat_server_packets($1)
+	corenet_dontaudit_receive_swat_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to stunnel_server the packet type.
+##	Relabel packets to swat_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84217,20 +87318,20 @@ interface(`corenet_dontaudit_sendrecv_stunnel_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_stunnel_server_packets',`
+interface(`corenet_relabelto_swat_server_packets',`
 	gen_require(`
-		type stunnel_server_packet_t;
+		type swat_server_packet_t;
 	')
 
-	allow $1 stunnel_server_packet_t:packet relabelto;
+	allow $1 swat_server_packet_t:packet relabelto;
 ')
 
- # no defined portcon
+
 
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the svn port.
+##	Send and receive TCP traffic on the syncthing port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84239,17 +87340,17 @@ interface(`corenet_relabelto_stunnel_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_svn_port',`
+interface(`corenet_tcp_sendrecv_syncthing_port',`
 	gen_require(`
-		type svn_port_t;
+		type syncthing_port_t;
 	')
 
-	allow $1 svn_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 syncthing_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the svn port.
+##	Send UDP traffic on the syncthing port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84258,17 +87359,17 @@ interface(`corenet_tcp_sendrecv_svn_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_svn_port',`
+interface(`corenet_udp_send_syncthing_port',`
 	gen_require(`
-		type svn_port_t;
+		type syncthing_port_t;
 	')
 
-	allow $1 svn_port_t:udp_socket send_msg;
+	allow $1 syncthing_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the svn port.
+##	Do not audit attempts to send UDP traffic on the syncthing port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84277,17 +87378,17 @@ interface(`corenet_udp_send_svn_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_svn_port',`
+interface(`corenet_dontaudit_udp_send_syncthing_port',`
 	gen_require(`
-		type svn_port_t;
+		type syncthing_port_t;
 	')
 
-	dontaudit $1 svn_port_t:udp_socket send_msg;
+	dontaudit $1 syncthing_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the svn port.
+##	Receive UDP traffic on the syncthing port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84296,17 +87397,17 @@ interface(`corenet_dontaudit_udp_send_svn_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_svn_port',`
+interface(`corenet_udp_receive_syncthing_port',`
 	gen_require(`
-		type svn_port_t;
+		type syncthing_port_t;
 	')
 
-	allow $1 svn_port_t:udp_socket recv_msg;
+	allow $1 syncthing_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the svn port.
+##	Do not audit attempts to receive UDP traffic on the syncthing port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84315,17 +87416,17 @@ interface(`corenet_udp_receive_svn_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_svn_port',`
+interface(`corenet_dontaudit_udp_receive_syncthing_port',`
 	gen_require(`
-		type svn_port_t;
+		type syncthing_port_t;
 	')
 
-	dontaudit $1 svn_port_t:udp_socket recv_msg;
+	dontaudit $1 syncthing_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the svn port.
+##	Send and receive UDP traffic on the syncthing port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84334,15 +87435,15 @@ interface(`corenet_dontaudit_udp_receive_svn_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_svn_port',`
-	corenet_udp_send_svn_port($1)
-	corenet_udp_receive_svn_port($1)
+interface(`corenet_udp_sendrecv_syncthing_port',`
+	corenet_udp_send_syncthing_port($1)
+	corenet_udp_receive_syncthing_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the svn port.
+##	UDP traffic on the syncthing port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84351,14 +87452,14 @@ interface(`corenet_udp_sendrecv_svn_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_svn_port',`
-	corenet_dontaudit_udp_send_svn_port($1)
-	corenet_dontaudit_udp_receive_svn_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_syncthing_port',`
+	corenet_dontaudit_udp_send_syncthing_port($1)
+	corenet_dontaudit_udp_receive_syncthing_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the svn port.
+##	Bind TCP sockets to the syncthing port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84367,18 +87468,18 @@ interface(`corenet_dontaudit_udp_sendrecv_svn_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_svn_port',`
+interface(`corenet_tcp_bind_syncthing_port',`
 	gen_require(`
-		type svn_port_t;
+		type syncthing_port_t;
 	')
 
-	allow $1 svn_port_t:tcp_socket name_bind;
+	allow $1 syncthing_port_t:tcp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the svn port.
+##	Bind UDP sockets to the syncthing port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84387,18 +87488,18 @@ interface(`corenet_tcp_bind_svn_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_svn_port',`
+interface(`corenet_udp_bind_syncthing_port',`
 	gen_require(`
-		type svn_port_t;
+		type syncthing_port_t;
 	')
 
-	allow $1 svn_port_t:udp_socket name_bind;
+	allow $1 syncthing_port_t:udp_socket name_bind;
 	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the svn port.
+##	Make a TCP connection to the syncthing port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84406,18 +87507,18 @@ interface(`corenet_udp_bind_svn_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_svn_port',`
+interface(`corenet_tcp_connect_syncthing_port',`
 	gen_require(`
-		type svn_port_t;
+		type syncthing_port_t;
 	')
 
-	allow $1 svn_port_t:tcp_socket name_connect;
+	allow $1 syncthing_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send svn_client packets.
+##	Send syncthing_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84426,17 +87527,17 @@ interface(`corenet_tcp_connect_svn_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_svn_client_packets',`
+interface(`corenet_send_syncthing_client_packets',`
 	gen_require(`
-		type svn_client_packet_t;
+		type syncthing_client_packet_t;
 	')
 
-	allow $1 svn_client_packet_t:packet send;
+	allow $1 syncthing_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send svn_client packets.
+##	Do not audit attempts to send syncthing_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84445,17 +87546,17 @@ interface(`corenet_send_svn_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_svn_client_packets',`
+interface(`corenet_dontaudit_send_syncthing_client_packets',`
 	gen_require(`
-		type svn_client_packet_t;
+		type syncthing_client_packet_t;
 	')
 
-	dontaudit $1 svn_client_packet_t:packet send;
+	dontaudit $1 syncthing_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive svn_client packets.
+##	Receive syncthing_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84464,17 +87565,17 @@ interface(`corenet_dontaudit_send_svn_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_svn_client_packets',`
+interface(`corenet_receive_syncthing_client_packets',`
 	gen_require(`
-		type svn_client_packet_t;
+		type syncthing_client_packet_t;
 	')
 
-	allow $1 svn_client_packet_t:packet recv;
+	allow $1 syncthing_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive svn_client packets.
+##	Do not audit attempts to receive syncthing_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84483,17 +87584,17 @@ interface(`corenet_receive_svn_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_svn_client_packets',`
+interface(`corenet_dontaudit_receive_syncthing_client_packets',`
 	gen_require(`
-		type svn_client_packet_t;
+		type syncthing_client_packet_t;
 	')
 
-	dontaudit $1 svn_client_packet_t:packet recv;
+	dontaudit $1 syncthing_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive svn_client packets.
+##	Send and receive syncthing_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84502,14 +87603,14 @@ interface(`corenet_dontaudit_receive_svn_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_svn_client_packets',`
-	corenet_send_svn_client_packets($1)
-	corenet_receive_svn_client_packets($1)
+interface(`corenet_sendrecv_syncthing_client_packets',`
+	corenet_send_syncthing_client_packets($1)
+	corenet_receive_syncthing_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive svn_client packets.
+##	Do not audit attempts to send and receive syncthing_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84518,14 +87619,14 @@ interface(`corenet_sendrecv_svn_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_svn_client_packets',`
-	corenet_dontaudit_send_svn_client_packets($1)
-	corenet_dontaudit_receive_svn_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_syncthing_client_packets',`
+	corenet_dontaudit_send_syncthing_client_packets($1)
+	corenet_dontaudit_receive_syncthing_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to svn_client the packet type.
+##	Relabel packets to syncthing_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84533,18 +87634,18 @@ interface(`corenet_dontaudit_sendrecv_svn_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_svn_client_packets',`
+interface(`corenet_relabelto_syncthing_client_packets',`
 	gen_require(`
-		type svn_client_packet_t;
+		type syncthing_client_packet_t;
 	')
 
-	allow $1 svn_client_packet_t:packet relabelto;
+	allow $1 syncthing_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send svn_server packets.
+##	Send syncthing_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84553,17 +87654,17 @@ interface(`corenet_relabelto_svn_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_svn_server_packets',`
+interface(`corenet_send_syncthing_server_packets',`
 	gen_require(`
-		type svn_server_packet_t;
+		type syncthing_server_packet_t;
 	')
 
-	allow $1 svn_server_packet_t:packet send;
+	allow $1 syncthing_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send svn_server packets.
+##	Do not audit attempts to send syncthing_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84572,17 +87673,17 @@ interface(`corenet_send_svn_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_svn_server_packets',`
+interface(`corenet_dontaudit_send_syncthing_server_packets',`
 	gen_require(`
-		type svn_server_packet_t;
+		type syncthing_server_packet_t;
 	')
 
-	dontaudit $1 svn_server_packet_t:packet send;
+	dontaudit $1 syncthing_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive svn_server packets.
+##	Receive syncthing_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84591,17 +87692,17 @@ interface(`corenet_dontaudit_send_svn_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_svn_server_packets',`
+interface(`corenet_receive_syncthing_server_packets',`
 	gen_require(`
-		type svn_server_packet_t;
+		type syncthing_server_packet_t;
 	')
 
-	allow $1 svn_server_packet_t:packet recv;
+	allow $1 syncthing_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive svn_server packets.
+##	Do not audit attempts to receive syncthing_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84610,17 +87711,17 @@ interface(`corenet_receive_svn_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_svn_server_packets',`
+interface(`corenet_dontaudit_receive_syncthing_server_packets',`
 	gen_require(`
-		type svn_server_packet_t;
+		type syncthing_server_packet_t;
 	')
 
-	dontaudit $1 svn_server_packet_t:packet recv;
+	dontaudit $1 syncthing_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive svn_server packets.
+##	Send and receive syncthing_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84629,14 +87730,14 @@ interface(`corenet_dontaudit_receive_svn_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_svn_server_packets',`
-	corenet_send_svn_server_packets($1)
-	corenet_receive_svn_server_packets($1)
+interface(`corenet_sendrecv_syncthing_server_packets',`
+	corenet_send_syncthing_server_packets($1)
+	corenet_receive_syncthing_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive svn_server packets.
+##	Do not audit attempts to send and receive syncthing_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84645,14 +87746,14 @@ interface(`corenet_sendrecv_svn_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_svn_server_packets',`
-	corenet_dontaudit_send_svn_server_packets($1)
-	corenet_dontaudit_receive_svn_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_syncthing_server_packets',`
+	corenet_dontaudit_send_syncthing_server_packets($1)
+	corenet_dontaudit_receive_syncthing_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to svn_server the packet type.
+##	Relabel packets to syncthing_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84660,12 +87761,12 @@ interface(`corenet_dontaudit_sendrecv_svn_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_svn_server_packets',`
+interface(`corenet_relabelto_syncthing_server_packets',`
 	gen_require(`
-		type svn_server_packet_t;
+		type syncthing_server_packet_t;
 	')
 
-	allow $1 svn_server_packet_t:packet relabelto;
+	allow $1 syncthing_server_packet_t:packet relabelto;
 ')
 
 
@@ -84673,7 +87774,7 @@ interface(`corenet_relabelto_svn_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the svrloc port.
+##	Send and receive TCP traffic on the syncthing_admin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84682,17 +87783,17 @@ interface(`corenet_relabelto_svn_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_svrloc_port',`
+interface(`corenet_tcp_sendrecv_syncthing_admin_port',`
 	gen_require(`
-		type svrloc_port_t;
+		type syncthing_admin_port_t;
 	')
 
-	allow $1 svrloc_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 syncthing_admin_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the svrloc port.
+##	Send UDP traffic on the syncthing_admin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84701,17 +87802,17 @@ interface(`corenet_tcp_sendrecv_svrloc_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_svrloc_port',`
+interface(`corenet_udp_send_syncthing_admin_port',`
 	gen_require(`
-		type svrloc_port_t;
+		type syncthing_admin_port_t;
 	')
 
-	allow $1 svrloc_port_t:udp_socket send_msg;
+	allow $1 syncthing_admin_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the svrloc port.
+##	Do not audit attempts to send UDP traffic on the syncthing_admin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84720,17 +87821,17 @@ interface(`corenet_udp_send_svrloc_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_svrloc_port',`
+interface(`corenet_dontaudit_udp_send_syncthing_admin_port',`
 	gen_require(`
-		type svrloc_port_t;
+		type syncthing_admin_port_t;
 	')
 
-	dontaudit $1 svrloc_port_t:udp_socket send_msg;
+	dontaudit $1 syncthing_admin_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the svrloc port.
+##	Receive UDP traffic on the syncthing_admin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84739,17 +87840,17 @@ interface(`corenet_dontaudit_udp_send_svrloc_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_svrloc_port',`
+interface(`corenet_udp_receive_syncthing_admin_port',`
 	gen_require(`
-		type svrloc_port_t;
+		type syncthing_admin_port_t;
 	')
 
-	allow $1 svrloc_port_t:udp_socket recv_msg;
+	allow $1 syncthing_admin_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the svrloc port.
+##	Do not audit attempts to receive UDP traffic on the syncthing_admin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84758,17 +87859,17 @@ interface(`corenet_udp_receive_svrloc_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_svrloc_port',`
+interface(`corenet_dontaudit_udp_receive_syncthing_admin_port',`
 	gen_require(`
-		type svrloc_port_t;
+		type syncthing_admin_port_t;
 	')
 
-	dontaudit $1 svrloc_port_t:udp_socket recv_msg;
+	dontaudit $1 syncthing_admin_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the svrloc port.
+##	Send and receive UDP traffic on the syncthing_admin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84777,15 +87878,15 @@ interface(`corenet_dontaudit_udp_receive_svrloc_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_svrloc_port',`
-	corenet_udp_send_svrloc_port($1)
-	corenet_udp_receive_svrloc_port($1)
+interface(`corenet_udp_sendrecv_syncthing_admin_port',`
+	corenet_udp_send_syncthing_admin_port($1)
+	corenet_udp_receive_syncthing_admin_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the svrloc port.
+##	UDP traffic on the syncthing_admin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84794,14 +87895,14 @@ interface(`corenet_udp_sendrecv_svrloc_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_svrloc_port',`
-	corenet_dontaudit_udp_send_svrloc_port($1)
-	corenet_dontaudit_udp_receive_svrloc_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_syncthing_admin_port',`
+	corenet_dontaudit_udp_send_syncthing_admin_port($1)
+	corenet_dontaudit_udp_receive_syncthing_admin_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the svrloc port.
+##	Bind TCP sockets to the syncthing_admin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84810,18 +87911,18 @@ interface(`corenet_dontaudit_udp_sendrecv_svrloc_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_svrloc_port',`
+interface(`corenet_tcp_bind_syncthing_admin_port',`
 	gen_require(`
-		type svrloc_port_t;
+		type syncthing_admin_port_t;
 	')
 
-	allow $1 svrloc_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 syncthing_admin_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the svrloc port.
+##	Bind UDP sockets to the syncthing_admin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84830,18 +87931,18 @@ interface(`corenet_tcp_bind_svrloc_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_svrloc_port',`
+interface(`corenet_udp_bind_syncthing_admin_port',`
 	gen_require(`
-		type svrloc_port_t;
+		type syncthing_admin_port_t;
 	')
 
-	allow $1 svrloc_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 syncthing_admin_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the svrloc port.
+##	Make a TCP connection to the syncthing_admin port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84849,18 +87950,18 @@ interface(`corenet_udp_bind_svrloc_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_svrloc_port',`
+interface(`corenet_tcp_connect_syncthing_admin_port',`
 	gen_require(`
-		type svrloc_port_t;
+		type syncthing_admin_port_t;
 	')
 
-	allow $1 svrloc_port_t:tcp_socket name_connect;
+	allow $1 syncthing_admin_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send svrloc_client packets.
+##	Send syncthing_admin_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84869,17 +87970,17 @@ interface(`corenet_tcp_connect_svrloc_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_svrloc_client_packets',`
+interface(`corenet_send_syncthing_admin_client_packets',`
 	gen_require(`
-		type svrloc_client_packet_t;
+		type syncthing_admin_client_packet_t;
 	')
 
-	allow $1 svrloc_client_packet_t:packet send;
+	allow $1 syncthing_admin_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send svrloc_client packets.
+##	Do not audit attempts to send syncthing_admin_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84888,17 +87989,17 @@ interface(`corenet_send_svrloc_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_svrloc_client_packets',`
+interface(`corenet_dontaudit_send_syncthing_admin_client_packets',`
 	gen_require(`
-		type svrloc_client_packet_t;
+		type syncthing_admin_client_packet_t;
 	')
 
-	dontaudit $1 svrloc_client_packet_t:packet send;
+	dontaudit $1 syncthing_admin_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive svrloc_client packets.
+##	Receive syncthing_admin_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84907,17 +88008,17 @@ interface(`corenet_dontaudit_send_svrloc_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_svrloc_client_packets',`
+interface(`corenet_receive_syncthing_admin_client_packets',`
 	gen_require(`
-		type svrloc_client_packet_t;
+		type syncthing_admin_client_packet_t;
 	')
 
-	allow $1 svrloc_client_packet_t:packet recv;
+	allow $1 syncthing_admin_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive svrloc_client packets.
+##	Do not audit attempts to receive syncthing_admin_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84926,17 +88027,17 @@ interface(`corenet_receive_svrloc_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_svrloc_client_packets',`
+interface(`corenet_dontaudit_receive_syncthing_admin_client_packets',`
 	gen_require(`
-		type svrloc_client_packet_t;
+		type syncthing_admin_client_packet_t;
 	')
 
-	dontaudit $1 svrloc_client_packet_t:packet recv;
+	dontaudit $1 syncthing_admin_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive svrloc_client packets.
+##	Send and receive syncthing_admin_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84945,14 +88046,14 @@ interface(`corenet_dontaudit_receive_svrloc_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_svrloc_client_packets',`
-	corenet_send_svrloc_client_packets($1)
-	corenet_receive_svrloc_client_packets($1)
+interface(`corenet_sendrecv_syncthing_admin_client_packets',`
+	corenet_send_syncthing_admin_client_packets($1)
+	corenet_receive_syncthing_admin_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive svrloc_client packets.
+##	Do not audit attempts to send and receive syncthing_admin_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84961,14 +88062,14 @@ interface(`corenet_sendrecv_svrloc_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_svrloc_client_packets',`
-	corenet_dontaudit_send_svrloc_client_packets($1)
-	corenet_dontaudit_receive_svrloc_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_syncthing_admin_client_packets',`
+	corenet_dontaudit_send_syncthing_admin_client_packets($1)
+	corenet_dontaudit_receive_syncthing_admin_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to svrloc_client the packet type.
+##	Relabel packets to syncthing_admin_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84976,18 +88077,18 @@ interface(`corenet_dontaudit_sendrecv_svrloc_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_svrloc_client_packets',`
+interface(`corenet_relabelto_syncthing_admin_client_packets',`
 	gen_require(`
-		type svrloc_client_packet_t;
+		type syncthing_admin_client_packet_t;
 	')
 
-	allow $1 svrloc_client_packet_t:packet relabelto;
+	allow $1 syncthing_admin_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send svrloc_server packets.
+##	Send syncthing_admin_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -84996,17 +88097,17 @@ interface(`corenet_relabelto_svrloc_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_svrloc_server_packets',`
+interface(`corenet_send_syncthing_admin_server_packets',`
 	gen_require(`
-		type svrloc_server_packet_t;
+		type syncthing_admin_server_packet_t;
 	')
 
-	allow $1 svrloc_server_packet_t:packet send;
+	allow $1 syncthing_admin_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send svrloc_server packets.
+##	Do not audit attempts to send syncthing_admin_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85015,17 +88116,17 @@ interface(`corenet_send_svrloc_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_svrloc_server_packets',`
+interface(`corenet_dontaudit_send_syncthing_admin_server_packets',`
 	gen_require(`
-		type svrloc_server_packet_t;
+		type syncthing_admin_server_packet_t;
 	')
 
-	dontaudit $1 svrloc_server_packet_t:packet send;
+	dontaudit $1 syncthing_admin_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive svrloc_server packets.
+##	Receive syncthing_admin_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85034,17 +88135,17 @@ interface(`corenet_dontaudit_send_svrloc_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_svrloc_server_packets',`
+interface(`corenet_receive_syncthing_admin_server_packets',`
 	gen_require(`
-		type svrloc_server_packet_t;
+		type syncthing_admin_server_packet_t;
 	')
 
-	allow $1 svrloc_server_packet_t:packet recv;
+	allow $1 syncthing_admin_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive svrloc_server packets.
+##	Do not audit attempts to receive syncthing_admin_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85053,17 +88154,17 @@ interface(`corenet_receive_svrloc_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_svrloc_server_packets',`
+interface(`corenet_dontaudit_receive_syncthing_admin_server_packets',`
 	gen_require(`
-		type svrloc_server_packet_t;
+		type syncthing_admin_server_packet_t;
 	')
 
-	dontaudit $1 svrloc_server_packet_t:packet recv;
+	dontaudit $1 syncthing_admin_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive svrloc_server packets.
+##	Send and receive syncthing_admin_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85072,14 +88173,14 @@ interface(`corenet_dontaudit_receive_svrloc_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_svrloc_server_packets',`
-	corenet_send_svrloc_server_packets($1)
-	corenet_receive_svrloc_server_packets($1)
+interface(`corenet_sendrecv_syncthing_admin_server_packets',`
+	corenet_send_syncthing_admin_server_packets($1)
+	corenet_receive_syncthing_admin_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive svrloc_server packets.
+##	Do not audit attempts to send and receive syncthing_admin_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85088,14 +88189,14 @@ interface(`corenet_sendrecv_svrloc_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_svrloc_server_packets',`
-	corenet_dontaudit_send_svrloc_server_packets($1)
-	corenet_dontaudit_receive_svrloc_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_syncthing_admin_server_packets',`
+	corenet_dontaudit_send_syncthing_admin_server_packets($1)
+	corenet_dontaudit_receive_syncthing_admin_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to svrloc_server the packet type.
+##	Relabel packets to syncthing_admin_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85103,12 +88204,12 @@ interface(`corenet_dontaudit_sendrecv_svrloc_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_svrloc_server_packets',`
+interface(`corenet_relabelto_syncthing_admin_server_packets',`
 	gen_require(`
-		type svrloc_server_packet_t;
+		type syncthing_admin_server_packet_t;
 	')
 
-	allow $1 svrloc_server_packet_t:packet relabelto;
+	allow $1 syncthing_admin_server_packet_t:packet relabelto;
 ')
 
 
@@ -85116,7 +88217,7 @@ interface(`corenet_relabelto_svrloc_server_packets',`
 
 ########################################
 ## <summary>
-##	Send and receive TCP traffic on the swat port.
+##	Send and receive TCP traffic on the syncthing_discovery port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85125,17 +88226,17 @@ interface(`corenet_relabelto_svrloc_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_tcp_sendrecv_swat_port',`
+interface(`corenet_tcp_sendrecv_syncthing_discovery_port',`
 	gen_require(`
-		type swat_port_t;
+		type syncthing_discovery_port_t;
 	')
 
-	allow $1 swat_port_t:tcp_socket { send_msg recv_msg };
+	allow $1 syncthing_discovery_port_t:tcp_socket { send_msg recv_msg };
 ')
 
 ########################################
 ## <summary>
-##	Send UDP traffic on the swat port.
+##	Send UDP traffic on the syncthing_discovery port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85144,17 +88245,17 @@ interface(`corenet_tcp_sendrecv_swat_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_udp_send_swat_port',`
+interface(`corenet_udp_send_syncthing_discovery_port',`
 	gen_require(`
-		type swat_port_t;
+		type syncthing_discovery_port_t;
 	')
 
-	allow $1 swat_port_t:udp_socket send_msg;
+	allow $1 syncthing_discovery_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send UDP traffic on the swat port.
+##	Do not audit attempts to send UDP traffic on the syncthing_discovery port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85163,17 +88264,17 @@ interface(`corenet_udp_send_swat_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_send_swat_port',`
+interface(`corenet_dontaudit_udp_send_syncthing_discovery_port',`
 	gen_require(`
-		type swat_port_t;
+		type syncthing_discovery_port_t;
 	')
 
-	dontaudit $1 swat_port_t:udp_socket send_msg;
+	dontaudit $1 syncthing_discovery_port_t:udp_socket send_msg;
 ')
 
 ########################################
 ## <summary>
-##	Receive UDP traffic on the swat port.
+##	Receive UDP traffic on the syncthing_discovery port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85182,17 +88283,17 @@ interface(`corenet_dontaudit_udp_send_swat_port',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_udp_receive_swat_port',`
+interface(`corenet_udp_receive_syncthing_discovery_port',`
 	gen_require(`
-		type swat_port_t;
+		type syncthing_discovery_port_t;
 	')
 
-	allow $1 swat_port_t:udp_socket recv_msg;
+	allow $1 syncthing_discovery_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive UDP traffic on the swat port.
+##	Do not audit attempts to receive UDP traffic on the syncthing_discovery port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85201,17 +88302,17 @@ interface(`corenet_udp_receive_swat_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_receive_swat_port',`
+interface(`corenet_dontaudit_udp_receive_syncthing_discovery_port',`
 	gen_require(`
-		type swat_port_t;
+		type syncthing_discovery_port_t;
 	')
 
-	dontaudit $1 swat_port_t:udp_socket recv_msg;
+	dontaudit $1 syncthing_discovery_port_t:udp_socket recv_msg;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive UDP traffic on the swat port.
+##	Send and receive UDP traffic on the syncthing_discovery port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85220,15 +88321,15 @@ interface(`corenet_dontaudit_udp_receive_swat_port',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_udp_sendrecv_swat_port',`
-	corenet_udp_send_swat_port($1)
-	corenet_udp_receive_swat_port($1)
+interface(`corenet_udp_sendrecv_syncthing_discovery_port',`
+	corenet_udp_send_syncthing_discovery_port($1)
+	corenet_udp_receive_syncthing_discovery_port($1)
 ')
 
 ########################################
 ## <summary>
 ##	Do not audit attempts to send and receive
-##	UDP traffic on the swat port.
+##	UDP traffic on the syncthing_discovery port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85237,14 +88338,14 @@ interface(`corenet_udp_sendrecv_swat_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_udp_sendrecv_swat_port',`
-	corenet_dontaudit_udp_send_swat_port($1)
-	corenet_dontaudit_udp_receive_swat_port($1)
+interface(`corenet_dontaudit_udp_sendrecv_syncthing_discovery_port',`
+	corenet_dontaudit_udp_send_syncthing_discovery_port($1)
+	corenet_dontaudit_udp_receive_syncthing_discovery_port($1)
 ')
 
 ########################################
 ## <summary>
-##	Bind TCP sockets to the swat port.
+##	Bind TCP sockets to the syncthing_discovery port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85253,18 +88354,18 @@ interface(`corenet_dontaudit_udp_sendrecv_swat_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_tcp_bind_swat_port',`
+interface(`corenet_tcp_bind_syncthing_discovery_port',`
 	gen_require(`
-		type swat_port_t;
+		type syncthing_discovery_port_t;
 	')
 
-	allow $1 swat_port_t:tcp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 syncthing_discovery_port_t:tcp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Bind UDP sockets to the swat port.
+##	Bind UDP sockets to the syncthing_discovery port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85273,18 +88374,18 @@ interface(`corenet_tcp_bind_swat_port',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_udp_bind_swat_port',`
+interface(`corenet_udp_bind_syncthing_discovery_port',`
 	gen_require(`
-		type swat_port_t;
+		type syncthing_discovery_port_t;
 	')
 
-	allow $1 swat_port_t:udp_socket name_bind;
-	allow $1 self:capability net_bind_service;
+	allow $1 syncthing_discovery_port_t:udp_socket name_bind;
+	
 ')
 
 ########################################
 ## <summary>
-##	Make a TCP connection to the swat port.
+##	Make a TCP connection to the syncthing_discovery port.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85292,18 +88393,18 @@ interface(`corenet_udp_bind_swat_port',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_tcp_connect_swat_port',`
+interface(`corenet_tcp_connect_syncthing_discovery_port',`
 	gen_require(`
-		type swat_port_t;
+		type syncthing_discovery_port_t;
 	')
 
-	allow $1 swat_port_t:tcp_socket name_connect;
+	allow $1 syncthing_discovery_port_t:tcp_socket name_connect;
 ')
 
 
 ########################################
 ## <summary>
-##	Send swat_client packets.
+##	Send syncthing_discovery_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85312,17 +88413,17 @@ interface(`corenet_tcp_connect_swat_port',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_swat_client_packets',`
+interface(`corenet_send_syncthing_discovery_client_packets',`
 	gen_require(`
-		type swat_client_packet_t;
+		type syncthing_discovery_client_packet_t;
 	')
 
-	allow $1 swat_client_packet_t:packet send;
+	allow $1 syncthing_discovery_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send swat_client packets.
+##	Do not audit attempts to send syncthing_discovery_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85331,17 +88432,17 @@ interface(`corenet_send_swat_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_swat_client_packets',`
+interface(`corenet_dontaudit_send_syncthing_discovery_client_packets',`
 	gen_require(`
-		type swat_client_packet_t;
+		type syncthing_discovery_client_packet_t;
 	')
 
-	dontaudit $1 swat_client_packet_t:packet send;
+	dontaudit $1 syncthing_discovery_client_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive swat_client packets.
+##	Receive syncthing_discovery_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85350,17 +88451,17 @@ interface(`corenet_dontaudit_send_swat_client_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_swat_client_packets',`
+interface(`corenet_receive_syncthing_discovery_client_packets',`
 	gen_require(`
-		type swat_client_packet_t;
+		type syncthing_discovery_client_packet_t;
 	')
 
-	allow $1 swat_client_packet_t:packet recv;
+	allow $1 syncthing_discovery_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive swat_client packets.
+##	Do not audit attempts to receive syncthing_discovery_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85369,17 +88470,17 @@ interface(`corenet_receive_swat_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_swat_client_packets',`
+interface(`corenet_dontaudit_receive_syncthing_discovery_client_packets',`
 	gen_require(`
-		type swat_client_packet_t;
+		type syncthing_discovery_client_packet_t;
 	')
 
-	dontaudit $1 swat_client_packet_t:packet recv;
+	dontaudit $1 syncthing_discovery_client_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive swat_client packets.
+##	Send and receive syncthing_discovery_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85388,14 +88489,14 @@ interface(`corenet_dontaudit_receive_swat_client_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_swat_client_packets',`
-	corenet_send_swat_client_packets($1)
-	corenet_receive_swat_client_packets($1)
+interface(`corenet_sendrecv_syncthing_discovery_client_packets',`
+	corenet_send_syncthing_discovery_client_packets($1)
+	corenet_receive_syncthing_discovery_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive swat_client packets.
+##	Do not audit attempts to send and receive syncthing_discovery_client packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85404,14 +88505,14 @@ interface(`corenet_sendrecv_swat_client_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_swat_client_packets',`
-	corenet_dontaudit_send_swat_client_packets($1)
-	corenet_dontaudit_receive_swat_client_packets($1)
+interface(`corenet_dontaudit_sendrecv_syncthing_discovery_client_packets',`
+	corenet_dontaudit_send_syncthing_discovery_client_packets($1)
+	corenet_dontaudit_receive_syncthing_discovery_client_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to swat_client the packet type.
+##	Relabel packets to syncthing_discovery_client the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85419,18 +88520,18 @@ interface(`corenet_dontaudit_sendrecv_swat_client_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_swat_client_packets',`
+interface(`corenet_relabelto_syncthing_discovery_client_packets',`
 	gen_require(`
-		type swat_client_packet_t;
+		type syncthing_discovery_client_packet_t;
 	')
 
-	allow $1 swat_client_packet_t:packet relabelto;
+	allow $1 syncthing_discovery_client_packet_t:packet relabelto;
 ')
 
 
 ########################################
 ## <summary>
-##	Send swat_server packets.
+##	Send syncthing_discovery_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85439,17 +88540,17 @@ interface(`corenet_relabelto_swat_client_packets',`
 ## </param>
 ## <infoflow type="write" weight="10"/>
 #
-interface(`corenet_send_swat_server_packets',`
+interface(`corenet_send_syncthing_discovery_server_packets',`
 	gen_require(`
-		type swat_server_packet_t;
+		type syncthing_discovery_server_packet_t;
 	')
 
-	allow $1 swat_server_packet_t:packet send;
+	allow $1 syncthing_discovery_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send swat_server packets.
+##	Do not audit attempts to send syncthing_discovery_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85458,17 +88559,17 @@ interface(`corenet_send_swat_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_send_swat_server_packets',`
+interface(`corenet_dontaudit_send_syncthing_discovery_server_packets',`
 	gen_require(`
-		type swat_server_packet_t;
+		type syncthing_discovery_server_packet_t;
 	')
 
-	dontaudit $1 swat_server_packet_t:packet send;
+	dontaudit $1 syncthing_discovery_server_packet_t:packet send;
 ')
 
 ########################################
 ## <summary>
-##	Receive swat_server packets.
+##	Receive syncthing_discovery_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85477,17 +88578,17 @@ interface(`corenet_dontaudit_send_swat_server_packets',`
 ## </param>
 ## <infoflow type="read" weight="10"/>
 #
-interface(`corenet_receive_swat_server_packets',`
+interface(`corenet_receive_syncthing_discovery_server_packets',`
 	gen_require(`
-		type swat_server_packet_t;
+		type syncthing_discovery_server_packet_t;
 	')
 
-	allow $1 swat_server_packet_t:packet recv;
+	allow $1 syncthing_discovery_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to receive swat_server packets.
+##	Do not audit attempts to receive syncthing_discovery_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85496,17 +88597,17 @@ interface(`corenet_receive_swat_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_receive_swat_server_packets',`
+interface(`corenet_dontaudit_receive_syncthing_discovery_server_packets',`
 	gen_require(`
-		type swat_server_packet_t;
+		type syncthing_discovery_server_packet_t;
 	')
 
-	dontaudit $1 swat_server_packet_t:packet recv;
+	dontaudit $1 syncthing_discovery_server_packet_t:packet recv;
 ')
 
 ########################################
 ## <summary>
-##	Send and receive swat_server packets.
+##	Send and receive syncthing_discovery_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85515,14 +88616,14 @@ interface(`corenet_dontaudit_receive_swat_server_packets',`
 ## </param>
 ## <infoflow type="both" weight="10"/>
 #
-interface(`corenet_sendrecv_swat_server_packets',`
-	corenet_send_swat_server_packets($1)
-	corenet_receive_swat_server_packets($1)
+interface(`corenet_sendrecv_syncthing_discovery_server_packets',`
+	corenet_send_syncthing_discovery_server_packets($1)
+	corenet_receive_syncthing_discovery_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Do not audit attempts to send and receive swat_server packets.
+##	Do not audit attempts to send and receive syncthing_discovery_server packets.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85531,14 +88632,14 @@ interface(`corenet_sendrecv_swat_server_packets',`
 ## </param>
 ## <infoflow type="none"/>
 #
-interface(`corenet_dontaudit_sendrecv_swat_server_packets',`
-	corenet_dontaudit_send_swat_server_packets($1)
-	corenet_dontaudit_receive_swat_server_packets($1)
+interface(`corenet_dontaudit_sendrecv_syncthing_discovery_server_packets',`
+	corenet_dontaudit_send_syncthing_discovery_server_packets($1)
+	corenet_dontaudit_receive_syncthing_discovery_server_packets($1)
 ')
 
 ########################################
 ## <summary>
-##	Relabel packets to swat_server the packet type.
+##	Relabel packets to syncthing_discovery_server the packet type.
 ## </summary>
 ## <param name="domain">
 ##	<summary>
@@ -85546,12 +88647,12 @@ interface(`corenet_dontaudit_sendrecv_swat_server_packets',`
 ##	</summary>
 ## </param>
 #
-interface(`corenet_relabelto_swat_server_packets',`
+interface(`corenet_relabelto_syncthing_discovery_server_packets',`
 	gen_require(`
-		type swat_server_packet_t;
+		type syncthing_discovery_server_packet_t;
 	')
 
-	allow $1 swat_server_packet_t:packet relabelto;
+	allow $1 syncthing_discovery_server_packet_t:packet relabelto;
 ')
 
 

diff --git a/policy/modules/kernel/corenetwork.te b/policy/modules/kernel/corenetwork.te
index af43a4e2..a7eb9045 100644
--- a/policy/modules/kernel/corenetwork.te
+++ b/policy/modules/kernel/corenetwork.te
@@ -2,7 +2,7 @@
 # This is a generated file!  Instead of modifying this file, the
 # corenetwork.te.in or corenetwork.te.m4 file should be modified.
 #
-policy_module(corenetwork, 1.21.0)
+policy_module(corenetwork, 1.23.3)
 
 ########################################
 #
@@ -867,6 +867,14 @@ typeattribute kismet_port_t unreserved_port_type;
 portcon tcp 2501 gen_context(system_u:object_r:kismet_port_t,s0)
 
 
+type kdeconnect_port_t, port_type, defined_port_type;
+type kdeconnect_client_packet_t, packet_type, client_packet_type;
+type kdeconnect_server_packet_t, packet_type, server_packet_type;
+typeattribute kdeconnect_port_t unreserved_port_type;
+portcon tcp 1714 gen_context(system_u:object_r:kdeconnect_port_t,s0)
+portcon udp 1714 gen_context(system_u:object_r:kdeconnect_port_t,s0)
+
+
 type kprop_port_t, port_type, defined_port_type;
 type kprop_client_packet_t, packet_type, client_packet_type;
 type kprop_server_packet_t, packet_type, server_packet_type;
@@ -902,6 +910,7 @@ portcon udp 389 gen_context(system_u:object_r:ldap_port_t,s0)
 portcon tcp 636 gen_context(system_u:object_r:ldap_port_t,s0)
 portcon udp 636 gen_context(system_u:object_r:ldap_port_t,s0)
 portcon tcp 3268 gen_context(system_u:object_r:ldap_port_t,s0)
+portcon tcp 3269 gen_context(system_u:object_r:ldap_port_t,s0)
 
 
 type lirc_port_t, port_type, defined_port_type;
@@ -911,6 +920,14 @@ typeattribute lirc_port_t unreserved_port_type;
 portcon tcp 8765 gen_context(system_u:object_r:lirc_port_t,s0)
 
 
+type llmnr_port_t, port_type, defined_port_type;
+type llmnr_client_packet_t, packet_type, client_packet_type;
+type llmnr_server_packet_t, packet_type, server_packet_type;
+typeattribute llmnr_port_t unreserved_port_type;
+portcon tcp 5355 gen_context(system_u:object_r:llmnr_port_t,s0)
+portcon udp 5355 gen_context(system_u:object_r:llmnr_port_t,s0)
+
+
 type lmtp_port_t, port_type, defined_port_type;
 type lmtp_client_packet_t, packet_type, client_packet_type;
 type lmtp_server_packet_t, packet_type, server_packet_type;
@@ -961,6 +978,21 @@ portcon tcp 5050 gen_context(system_u:object_r:mmcc_port_t,s0)
 portcon udp 5050 gen_context(system_u:object_r:mmcc_port_t,s0)
 
 
+type mon_port_t, port_type, defined_port_type;
+type mon_client_packet_t, packet_type, client_packet_type;
+type mon_server_packet_t, packet_type, server_packet_type;
+typeattribute mon_port_t unreserved_port_type;
+portcon tcp 2583 gen_context(system_u:object_r:mon_port_t,s0)
+portcon udp 2583 gen_context(system_u:object_r:mon_port_t,s0)
+
+
+type monit_port_t, port_type, defined_port_type;
+type monit_client_packet_t, packet_type, client_packet_type;
+type monit_server_packet_t, packet_type, server_packet_type;
+typeattribute monit_port_t unreserved_port_type;
+portcon tcp 2812 gen_context(system_u:object_r:monit_port_t,s0)
+
+
 type monopd_port_t, port_type, defined_port_type;
 type monopd_client_packet_t, packet_type, client_packet_type;
 type monopd_server_packet_t, packet_type, server_packet_type;
@@ -1248,6 +1280,7 @@ type postgrey_port_t, port_type, defined_port_type;
 type postgrey_client_packet_t, packet_type, client_packet_type;
 type postgrey_server_packet_t, packet_type, server_packet_type;
 typeattribute postgrey_port_t unreserved_port_type;
+portcon tcp 10023 gen_context(system_u:object_r:postgrey_port_t,s0)
 portcon tcp 60000 gen_context(system_u:object_r:postgrey_port_t,s0)
 
 
@@ -1360,6 +1393,7 @@ type redis_client_packet_t, packet_type, client_packet_type;
 type redis_server_packet_t, packet_type, server_packet_type;
 typeattribute redis_port_t unreserved_port_type;
 portcon tcp 6379 gen_context(system_u:object_r:redis_port_t,s0)
+portcon tcp 26379 gen_context(system_u:object_r:redis_port_t,s0)
 
 
 type repository_port_t, port_type, defined_port_type;
@@ -1400,6 +1434,8 @@ typeattribute rndc_port_t reserved_port_type;
 typeattribute rndc_port_t rpc_port_type;
 portcon tcp 953 gen_context(system_u:object_r:rndc_port_t,s0)
 portcon udp 953 gen_context(system_u:object_r:rndc_port_t,s0)
+portcon tcp 8953 gen_context(system_u:object_r:rndc_port_t,s0)
+portcon udp 8953 gen_context(system_u:object_r:rndc_port_t,s0)
 
 
 type router_port_t, port_type, defined_port_type;
@@ -1433,7 +1469,9 @@ type rtorrent_port_t, port_type, defined_port_type;
 type rtorrent_client_packet_t, packet_type, client_packet_type;
 type rtorrent_server_packet_t, packet_type, server_packet_type;
 typeattribute rtorrent_port_t unreserved_port_type;
+portcon tcp 6881 gen_context(system_u:object_r:rtorrent_port_t,s0)
 portcon udp 6881 gen_context(system_u:object_r:rtorrent_port_t,s0)
+portcon tcp 6926 gen_context(system_u:object_r:rtorrent_port_t,s0)
 
 
 type rtsp_port_t, port_type, defined_port_type;
@@ -1613,6 +1651,27 @@ typeattribute swat_port_t rpc_port_type;
 portcon tcp 901 gen_context(system_u:object_r:swat_port_t,s0)
 
 
+type syncthing_port_t, port_type, defined_port_type;
+type syncthing_client_packet_t, packet_type, client_packet_type;
+type syncthing_server_packet_t, packet_type, server_packet_type;
+typeattribute syncthing_port_t unreserved_port_type;
+portcon tcp 22000 gen_context(system_u:object_r:syncthing_port_t,s0)
+
+
+type syncthing_admin_port_t, port_type, defined_port_type;
+type syncthing_admin_client_packet_t, packet_type, client_packet_type;
+type syncthing_admin_server_packet_t, packet_type, server_packet_type;
+typeattribute syncthing_admin_port_t unreserved_port_type;
+portcon tcp 8384 gen_context(system_u:object_r:syncthing_admin_port_t,s0)
+
+
+type syncthing_discovery_port_t, port_type, defined_port_type;
+type syncthing_discovery_client_packet_t, packet_type, client_packet_type;
+type syncthing_discovery_server_packet_t, packet_type, server_packet_type;
+typeattribute syncthing_discovery_port_t unreserved_port_type;
+portcon udp 21027 gen_context(system_u:object_r:syncthing_discovery_port_t,s0)
+
+
 type sype_transport_port_t, port_type, defined_port_type;
 type sype_transport_client_packet_t, packet_type, client_packet_type;
 type sype_transport_server_packet_t, packet_type, server_packet_type;