diff --git a/refpolicy/policy/modules/kernel/terminal.if b/refpolicy/policy/modules/kernel/terminal.if
index a91c10714..1d3e76d13 100644
--- a/refpolicy/policy/modules/kernel/terminal.if
+++ b/refpolicy/policy/modules/kernel/terminal.if
@@ -3,16 +3,16 @@
 
 ########################################
 #
-# terminal_make_pseudoterminal(type)
+# term_make_pty(type)
 #
-define(`terminal_make_pseudoterminal',`
+define(`term_make_pty',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 devpts_t:filesystem associate;
 	typeattribute $1 ptynode;
 ')
 
-define(`terminal_make_pseudoterminal_depend',`
+define(`term_make_pty_depend',`
 	attribute ptynode;
 
 	type devpts_t;
@@ -21,25 +21,45 @@ define(`terminal_make_pseudoterminal_depend',`
 ')
 
 ########################################
+## <interface name="term_make_user_pty">
+##	<description>
+##		Transform specified type into a user
+##		pty type. Interactive ptys will be relabeled
+##		
+##	</description>
+##	<parameter name="userdomain">
+##		An object type that will applied to a pty.
+##	</parameter>
+##	<parameter name="pty_type">
+##		An object type that will applied to a pty.
+##	</parameter>
+## </interface>
 #
-# terminal_make_user_pseudoterminal(domain,type)
-#
-define(`terminal_make_user_pseudoterminal',`
+define(`term_make_user_pty',`
 	requires_block_template(`$0'_depend)
 
-	terminal_make_pseudoterminal($1)
+	term_make_pty($1)
 	type_change $1 server_ptynode:chr_file $2;
 ')
 
-define(`terminal_make_user_pseudoterminal_depend',`
+define(`term_make_user_pty_depend',`
 	attribute server_ptynode;
 ')
 
+
 ########################################
+## <interface name="term_make_interactive_pty">
+##	<description>
+##		Transform specified type into an interactive
+##		pty type. This allows it to be relabeled via
+##		type change by login programs such as ssh.
+##	</description>
+##	<parameter name="object_type">
+##		An object type that will applied to a pty.
+##	</parameter>
+## </interface>
 #
-# terminal_make_service_pseudoterminal(type)
-#
-define(`terminal_make_service_pseudoterminal',`
+define(`term_make_interactive_pty',`
 	requires_block_template(`$0'_depend)
 
 	terminal_make_pseudoterminal($1)
@@ -52,9 +72,9 @@ define(`terminal_make_service_pseudoterminal_depend',`
 
 ########################################
 #
-# terminal_make_physical_terminal(domain,type)
+# term_make_tty(domain,type)
 #
-define(`terminal_make_physical_terminal',`
+define(`term_make_tty',`
 	requires_block_template(`$0'_depend)
 
 	typeattribute $2 ttynode;
@@ -71,7 +91,7 @@ define(`terminal_make_physical_terminal',`
 	')
 ')
 
-define(`terminal_make_physical_terminal_depend',`
+define(`term_make_tty_depend',`
 	attribute ttynode;
 
 	type tty_device_t;
@@ -79,9 +99,9 @@ define(`terminal_make_physical_terminal_depend',`
 
 ########################################
 #
-# terminal_create_private_pseudoterminal(domain,ptytype)
+# term_create_pty(domain,ptytype)
 #
-define(`terminal_create_private_pseudoterminal',`
+define(`term_create_pty',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
@@ -92,7 +112,7 @@ define(`terminal_create_private_pseudoterminal',`
 	type_transition $1 devpts_t:chr_file $2;
 ')
 
-define(`terminal_create_pseudoterminal_depend',`
+define(`term_create_pty_depend',`
 	type ptmx_t, devpts_t;
 
 	class filesystem getattr;
@@ -102,9 +122,9 @@ define(`terminal_create_pseudoterminal_depend',`
 
 ########################################
 #
-# terminal_use_all_terminals(domain)
+# term_use_all_terminals(domain)
 #
-define(`terminal_use_all_terminals',`
+define(`term_use_all_terminals',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
@@ -112,7 +132,7 @@ define(`terminal_use_all_terminals',`
 	allow $1 { console_device_t tty_device_t ttynode ptynode }:chr_file rw_file_perms;
 ')
 
-define(`terminal_use_all_terminals_depend',`
+define(`term_use_all_terminals_depend',`
 	attribute ttynode, ptynode;
 
 	type console_device_t, devpts_t, tty_device_t;
@@ -122,7 +142,7 @@ define(`terminal_use_all_terminals_depend',`
 ')
 
 ########################################
-## <interface name="terminal_write_console">
+## <interface name="term_write_console">
 ##	<description>
 ##		Write to the console.
 ##	</description>
@@ -132,20 +152,20 @@ define(`terminal_use_all_terminals_depend',`
 ##	<infoflow type="write" weight="10"/>
 ## </interface>
 #
-define(`terminal_write_console',`
+define(`term_write_console',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 console_device_t:chr_file write;
 ')
 
-define(`terminal_use_console_depend',`
+define(`term_use_console_depend',`
 	type console_device_t;
 	class chr_file write;
 ')
 
 ########################################
-## <interface name="terminal_use_console">
+## <interface name="term_use_console">
 ##	<description>
 ##		Read from and write to the console.
 ##	</description>
@@ -155,21 +175,21 @@ define(`terminal_use_console_depend',`
 ##	<infoflow type="both" weight="10"/>
 ## </interface>
 #
-define(`terminal_use_console',`
+define(`term_use_console',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 console_device_t:chr_file rw_file_perms;
 ')
 
-define(`terminal_use_console_depend',`
+define(`term_use_console_depend',`
 	type console_device_t;
 
 	class chr_file rw_file_perms;
 ')
 
 ########################################
-## <interface name="terminal_ignore_use_console">
+## <interface name="term_dontaudit_use_console">
 ##	<description>
 ##		Do not audit read from or write to the console.
 ##	</description>
@@ -179,13 +199,13 @@ define(`terminal_use_console_depend',`
 ##	<infoflow type="both" weight="10"/>
 ## </interface>
 #
-define(`terminal_ignore_use_console',`
+define(`term_dontaudit_use_console',`
 	requires_block_template(`$0'_depend)
 
 	dontaudit $1 console_device_t:chr_file { read write };
 ')
 
-define(`terminal_ignore_use_console_depend',`
+define(`term_dontaudit_use_console_depend',`
 	type console_device_t;
 
 	class chr_file { read write };
@@ -193,16 +213,16 @@ define(`terminal_ignore_use_console_depend',`
 
 ########################################
 #
-# terminal_set_console_attributes(domain)
+# term_setattr_console(domain)
 #
-define(`terminal_set_console_attributes',`
+define(`term_setattr_console',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 console_device_t:chr_file setattr;
 ')
 
-define(`terminal_set_console_attributes_depend',`
+define(`term_setattr_console_depend',`
 	type console_device_t;
 
 	class chr_file setattr;
@@ -210,16 +230,16 @@ define(`terminal_set_console_attributes_depend',`
 
 ########################################
 #
-# terminal_list_pseudoterminals(domain)
+# term_list_ptys(domain)
 #
-define(`terminal_list_pseudoterminals',`
+define(`term_list_ptys',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 devpts_t:dir r_dir_perms;
 ')
 
-define(`terminal_list_pseudoterminals_depend',`
+define(`term_list_ptys_depend',`
 	type devpts_t;
 
 	class dir r_dir_perms;
@@ -227,15 +247,15 @@ define(`terminal_list_pseudoterminals_depend',`
 
 ########################################
 #
-# terminal_ignore_list_pseudoterminals(domain)
+# term_dontaudit_list_ptys(domain)
 #
-define(`terminal_ignore_list_pseudoterminals',`
+define(`term_dontaudit_list_ptys',`
 	requires_block_template(`$0'_depend)
 
 	dontaudit $1 devpts_t:dir { getattr search read };
 ')
 
-define(`terminal_ignore_list_pseudoterminals_depend',`
+define(`term_dontaudit_list_ptys_depend',`
 	type devpts_t;
 
 	class dir { getattr search read };
@@ -243,16 +263,16 @@ define(`terminal_ignore_list_pseudoterminals_depend',`
 
 ########################################
 #
-# terminal_use_general_pseudoterminal(domain)
+# term_use_generic_pty(domain)
 #
-define(`terminal_use_general_pseudoterminal',`
+define(`term_use_generic_pty',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 devpts_t:chr_file { read write };
 ')
 
-define(`terminal_use_general_pseudoterminal_depend',`
+define(`term_use_generic_pty_depend',`
 	type devpts_t;
 
 	class chr_file { read write };
@@ -260,15 +280,15 @@ define(`terminal_use_general_pseudoterminal_depend',`
 
 ########################################
 #
-# terminal_ignore_use_general_pseudoterminal(domain)
+# term_dontaudit_use_generic_pty(domain)
 #
-define(`terminal_ignore_use_general_pseudoterminal',`
+define(`term_dontaudit_use_generic_pty',`
 	requires_block_template(`$0'_depend)
 
 	dontaudit $1 devpts_t:chr_file { read write };
 ')
 
-define(`terminal_ignore_use_general_pseudoterminal_depend',`
+define(`term_dontaudit_use_generic_pty_depend',`
 	type devpts_t;
 
 	class chr_file { read write };
@@ -276,16 +296,16 @@ define(`terminal_ignore_use_general_pseudoterminal_depend',`
 
 ########################################
 #
-# terminal_use_controlling_terminal(domain)
+# term_use_controlling_terminal(domain)
 #
-define(`terminal_use_controlling_terminal',`
+define(`term_use_controlling_terminal',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 devtty_t:chr_file { getattr read write ioctl };
 ')
 
-define(`terminal_use_controlling_terminal_depend',`
+define(`term_use_controlling_terminal_depend',`
 	type devtty_t;
 
 	class chr_file { getattr read write ioctl };
@@ -293,15 +313,15 @@ define(`terminal_use_controlling_terminal_depend',`
 
 ########################################
 #
-# terminal_ignore_use_pseudoterminal_multiplexer(domain)
+# term_dontaudit_rw_ptmx(domain)
 #
-define(`terminal_ignore_use_pseudoterminal_multiplexer',`
+define(`term_dontaudit_rw_ptmx',`
 	requires_block_template(`$0'_depend)
 
 	dontaudit $1 ptmx_t:chr_file { getattr read write };
 ')
 
-define(`terminal_ignore_use_pseudoterminal_multiplexer_depend',`
+define(`term_dontaudit_rw_ptmx_depend',`
 	type ptmx_t;
 
 	class chr_file { getattr read write };
@@ -309,9 +329,9 @@ define(`terminal_ignore_use_pseudoterminal_multiplexer_depend',`
 
 ########################################
 #
-# terminal_get_all_private_pseudoterminal_attributes(domain)
+# term_getattr_all_ptys(domain)
 #
-define(`terminal_get_all_private_pseudoterminal_attributes',`
+define(`term_getattr_all_ptys',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
@@ -319,7 +339,7 @@ define(`terminal_get_all_private_pseudoterminal_attributes',`
 	allow $1 ptynode:chr_file getattr;
 ')
 
-define(`terminal_get_all_private_pseudoterminal_attributes_depend',`
+define(`term_getattr_all_ptys_depend',`
 	attribute ptynode;
 
 	class dir r_dir_perms;
@@ -328,9 +348,9 @@ define(`terminal_get_all_private_pseudoterminal_attributes_depend',`
 
 ########################################
 #
-# terminal_use_all_private_pseudoterminals(domain)
+# term_use_all_private_ptys(domain)
 #
-define(`terminal_use_all_private_pseudoterminals',`
+define(`term_use_all_private_ptys',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
@@ -338,7 +358,7 @@ define(`terminal_use_all_private_pseudoterminals',`
 	allow $1 ptynode:chr_file { getattr read write ioctl };
 ')
 
-define(`terminal_use_all_private_pseudoterminals_depend',`
+define(`term_use_all_private_ptys_depend',`
 	attribute ptynode;
 
 	class dir r_dir_perms;
@@ -347,15 +367,15 @@ define(`terminal_use_all_private_pseudoterminals_depend',`
 
 ########################################
 #
-# terminal_ignore_use_all_private_pseudoterminals(domain)
+# term_dontaudit_use_all_private_ptys(domain)
 #
-define(`terminal_ignore_use_all_private_pseudoterminals',`
+define(`term_dontaudit_use_all_private_ptys',`
 	requires_block_template(`$0'_depend)
 
 	dontaudit $1 ptynode:chr_file { read write };
 ')
 
-define(`terminal_ignore_use_all_private_pseudoterminals_depend',`
+define(`term_dontaudit_use_all_private_ptys_depend',`
 	attribute ptynode;
 
 	class chr_file { read write };
@@ -363,16 +383,16 @@ define(`terminal_ignore_use_all_private_pseudoterminals_depend',`
 
 ########################################
 #
-# terminal_get_general_physical_terminal_attributes(domain)
+# term_gettattr_unallocated_ttys(domain)
 #
-define(`terminal_get_general_physical_terminal_attributes',`
+define(`term_gettattr_unallocated_ttys',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 tty_device_t:chr_file getattr;
 ')
 
-define(`terminal_get_general_physical_terminal_attributes_depend',`
+define(`term_gettattr_unallocated_ttys_depend',`
 	type tty_device_t;
 
 	class chr_file getattr;
@@ -380,16 +400,16 @@ define(`terminal_get_general_physical_terminal_attributes_depend',`
 
 ########################################
 #
-# terminal_set_general_physical_terminal_attributes(domain)
+# term_settattr_unallocated_ttys(domain)
 #
-define(`terminal_set_general_physical_terminal_attributes',`
+define(`term_settattr_unallocated_ttys',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 tty_device_t:chr_file setattr;
 ')
 
-define(`terminal_set_general_physical_terminal_attributes_depend',`
+define(`term_settattr_unallocated_ttys_depend',`
 	type tty_device_t;
 
 	class chr_file setattr;
@@ -397,16 +417,16 @@ define(`terminal_set_general_physical_terminal_attributes_depend',`
 
 ########################################
 #
-# terminal_relabel_general_physical_terminal(domain)
+# term_relabel_unallocated_tty(domain)
 #
-define(`terminal_relabel_general_physical_terminal',`
+define(`term_relabel_unallocated_tty',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 tty_device_t:chr_file { relabelfrom relabelto };
 ')
 
-define(`terminal_relabel_general_physical_terminal_depend',`
+define(`term_relabel_unallocated_tty_depend',`
 	type tty_device_t;
 
 	class chr_file { relabelfrom relabelto };
@@ -414,9 +434,9 @@ define(`terminal_relabel_general_physical_terminal_depend',`
 
 ########################################
 #
-# terminal_reset_physical_terminal_labels(domain)
+# term_reset_tty_labels(domain)
 #
-define(`terminal_reset_physical_terminal_labels',`
+define(`term_reset_tty_labels',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
@@ -424,7 +444,7 @@ define(`terminal_reset_physical_terminal_labels',`
 	allow $1 tty_device_t:chr_file relabelto;
 ')
 
-define(`terminal_reset_physical_terminal_labels_depend',`
+define(`term_reset_tty_labels_depend',`
 	attribute ttynode;
 
 	type tty_device_t;
@@ -432,9 +452,9 @@ define(`terminal_reset_physical_terminal_labels_depend',`
 ')
 
 ########################################
-## <interface name="terminal_write_general_physical_terminal">
+## <interface name="term_write_unallocated_tty">
 ##	<description>
-##		Write to general ttys.  Has a backchannel of
+##		Write to all unallocated ttys.  Has a backchannel of
 ##		getting all tty attributes.
 ##	</description>
 ##	<parameter name="domain">
@@ -443,14 +463,14 @@ define(`terminal_reset_physical_terminal_labels_depend',`
 ##	<infoflow type="write" weight="10"/>
 ## </interface>
 #
-define(`terminal_write_general_physical_terminal',`
+define(`term_write_general_tty',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 tty_device_t:chr_file { getattr write };
 ')
 
-define(`terminal_write_general_physical_terminal_depend',`
+define(`term_write_general_tty_depend',`
 	type tty_device_t;
 
 	class chr_file { getattr write };
@@ -458,16 +478,16 @@ define(`terminal_write_general_physical_terminal_depend',`
 
 ########################################
 #
-# terminal_use_general_physical_terminal(domain)
+# term_use_unallocated_tty(domain)
 #
-define(`terminal_use_general_physical_terminal',`
+define(`term_use_unallocated_tty',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 tty_device_t:chr_file { getattr read write ioctl };
 ')
 
-define(`terminal_use_general_physical_terminal_depend',`
+define(`term_use_unallocated_tty_depend',`
 	type tty_device_t;
 
 	class chr_file { getattr read write ioctl };
@@ -475,15 +495,15 @@ define(`terminal_use_general_physical_terminal_depend',`
 
 ########################################
 #
-# terminal_ignore_use_general_physical_terminal(domain)
+# term_dontaudit_use_unallocated_tty(domain)
 #
-define(`terminal_ignore_use_general_physical_terminal',`
+define(`term_dontaudit_use_unallocated_tty',`
 	requires_block_template(`$0'_depend)
 
 	dontaudit $1 tty_device_t:chr_file { read write };
 ')
 
-define(`terminal_ignore_use_general_physical_terminal_depend',`
+define(`term_dontaudit_use_unallocated_tty_depend',`
 	type tty_device_t;
 
 	class chr_file { read write };
@@ -491,16 +511,16 @@ define(`terminal_ignore_use_general_physical_terminal_depend',`
 
 ########################################
 #
-# terminal_get_all_private_physical_terminal_attributes(domain)
+# term_getattr_all_private_ttys(domain)
 #
-define(`terminal_get_all_private_physical_terminal_attributes',`
+define(`term_getattr_all_private_ttys',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 ttynode:chr_file getattr;
 ')
 
-define(`terminal_get_all_private_physical_terminal_attributes_depend',`
+define(`term_getattr_all_private_ttys_depend',`
 	attribute ttynode;
 
 	class chr_file getattr;
@@ -508,16 +528,16 @@ define(`terminal_get_all_private_physical_terminal_attributes_depend',`
 
 ########################################
 #
-# terminal_set_all_private_physical_terminal_attributes(domain)
+# term_setattr_all_private_ttys(domain)
 #
-define(`terminal_set_all_private_physical_terminal_attributes',`
+define(`term_setattr_all_private_ttys',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 ttynode:chr_file setattr;
 ')
 
-define(`terminal_set_all_private_physical_terminal_attributes_depend',`
+define(`term_setattr_all_private_ttys_depend',`
 	attribute ttynode;
 
 	class chr_file setattr;
@@ -525,15 +545,15 @@ define(`terminal_set_all_private_physical_terminal_attributes_depend',`
 
 ########################################
 #
-# terminal_ignore_get_all_private_physical_terminal_attributes(domain)
+# term_dontaudit_getattr_all_private_ttys(domain)
 #
-define(`terminal_ignore_get_all_private_physical_terminal_attributes',`
+define(`term_dontaudit_getattr_all_private_ttys',`
 	requires_block_template(`$0'_depend)
 
 	dontaudit $1 ttynode:chr_file getattr;
 ')
 
-define(`terminal_ignore_get_all_private_physical_terminal_attributes_depend',`
+define(`term_dontaudit_getattr_all_private_ttys_depend',`
 	attribute ttynode;
 
 	class chr_file getattr;
@@ -541,23 +561,23 @@ define(`terminal_ignore_get_all_private_physical_terminal_attributes_depend',`
 
 ########################################
 #
-# terminal_relabel_all_private_physical_terminals(domain)
+# term_relabel_all_private_ttys(domain)
 #
-define(`terminal_relabel_all_private_physical_terminals',`
+define(`term_relabel_all_private_ttys',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 ttynode:chr_file { relabelfrom relabelto };
 ')
 
-define(`terminal_relabel_all_private_physical_terminals_depend',`
+define(`term_relabel_all_private_ttys_depend',`
 	attribute ttynode;
 
 	class chr_file { relabelfrom relabelto };
 ')
 
 ########################################
-## <interface name="terminal_write_all_private_physical_terminals">
+## <interface name="term_write_all_private_ttys">
 ##	<description>
 ##		Write to all private ttys.  Has a backchannel of
 ##		getting all private tty attributes.
@@ -568,14 +588,14 @@ define(`terminal_relabel_all_private_physical_terminals_depend',`
 ##	<infoflow type="write" weight="10"/>
 ## </interface>
 #
-define(`terminal_write_all_private_physical_terminals',`
+define(`term_write_all_private_ttys',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 ttynode:chr_file { getattr write };
 ')
 
-define(`terminal_write_all_private_physical_terminals_depend',`
+define(`term_write_all_private_ttys_depend',`
 	attribute ttynode;
 
 	class chr_file { getattr write };
@@ -583,16 +603,16 @@ define(`terminal_write_all_private_physical_terminals_depend',`
 
 ########################################
 #
-# terminal_use_all_private_physical_terminals(domain)
+# term_use_all_private_ttys(domain)
 #
-define(`terminal_use_all_private_physical_terminals',`
+define(`term_use_all_private_ttys',`
 	requires_block_template(`$0'_depend)
 
 	devices_list_device_nodes($1)
 	allow $1 ttynode:chr_file { getattr read write ioctl };
 ')
 
-define(`terminal_use_all_private_physical_terminals_depend',`
+define(`term_use_all_private_ttys_depend',`
 	attribute ttynode;
 
 	class chr_file { getattr read write ioctl };
@@ -600,15 +620,15 @@ define(`terminal_use_all_private_physical_terminals_depend',`
 
 ########################################
 #
-# terminal_ignore_use_all_private_physical_terminals(domain)
+# term_dontaudit_use_all_private_ttys(domain)
 #
-define(`terminal_ignore_use_all_private_physical_terminals',`
+define(`term_dontaudit_use_all_private_ttys',`
 	requires_block_template(`$0'_depend)
 
 	dontaudit $1 ttynode:chr_file { read write };
 ')
 
-define(`terminal_ignore_use_all_private_physical_terminals_depend',`
+define(`term_dontaudit_use_all_private_ttys_depend',`
 	attribute ttynode;
 
 	class chr_file { read write };