diff --git a/private/compat/28.0/28.0.cil b/private/compat/28.0/28.0.cil
index f7a0c375642948d20a3adc85b8a7714ca755a8d3..d3019ecb58e01bbef3e47f7be233271fcfffff2f 100644
--- a/private/compat/28.0/28.0.cil
+++ b/private/compat/28.0/28.0.cil
@@ -3,7 +3,6 @@
 (type audio_timer_device)
 (type commontime_management_service)
 (type cpuctl_device)
-(type fingerprint_vendor_data_file)
 (type full_device)
 (type i2c_device)
 (type kmem_device)
@@ -1075,7 +1074,7 @@
 (typeattributeset fingerprintd_service_28_0 (fingerprintd_service))
 (typeattributeset fingerprint_prop_28_0 (fingerprint_prop))
 (typeattributeset fingerprint_service_28_0 (fingerprint_service))
-(typeattributeset fingerprint_vendor_data_file_28_0 (biometric_vendor_data_file))
+(typeattributeset fingerprint_vendor_data_file_28_0 (fingerprint_vendor_data_file))
 (typeattributeset firstboot_prop_28_0 (firstboot_prop))
 (typeattributeset font_service_28_0 (font_service))
 (typeattributeset frp_block_device_28_0 (frp_block_device))
diff --git a/private/compat/28.0/28.0.ignore.cil b/private/compat/28.0/28.0.ignore.cil
index cfc2c1a2f1c4fce1ea0e83d6b8dc2ce67deb7ce9..cf72e3795665412e2231bf47ca25d464c313ea6e 100644
--- a/private/compat/28.0/28.0.ignore.cil
+++ b/private/compat/28.0/28.0.ignore.cil
@@ -17,7 +17,6 @@
     apexd_prop
     apexd_tmpfs
     biometric_service
-    biometric_vendor_data_file
     cpu_variant_prop
     dev_cpu_variant
     device_config_boot_count_prop
diff --git a/private/file_contexts b/private/file_contexts
index a7880c0a3cd4f1011e3680821ba9148d21afc623..acd5df984a2ac1fe1e20fdf45610c2ce4e45f0a8 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -482,13 +482,7 @@
 /data/system/users/[0-9]+/fpdata(/.*)? u:object_r:fingerprintd_data_file:s0
 
 # Fingerprint vendor data file
-/data/vendor_de/[0-9]+/fpdata(/.*)? u:object_r:biometric_vendor_data_file:s0
-
-# Face vendor data file
-/data/vendor_de/[0-9]+/facedata(/.*)? u:object_r:biometric_vendor_data_file:s0
-
-# Iris vendor data file
-/data/vendor_de/[0-9]+/irisdata(/.*)? u:object_r:biometric_vendor_data_file:s0
+/data/vendor_de/[0-9]+/fpdata(/.*)? u:object_r:fingerprint_vendor_data_file:s0
 
 # Bootchart data
 /data/bootchart(/.*)?		u:object_r:bootchart_data_file:s0
diff --git a/private/vold_prepare_subdirs.te b/private/vold_prepare_subdirs.te
index 8ed8f56e77ae177735f9e08e20fb439018771af1..0d062e991e3b15856ddd3f571f60dbfa4d26a26a 100644
--- a/private/vold_prepare_subdirs.te
+++ b/private/vold_prepare_subdirs.te
@@ -14,12 +14,12 @@ allow vold_prepare_subdirs {
   vendor_data_file
 }:dir { open read write add_name remove_name rmdir relabelfrom };
 allow vold_prepare_subdirs {
-    biometric_vendor_data_file
+    fingerprint_vendor_data_file
     storaged_data_file
     vold_data_file
 }:dir { create_dir_perms relabelto };
 allow vold_prepare_subdirs {
-    biometric_vendor_data_file
+    fingerprint_vendor_data_file
     storaged_data_file
     system_data_file
     vold_data_file
diff --git a/public/file.te b/public/file.te
index 9f14621cb4db44b4f67601a21f8c13fe1d843810..3d09537323bc45bab4808d2757428e432458341d 100644
--- a/public/file.te
+++ b/public/file.te
@@ -354,8 +354,8 @@ type backup_data_file, file_type, data_file_type, core_data_file_type, mlstruste
 type bluetooth_efs_file, file_type;
 # Type for fingerprint template file
 type fingerprintd_data_file, file_type, data_file_type, core_data_file_type;
-# Type for biometric template file
-type biometric_vendor_data_file, file_type, data_file_type;
+# Type for _new_ fingerprint template file
+type fingerprint_vendor_data_file, file_type, data_file_type;
 # Type for appfuse file.
 type app_fuse_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
 
diff --git a/public/hal_fingerprint.te b/public/hal_fingerprint.te
index a0222e9df1a4842aaf1c737be92c0f7c307fabd2..b673e291b50ed6ac1f07d06c389554f032efbd5c 100644
--- a/public/hal_fingerprint.te
+++ b/public/hal_fingerprint.te
@@ -7,8 +7,8 @@ hal_attribute_hwservice(hal_fingerprint, hal_fingerprint_hwservice)
 # For memory allocation
 allow hal_fingerprint ion_device:chr_file r_file_perms;
 
-allow hal_fingerprint biometric_vendor_data_file:file { create_file_perms };
-allow hal_fingerprint biometric_vendor_data_file:dir rw_dir_perms;
+allow hal_fingerprint fingerprint_vendor_data_file:file { create_file_perms };
+allow hal_fingerprint fingerprint_vendor_data_file:dir rw_dir_perms;
 
 r_dir_file(hal_fingerprint, cgroup)
 r_dir_file(hal_fingerprint, sysfs)
diff --git a/public/tee.te b/public/tee.te
index dffe06ff7112a801bdf8e9afc2a98ccce9c68fee..0f9b32dc9d4cb095f4ea361e39a52b09d0c01b29 100644
--- a/public/tee.te
+++ b/public/tee.te
@@ -6,6 +6,6 @@ type tee, domain;
 # Device(s) for communicating with the TEE
 type tee_device, dev_type;
 
-allow tee biometric_vendor_data_file:dir rw_dir_perms;
-allow tee biometric_vendor_data_file:file create_file_perms;
+allow tee fingerprint_vendor_data_file:dir rw_dir_perms;
+allow tee fingerprint_vendor_data_file:file create_file_perms;