diff --git a/config/derivlist.txt b/config/derivlist.txt
index fdb17dfd3..32768a3af 100644
--- a/config/derivlist.txt
+++ b/config/derivlist.txt
@@ -328,22 +328,22 @@ deriv bpred_GSHARE_16_16_10_0_rv32gc bpred_GSHARE_16_16_10_1_rv32gc
 INSTR_CLASS_PRED          0
 
 deriv bpred_TWOBIT_6_16_10_0_rv32gc bpred_GSHARE_6_16_10_0_rv32gc
-INSTR_CLASS_PRED          0
+BPRED_TYPE          `BP_TWOBIT
 
 deriv bpred_TWOBIT_8_16_10_0_rv32gc bpred_GSHARE_8_16_10_0_rv32gc
-INSTR_CLASS_PRED          0
+BPRED_TYPE          `BP_TWOBIT
 
 deriv bpred_TWOBIT_10_16_10_0_rv32gc bpred_GSHARE_10_16_10_0_rv32gc
-INSTR_CLASS_PRED          0
+BPRED_TYPE          `BP_TWOBIT
 
 deriv bpred_TWOBIT_12_16_10_0_rv32gc bpred_GSHARE_12_16_10_0_rv32gc
-INSTR_CLASS_PRED          0
+BPRED_TYPE          `BP_TWOBIT
 
 deriv bpred_TWOBIT_14_16_10_0_rv32gc bpred_GSHARE_14_16_10_0_rv32gc
-INSTR_CLASS_PRED          0
+BPRED_TYPE          `BP_TWOBIT
 
 deriv bpred_TWOBIT_16_16_10_0_rv32gc bpred_GSHARE_16_16_10_0_rv32gc
-INSTR_CLASS_PRED          0
+BPRED_TYPE          `BP_TWOBIT
 
 deriv bpred_GSHARE_10_2_10_0_rv32gc bpred_GSHARE_10_2_10_1_rv32gc
 INSTR_CLASS_PRED          0