diff --git a/.github/scripts/check-commit.sh b/.github/scripts/check-commit.sh
index f54fd50e..68e71760 100755
--- a/.github/scripts/check-commit.sh
+++ b/.github/scripts/check-commit.sh
@@ -82,7 +82,7 @@ dir="software"
 branches=("master" "dev")
 search
 
-submodules=("DRAMSim2" "axe" "dsptools" "rocket-dsp-utils" "torture" "fixedpoint" "cde")
+submodules=("DRAMSim2" "axe" "dsptools-chisel3" "rocket-dsp-utils" "torture" "fixedpoint-chisel3" "cde")
 dir="tools"
 branches=("master" "dev" "main")
 search
diff --git a/.gitmodules b/.gitmodules
index 240fad83..c0ce2d64 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -115,11 +115,11 @@
 [submodule "tools/circt"]
 	path = tools/circt
 	url = https://github.com/llvm/circt.git
-[submodule "tools/dsptools"]
-	path = tools/dsptools
+[submodule "tools/dsptools-fixedpoint"]
+	path = tools/dsptools-chisel3
 	url = https://github.com/ucb-bar/dsptools.git
-[submodule "tools/fixedpoint"]
-	path = tools/fixedpoint
+[submodule "tools/fixedpoint-chisel3"]
+	path = tools/fixedpoint-chisel3
 	url = https://github.com/ucb-bar/fixedpoint.git
 [submodule "tools/install-circt"]
 	path = tools/install-circt
diff --git a/build.sbt b/build.sbt
index 0775cd44..35103b67 100644
--- a/build.sbt
+++ b/build.sbt
@@ -248,11 +248,11 @@ lazy val tapeout = (project in file("./tools/tapeout/"))
   .settings(commonSettings)
   .settings(libraryDependencies ++= Seq("com.typesafe.play" %% "play-json" % "2.9.2"))
 
-lazy val fixedpoint = (project in file("./tools/fixedpoint/"))
+lazy val fixedpoint = freshProject("fixedpoint", file("./tools/fixedpoint-chisel3/"))
   .settings(chiselSettings)
   .settings(commonSettings)
 
-lazy val dsptools = freshProject("dsptools", file("./tools/dsptools"))
+lazy val dsptools = freshProject("dsptools", file("./tools/dsptools-chisel3"))
   .dependsOn(fixedpoint)
   .settings(
     chiselSettings,
diff --git a/tools/dsptools b/tools/dsptools-chisel3
similarity index 100%
rename from tools/dsptools
rename to tools/dsptools-chisel3
diff --git a/tools/fixedpoint b/tools/fixedpoint-chisel3
similarity index 100%
rename from tools/fixedpoint
rename to tools/fixedpoint-chisel3