diff --git a/scripts/build-toolchains.sh b/scripts/build-toolchains.sh
index 641fde86..6996b279 100755
--- a/scripts/build-toolchains.sh
+++ b/scripts/build-toolchains.sh
@@ -32,7 +32,7 @@ if [ "$1" == "--help" -o "$1" == "-h" -o "$1" == "-H" ]; then
 fi
 
 TOOLCHAIN="riscv-tools"
-FIRESIMINSTALL="false"
+EC2INSTALL="false"
 EC2FASTINSTALL="false"
 FASTINSTALL="false"
 while test $# -gt 0
@@ -44,8 +44,8 @@ do
         hwacha)
             TOOLCHAIN="esp-tools"
             ;;
-        firesim | --firesim) # I don't want to break this api
-            FIRESIMINSTALL=true
+        ec2 | --ec2) 
+            EC2INSTALL=true
             ;;
         ec2fast | --ec2fast) # I don't want to break this api
             EC2FASTINSTALL=true
@@ -145,7 +145,7 @@ echo "Toolchain Build Complete!"
 
 
 if [ "$FASTINSTALL" = "false" ]; then
-    if [ "$FIRESIMINSTALL" = "false" ]; then
+    if [ "$EC2INSTALL" = "false" ]; then
         echo "Building RISC-V OpenOCD Complete!"
         check_version automake 1.14 "OpenOCD build"
         check_version autoconf 2.64 "OpenOCD build"
diff --git a/sims/firesim b/sims/firesim
index 4bb74da2..536237ba 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 4bb74da2a87a3519d5095a31023cadd256e592a6
+Subproject commit 536237ba19249258b7dd1d8c29439417c21396ed