diff --git a/WHENCE b/WHENCE
index 59a123c3..0eb303a5 100644
--- a/WHENCE
+++ b/WHENCE
@@ -5963,12 +5963,13 @@ File: qcom/venus-6.0/venus.mbn
 
 Version: VIDEO.VE.6.0-00049-PROD-1
 
-File: qcom/vpu-1.0/venus.mbn
-Link: qcom/vpu-1.0/venus.mdt -> venus.mbn
+File: qcom/vpu/vpu20_p4.mbn
+Link: qcom/vpu-1.0/venus.mbn -> ../vpu/vpu20_p4.mbn
 
 Version: VIDEO.VPU.1.0-00087-PROD-1
 
-File: qcom/vpu-2.0/venus.mbn
+File: qcom/vpu/vpu20_p1.mbn
+Link: qcom/vpu-2.0/venus.mbn -> ../vpu/vpu20_p1.mbn
 
 Version: VIDEO.VPU.2.0-00049-PROD-1
 
@@ -5981,7 +5982,7 @@ https://developer.qualcomm.com/hardware/dragonboard-410c/tools
 
 Driver: iris - Qualcomm Iris video codec accelerator
 
-File: qcom/vpu-3.0/vpu30_4v.mbn
+File: qcom/vpu/vpu30_p4.mbn
 
 Version: VIDEO.VPU.3.1-0076
 
diff --git a/qcom/vpu-2.0/venus.mbn b/qcom/vpu/vpu20_p1.mbn
similarity index 100%
rename from qcom/vpu-2.0/venus.mbn
rename to qcom/vpu/vpu20_p1.mbn
diff --git a/qcom/vpu-1.0/venus.mbn b/qcom/vpu/vpu20_p4.mbn
similarity index 100%
rename from qcom/vpu-1.0/venus.mbn
rename to qcom/vpu/vpu20_p4.mbn
diff --git a/qcom/vpu-3.0/vpu30_4v.mbn b/qcom/vpu/vpu30_p4.mbn
similarity index 100%
rename from qcom/vpu-3.0/vpu30_4v.mbn
rename to qcom/vpu/vpu30_p4.mbn