diff --git a/dv/uvm/Makefile b/dv/uvm/Makefile
index 6b175203..214a537f 100644
--- a/dv/uvm/Makefile
+++ b/dv/uvm/Makefile
@@ -73,11 +73,10 @@ CSR_OPTS=--csr_yaml=${CSR_FILE} \
      --steps=gen \
      --gen_timeout=${TIMEOUT} \
      --lsf_cmd="${LSF_CMD}" \
+     --core_setting_dir=${DV_DIR}/riscv_dv_extension \
+     --user_extension_dir=${DV_DIR}/riscv_dv_extension \
      ${COMMON_OPTS} \
      ${CSR_OPTS} \
-     --cmp_opts="+define+RISCV_CORE_SETTING=${DV_DIR}/riscv_dv_extension/ibex_core_setting.sv \
-       +define+RISCV_DV_EXT_FILE_LIST=${DV_DIR}/riscv_dv_extension/flist \
-       +incdir+${DV_DIR}/riscv_dv_extension/ " \
      --sim_opts="+uvm_set_type_override=riscv_asm_program_gen,ibex_asm_program_gen \
                  +signature_addr=${SIGNATURE_ADDR}";
 
diff --git a/dv/uvm/riscv_dv_extension/ibex_core_setting.sv b/dv/uvm/riscv_dv_extension/riscv_core_setting.sv
similarity index 100%
rename from dv/uvm/riscv_dv_extension/ibex_core_setting.sv
rename to dv/uvm/riscv_dv_extension/riscv_core_setting.sv
diff --git a/dv/uvm/riscv_dv_extension/flist b/dv/uvm/riscv_dv_extension/user_extension.svh
similarity index 100%
rename from dv/uvm/riscv_dv_extension/flist
rename to dv/uvm/riscv_dv_extension/user_extension.svh