diff --git a/scripts/ubsan_basop.supp b/scripts/ubsan_basop.supp
index b836305c7f581de82ebaabd5d6bebd22daa6364f..bfd00f357312259871d5b67a802699393a92a559 100644
--- a/scripts/ubsan_basop.supp
+++ b/scripts/ubsan_basop.supp
@@ -1,35 +1,32 @@
 # From the scheduled sanitizer tests with self_test.py
-# lib_com
-implicit-integer-sign-change:lib_com/ACcontextMapping_fx.c
-implicit-integer-sign-change:lib_com/bitstream_fx.c
-implicit-integer-sign-change:lib_com/enh64.c
-implicit-signed-integer-truncation:lib_com/enh1632.c
-implicit-signed-integer-truncation:lib_com/enhUL32.c
-invalid-shift-base:lib_com/enh64.c
-invalid-shift-exponent:lib_com/basop32.c
-invalid-shift-exponent:lib_com/enh64.c
-out-of-bounds-index:lib_com/ifft_rel.c
-out-of-bounds-index:lib_com/log2.c
-out-of-bounds-index:lib_com/tcx_ltp_fx.c
-out-of-bounds-index:lib_com/trans_direct_fx.c
-out-of-bounds-index:lib_com/trans_inv_fx.c
-signed-integer-overflow:lib_com/enh64.c
-# lib_enc
-implicit-integer-sign-change:lib_enc/ACcontextMapping_enc_fx.c
-implicit-integer-sign-change:lib_enc/bass_psfilter_enc_fx.c
-implicit-integer-sign-change:lib_enc/cod4t64_fx.c
-implicit-integer-sign-change:lib_enc/core_enc_ol_fx.c
-implicit-integer-sign-change:lib_enc/enc_acelp_fx.c
-implicit-integer-sign-change:lib_enc/enc_prm_fx.c
-implicit-integer-sign-change:lib_enc/hq_classifier_enc_fx.c
-implicit-integer-sign-change:lib_enc/inov_enc_fx.c
-implicit-integer-sign-change:lib_enc/lead_indexing_fx.c
-implicit-integer-sign-change:lib_enc/range_enc_fx.c
-implicit-integer-sign-change:lib_enc/tcx_utils_enc_fx.c
-out-of-bounds-index:lib_enc/enc_acelp_fx.c
-out-of-bounds-index:lib_enc/enc_gain_fx.c
-out-of-bounds-index:lib_enc/pit_enc_fx.c
-out-of-bounds-index:lib_enc/pitch_ol2_fx.c
-out-of-bounds-index:lib_enc/tcx_ltp_enc_fx.c
-# lib_dec
-out-of-bounds-index:lib_dec/dec_acelp_fx.c
+implicit-integer-sign-change:ACcontextMapping_fx.c
+implicit-integer-sign-change:bitstream_fx.c
+implicit-integer-sign-change:enh64.c
+implicit-signed-integer-truncation:enh1632.c
+implicit-signed-integer-truncation:enhUL32.c
+shift-base:enh64.c
+shift-exponent:basop32.c
+shift-exponent:enh64.c
+bounds:ifft_rel.c
+bounds:log2.c
+bounds:tcx_ltp_fx.c
+bounds:trans_direct_fx.c
+bounds:trans_inv_fx.c
+signed-integer-overflow:enh64.c
+implicit-integer-sign-change:ACcontextMapping_enc_fx.c
+implicit-integer-sign-change:bass_psfilter_enc_fx.c
+implicit-integer-sign-change:cod4t64_fx.c
+implicit-integer-sign-change:core_enc_ol_fx.c
+implicit-integer-sign-change:enc_acelp_fx.c
+implicit-integer-sign-change:enc_prm_fx.c
+implicit-integer-sign-change:hq_classifier_enc_fx.c
+implicit-integer-sign-change:inov_enc_fx.c
+implicit-integer-sign-change:lead_indexing_fx.c
+implicit-integer-sign-change:range_enc_fx.c
+implicit-integer-sign-change:tcx_utils_enc_fx.c
+bounds:enc_acelp_fx.c
+bounds:enc_gain_fx.c
+bounds:pit_enc_fx.c
+bounds:pitch_ol2_fx.c
+bounds:tcx_ltp_enc_fx.c
+bounds:dec_acelp_fx.c