diff --git a/src/main/scala/coreplex/Coreplex.scala b/src/main/scala/coreplex/Coreplex.scala
deleted file mode 100644
index 4e844c8d..00000000
--- a/src/main/scala/coreplex/Coreplex.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-// See LICENSE.SiFive for license details.
-
-package coreplex
-
-import Chisel._
-import config._
-import diplomacy._
-import util._
-
-/////
-
-class DefaultCoreplex(implicit p: Parameters) extends BaseCoreplex
-    with CoreplexRISCVPlatform
-    with HasRocketTiles {
-  override lazy val module = new DefaultCoreplexModule(this, () => new DefaultCoreplexBundle(this))
-}
-
-class DefaultCoreplexBundle[+L <: DefaultCoreplex](_outer: L) extends BaseCoreplexBundle(_outer)
-    with CoreplexRISCVPlatformBundle
-    with HasRocketTilesBundle
-
-class DefaultCoreplexModule[+L <: DefaultCoreplex, +B <: DefaultCoreplexBundle[L]](_outer: L, _io: () => B) extends BaseCoreplexModule(_outer, _io)
-    with CoreplexRISCVPlatformModule
-    with HasRocketTilesModule
diff --git a/src/main/scala/coreplex/RocketPlex.scala b/src/main/scala/coreplex/RocketPlex.scala
new file mode 100644
index 00000000..25c25ca1
--- /dev/null
+++ b/src/main/scala/coreplex/RocketPlex.scala
@@ -0,0 +1,20 @@
+// See LICENSE.SiFive for license details.
+
+package coreplex
+
+import Chisel._
+import config.Parameters
+
+class RocketPlex(implicit p: Parameters) extends BaseCoreplex
+    with CoreplexRISCVPlatform
+    with HasRocketTiles {
+  override lazy val module = new RocketPlexModule(this, () => new RocketPlexBundle(this))
+}
+
+class RocketPlexBundle[+L <: RocketPlex](_outer: L) extends BaseCoreplexBundle(_outer)
+    with CoreplexRISCVPlatformBundle
+    with HasRocketTilesBundle
+
+class RocketPlexModule[+L <: RocketPlex, +B <: RocketPlexBundle[L]](_outer: L, _io: () => B) extends BaseCoreplexModule(_outer, _io)
+    with CoreplexRISCVPlatformModule
+    with HasRocketTilesModule
diff --git a/src/main/scala/rocketchip/RocketPlexMaster.scala b/src/main/scala/rocketchip/RocketPlexMaster.scala
index d0a31dd1..54731d56 100644
--- a/src/main/scala/rocketchip/RocketPlexMaster.scala
+++ b/src/main/scala/rocketchip/RocketPlexMaster.scala
@@ -3,17 +3,13 @@
 package rocketchip
 
 import Chisel._
-import config._
-import diplomacy._
-import uncore.tilelink2._
-import uncore.devices._
-import util._
-import coreplex._
+import coreplex.RocketPlex
+import diplomacy.LazyModule
 
 trait RocketPlexMaster extends HasTopLevelNetworks {
   val module: RocketPlexMasterModule
 
-  val coreplex = LazyModule(new DefaultCoreplex)
+  val coreplex = LazyModule(new RocketPlex)
 
   coreplex.l2in :=* fsb.node
   bsb.node :*= coreplex.l2out