diff --git a/config/buildroot/config.vh b/config/buildroot/config.vh
index b25e8fe9c..05c8aa646 100644
--- a/config/buildroot/config.vh
+++ b/config/buildroot/config.vh
@@ -1,5 +1,5 @@
 //////////////////////////////////////////
-// wally-config.vh
+// config.vh
 //
 // Written: David_Harris@hmc.edu 4 January 2021
 // Modified: 
diff --git a/config/fpga/config.vh b/config/fpga/config.vh
index 2508b557e..9e2b4cbb9 100644
--- a/config/fpga/config.vh
+++ b/config/fpga/config.vh
@@ -1,5 +1,5 @@
 //////////////////////////////////////////
-// wally-config.vh
+// config.vh
 //
 // Written: David_Harris@hmc.edu 4 January 2021
 // Modified: 
diff --git a/config/rv32e/config.vh b/config/rv32e/config.vh
index 35e85003d..bf5965fb5 100644
--- a/config/rv32e/config.vh
+++ b/config/rv32e/config.vh
@@ -1,5 +1,5 @@
 //////////////////////////////////////////
-// wally-config.vh
+// config.vh
 //
 // Written: David_Harris@hmc.edu 4 January 2021
 // Modified: 
diff --git a/config/rv32gc/config.vh b/config/rv32gc/config.vh
index 06be2e01b..1d42e233a 100644
--- a/config/rv32gc/config.vh
+++ b/config/rv32gc/config.vh
@@ -1,5 +1,5 @@
 //////////////////////////////////////////
-// wally-config.vh
+// config.vh
 //
 // Written: David_Harris@hmc.edu 4 January 2021
 // Modified: 
diff --git a/config/rv32i/config.vh b/config/rv32i/config.vh
index 5e03d3e93..008687007 100644
--- a/config/rv32i/config.vh
+++ b/config/rv32i/config.vh
@@ -1,5 +1,5 @@
 //////////////////////////////////////////
-// wally-config.vh
+// config.vh
 //
 // Written: David_Harris@hmc.edu 4 January 2021
 // Modified: 
diff --git a/config/rv32imc/config.vh b/config/rv32imc/config.vh
index cb031d2db..1867b9f99 100644
--- a/config/rv32imc/config.vh
+++ b/config/rv32imc/config.vh
@@ -1,5 +1,5 @@
 //////////////////////////////////////////
-// wally-config.vh
+// config.vh
 //
 // Written: David_Harris@hmc.edu 4 January 2021
 // Modified: 
diff --git a/config/rv64fpquad/config.vh b/config/rv64fpquad/config.vh
index 63a35c7f5..6e2e0a33d 100644
--- a/config/rv64fpquad/config.vh
+++ b/config/rv64fpquad/config.vh
@@ -1,5 +1,5 @@
 //////////////////////////////////////////
-// wally-config.vh
+// config.vh
 //
 // Written: David_Harris@hmc.edu 4 January 2021
 // Modified: 
diff --git a/config/rv64gc/config.vh b/config/rv64gc/config.vh
index f17761e33..f3057c287 100644
--- a/config/rv64gc/config.vh
+++ b/config/rv64gc/config.vh
@@ -1,5 +1,5 @@
 //////////////////////////////////////////
-// wally-config.vh
+// config.vh
 //
 // Written: David_Harris@hmc.edu 4 January 2021
 // Modified: 
@@ -25,9 +25,6 @@
 // and limitations under the License.
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
-// include shared configuration
-// `include "wally-shared.vh"
-
 `include "BranchPredictorType.vh"
 
 localparam FPGA = 0;
diff --git a/config/rv64i/config.vh b/config/rv64i/config.vh
index d87708c18..35fc2bdfa 100644
--- a/config/rv64i/config.vh
+++ b/config/rv64i/config.vh
@@ -1,5 +1,5 @@
 //////////////////////////////////////////
-// wally-config.vh
+// config.vh
 //
 // Written: David_Harris@hmc.edu 4 January 2021
 // Modified: 
diff --git a/sim/verilate b/sim/verilate
index 9555322f9..7aab1ba63 100755
--- a/sim/verilate
+++ b/sim/verilate
@@ -16,7 +16,7 @@ done
 echo "All lints run with no errors or warnings"
 
 # --lint-only just runs lint rather than trying to compile and simulate
-# -I points to the include directory where files such as `include wally-config.vh  are found
+# -I points to the include directory where files such as `include config.vh  are found
 
 # For more exhaustive (and sometimes spurious) warnings, add --Wall to the Verilator command
 # Unfortunately, this produces a bunch of UNUSED and UNDRIVEN signal warnings in blocks that are configured to not exist.
diff --git a/src/fpu/postproc/divshiftcalc.sv b/src/fpu/postproc/divshiftcalc.sv
index 4f4ce8c50..d560714db 100644
--- a/src/fpu/postproc/divshiftcalc.sv
+++ b/src/fpu/postproc/divshiftcalc.sv
@@ -24,7 +24,7 @@
 // License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
 // either express or implied. See the License for the specific language governing permissions 
 // and limitations under the License.
-////////////////////////////////////////////////////////////////////////////////////////////////`include "wally-config.vh"
+////////////////////////////////////////////////////////////////////////////////////////////////
 
 module divshiftcalc import cvw::*;  #(parameter cvw_t P) (
   input  logic [P.DIVb:0]              DivQm,              // divsqrt significand
diff --git a/studies/comparator.sv b/studies/comparator.sv
index 771236f65..a5dbb6cb6 100644
--- a/studies/comparator.sv
+++ b/studies/comparator.sv
@@ -27,7 +27,7 @@
 // and limitations under the License.
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
-`include "wally-config.vh"
+`include "config.vh"
 
 // This comparator is best
 module comparator_dc_flip #(parameter WIDTH=64) (
diff --git a/testbench/sdc/sd_top_tb.sv b/testbench/sdc/sd_top_tb.sv
index 65d9ed454..d969af194 100644
--- a/testbench/sdc/sd_top_tb.sv
+++ b/testbench/sdc/sd_top_tb.sv
@@ -26,7 +26,7 @@
 //   OR OTHER DEALINGS IN THE SOFTWARE.
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
-`include "wally-config.vh"
+`include "wconfig.vh"
 
 
 module sd_top_tb();