diff --git a/pipelined/config/rv32ia/BTBPredictor.txt b/pipelined/config/rv32i/BTBPredictor.txt
similarity index 100%
rename from pipelined/config/rv32ia/BTBPredictor.txt
rename to pipelined/config/rv32i/BTBPredictor.txt
diff --git a/pipelined/config/rv32ia/twoBitPredictor.txt b/pipelined/config/rv32i/twoBitPredictor.txt
similarity index 100%
rename from pipelined/config/rv32ia/twoBitPredictor.txt
rename to pipelined/config/rv32i/twoBitPredictor.txt
diff --git a/pipelined/config/rv32ia/wally-config.vh b/pipelined/config/rv32i/wally-config.vh
similarity index 95%
rename from pipelined/config/rv32ia/wally-config.vh
rename to pipelined/config/rv32i/wally-config.vh
index 122aba8f..a263beaa 100644
--- a/pipelined/config/rv32ia/wally-config.vh
+++ b/pipelined/config/rv32i/wally-config.vh
@@ -37,8 +37,8 @@
 // IEEE 754 compliance
 `define IEEE754 0
 
-// IA
-`define MISA (32'h00000100 | 1 << 20 | 1 << 18 | 1 << 12 | 1 << 0 | 1 << 3 | 1 << 5)
+// I
+`define MISA (32'h00000100 | 1 << 20 | 1 << 18 )
 `define ZICSR_SUPPORTED 1
 `define ZIFENCEI_SUPPORTED 1
 `define COUNTERS 32
@@ -129,8 +129,8 @@
 `define PLIC_GPIO_ID 3
 `define PLIC_UART_ID 10
 
-`define TWO_BIT_PRELOAD "../config/rv32ia/twoBitPredictor.txt"
-`define BTB_PRELOAD "../config/rv32ia/BTBPredictor.txt"
+`define TWO_BIT_PRELOAD "../config/rv32i/twoBitPredictor.txt"
+`define BTB_PRELOAD "../config/rv32i/BTBPredictor.txt"
 `define BPRED_ENABLED 1
 `define BPTYPE "BPGSHARE" // BPLOCALPAg or BPGLOBAL or BPTWOBIT or BPGSHARE
 `define TESTSBP 0
diff --git a/pipelined/config/rv64ia/BTBPredictor.txt b/pipelined/config/rv64i/BTBPredictor.txt
similarity index 100%
rename from pipelined/config/rv64ia/BTBPredictor.txt
rename to pipelined/config/rv64i/BTBPredictor.txt
diff --git a/pipelined/config/rv64ia/twoBitPredictor.txt b/pipelined/config/rv64i/twoBitPredictor.txt
similarity index 100%
rename from pipelined/config/rv64ia/twoBitPredictor.txt
rename to pipelined/config/rv64i/twoBitPredictor.txt
diff --git a/pipelined/config/rv64ia/wally-config.vh b/pipelined/config/rv64i/wally-config.vh
similarity index 94%
rename from pipelined/config/rv64ia/wally-config.vh
rename to pipelined/config/rv64i/wally-config.vh
index dd82f9c6..e936364c 100644
--- a/pipelined/config/rv64ia/wally-config.vh
+++ b/pipelined/config/rv64i/wally-config.vh
@@ -37,8 +37,8 @@
 // IEEE 754 compliance
 `define IEEE754 0
 
-// MISA RISC-V configuration per specification IA
-`define MISA (32'h00000100 | 1 << 20 | 1 << 18 | 1 << 12 | 1 << 0 | 1 << 3 | 1 << 5)
+// MISA RISC-V configuration per specification I
+`define MISA (32'h00000100 | 1 << 20 | 1 << 18 )
 `define ZICSR_SUPPORTED 1
 `define ZIFENCEI_SUPPORTED 1
 `define COUNTERS 32
@@ -130,8 +130,8 @@
 `define PLIC_GPIO_ID 3
 `define PLIC_UART_ID 10
 
-`define TWO_BIT_PRELOAD "../config/rv64ia/twoBitPredictor.txt"
-`define BTB_PRELOAD "../config/rv64ia/BTBPredictor.txt"
+`define TWO_BIT_PRELOAD "../config/rv64i/twoBitPredictor.txt"
+`define BTB_PRELOAD "../config/rv64i/BTBPredictor.txt"
 `define BPRED_ENABLED 1
 `define BPTYPE "BPGSHARE" // BPLOCALPAg or BPGLOBAL or BPTWOBIT or BPGSHARE
 `define TESTSBP 0