diff --git a/benchmarks/coremark/Makefile b/benchmarks/coremark/Makefile
index bb0f20f5..b412c36e 100644
--- a/benchmarks/coremark/Makefile
+++ b/benchmarks/coremark/Makefile
@@ -22,7 +22,7 @@ PORT_CFLAGS = -g -mabi=$(ABI) -march=$(ARCH) -static -falign-functions=16 \
 all: $(work_dir)/coremark.bare.riscv.elf.memfile
 
 run:
-	(cd ../../sim && (time vsim -c -do "do wally-pipelined-batch.do rv$(XLEN)gc coremark" 2>&1 | tee $(work_dir)/coremark.sim.log))
+	(cd ../../sim && (time vsim -c -do "do wally-batch.do rv$(XLEN)gc coremark" 2>&1 | tee $(work_dir)/coremark.sim.log))
 	cd ../benchmarks/coremark/
 #	KMG: added post processing script to give out branch miss proportion along with other stats to the coremark test
 	python3 coremark-postprocess.py
diff --git a/benchmarks/embench/Makefile b/benchmarks/embench/Makefile
index 0d619c90..538fb64f 100644
--- a/benchmarks/embench/Makefile
+++ b/benchmarks/embench/Makefile
@@ -34,7 +34,7 @@ sim: modelsim_build_memfile modelsim_run speed
 
 # launches modelsim to simulate tests on wally
 modelsim_run:
-	(cd ../../sim/ && vsim -c -do "do wally-pipelined-batch.do rv32gc embench")
+	(cd ../../sim/ && vsim -c -do "do wally-batch.do rv32gc embench")
 	cd ../../benchmarks/embench/
 
 # builds the objdump based on the compiled c elf files
diff --git a/setup.imperas.sh b/setup.imperas.sh
index 755a298b..71d5dcfd 100644
--- a/setup.imperas.sh
+++ b/setup.imperas.sh
@@ -36,7 +36,7 @@ pushd sim
     IMPERAS_TOOLS=$(pwd)/imperas.ic \
         OTHERFLAGS="+TRACE2LOG_ENABLE=1 VERBOSE=1" \
         TESTDIR=${WALLY}/external/ImperasDV-HMC/tests/riscof/work/riscv-arch-test/rv64i_m/F/src/fadd_b1-01.S  \
-        vsim -c -do "do wally-pipelined-imperas.do rv64gc"
+        vsim -c -do "do wally-imperas.do rv64gc"
 popd
 
 # notes
@@ -50,7 +50,7 @@ popd
 IMPERAS_TOOLS=$(pwd)/imperas.ic \
 OTHERFLAGS="+TRACE2LOG_ENABLE=1 VERBOSE=1" \
 TESTDIR=../../tests/riscof_lee/work/riscv-arch-test/rv64i_m/F/src/fadd_b1-01.S  \
-vsim -c -do "do wally-pipelined-imperas.do rv64gc"
+vsim -c -do "do wally-imperas.do rv64gc"
 
 
 # getting library issue.
diff --git a/sim/buildrootBugFinder.py b/sim/buildrootBugFinder.py
index 89a838d2..af632459 100755
--- a/sim/buildrootBugFinder.py
+++ b/sim/buildrootBugFinder.py
@@ -22,7 +22,7 @@ def main():
             break
         checkpoint = checkpointList[0]
         logFile = logDir+"checkpoint"+str(checkpoint)+".log"
-        runCommand="{\nvsim -c <<!\ndo wally-pipelined-batch.do buildroot buildroot /opt/riscv 0 "+str(checkpoint+1)+" "+str(checkpoint)+"\n!\n} | tee "+logFile 
+        runCommand="{\nvsim -c <<!\ndo wally-batch.do buildroot buildroot /opt/riscv 0 "+str(checkpoint+1)+" "+str(checkpoint)+"\n!\n} | tee "+logFile 
         print(runCommand)
         os.system(runCommand)
         try:
diff --git a/sim/regression-wally b/sim/regression-wally
index f9990628..07603120 100755
--- a/sim/regression-wally
+++ b/sim/regression-wally
@@ -50,18 +50,18 @@ def getBuildrootTC(boot):
     MAX_EXPECTED = 246000000 # *** TODO: replace this with a search for the login prompt.
     if boot:
         name="buildrootboot"
-        BRcmd="vsim > {} -c <<!\ndo wally-pipelined.do buildroot buildroot-no-trace $RISCV 0 1 0\n!"
+        BRcmd="vsim > {} -c <<!\ndo wally.do buildroot buildroot-no-trace $RISCV 0 1 0\n!"
         BRgrepstr="WallyHostname login:"
     else:
         name="buildroot"
