diff --git a/refpolicy/policy/modules/kernel/devices.if b/refpolicy/policy/modules/kernel/devices.if
index 9f1cb67..5308261 100644
--- a/refpolicy/policy/modules/kernel/devices.if
+++ b/refpolicy/policy/modules/kernel/devices.if
@@ -44,7 +44,7 @@ define(`dev_node',`
 	fs_associate($1)
 
 	optional_policy(`distro_redhat',`
-		fs_tmpfs_associate($1)
+		fs_associate_tmpfs($1)
 	')
 ')
 
@@ -531,7 +531,7 @@ define(`dev_create_dev_node',`
 	type_transition $1 device_t:$3 $2;
 
 	optional_policy(`distro_redhat',`
-		fs_tmpfs_associate($2)
+		fs_associate_tmpfs($2)
 	')
 ')
 
diff --git a/refpolicy/policy/modules/system/init.te b/refpolicy/policy/modules/system/init.te
index b7b1143..303f8d9 100644
--- a/refpolicy/policy/modules/system/init.te
+++ b/refpolicy/policy/modules/system/init.te
@@ -312,8 +312,8 @@ ifdef(`distro_redhat',`
 
 	# Create and read /boot/kernel.h and /boot/System.map.
 	# Redhat systems typically create this file at boot time.
-	bootloader_create_runtime_data(initrc_t)
-	bootloader_modify_bootloader_data_directory_symbolic_links(initrc_t)
+	bootloader_create_runtime_file(initrc_t)
+	bootloader_rw_boot_symlinks(initrc_t)
 
 	# These seem to be from the initrd
 	# during device initialization: