diff --git a/pipelined/regression/regression-wally b/pipelined/regression/regression-wally
index 6bbaa04b..7398d7ce 100755
--- a/pipelined/regression/regression-wally
+++ b/pipelined/regression/regression-wally
@@ -204,9 +204,6 @@ def main():
     # Count the number of failures
     if num_fail:
         print(f"{bcolors.FAIL}Regression failed with %s failed configurations{bcolors.ENDC}" % num_fail)
-        # Remind the user to try `make allclean`, since it may be needed if test
-        # cases have changed
-        print("Reminder: have you run `make allclean`?")
     else:
         print(f"{bcolors.OKGREEN}SUCCESS! All tests ran without failures{bcolors.ENDC}")
     return num_fail
diff --git a/pipelined/src/ifu/brpred/RAsPredictor.sv b/pipelined/src/ifu/bpred/RAsPredictor.sv
similarity index 100%
rename from pipelined/src/ifu/brpred/RAsPredictor.sv
rename to pipelined/src/ifu/bpred/RAsPredictor.sv
diff --git a/pipelined/src/ifu/brpred/bpred.sv b/pipelined/src/ifu/bpred/bpred.sv
similarity index 98%
rename from pipelined/src/ifu/brpred/bpred.sv
rename to pipelined/src/ifu/bpred/bpred.sv
index 4e1ada3c..0319d3a0 100644
--- a/pipelined/src/ifu/brpred/bpred.sv
+++ b/pipelined/src/ifu/bpred/bpred.sv
@@ -49,7 +49,7 @@ module bpred (
   // Branch and jump outcome
   input  logic             PCSrcE,                    // Executation stage branch is taken
   input  logic [`XLEN-1:0] IEUAdrE,                   // The branch/jump target address
-  input  logic [`XLEN-1:0]  dPCLinkE,                   // The address following the branch instruction. (AKA Fall through address)
+  input  logic [`XLEN-1:0] PCLinkE,                   // The address following the branch instruction. (AKA Fall through address)
   output logic [3:0]       InstrClassM,               // The valid instruction class. 1-hot encoded as jalr, ret, jr (not ret), j, br
 
   // Report branch prediction status
diff --git a/pipelined/src/ifu/brpred/btb.sv b/pipelined/src/ifu/bpred/btb.sv
similarity index 100%
rename from pipelined/src/ifu/brpred/btb.sv
rename to pipelined/src/ifu/bpred/btb.sv
diff --git a/pipelined/src/ifu/brpred/foldedgshare.sv b/pipelined/src/ifu/bpred/foldedgshare.sv
similarity index 100%
rename from pipelined/src/ifu/brpred/foldedgshare.sv
rename to pipelined/src/ifu/bpred/foldedgshare.sv
diff --git a/pipelined/src/ifu/brpred/globalhistory.sv b/pipelined/src/ifu/bpred/globalhistory.sv
similarity index 100%
rename from pipelined/src/ifu/brpred/globalhistory.sv
rename to pipelined/src/ifu/bpred/globalhistory.sv
diff --git a/pipelined/src/ifu/brpred/gshare.sv b/pipelined/src/ifu/bpred/gshare.sv
similarity index 100%
rename from pipelined/src/ifu/brpred/gshare.sv
rename to pipelined/src/ifu/bpred/gshare.sv
diff --git a/pipelined/src/ifu/brpred/localHistoryPredictor.sv b/pipelined/src/ifu/bpred/localHistoryPredictor.sv
similarity index 100%
rename from pipelined/src/ifu/brpred/localHistoryPredictor.sv
rename to pipelined/src/ifu/bpred/localHistoryPredictor.sv
diff --git a/pipelined/src/ifu/brpred/optgshare.sv b/pipelined/src/ifu/bpred/optgshare.sv
similarity index 100%
rename from pipelined/src/ifu/brpred/optgshare.sv
rename to pipelined/src/ifu/bpred/optgshare.sv
diff --git a/pipelined/src/ifu/brpred/satCounter2.sv b/pipelined/src/ifu/bpred/satCounter2.sv
similarity index 100%
rename from pipelined/src/ifu/brpred/satCounter2.sv
rename to pipelined/src/ifu/bpred/satCounter2.sv
diff --git a/pipelined/src/ifu/brpred/speculativeglobalhistory.sv b/pipelined/src/ifu/bpred/speculativeglobalhistory.sv
similarity index 100%
rename from pipelined/src/ifu/brpred/speculativeglobalhistory.sv
rename to pipelined/src/ifu/bpred/speculativeglobalhistory.sv
diff --git a/pipelined/src/ifu/brpred/speculativegshare.sv b/pipelined/src/ifu/bpred/speculativegshare.sv
similarity index 100%
rename from pipelined/src/ifu/brpred/speculativegshare.sv
rename to pipelined/src/ifu/bpred/speculativegshare.sv
diff --git a/pipelined/src/ifu/brpred/twoBitPredictor.sv b/pipelined/src/ifu/bpred/twoBitPredictor.sv
similarity index 100%
rename from pipelined/src/ifu/brpred/twoBitPredictor.sv
rename to pipelined/src/ifu/bpred/twoBitPredictor.sv
diff --git a/tests/riscof/Makefile b/tests/riscof/Makefile
index 2918494d..d963e4f0 100644
--- a/tests/riscof/Makefile
+++ b/tests/riscof/Makefile
@@ -16,7 +16,7 @@ root:
 	mkdir -p $(work)
 	mkdir -p $(arch_workdir)
 	mkdir -p $(wally_workdir)
-	sed 's,{0},$(current_dir),g;s,{1},32imc,g' config.ini > config32.ini
+	sed 's,{0},$(current_dir),g;s,{1},32gc,g' config.ini > config32.ini
 	sed 's,{0},$(current_dir),g;s,{1},64gc,g' config.ini > config64.ini
 	sed 's,{0},$(current_dir),g;s,{1},32e,g' config.ini > config32e.ini
 
diff --git a/tests/riscof/spike/spike_rv32e_isa.yaml b/tests/riscof/spike/spike_rv32e_isa.yaml
index 7ae54347..9e9775a9 100644
--- a/tests/riscof/spike/spike_rv32e_isa.yaml
+++ b/tests/riscof/spike/spike_rv32e_isa.yaml
@@ -1,11 +1,11 @@
 hart_ids: [0]
 hart0:
-  ISA: RV32EMFCZicsr_Zifencei
+  ISA: RV32EMCZicsr_Zifencei
   physical_addr_sz: 32
   User_Spec_Version: '2.3'
   supported_xlen: [32]
   misa:
-   reset-val: 0x40001034
+   reset-val: 0x40001014
    rv32:
      accessible: true
      mxl:
diff --git a/tests/riscof/spike/spike_rv32imc_isa.yaml b/tests/riscof/spike/spike_rv32gc_isa.yaml
similarity index 100%
rename from tests/riscof/spike/spike_rv32imc_isa.yaml
rename to tests/riscof/spike/spike_rv32gc_isa.yaml