-        BRcmd="vsim > {} -c <<!\ndo wally-pipelined-batch.do buildroot buildroot $RISCV "+str(INSTR_LIMIT)+" 1 0\n!"
+        BRcmd="vsim > {} -c <<!\ndo wally-batch.do buildroot buildroot $RISCV "+str(INSTR_LIMIT)+" 1 0\n!"
         BRgrepstr=str(INSTR_LIMIT)+" instructions"
     return  TestCase(name,variant="rv64gc",cmd=BRcmd,grepstr=BRgrepstr)
 
 tc = TestCase(
       name="buildroot-checkpoint",
       variant="rv64gc",
-      cmd="vsim > {} -c <<!\ndo wally-pipelined-batch.do buildroot buildroot-checkpoint $RISCV 400100000 400000001 400000000\n!", # *** will this work with rv64gc rather than buildroot config?
+      cmd="vsim > {} -c <<!\ndo wally-batch.do buildroot buildroot-checkpoint $RISCV 400100000 400000001 400000000\n!", # *** will this work with rv64gc rather than buildroot config?
       grepstr="400100000 instructions")
 configs.append(tc)
 
@@ -71,7 +71,7 @@ for test in tests64gc:
   tc = TestCase(
         name=test,
         variant="rv64gc",
-        cmd="vsim > {} -c <<!\ndo wally-pipelined-batch.do rv64gc "+test+"\n!",
+        cmd="vsim > {} -c <<!\ndo wally-batch.do rv64gc "+test+"\n!",
         grepstr="All tests ran without failures")
   configs.append(tc)
 
@@ -80,7 +80,7 @@ for test in tests64i:
   tc = TestCase(
         name=test,
         variant="rv64i",
-        cmd="vsim > {} -c <<!\ndo wally-pipelined-batch.do rv64i "+test+"\n!",
+        cmd="vsim > {} -c <<!\ndo wally-batch.do rv64i "+test+"\n!",
         grepstr="All tests ran without failures")
   configs.append(tc)
 
@@ -90,7 +90,7 @@ for test in tests32gc:
   tc = TestCase(
         name=test,
         variant="rv32gc",
-        cmd="vsim > {} -c <<!\ndo wally-pipelined-batch.do rv32gc "+test+"\n!",
+        cmd="vsim > {} -c <<!\ndo wally-batch.do rv32gc "+test+"\n!",
         grepstr="All tests ran without failures")
   configs.append(tc)
 
@@ -100,7 +100,7 @@ for test in tests32imc:
   tc = TestCase(
         name=test,
         variant="rv32imc",
-        cmd="vsim > {} -c <<!\ndo wally-pipelined-batch.do rv32imc "+test+"\n!",
+        cmd="vsim > {} -c <<!\ndo wally-batch.do rv32imc "+test+"\n!",
         grepstr="All tests ran without failures")
   configs.append(tc)
 
@@ -109,7 +109,7 @@ for test in tests32i:
   tc = TestCase(
         name=test,
         variant="rv32i",
-        cmd="vsim > {} -c <<!\ndo wally-pipelined-batch.do rv32i "+test+"\n!",
+        cmd="vsim > {} -c <<!\ndo wally-batch.do rv32i "+test+"\n!",
         grepstr="All tests ran without failures")
   configs.append(tc)
 
@@ -119,7 +119,7 @@ for test in tests32e:
   tc = TestCase(
         name=test,
         variant="rv32e",
-        cmd="vsim > {} -c <<!\ndo wally-pipelined-batch.do rv32e "+test+"\n!",
+        cmd="vsim > {} -c <<!\ndo wally-batch.do rv32e "+test+"\n!",
         grepstr="All tests ran without failures")
   configs.append(tc)
 
@@ -128,7 +128,7 @@ for test in ahbTests:
   tc = TestCase(
         name="ram_latency_" + test[0] + "_burst_en_" + test[1],
         variant="ahb",
-        cmd="vsim > {} -c <<!\ndo wally-pipelined-batch.do rv64gc ahb "+test[0]+" "+test[1]+"\n!",
+        cmd="vsim > {} -c <<!\ndo wally-batch.do rv64gc ahb "+test[0]+" "+test[1]+"\n!",
         grepstr="All tests ran without failures")
   configs.append(tc)
   
diff --git a/sim/run-imperasdv-tests.bash b/sim/run-imperasdv-tests.bash
index c037c369..a9facd0e 100755
--- a/sim/run-imperasdv-tests.bash
+++ b/sim/run-imperasdv-tests.bash
@@ -17,6 +17,6 @@ for t in $ALL; do
     echo "Running test ${TESTDIR} -> ${OUTDIR} :: ${OUTLOG}"
 
     mkdir -p ${OUTDIR}
