diff --git a/.circleci/build-toolchains.sh b/.circleci/build-toolchains.sh
index 1305617f..a2e37381 100755
--- a/.circleci/build-toolchains.sh
+++ b/.circleci/build-toolchains.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# create the riscv tools binaries from riscv-boom/boom-template with rocket-chip hash given by riscv-boom
+# create the riscv tools/esp tools binaries
 
 # turn echo on and error on earliest command
 set -ex
diff --git a/.circleci/build-verilator.sh b/.circleci/build-verilator.sh
index ae41be3a..00cd7217 100755
--- a/.circleci/build-verilator.sh
+++ b/.circleci/build-verilator.sh
@@ -1,18 +1,15 @@
 #!/bin/bash
 
-# build verilator and init submodules with rocket-chip hash given by riscv-boom
+# build verilator
 
 # turn echo on and error on earliest command
 set -ex
 
 cd $HOME/project
 
-# init all submodules (according to what boom-template wants)
-./scripts/init-submodules-no-riscv-tools.sh
-
 cd sims/verisim
 
 if [ ! -d "$HOME/project/sims/verisim/verilator" ]; then
-    # make boom-template verilator version
+    # make verilator
     make verilator_install
 fi
diff --git a/.circleci/do-rtl-build.sh b/.circleci/do-rtl-build.sh
index dcfaa8db..e8336ae2 100755
--- a/.circleci/do-rtl-build.sh
+++ b/.circleci/do-rtl-build.sh
@@ -1,13 +1,15 @@
 #!/bin/bash
 
-# create the different verilator builds of BOOM based on arg
+# create the different verilator builds arg (subproject)
 
 # turn echo on and error on earliest command
 set -ex
 
-# this file assumes cache is updated correctly
+# init all submodules
+cd $HOME/project
+./scripts/init-submodules-no-riscv-tools.sh
 
 # enter the verisim directory and build the specific config
-cd $HOME/project/sims/verisim
+cd sims/verisim
 make clean
 make SUB_PROJECT=$1 JAVA_ARGS="-Xmx2G -Xss8M"