diff --git a/build.sbt b/build.sbt
index 64885781..c6c2be85 100644
--- a/build.sbt
+++ b/build.sbt
@@ -82,7 +82,7 @@ def isolateAllTests(tests: Seq[TestDefinition]) = tests map { test =>
   new Group(test.name, Seq(test), SubProcess(options))
 } toSeq
 
-val chiselVersion = "3.5.6"
+val chiselVersion = "3.6.0"
 
 lazy val chiselSettings = Seq(
   libraryDependencies ++= Seq("edu.berkeley.cs" %% "chisel3" % chiselVersion,
@@ -91,16 +91,12 @@ lazy val chiselSettings = Seq(
   addCompilerPlugin("edu.berkeley.cs" % "chisel3-plugin" % chiselVersion cross CrossVersion.full))
 
 
-val chiselTestVersion = "2.5.1"
-
-lazy val chiselTestSettings = Seq(libraryDependencies ++= Seq("edu.berkeley.cs" %% "chisel-iotesters" % chiselTestVersion))
-
 // Subproject definitions begin
 
 // -- Rocket Chip --
 
 // Rocket-chip dependencies (subsumes making RC a RootProject)
-lazy val hardfloat  = (project in rocketChipDir / "hardfloat")
+lazy val hardfloat  = freshProject("hardfloat", rocketChipDir / "hardfloat")
   .settings(chiselSettings)
   .dependsOn(midasTargetUtils)
   .settings(commonSettings)
@@ -165,7 +161,6 @@ lazy val chipyard = (project in file("generators/chipyard"))
 lazy val mempress = (project in file("generators/mempress"))
   .dependsOn(rocketchip, midasTargetUtils)
   .settings(libraryDependencies ++= rocketLibDeps.value)
-  .settings(chiselTestSettings)
   .settings(commonSettings)
 
 lazy val barf = (project in file("generators/bar-fetchers"))
@@ -226,13 +221,11 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
 lazy val sha3 = (project in file("generators/sha3"))
   .dependsOn(rocketchip, midasTargetUtils)
   .settings(libraryDependencies ++= rocketLibDeps.value)
-  .settings(chiselTestSettings)
   .settings(commonSettings)
 
 lazy val gemmini = (project in file("generators/gemmini"))
   .dependsOn(rocketchip)
   .settings(libraryDependencies ++= rocketLibDeps.value)
-  .settings(chiselTestSettings)
   .settings(commonSettings)
 
 lazy val nvdla = (project in file("generators/nvdla"))
@@ -250,13 +243,11 @@ lazy val iocell = Project(id = "iocell", base = file("./tools/barstools/") / "sr
 
 lazy val tapeout = (project in file("./tools/barstools/"))
   .settings(chiselSettings)
-  .settings(chiselTestSettings)
   .settings(commonSettings)
 
 lazy val dsptools = freshProject("dsptools", file("./tools/dsptools"))
   .settings(
     chiselSettings,
-    chiselTestSettings,
     commonSettings,
     libraryDependencies ++= Seq(
       "org.scalatest" %% "scalatest" % "3.2.+" % "test",
diff --git a/fpga/src/main/scala/vc707/TestHarness.scala b/fpga/src/main/scala/vc707/TestHarness.scala
index 2b4b5047..96311f1f 100644
--- a/fpga/src/main/scala/vc707/TestHarness.scala
+++ b/fpga/src/main/scala/vc707/TestHarness.scala
@@ -90,7 +90,7 @@ class VC707FPGATestHarness(override implicit val p: Parameters) extends VC707She
 class VC707FPGATestHarnessImp(_outer: VC707FPGATestHarness) extends LazyRawModuleImp(_outer) with HasHarnessInstantiators {
   val vc707Outer = _outer
 
-  val reset = IO(Input(Bool()))
+  val reset = IO(Input(Bool())).suggestName("reset")
   _outer.xdc.addBoardPin(reset, "reset")
 
   val resetIBUF = Module(new IBUF)
diff --git a/fpga/src/main/scala/vcu118/TestHarness.scala b/fpga/src/main/scala/vcu118/TestHarness.scala
index 850b7f62..6bffc9a7 100644
--- a/fpga/src/main/scala/vcu118/TestHarness.scala
+++ b/fpga/src/main/scala/vcu118/TestHarness.scala
@@ -93,7 +93,7 @@ class VCU118FPGATestHarness(override implicit val p: Parameters) extends VCU118S
 class VCU118FPGATestHarnessImp(_outer: VCU118FPGATestHarness) extends LazyRawModuleImp(_outer) with HasHarnessInstantiators {
   val vcu118Outer = _outer
 
-  val reset = IO(Input(Bool()))
+  val reset = IO(Input(Bool())).suggestName("reset")
   _outer.xdc.addPackagePin(reset, "L19")
   _outer.xdc.addIOStandard(reset, "LVCMOS12")
 
diff --git a/generators/bar-fetchers b/generators/bar-fetchers
index 3a33d818..a5bd985d 160000
--- a/generators/bar-fetchers
+++ b/generators/bar-fetchers
@@ -1 +1 @@
-Subproject commit 3a33d818aefe5444aa27fc1557008f747538d2cc
+Subproject commit a5bd985d29b07940e326d78964b370fa1cefec71
diff --git a/generators/gemmini b/generators/gemmini
index f13847e8..771c84c5 160000
--- a/generators/gemmini
+++ b/generators/gemmini
@@ -1 +1 @@
-Subproject commit f13847e839baee4a3c8d5d51e76a3dc9e9c1933f
+Subproject commit 771c84c51ac66b1e4f37c8d5fdf70aa0ea9bc237
diff --git a/generators/rocket-chip b/generators/rocket-chip
index 47f7b714..67ceb1dd 160000
--- a/generators/rocket-chip
+++ b/generators/rocket-chip
@@ -1 +1 @@
-Subproject commit 47f7b7144727f0340d511d35b9f6c7a91b2a276f
+Subproject commit 67ceb1ddbfd1c6f50d2b4fdadf68f304f5e62287
diff --git a/generators/shuttle b/generators/shuttle
index 3c15591a..e89380bf 160000
--- a/generators/shuttle
+++ b/generators/shuttle
@@ -1 +1 @@
-Subproject commit 3c15591a9ee237bb1251e5362de22ad19f64ba07
+Subproject commit e89380bfaab3190cc84d700a122a90475d081954
diff --git a/scripts/tutorial-patches/build.sbt.patch b/scripts/tutorial-patches/build.sbt.patch
index 04274910..37af6be6 100644
--- a/scripts/tutorial-patches/build.sbt.patch
+++ b/scripts/tutorial-patches/build.sbt.patch
@@ -1,30 +1,28 @@
 diff --git a/build.sbt b/build.sbt
-index ec36a85f..c0c2849a 100644
+index c6c2be85..58851f7f 100644
 --- a/build.sbt
 +++ b/build.sbt
 @@ -146,7 +146,7 @@ lazy val testchipip = (project in file("generators/testchipip"))
-
+ 
  lazy val chipyard = (project in file("generators/chipyard"))
    .dependsOn(testchipip, rocketchip, boom, hwacha, sifive_blocks, sifive_cache, iocell,
 -    sha3, // On separate line to allow for cleaner tutorial-setup patches
-+//    sha3, // On separate line to allow for cleaner tutorial-setup patches
++    //sha3, // On separate line to allow for cleaner tutorial-setup patches
      dsptools, `rocket-dsp-utils`,
      gemmini, icenet, tracegen, cva6, nvdla, sodor, ibex, fft_generator,
      constellation, mempress, barf, shuttle)
-@@ -204,11 +204,11 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
+@@ -218,10 +218,10 @@ lazy val sodor = (project in file("generators/riscv-sodor"))
    .settings(libraryDependencies ++= rocketLibDeps.value)
    .settings(commonSettings)
-
+ 
 -lazy val sha3 = (project in file("generators/sha3"))
 -  .dependsOn(rocketchip, midasTargetUtils)
 -  .settings(libraryDependencies ++= rocketLibDeps.value)
--  .settings(chiselTestSettings)
 -  .settings(commonSettings)
-+//lazy val sha3 = (project in file("generators/sha3"))
-+//  .dependsOn(rocketchip, midasTargetUtils)
-+//  .settings(libraryDependencies ++= rocketLibDeps.value)
-+//  .settings(chiselTestSettings)
-+//  .settings(commonSettings)
-
++// lazy val sha3 = (project in file("generators/sha3"))
++//   .dependsOn(rocketchip, midasTargetUtils)
++//   .settings(libraryDependencies ++= rocketLibDeps.value)
++//   .settings(commonSettings)
+ 
  lazy val gemmini = (project in file("generators/gemmini"))
    .dependsOn(rocketchip)
diff --git a/sims/firesim b/sims/firesim
index 56d30d55..ceca13ee 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 56d30d5536bdb1bcf6167103bd236b79d3cbd992
+Subproject commit ceca13eede353eef1cde6deef34631bb26e18626
diff --git a/tools/barstools b/tools/barstools
index fe81afec..2d45407a 160000
--- a/tools/barstools
+++ b/tools/barstools
@@ -1 +1 @@
-Subproject commit fe81afec14634316606a9dd10628c220d53bd256
+Subproject commit 2d45407aad78876a5586e157eb9d69e80328e78f
diff --git a/tools/dsptools b/tools/dsptools
index 5b1e7335..fc9c70af 160000
--- a/tools/dsptools
+++ b/tools/dsptools
@@ -1 +1 @@
-Subproject commit 5b1e733596a39f6960bf9a7c1897d82912372766
+Subproject commit fc9c70afaf2fe48f08c9015cf977773012be5a29
diff --git a/tools/rocket-dsp-utils b/tools/rocket-dsp-utils
index fe641d1c..8f835144 160000
--- a/tools/rocket-dsp-utils
+++ b/tools/rocket-dsp-utils
@@ -1 +1 @@
-Subproject commit fe641d1c346d5605f95d235e8c75d0baac7fa6d8
+Subproject commit 8f83514469e96fccd159f077b6beae459f8c4299