-    vsim -c -do "do wally-pipelined-imperas.do rv64gc"
+    vsim -c -do "do wally-imperas.do rv64gc"
     mv transcript ${OUTLOG}
 done
diff --git a/sim/sim-buildroot b/sim/sim-buildroot
index 938bff86..530e3338 100755
--- a/sim/sim-buildroot
+++ b/sim/sim-buildroot
@@ -30,4 +30,4 @@ echo "INSTR_LIMIT  = ${INSTR_LIMIT}"
 echo "INSTR_WAVEON = ${INSTR_WAVEON}"
 echo "CHECKPOINT   = ${CHECKPOINT}"
 
-vsim -do "do ./wally-pipelined.do buildroot buildroot $RISCV $INSTR_LIMIT $INSTR_WAVEON $CHECKPOINT"
+vsim -do "do ./wally.do buildroot buildroot $RISCV $INSTR_LIMIT $INSTR_WAVEON $CHECKPOINT"
diff --git a/sim/sim-buildroot-batch b/sim/sim-buildroot-batch
index a8d4038e..81a6fac1 100755
--- a/sim/sim-buildroot-batch
+++ b/sim/sim-buildroot-batch
@@ -32,5 +32,5 @@ echo "CHECKPOINT   = ${CHECKPOINT}"
 
 # *** change config from buildroot to rv64gc
 vsim -c <<!
-do wally-pipelined-batch.do buildroot buildroot-no-trace $RISCV $INSTR_LIMIT $INSTR_WAVEON $CHECKPOINT
+do wally-batch.do buildroot buildroot-no-trace $RISCV $INSTR_LIMIT $INSTR_WAVEON $CHECKPOINT
 !
diff --git a/sim/sim-imperas b/sim/sim-imperas
index d696f18e..eb763390 100755
--- a/sim/sim-imperas
+++ b/sim/sim-imperas
@@ -29,4 +29,4 @@
 IMPERAS_TOOLS=$(pwd)/imperas.ic \
 OTHERFLAGS="+TRACE2LOG_ENABLE=1 VERBOSE=1" \
 TESTDIR=${WALLY}/external/ImperasDV-HMC/tests/riscof/work/riscv-arch-test/rv64i_m/F/src/fadd_b1-01.S  \
-vsim -c -do "do wally-pipelined-imperas.do rv64gc"
+vsim -c -do "do wally-imperas.do rv64gc"
diff --git a/sim/sim-wally b/sim/sim-wally
index 51c8b3ed..410cc540 100755
--- a/sim/sim-wally
+++ b/sim/sim-wally
@@ -1,2 +1,2 @@
-vsim -do "do wally-pipelined.do rv64gc arch64d"
+vsim -do "do wally.do rv64gc arch64d"
 
diff --git a/sim/sim-wally-batch b/sim/sim-wally-batch
index e9a387d0..46c35c75 100755
--- a/sim/sim-wally-batch
+++ b/sim/sim-wally-batch
@@ -1 +1 @@
-vsim -c -do "do wally-pipelined-batch.do rv32gc wally32priv"
+vsim -c -do "do wally-batch.do rv32gc wally32priv"
diff --git a/sim/testfloat.do b/sim/testfloat.do
index 9b2c2b16..49f816ce 100644
--- a/sim/testfloat.do
+++ b/sim/testfloat.do
@@ -1,4 +1,4 @@
-# wally-pipelined.do 
+# testfloat.do 
 #
 # Modification by Oklahoma State University & Harvey Mudd College
 # Use with Testbench 
@@ -7,14 +7,7 @@
 #
 # Takes 1:10 to run RV64IC tests using gui
 
-# run with vsim -do "do wally-pipelined.do rv64ic riscvarchtest-64m"
-
-# Use this wally-pipelined.do file to run this example.
-# Either bring up ModelSim and type the following at the "ModelSim>" prompt:
-#     do wally-pipelined.do
-# or, to run from a shell, type the following at the shell prompt:
-#     vsim -do wally-pipelined.do -c
-# (omit the "-c" to see the GUI while running from the shell)
+# run with vsim -do "do wally.do rv64ic riscvarchtest-64m"
 
 onbreak {resume}
 
diff --git a/sim/wally-pipelined-batch.do b/sim/wally-batch.do
similarity index 89%
rename from sim/wally-pipelined-batch.do
rename to sim/wally-batch.do
index 4bd153ce..064f503b 100644
--- a/sim/wally-pipelined-batch.do
+++ b/sim/wally-batch.do
@@ -1,4 +1,5 @@
-# wally-pipelined-batch.do 
+# wally-batch.do 
+# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
 #
 # Modification by Oklahoma State University & Harvey Mudd College
 # Use with Testbench 
