diff --git a/wally-pipelined/config/rv32g/BTBPredictor.txt b/wally-pipelined/config/rv32gc/BTBPredictor.txt
similarity index 100%
rename from wally-pipelined/config/rv32g/BTBPredictor.txt
rename to wally-pipelined/config/rv32gc/BTBPredictor.txt
diff --git a/wally-pipelined/config/rv32g/twoBitPredictor.txt b/wally-pipelined/config/rv32gc/twoBitPredictor.txt
similarity index 100%
rename from wally-pipelined/config/rv32g/twoBitPredictor.txt
rename to wally-pipelined/config/rv32gc/twoBitPredictor.txt
diff --git a/wally-pipelined/config/rv32g/wally-config.vh b/wally-pipelined/config/rv32gc/wally-config.vh
similarity index 100%
rename from wally-pipelined/config/rv32g/wally-config.vh
rename to wally-pipelined/config/rv32gc/wally-config.vh
diff --git a/wally-pipelined/config/rv64g/BTBPredictor.txt b/wally-pipelined/config/rv64gc/BTBPredictor.txt
similarity index 100%
rename from wally-pipelined/config/rv64g/BTBPredictor.txt
rename to wally-pipelined/config/rv64gc/BTBPredictor.txt
diff --git a/wally-pipelined/config/rv64g/twoBitPredictor.txt b/wally-pipelined/config/rv64gc/twoBitPredictor.txt
similarity index 100%
rename from wally-pipelined/config/rv64g/twoBitPredictor.txt
rename to wally-pipelined/config/rv64gc/twoBitPredictor.txt
diff --git a/wally-pipelined/config/rv64g/wally-config.vh b/wally-pipelined/config/rv64gc/wally-config.vh
similarity index 100%
rename from wally-pipelined/config/rv64g/wally-config.vh
rename to wally-pipelined/config/rv64gc/wally-config.vh
diff --git a/wally-pipelined/regression/lint-wally b/wally-pipelined/regression/lint-wally
index a61624aa..23f239c1 100755
--- a/wally-pipelined/regression/lint-wally
+++ b/wally-pipelined/regression/lint-wally
@@ -5,7 +5,7 @@ export PATH=$PATH:/usr/local/bin/
 verilator=`which verilator`
 
 basepath=$(dirname $0)/..
-for config in rv64g rv32g; do
+for config in rv64gc rv32gc; do
     echo "$config linting..."
     if !($verilator --lint-only "$@" --top-module wallypipelinedsoc "-I$basepath/config/shared" "-I$basepath/config/$config" $basepath/src/*/*.sv $basepath/src/*/*/*.sv --relative-includes); then
         echo "Exiting after $config lint due to errors or warnings"
diff --git a/wally-pipelined/regression/regression-wally.py b/wally-pipelined/regression/regression-wally.py
index a0591d6a..4c78e1a8 100755
--- a/wally-pipelined/regression/regression-wally.py
+++ b/wally-pipelined/regression/regression-wally.py
@@ -53,7 +53,7 @@ tests64 = ["wally64i", "arch64i", "arch64priv", "arch64c",  "arch64m", "imperas6
 for test in tests64:
   tc = TestCase(
         name=test,
-        cmd="vsim > {} -c <<!\ndo wally-pipelined-batch.do rv64g "+test+"\n!",
+        cmd="vsim > {} -c <<!\ndo wally-pipelined-batch.do rv64gc "+test+"\n!",
         grepstr="All tests ran without failures")
   configs.append(tc)
 #tests32 = ["arch32i", "arch32priv", "arch32c",  "arch32m", "arch32f", "imperas32i", "imperas32p", "imperas32mmu", "imperas32f", "imperas32m", "imperas32a",  "imperas32c"]
@@ -61,7 +61,7 @@ tests32 = ["wally32i", "arch32i", "arch32priv", "arch32c",  "arch32m", "imperas3
 for test in tests32:
   tc = TestCase(
         name=test,
-        cmd="vsim > {} -c <<!\ndo wally-pipelined-batch.do rv32g "+test+"\n!",
+        cmd="vsim > {} -c <<!\ndo wally-pipelined-batch.do rv32gc "+test+"\n!",
         grepstr="All tests ran without failures")
   configs.append(tc)
 
diff --git a/wally-pipelined/regression/sim-fp64-batch b/wally-pipelined/regression/sim-fp64-batch
index 693bfeb2..226d0586 100755
--- a/wally-pipelined/regression/sim-fp64-batch
+++ b/wally-pipelined/regression/sim-fp64-batch
@@ -1,3 +1,3 @@
 vsim -c <<!
-do wally-fp64-batch.do rv64g imperas64d
+do wally-fp64-batch.do rv64gc imperas64d
 !
diff --git a/wally-pipelined/regression/wally-fp64.do b/wally-pipelined/regression/wally-fp64.do
index c131ff16..96c6d61f 100644
--- a/wally-pipelined/regression/wally-fp64.do
+++ b/wally-pipelined/regression/wally-fp64.do
@@ -37,7 +37,7 @@ vlib work
 #}
 # start and run simulation
 # remove +acc flag for faster sim during regressions if there is no need to access internal signals
-vlog +incdir+../config/rv64g +incdir+../config/shared ../testbench/testbench-f64.sv ../testbench/common/*.sv   ../src/*/*.sv -suppress 2583
+vlog +incdir+../config/rv64gc +incdir+../config/shared ../testbench/testbench-f64.sv ../testbench/common/*.sv   ../src/*/*.sv -suppress 2583
 vopt +acc work.testbench -G TEST=imperas64d -o workopt 
 vsim workopt