diff --git a/config/rv32gc/coverage.svh b/config/rv32gc/coverage.svh
index 90593e0f5..ccc194a27 100644
--- a/config/rv32gc/coverage.svh
+++ b/config/rv32gc/coverage.svh
@@ -13,27 +13,35 @@
 `define CLINT_BASE 64'h02000000
 
 // Unprivileged extensions
-`include "RV32I_coverage.svh"
-`include "RV32M_coverage.svh"
-`include "RV32F_coverage.svh"
-`include "RV32D_coverage.svh"
-`include "RV32Zba_coverage.svh"
-`include "RV32Zbb_coverage.svh"
-`include "RV32Zbc_coverage.svh"
-`include "RV32Zbs_coverage.svh"
-`include "RV32ZfaF_coverage.svh"
-`include "RV32ZfaD_coverage.svh"
-`include "RV32ZfaZfh_coverage.svh"
-`include "RV32ZfhD_coverage.svh"
-`include "RV32Zfh_coverage.svh"
-`include "RV32Zicond_coverage.svh"
-`include "RV32Zca_coverage.svh"
-`include "RV32Zcb_coverage.svh"
-`include "RV32ZcbM_coverage.svh"
-`include "RV32ZcbZbb_coverage.svh"
-`include "RV32Zcf_coverage.svh"
-`include "RV32Zcd_coverage.svh"
-`include "RV32Zicsr_coverage.svh"
+`include "I_coverage.svh"
+`include "M_coverage.svh"
+`include "F_coverage.svh"
+`include "D_coverage.svh"
+`include "Zba_coverage.svh"
+`include "Zbb_coverage.svh"
+`include "Zbc_coverage.svh"
+`include "Zbs_coverage.svh"
+`include "ZfaF_coverage.svh"
+`include "ZfaD_coverage.svh"
+`include "ZfaZfh_coverage.svh"
+`include "Zfh_coverage.svh"
+`include "ZfhD_coverage.svh"
+`include "Zicond_coverage.svh"
+`include "Zca_coverage.svh"
+`include "Zcb_coverage.svh"
+`include "ZcbM_coverage.svh"
+`include "ZcbZbb_coverage.svh"
+`include "Zcf_coverage.svh"
+`include "Zcd_coverage.svh"
+`include "Zicsr_coverage.svh"
+`include "Zbkb_coverage.svh"
+`include "Zbkc_coverage.svh"
+`include "Zbkx_coverage.svh"
+`include "Zknd_coverage.svh"
+`include "Zkne_coverage.svh"
+`include "Zknh_coverage.svh"
+`include "Zaamo_coverage.svh"
+`include "Zalrsc_coverage.svh"
 
 // Privileged extensions
 `include "ZicsrM_coverage.svh"
diff --git a/config/rv64gc/coverage.svh b/config/rv64gc/coverage.svh
index 6aba1ac9a..d0ec96fb8 100644
--- a/config/rv64gc/coverage.svh
+++ b/config/rv64gc/coverage.svh
@@ -13,27 +13,35 @@
 `define CLINT_BASE 64'h02000000
 
 // Unprivileged extensions
-`include "RV64I_coverage.svh"
-`include "RV64M_coverage.svh"
-`include "RV64F_coverage.svh"
-`include "RV64D_coverage.svh"
-`include "RV64Zba_coverage.svh"
-`include "RV64Zbb_coverage.svh"
-`include "RV64Zbc_coverage.svh"
-`include "RV64Zbs_coverage.svh"
-`include "RV64ZfaF_coverage.svh"
-`include "RV64ZfaD_coverage.svh"
-`include "RV64ZfaZfh_coverage.svh"
-`include "RV64ZfhD_coverage.svh"
-`include "RV64Zfh_coverage.svh"
-`include "RV64Zicond_coverage.svh"
-`include "RV64Zca_coverage.svh"
-`include "RV64Zcb_coverage.svh"
-`include "RV64ZcbM_coverage.svh"
-`include "RV64ZcbZbb_coverage.svh"
-`include "RV64ZcbZba_coverage.svh"
-`include "RV64Zcd_coverage.svh"
-`include "RV64Zicsr_coverage.svh"
+`include "I_coverage.svh"
+`include "M_coverage.svh"
+`include "F_coverage.svh"
+`include "D_coverage.svh"
+`include "Zba_coverage.svh"
+`include "Zbb_coverage.svh"
+`include "Zbc_coverage.svh"
+`include "Zbs_coverage.svh"
+`include "ZfaF_coverage.svh"
+`include "ZfaD_coverage.svh"
+`include "ZfaZfh_coverage.svh"
+`include "ZfhD_coverage.svh"
+`include "Zfh_coverage.svh"
+`include "Zicond_coverage.svh"
+`include "Zca_coverage.svh"
+`include "Zcb_coverage.svh"
+`include "ZcbM_coverage.svh"
+`include "ZcbZbb_coverage.svh"
+`include "ZcbZba_coverage.svh"
+`include "Zcd_coverage.svh"
+`include "Zicsr_coverage.svh"
+`include "Zbkb_coverage.svh"
+`include "Zbkc_coverage.svh"
+`include "Zbkx_coverage.svh"
+`include "Zknd_coverage.svh"
+`include "Zkne_coverage.svh"
+`include "Zknh_coverage.svh"
+`include "Zaamo_coverage.svh"
+`include "Zalrsc_coverage.svh"
 
 // Privileged extensions
 `include "RV64VM_coverage.svh"
diff --git a/sim/questa/wally.do b/sim/questa/wally.do
index 1b3c19393..218be69bc 100644
--- a/sim/questa/wally.do
+++ b/sim/questa/wally.do
@@ -104,7 +104,7 @@ if {[lcheck lst "--ccov"]} {
 # if --fcov found set flag and remove from list
 if {[lcheck lst "--fcov"]} {
     set FunctCoverage 1
-    set FCvlog "+incdir+${FCRVVI}/rv32 +incdir+${FCRVVI}/rv64 \
+    set FCvlog "+incdir+${FCRVVI}/unpriv \
                 +incdir+${FCRVVI}/priv +incdir+${FCRVVI}/rv64_priv +incdir+${FCRVVI}/rv32_priv \
                 +incdir+${FCRVVI}/common +incdir+${FCRVVI} \
                 +incdir+$env(WALLY)/addins/cvw-arch-verif/riscvISACOV/source"