@@ -7,14 +8,14 @@
 #
 # Takes 1:10 to run RV64IC tests using gui
 
-# Usage: do wally-pipelined-batch.do <config> <testcases>
-# Example: do wally-pipelined-batch.do rv32imc imperas-32i
+# Usage: do wally-batch.do <config> <testcases>
+# Example: do wally-batch.do rv32imc imperas-32i
 
-# Use this wally-pipelined-batch.do file to run this example.
+# Use this wally-batch.do file to run this example.
 # Either bring up ModelSim and type the following at the "ModelSim>" prompt:
-#     do wally-pipelined-batch.do
+#     do wally-batch.do
 # or, to run from a shell, type the following at the shell prompt:
-#     vsim -do wally-pipelined-batch.do -c
+#     vsim -do wally-batch.do -c
 # (omit the "-c" to see the GUI while running from the shell)
 
 onbreak {resume}
@@ -91,9 +92,9 @@ if {$2 eq "buildroot" || $2 eq "buildroot-checkpoint"} {
     # power off -r /dut/core/*
 } 
 
-#coverage report -file wally-pipelined-coverage.txt
+#coverage report -file wally-coverage.txt
 # These aren't doing anything helpful
 #coverage report -memory 
-#profile report -calltree -file wally-pipelined-calltree.rpt -cutoff 2
+#profile report -calltree -file wally-calltree.rpt -cutoff 2
 #power report -all -bsaif power.saif
 quit
diff --git a/sim/wally-pipelined-imperas-no-idv.do b/sim/wally-imperas-no-idv.do
similarity index 73%
rename from sim/wally-pipelined-imperas-no-idv.do
rename to sim/wally-imperas-no-idv.do
index 646c41c7..5f300250 100644
--- a/sim/wally-pipelined-imperas-no-idv.do
+++ b/sim/wally-imperas-no-idv.do
@@ -1,4 +1,5 @@
-# wally-pipelined.do 
+# wally.do 
+# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
 #
 # Modification by Oklahoma State University & Harvey Mudd College
 # Use with Testbench 
@@ -7,15 +8,6 @@
 #
 # Takes 1:10 to run RV64IC tests using gui
 
-# run with vsim -do "do wally-pipelined.do rv64ic riscvarchtest-64m"
-
-# Use this wally-pipelined.do file to run this example.
-# Either bring up ModelSim and type the following at the "ModelSim>" prompt:
-#     do wally-pipelined.do
-# or, to run from a shell, type the following at the shell prompt:
-#     vsim -do wally-pipelined.do -c
-# (omit the "-c" to see the GUI while running from the shell)
-
 onbreak {resume}
 
 # create library
diff --git a/sim/wally-pipelined-imperas.do b/sim/wally-imperas.do
similarity index 79%
rename from sim/wally-pipelined-imperas.do
rename to sim/wally-imperas.do
index 21ed7142..d08361e8 100644
--- a/sim/wally-pipelined-imperas.do
+++ b/sim/wally-imperas.do
@@ -1,4 +1,5 @@
-# wally-pipelined.do 
+# wally.do 
+# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
 #
 # Modification by Oklahoma State University & Harvey Mudd College
 # Use with Testbench 
@@ -7,15 +8,6 @@
 #
 # Takes 1:10 to run RV64IC tests using gui
 
-# run with vsim -do "do wally-pipelined.do rv64ic riscvarchtest-64m"
-
-# Use this wally-pipelined.do file to run this example.
-# Either bring up ModelSim and type the following at the "ModelSim>" prompt:
-#     do wally-pipelined.do
-# or, to run from a shell, type the following at the shell prompt:
-#     vsim -do wally-pipelined.do -c
-# (omit the "-c" to see the GUI while running from the shell)
-
 onbreak {resume}
 
 # create library
diff --git a/sim/wally-pipelined.do b/sim/wally.do
similarity index 95%
rename from sim/wally-pipelined.do
rename to sim/wally.do
index 9d61511b..895b10b9 100644
--- a/sim/wally-pipelined.do
+++ b/sim/wally.do
@@ -1,4 +1,5 @@
-# wally-pipelined.do 
+# wally.do 
+# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
 #
 # Modification by Oklahoma State University & Harvey Mudd College
 # Use with Testbench 
@@ -11,9 +12,9 @@
 
 # Use this wally-pipelined.do file to run this example.
 # Either bring up ModelSim and type the following at the "ModelSim>" prompt:
-#     do wally-pipelined.do
+#     do wally.do
 # or, to run from a shell, type the following at the shell prompt:
-#     vsim -do wally-pipelined.do -c
+#     vsim -do wally.do -c
 # (omit the "-c" to see the GUI while running from the shell)
 
 onbreak {resume}