diff --git a/refpolicy/policy/modules/kernel/storage.if b/refpolicy/policy/modules/kernel/storage.if
index dd4ee09e..2439fcbe 100644
--- a/refpolicy/policy/modules/kernel/storage.if
+++ b/refpolicy/policy/modules/kernel/storage.if
@@ -404,14 +404,14 @@ define(`storage_dontaudit_getattr_removable_device_depend',`
 ##	</parameter>
 ## </interface>
 #
-define(`storage_set_removable_device_attributes',`
+define(`storage_setattr_removable_device',`
 	requires_block_template(`$0'_depend)
 
 	dev_list_all_dev_nodes($1)
 	allow $1 removable_device_t:blk_file setattr;
 ')
 
-define(`storage_set_removable_device_attributes_depend',`
+define(`storage_setattr_removable_device_depend',`
 	type removable_device_t;
 
 	class blk_file setattr;
diff --git a/refpolicy/policy/modules/system/authlogin.te b/refpolicy/policy/modules/system/authlogin.te
index 5af12811..9cc541dd 100644
--- a/refpolicy/policy/modules/system/authlogin.te
+++ b/refpolicy/policy/modules/system/authlogin.te
@@ -145,7 +145,7 @@ kernel_use_fd(pam_console_t)
 storage_getattr_fixed_disk(pam_console_t)
 storage_setattr_fixed_disk(pam_console_t)
 storage_getattr_removable_device(pam_console_t)
-storage_set_removable_device_attributes(pam_console_t)
+storage_setattr_removable_device(pam_console_t)
 
 term_use_console(pam_console_t)
 term_getattr_unallocated_ttys(pam_console_t)
diff --git a/refpolicy/policy/modules/system/hotplug.te b/refpolicy/policy/modules/system/hotplug.te
index 6e59141a..991c4fb2 100644
--- a/refpolicy/policy/modules/system/hotplug.te
+++ b/refpolicy/policy/modules/system/hotplug.te
@@ -64,7 +64,7 @@ dev_read_urand(hotplug_t)
 fs_getattr_all_fs(hotplug_t)
 
 storage_setattr_fixed_disk(hotplug_t)
-storage_set_removable_device_attributes(hotplug_t)
+storage_setattr_removable_device(hotplug_t)
 
 term_dontaudit_use_console(hotplug_t)
 
diff --git a/refpolicy/policy/modules/system/init.te b/refpolicy/policy/modules/system/init.te
index 929da00b..b7b11436 100644
--- a/refpolicy/policy/modules/system/init.te
+++ b/refpolicy/policy/modules/system/init.te
@@ -225,7 +225,7 @@ fs_getattr_all_fs(initrc_t)
 
 storage_getattr_fixed_disk(initrc_t)
 storage_setattr_fixed_disk(initrc_t)
-storage_set_removable_device_attributes(initrc_t)
+storage_setattr_removable_device(initrc_t)
 
 term_use_all_terms(initrc_t)
 term_reset_tty_labels(initrc_t)