diff --git a/refpolicy/policy/modules/kernel/filesystem.if b/refpolicy/policy/modules/kernel/filesystem.if
index c992b29..93ec06a 100644
--- a/refpolicy/policy/modules/kernel/filesystem.if
+++ b/refpolicy/policy/modules/kernel/filesystem.if
@@ -103,15 +103,15 @@ define(`fs_unmount_persistent_fs_depend',`
 
 ########################################
 #
-# fs_get_persistent_fs_attributes(domain)
+# fs_getattr_persistent_fs(domain)
 #
-define(`fs_get_persistent_fs_attributes',`
+define(`fs_getattr_persistent_fs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 fs_t:filesystem getattr;
 ')
 
-define(`fs_get_persistent_fs_attributes_depend',`
+define(`fs_getattr_persistent_fs_depend',`
 	type fs_t;
 
 	class filesystem getattr;
@@ -119,15 +119,15 @@ define(`fs_get_persistent_fs_attributes_depend',`
 
 ########################################
 #
-# fs_ignore_get_persistent_fs_attributes(domain)
+# fs_ignore_getattr_persistent_fs(domain)
 #
-define(`fs_ignore_get_persistent_fs_attributes',`
+define(`fs_ignore_getattr_persistent_fs',`
 	requires_block_template(`$0'_depend)
 
 	dontaudit $1 fs_t:filesystem getattr;
 ')
 
-define(`fs_ignore_get_persistent_fs_attributes_depend',`
+define(`fs_ignore_getattr_persistent_fs_depend',`
 	type fs_t;
 
 	class filesystem getattr;
@@ -151,30 +151,30 @@ define(`fs_relabelfrom_persistent_fs_depend',`
 
 ########################################
 #
-# fs_mount_automount_fs(domain)
+# fs_mount_autofs(domain)
 #
-define(`fs_mount_automount_fs',`
+define(`fs_mount_autofs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 autofs_t:filesystem mount;
 ')
 
-define(`fs_mount_automount_fs_depend',`
+define(`fs_mount_autofs_depend',`
 	type autofs_t;
 	class filesystem mount;
 ')
 
 ########################################
 #
-# fs_remount_automount_fs(domain)
+# fs_remount_autofs(domain)
 #
-define(`fs_remount_automount_fs',`
+define(`fs_remount_autofs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 autofs_t:filesystem remount;
 ')
 
-define(`fs_remount_automount_fs_depend',`
+define(`fs_remount_autofs_depend',`
 	type autofs_t;
 
 	class filesystem remount;
@@ -182,15 +182,15 @@ define(`fs_remount_automount_fs_depend',`
 
 ########################################
 #
-# fs_unmount_automount_fs(domain)
+# fs_unmount_autofs(domain)
 #
-define(`fs_unmount_automount_fs',`
+define(`fs_unmount_autofs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 autofs_t:filesystem mount;
 ')
 
-define(`fs_unmount_automount_fs_depend',`
+define(`fs_unmount_autofs_depend',`
 	type autofs_t;
 
 	class filesystem unmount;
@@ -198,15 +198,15 @@ define(`fs_unmount_automount_fs_depend',`
 
 ########################################
 #
-# fs_get_automount_fs_attributes(domain)
+# fs_getattr_autofs(domain)
 #
-define(`fs_get_automount_fs_attributes',`
+define(`fs_getattr_autofs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 autofs_t:filesystem getattr;
 ')
 
-define(`fs_get_automount_fs_attributes_depend',`
+define(`fs_getattr_autofs_depend',`
 	type autofs_t;
 
 	class filesystem getattr;
@@ -232,15 +232,15 @@ define(`fs_register_binary_executable_type_depend',`
 
 ########################################
 #
-# fs_mount_windows_network_fs(domain)
+# fs_mount_cifs(domain)
 #
-define(`fs_mount_windows_network_fs',`
+define(`fs_mount_cifs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 cifs_t:filesystem mount;
 ')
 
-define(`fs_mount_windows_network_fs_depend',`
+define(`fs_mount_cifs_depend',`
 	type cifs_t;
 
 	class filesystem mount;
@@ -248,15 +248,15 @@ define(`fs_mount_windows_network_fs_depend',`
 
 ########################################
 #
-# fs_remount_windows_network_fs(domain)
+# fs_remount_cifs(domain)
 #
-define(`fs_remount_windows_network_fs',`
+define(`fs_remount_cifs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 cifs_t:filesystem remount;
 ')
 
-define(`fs_remount_windows_network_fs_depend',`
+define(`fs_remount_cifs_depend',`
 	type cifs_t;
 
 	class filesystem remount;
@@ -264,15 +264,15 @@ define(`fs_remount_windows_network_fs_depend',`
 
 ########################################
 #
-# fs_unmount_windows_network_fs(domain)
+# fs_unmount_cifs(domain)
 #
-define(`fs_unmount_windows_network_fs',`
+define(`fs_unmount_cifs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 cifs_t:filesystem mount;
 ')
 
-define(`fs_unmount_windows_network_fs_depend',`
+define(`fs_unmount_cifs_depend',`
 	type cifs_t;
 
 	class filesystem unmount;
@@ -280,15 +280,15 @@ define(`fs_unmount_windows_network_fs_depend',`
 
 ########################################
 #
-# fs_get_windows_network_fs_attributes(domain)
+# fs_getattr_cifs(domain)
 #
-define(`fs_get_windows_network_fs_attributes',`
+define(`fs_getattr_cifs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 cifs_t:filesystem getattr;
 ')
 
-define(`fs_get_windows_network_fs_attributes_depend',`
+define(`fs_getattr_cifs_depend',`
 	type cifs_t;
 
 	class filesystem getattr;
@@ -296,16 +296,16 @@ define(`fs_get_windows_network_fs_attributes_depend',`
 
 ########################################
 #
-# fs_execute_windows_network_files(domain)
+# fs_execute_cifs_files(domain)
 #
-define(`fs_execute_windows_network_files',`
+define(`fs_execute_cifs_files',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 cifs_t:dir r_dir_perms;
 	allow $1 cifs_t:file { getattr read execute execute_no_trans };
 ')
 
-define(`fs_execute_windows_network_files_depend',`
+define(`fs_execute_cifs_files_depend',`
 	type cifs_t;
 
 	class dir r_dir_perms;
@@ -314,15 +314,15 @@ define(`fs_execute_windows_network_files_depend',`
 
 ########################################
 #
-# fs_manage_windows_network_directories(domain)
+# fs_manage_cifs_directories(domain)
 #
-define(`fs_manage_windows_network_directories',`
+define(`fs_manage_cifs_directories',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 cifs_t:dir create_file_perms;
 ')
 
-define(`fs_manage_windows_network_directories_depend',`
+define(`fs_manage_cifs_directories_depend',`
 	type cifs_t;
 
 	class dir create_file_perms;
@@ -330,16 +330,16 @@ define(`fs_manage_windows_network_directories_depend',`
 
 ########################################
 #
-# fs_manage_windows_network_files(domain)
+# fs_manage_cifs_files(domain)
 #
-define(`fs_manage_windows_network_files',`
+define(`fs_manage_cifs_files',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 cifs_t:dir rw_dir_perms;
 	allow $1 cifs_t:file create_file_perms;
 ')
 
-define(`fs_manage_windows_network_files_depend',`
+define(`fs_manage_cifs_files_depend',`
 	type cifs_t;
 
 	class dir rw_dir_perms;
@@ -348,16 +348,16 @@ define(`fs_manage_windows_network_files_depend',`
 
 ########################################
 #
-# fs_manage_windows_network_symbolic_links(domain)
+# fs_manage_cifs_symbolic_links(domain)
 #
-define(`fs_manage_windows_network_symbolic_links',`
+define(`fs_manage_cifs_symbolic_links',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 cifs_t:dir rw_dir_perms;
 	allow $1 cifs_t:lnk_file create_lnk_perms;
 ')
 
-define(`fs_manage_windows_network_symbolic_links_depend',`
+define(`fs_manage_cifs_symbolic_links_depend',`
 	type cifs_t;
 
 	class dir rw_dir_perms;
@@ -366,16 +366,16 @@ define(`fs_manage_windows_network_symbolic_links_depend',`
 
 ########################################
 #
-# fs_manage_windows_network_named_pipes(domain)
+# fs_manage_cifs_named_pipes(domain)
 #
-define(`fs_manage_windows_network_named_pipes',`
+define(`fs_manage_cifs_named_pipes',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 cifs_t:dir rw_dir_perms;
 	allow $1 cifs_t:fifo_file create_file_perms;
 ')
 
-define(`fs_manage_windows_network_named_pipes_depend',`
+define(`fs_manage_cifs_named_pipes_depend',`
 	type cifs_t;
 
 	class dir rw_dir_perms;
@@ -384,16 +384,16 @@ define(`fs_manage_windows_network_named_pipes_depend',`
 
 ########################################
 #
-# fs_manage_windows_network_named_sockets(domain)
+# fs_manage_cifs_named_sockets(domain)
 #
-define(`fs_manage_windows_network_named_sockets',`
+define(`fs_manage_cifs_named_sockets',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 cifs_t:dir rw_file_perms;
 	allow $1 cifs_t:sock_file create_file_perms;
 ')
 
-define(`fs_manage_windows_network_named_sockets_depend',`
+define(`fs_manage_cifs_named_sockets_depend',`
 	type cifs_t;
 
 	class dir rw_dir_perms;
@@ -450,15 +450,15 @@ define(`fs_unmount_dos_fs_depend',`
 
 ########################################
 #
-# fs_get_dos_fs_attributes(domain)
+# fs_getattr_dos_fs(domain)
 #
-define(`fs_get_dos_fs_attributes',`
+define(`fs_getattr_dos_fs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 dosfs_t:filesystem getattr;
 ')
 
-define(`fs_get_dos_fs_attributes_depend',`
+define(`fs_getattr_dos_fs_depend',`
 	type dosfs_t;
 
 	class filesystem getattr;
@@ -530,15 +530,15 @@ define(`fs_unmount_cd_fs_depend',`
 
 ########################################
 #
-# fs_get_cd_fs_attributes(domain)
+# fs_getattr_cd_fs(domain)
 #
-define(`fs_get_cd_fs_attributes',`
+define(`fs_getattr_cd_fs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 iso9660_t:filesystem getattr;
 ')
 
-define(`fs_get_cd_fs_attributes_depend',`
+define(`fs_getattr_cd_fs_depend',`
 	type iso9660_t;
 
 	class filesystem getattr;
@@ -546,15 +546,15 @@ define(`fs_get_cd_fs_attributes_depend',`
 
 ########################################
 #
-# fs_mount_nfs_fs(domain)
+# fs_mount_nfs(domain)
 #
-define(`fs_mount_nfs_fs',`
+define(`fs_mount_nfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 nfs_t:filesystem mount;
 ')
 
-define(`fs_mount_nfs_fs_depend',`
+define(`fs_mount_nfs_depend',`
 	type nfs_t;
 
 	class filesystem mount;
@@ -562,15 +562,15 @@ define(`fs_mount_nfs_fs_depend',`
 
 ########################################
 #
-# fs_remount_nfs_fs(domain)
+# fs_remount_nfs(domain)
 #
-define(`fs_remount_nfs_fs',`
+define(`fs_remount_nfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 nfs_t:filesystem remount;
 ')
 
-define(`fs_remount_nfs_fs_depend',`
+define(`fs_remount_nfs_depend',`
 	type nfs_t;
 
 	class filesystem remount;
@@ -578,15 +578,15 @@ define(`fs_remount_nfs_fs_depend',`
 
 ########################################
 #
-# fs_unmount_nfs_fs(domain)
+# fs_unmount_nfs(domain)
 #
-define(`fs_unmount_nfs_fs',`
+define(`fs_unmount_nfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 nfs_t:filesystem mount;
 ')
 
-define(`fs_unmount_nfs_fs_depend',`
+define(`fs_unmount_nfs_depend',`
 	type nfs_t;
 
 	class filesystem unmount;
@@ -594,15 +594,15 @@ define(`fs_unmount_nfs_fs_depend',`
 
 ########################################
 #
-# fs_get_nfs_fs_attributes(domain)
+# fs_getattr_nfs(domain)
 #
-define(`fs_get_nfs_fs_attributes',`
+define(`fs_getattr_nfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 nfs_t:filesystem getattr;
 ')
 
-define(`fs_get_nfs_fs_attributes_depend',`
+define(`fs_getattr_nfs_depend',`
 	type nfs_t;
 
 	class filesystem getattr;
@@ -764,15 +764,15 @@ define(`fs_unmount_nfsd_fs_depend',`
 
 ########################################
 #
-# fs_get_nfsd_fs_attributes(domain)
+# fs_getattr_nfsd_fs(domain)
 #
-define(`fs_get_nfsd_fs_attributes',`
+define(`fs_getattr_nfsd_fs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 nfsd_fs_t:filesystem getattr;
 ')
 
-define(`fs_get_nfsd_fs_attributes_depend',`
+define(`fs_getattr_nfsd_fs_depend',`
 	type nfsd_fs_t;
 
 	class filesystem getattr;
@@ -780,15 +780,15 @@ define(`fs_get_nfsd_fs_attributes_depend',`
 
 ########################################
 #
-# fs_mount_ram_fs(domain)
+# fs_mount_ramfs(domain)
 #
-define(`fs_mount_ram_fs',`
+define(`fs_mount_ramfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 ramfs_t:filesystem mount;
 ')
 
-define(`fs_mount_ram_fs_depend',`
+define(`fs_mount_ramfs_depend',`
 	type ramfs_t;
 
 	class filesystem mount;
@@ -796,15 +796,15 @@ define(`fs_mount_ram_fs_depend',`
 
 ########################################
 #
-# fs_remount_ram_fs(domain)
+# fs_remount_ramfs(domain)
 #
-define(`fs_remount_ram_fs',`
+define(`fs_remount_ramfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 ramfs_t:filesystem remount;
 ')
 
-define(`fs_remount_ram_fs_depend',`
+define(`fs_remount_ramfs_depend',`
 	type ramfs_t;
 
 	class filesystem remount;
@@ -812,15 +812,15 @@ define(`fs_remount_ram_fs_depend',`
 
 ########################################
 #
-# fs_unmount_ram_fs(domain)
+# fs_unmount_ramfs(domain)
 #
-define(`fs_unmount_ram_fs',`
+define(`fs_unmount_ramfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 ramfs_t:filesystem mount;
 ')
 
-define(`fs_unmount_ram_fs_depend',`
+define(`fs_unmount_ramfs_depend',`
 	type ramfs_t;
 
 	class filesystem unmount;
@@ -828,15 +828,15 @@ define(`fs_unmount_ram_fs_depend',`
 
 ########################################
 #
-# fs_get_ram_fs_attributes(domain)
+# fs_getattr_ramfs(domain)
 #
-define(`fs_get_ram_fs_attributes',`
+define(`fs_getattr_ramfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 ramfs_t:filesystem getattr;
 ')
 
-define(`fs_get_ram_fs_attributes_depend',`
+define(`fs_getattr_ramfs_depend',`
 	type ramfs_t;
 
 	class filesystem getattr;
@@ -844,15 +844,15 @@ define(`fs_get_ram_fs_attributes_depend',`
 
 ########################################
 #
-# fs_mount_rom_fs(domain)
+# fs_mount_romfs(domain)
 #
-define(`fs_mount_rom_fs',`
+define(`fs_mount_romfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 romfs_t:filesystem mount;
 ')
 
-define(`fs_mount_rom_fs_depend',`
+define(`fs_mount_romfs_depend',`
 	type romfs_t;
 
 	class filesystem mount;
@@ -860,15 +860,15 @@ define(`fs_mount_rom_fs_depend',`
 
 ########################################
 #
-# fs_remount_rom_fs(domain)
+# fs_remount_romfs(domain)
 #
-define(`fs_remount_rom_fs',`
+define(`fs_remount_romfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 romfs_t:filesystem remount;
 ')
 
-define(`fs_remount_rom_fs_depend',`
+define(`fs_remount_romfs_depend',`
 	type romfs_t;
 
 	class filesystem remount;
@@ -876,15 +876,15 @@ define(`fs_remount_rom_fs_depend',`
 
 ########################################
 #
-# fs_unmount_rom_fs(domain)
+# fs_unmount_romfs(domain)
 #
-define(`fs_unmount_rom_fs',`
+define(`fs_unmount_romfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 romfs_t:filesystem mount;
 ')
 
-define(`fs_unmount_rom_fs_depend',`
+define(`fs_unmount_romfs_depend',`
 	type romfs_t;
 
 	class filesystem unmount;
@@ -892,15 +892,15 @@ define(`fs_unmount_rom_fs_depend',`
 
 ########################################
 #
-# fs_get_rom_fs_attributes(domain)
+# fs_getattr_romfs(domain)
 #
-define(`fs_get_rom_fs_attributes',`
+define(`fs_getattr_romfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 romfs_t:filesystem getattr;
 ')
 
-define(`fs_get_rom_fs_attributes_depend',`
+define(`fs_getattr_romfs_depend',`
 	type romfs_t;
 
 	class filesystem getattr;
@@ -908,15 +908,15 @@ define(`fs_get_rom_fs_attributes_depend',`
 
 ########################################
 #
-# fs_mount_rpc_pipefs_fs(domain)
+# fs_mount_rpc_pipefs(domain)
 #
-define(`fs_mount_rpc_pipefs_fs',`
+define(`fs_mount_rpc_pipefs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 rpc_pipefs_t:filesystem mount;
 ')
 
-define(`fs_mount_rpc_pipefs_fs_depend',`
+define(`fs_mount_rpc_pipefs_depend',`
 	type rpc_pipefs_t;
 
 	class filesystem mount;
@@ -924,15 +924,15 @@ define(`fs_mount_rpc_pipefs_fs_depend',`
 
 ########################################
 #
-# fs_remount_rpc_pipefs_fs(domain)
+# fs_remount_rpc_pipefs(domain)
 #
-define(`fs_remount_rpc_pipefs_fs',`
+define(`fs_remount_rpc_pipefs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 rpc_pipefs_t:filesystem remount;
 ')
 
-define(`fs_remount_rpc_pipefs_fs_depend',`
+define(`fs_remount_rpc_pipefs_depend',`
 	type rpc_pipefs_t;
 
 	class filesystem remount;
@@ -940,15 +940,15 @@ define(`fs_remount_rpc_pipefs_fs_depend',`
 
 ########################################
 #
-# fs_unmount_rpc_pipefs_fs(domain)
+# fs_unmount_rpc_pipefs(domain)
 #
-define(`fs_unmount_rpc_pipefs_fs',`
+define(`fs_unmount_rpc_pipefs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 rpc_pipefs_t:filesystem mount;
 ')
 
-define(`fs_unmount_rpc_pipefs_fs_depend',`
+define(`fs_unmount_rpc_pipefs_depend',`
 	type rpc_pipefs_t;
 
 	class filesystem unmount;
@@ -956,15 +956,15 @@ define(`fs_unmount_rpc_pipefs_fs_depend',`
 
 ########################################
 #
-# fs_get_rpc_pipefs_fs_attributes(domain)
+# fs_getattr_rpc_pipefs(domain)
 #
-define(`fs_get_rpc_pipefs_fs_attributes',`
+define(`fs_getattr_rpc_pipefs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 rpc_pipefs_t:filesystem getattr;
 ')
 
-define(`fs_get_rpc_pipefs_fs_attributes_depend',`
+define(`fs_getattr_rpc_pipefs_depend',`
 	type rpc_pipefs_t;
 
 	class filesystem getattr;
@@ -972,15 +972,15 @@ define(`fs_get_rpc_pipefs_fs_attributes_depend',`
 
 ########################################
 #
-# fs_mount_tmpfs_fs(domain)
+# fs_mount_tmpfs(domain)
 #
-define(`fs_mount_tmpfs_fs',`
+define(`fs_mount_tmpfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 tmpfs_t:filesystem mount;
 ')
 
-define(`fs_mount_tmpfs_fs_depend',`
+define(`fs_mount_tmpfs_depend',`
 	type tmpfs_t;
 
 	class filesystem mount;
@@ -988,15 +988,15 @@ define(`fs_mount_tmpfs_fs_depend',`
 
 ########################################
 #
-# fs_remount_tmpfs_fs(domain)
+# fs_remount_tmpfs(domain)
 #
-define(`fs_remount_tmpfs_fs',`
+define(`fs_remount_tmpfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 tmpfs_t:filesystem remount;
 ')
 
-define(`fs_remount_tmpfs_fs_depend',`
+define(`fs_remount_tmpfs_depend',`
 	type tmpfs_t;
 
 	class filesystem remount;
@@ -1004,15 +1004,15 @@ define(`fs_remount_tmpfs_fs_depend',`
 
 ########################################
 #
-# fs_unmount_tmpfs_fs(domain)
+# fs_unmount_tmpfs(domain)
 #
-define(`fs_unmount_tmpfs_fs',`
+define(`fs_unmount_tmpfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 tmpfs_t:filesystem mount;
 ')
 
-define(`fs_unmount_tmpfs_fs_depend',`
+define(`fs_unmount_tmpfs_depend',`
 	type tmpfs_t;
 
 	class filesystem unmount;
@@ -1020,15 +1020,15 @@ define(`fs_unmount_tmpfs_fs_depend',`
 
 ########################################
 #
-# fs_get_tmpfs_fs_attributes(domain)
+# fs_getattr_tmpfs(domain)
 #
-define(`fs_get_tmpfs_fs_attributes',`
+define(`fs_getattr_tmpfs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 tmpfs_t:filesystem getattr;
 ')
 
-define(`fs_get_tmpfs_fs_attributes_depend',`
+define(`fs_getattr_tmpfs_depend',`
 	type tmpfs_t;
 
 	class filesystem getattr;
@@ -1059,9 +1059,9 @@ define(`fs_tmpfs_associate_depend',`
 
 ########################################
 #
-# fs_create_private_tmpfs_data(domain,derivedtype,[class])
+# fs_create_tmpfs_data(domain,derivedtype,[class])
 #
-define(`fs_create_private_tmpfs_data',`
+define(`fs_create_tmpfs_data',`
 	requires_block_template(`$0'_depend)
 
 	allow $2 tmpfs_t:filesystem associate;
@@ -1283,15 +1283,15 @@ define(`fs_mount_all_fs_depend',`
 
 ########################################
 #
-# fs_get_all_fs_attributes(type)
+# fs_getattr_all_fs(type)
 #
-define(`fs_get_all_fs_attributes',`
+define(`fs_getattr_all_fs',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 fs_type:filesystem getattr;
 ')
 
-define(`fs_get_all_fs_attributes_depend',`
+define(`fs_getattr_all_fs_depend',`
 	attribute fs_type;
 
 	class filesystem getattr;
@@ -1315,15 +1315,15 @@ define(`fs_get_all_fs_quotas_depend',`
 
 ########################################
 #
-# fs_set_all_fs_quotas(type)
+# fs_set_all_quotas(type)
 #
-define(`fs_set_all_fs_quotas',`
+define(`fs_set_all_quotas',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 fs_type:filesystem quotamod;
 ')
 
-define(`fs_set_all_fs_quotas_depend',`
+define(`fs_set_all_quotas_depend',`
 	attribute fs_type;
 
 	class filesystem quotamod;
@@ -1331,9 +1331,9 @@ define(`fs_set_all_fs_quotas_depend',`
 
 ########################################
 #
-# fs_get_all_file_attributes(type)
+# fs_getattr_all_files(type)
 #
-define(`fs_get_all_file_attributes',`
+define(`fs_getattr_all_files',`
 	requires_block_template(`$0'_depend)
 
 	allow $1 fs_type:dir { search getattr };
@@ -1343,7 +1343,7 @@ define(`fs_get_all_file_attributes',`
 	allow $1 fs_type:sock_file getattr;
 ')
 
-define(`fs_get_all_file_attributes_depend',`
+define(`fs_getattr_all_files_depend',`
 	attribute fs_type;
 
 	class dir { search getattr };