diff --git a/generators/boom b/generators/boom
index cee609e1..577eee7f 160000
--- a/generators/boom
+++ b/generators/boom
@@ -1 +1 @@
-Subproject commit cee609e1b144427ffaf8cc3b3bade2b0bce97b1d
+Subproject commit 577eee7f0ef01bb79180e6dccde2862855e9d39c
diff --git a/generators/example/src/main/scala/Configs.scala b/generators/example/src/main/scala/Configs.scala
index 4b5352d3..cd81f894 100644
--- a/generators/example/src/main/scala/Configs.scala
+++ b/generators/example/src/main/scala/Configs.scala
@@ -68,7 +68,7 @@ class GB1MemoryConfig extends Config(
 
 class BaseBoomConfig extends Config(
   new WithBootROM ++
-  new boom.system.BoomConfig)
+  new boom.system.LargeBoomConfig)
 
 class SmallBaseBoomConfig extends Config(
   new WithBootROM ++
@@ -121,7 +121,8 @@ class DualCoreBoomConfig extends Config(
   new WithNormalBoomRocketTop ++
   new WithBootROM ++
   new boom.common.WithRVC ++
-  new boom.common.DefaultBoomConfig ++
+  new boom.common.WithLargeBooms ++
+  new boom.common.BaseBoomConfig ++
   new boom.system.WithNBoomCores(2) ++
   new freechips.rocketchip.subsystem.WithoutTLMonitors ++
   new freechips.rocketchip.system.BaseConfig)
@@ -131,7 +132,7 @@ class DualCoreSmallBoomConfig extends Config(
   new WithBootROM ++
   new boom.common.WithRVC ++
   new boom.common.WithSmallBooms ++
-  new boom.common.DefaultBoomConfig ++
+  new boom.common.BaseBoomConfig ++
   new boom.system.WithNBoomCores(2) ++
   new freechips.rocketchip.subsystem.WithoutTLMonitors ++
   new freechips.rocketchip.system.BaseConfig)
@@ -149,7 +150,8 @@ class BaseBoomAndRocketConfig extends Config(
   new WithBootROM ++
   new boom.system.WithRenumberHarts ++
   new boom.common.WithRVC ++
-  new boom.common.DefaultBoomConfig ++
+  new boom.common.WithLargeBooms ++
+  new boom.common.BaseBoomConfig ++
   new boom.system.WithNBoomCores(1) ++
   new freechips.rocketchip.subsystem.WithoutTLMonitors ++
   new freechips.rocketchip.subsystem.WithNBigCores(1) ++
@@ -160,7 +162,7 @@ class SmallBaseBoomAndRocketConfig extends Config(
   new boom.system.WithRenumberHarts ++
   new boom.common.WithRVC ++
   new boom.common.WithSmallBooms ++
-  new boom.common.DefaultBoomConfig ++
+  new boom.common.BaseBoomConfig ++
   new boom.system.WithNBoomCores(1) ++
   new freechips.rocketchip.subsystem.WithoutTLMonitors ++
   new freechips.rocketchip.subsystem.WithNBigCores(1) ++
@@ -205,12 +207,13 @@ class GPIOBoomAndRocketConfig extends Config(
   new WithGPIOBoomRocketTop ++
   new BaseBoomAndRocketConfig)
 
-class DualBoomAndOneRocketConfig extends Config(
+class DualCoreBoomAndOneRocketConfig extends Config(
   new WithNormalBoomRocketTop ++
   new WithBootROM ++
   new boom.system.WithRenumberHarts ++
   new boom.common.WithRVC ++
-  new boom.common.DefaultBoomConfig ++
+  new boom.common.WithLargeBooms ++
+  new boom.common.BaseBoomConfig ++
   new boom.system.WithNBoomCores(2) ++
   new freechips.rocketchip.subsystem.WithoutTLMonitors ++
   new freechips.rocketchip.subsystem.WithNBigCores(1) ++
@@ -224,7 +227,8 @@ class DualBoomAndOneHwachaRocketConfig extends Config(
   new boom.system.WithRenumberHarts(rocketFirst = true) ++
   new hwacha.DefaultHwachaConfig ++
   new boom.common.WithRVC ++
-  new boom.common.DefaultBoomConfig ++
+  new boom.common.WithLargeBooms ++
+  new boom.common.BaseBoomConfig ++
   new boom.system.WithNBoomCores(2) ++
   new freechips.rocketchip.subsystem.WithoutTLMonitors ++
   new freechips.rocketchip.subsystem.WithNBigCores(1) ++
@@ -236,9 +240,10 @@ class RV32BoomAndRocketConfig extends Config(
   new boom.system.WithRenumberHarts ++
   new boom.common.WithBoomRV32 ++
   new boom.common.WithRVC ++
-  new boom.common.DefaultBoomConfig ++
+  new boom.common.WithLargeBooms ++
+  new boom.common.BaseBoomConfig ++
   new boom.system.WithNBoomCores(1) ++
   new freechips.rocketchip.subsystem.WithoutTLMonitors ++
-  new WithRV32 ++
+  new freechips.rocketchip.subsystem.WithRV32 ++
   new freechips.rocketchip.subsystem.WithNBigCores(1) ++
   new freechips.rocketchip.system.BaseConfig)
diff --git a/generators/rocket-chip b/generators/rocket-chip
index b8baef6f..50de8a34 160000
--- a/generators/rocket-chip
+++ b/generators/rocket-chip
@@ -1 +1 @@
-Subproject commit b8baef6f26fa36c9b4e0b2a5eec12cd76ae5daf8
+Subproject commit 50de8a34c19c12de5066cd7ada50ebb5f5b2ea26
diff --git a/generators/testchipip b/generators/testchipip
index cd176871..532d4a42 160000
--- a/generators/testchipip
+++ b/generators/testchipip
@@ -1 +1 @@
-Subproject commit cd1768712ead82d1a76278b65b7f6ea41ae82dc9
+Subproject commit 532d4a42914286548179f3893ab6349a0aedb5e3
diff --git a/tools/firrtl b/tools/firrtl
index 99ae1d66..228c9a4b 160000
--- a/tools/firrtl
+++ b/tools/firrtl
@@ -1 +1 @@
-Subproject commit 99ae1d6649f1731c5dec2098b10733735232b72c
+Subproject commit 228c9a4b7432ac52178d63b8f27fe064aec71e9c
diff --git a/variables.mk b/variables.mk
index da3a9a6e..d9ce7781 100644
--- a/variables.mk
+++ b/variables.mk
@@ -44,7 +44,7 @@ ifeq ($(SUB_PROJECT),boom)
 	MODEL             ?= TestHarness
 	VLOG_MODEL        ?= TestHarness
 	MODEL_PACKAGE     ?= boom.system
-	CONFIG            ?= BoomConfig
+	CONFIG            ?= LargeBoomConfig
 	CONFIG_PACKAGE    ?= boom.system
 	GENERATOR_PACKAGE ?= boom.system
 	TB                ?= TestDriver