diff --git a/groundtest/src/main/scala/BusMasterTest.scala b/groundtest/src/main/scala/BusMasterTest.scala
index 2af5bab1..3b2d178b 100644
--- a/groundtest/src/main/scala/BusMasterTest.scala
+++ b/groundtest/src/main/scala/BusMasterTest.scala
@@ -4,7 +4,7 @@ import Chisel._
 import uncore.tilelink._
 import uncore.agents._
 import uncore.coherence.{InnerTLId, OuterTLId}
-import uncore.Util._
+import uncore.util._
 import junctions.HasAddrMapParameters
 import cde.Parameters
 
diff --git a/uncore/src/main/scala/agents/Agents.scala b/uncore/src/main/scala/agents/Agents.scala
index 83bd5414..7a74ca4c 100644
--- a/uncore/src/main/scala/agents/Agents.scala
+++ b/uncore/src/main/scala/agents/Agents.scala
@@ -8,7 +8,7 @@ import junctions._
 import uncore.tilelink._
 import uncore.converters._
 import uncore.coherence._
-import uncore.Util._
+import uncore.util._
 
 case object NReleaseTransactors extends Field[Int]
 case object NProbeTransactors extends Field[Int]
diff --git a/uncore/src/main/scala/agents/Broadcast.scala b/uncore/src/main/scala/agents/Broadcast.scala
index 9845342e..21b286b9 100644
--- a/uncore/src/main/scala/agents/Broadcast.scala
+++ b/uncore/src/main/scala/agents/Broadcast.scala
@@ -6,7 +6,7 @@ import Chisel._
 import uncore.coherence._
 import uncore.tilelink._
 import uncore.constants._
-import uncore.Util._
+import uncore.util._
 import cde.Parameters
 
 class L2BroadcastHub(implicit p: Parameters) extends HierarchicalCoherenceAgent()(p) {
diff --git a/uncore/src/main/scala/agents/Cache.scala b/uncore/src/main/scala/agents/Cache.scala
index a710bb9c..262c2a8b 100644
--- a/uncore/src/main/scala/agents/Cache.scala
+++ b/uncore/src/main/scala/agents/Cache.scala
@@ -9,7 +9,7 @@ import uncore.util.AMOALU
 import uncore.coherence._
 import uncore.tilelink._
 import uncore.constants._
-import uncore.Util._
+import uncore.util._
 import cde.{Parameters, Field}
 
 case object CacheName extends Field[String]
diff --git a/uncore/src/main/scala/agents/Ecc.scala b/uncore/src/main/scala/agents/Ecc.scala
index 6b4b7673..88bae992 100644
--- a/uncore/src/main/scala/agents/Ecc.scala
+++ b/uncore/src/main/scala/agents/Ecc.scala
@@ -3,7 +3,7 @@
 package uncore.agents
 
 import Chisel._
-import uncore.Util._
+import uncore.util._
 
 abstract class Decoding
 {
diff --git a/uncore/src/main/scala/agents/Trackers.scala b/uncore/src/main/scala/agents/Trackers.scala
index 872d334d..96fe69e2 100644
--- a/uncore/src/main/scala/agents/Trackers.scala
+++ b/uncore/src/main/scala/agents/Trackers.scala
@@ -6,7 +6,7 @@ import Chisel._
 import uncore.coherence._
 import uncore.tilelink._
 import uncore.util._
-import uncore.Util._
+import uncore.util._
 import junctions._
 import cde.{Field, Parameters}
 import scala.math.max
diff --git a/uncore/src/main/scala/coherence/Policies.scala b/uncore/src/main/scala/coherence/Policies.scala
index 744b8e7d..68fb847f 100644
--- a/uncore/src/main/scala/coherence/Policies.scala
+++ b/uncore/src/main/scala/coherence/Policies.scala
@@ -5,7 +5,7 @@ package uncore.coherence
 import Chisel._
 import uncore.tilelink._
 import uncore.constants._
-import uncore.Util._
+import uncore.util._
 
 /** The entire CoherencePolicy API consists of the following three traits:
   * HasCustomTileLinkMessageTypes, used to define custom messages
diff --git a/uncore/src/main/scala/tilelink/Definitions.scala b/uncore/src/main/scala/tilelink/Definitions.scala
index 914d9a44..c52fb0a2 100644
--- a/uncore/src/main/scala/tilelink/Definitions.scala
+++ b/uncore/src/main/scala/tilelink/Definitions.scala
@@ -4,7 +4,7 @@ package uncore.tilelink
 import Chisel._
 import junctions._
 import uncore.coherence.CoherencePolicy
-import uncore.Util._
+import uncore.util._
 import scala.math.max
 import uncore.constants._
 import cde.{Parameters, Field}
diff --git a/uncore/src/main/scala/Util.scala b/uncore/src/main/scala/util/Package.scala
similarity index 96%
rename from uncore/src/main/scala/Util.scala
rename to uncore/src/main/scala/util/Package.scala
index a8a50282..4bcca3ff 100644
--- a/uncore/src/main/scala/Util.scala
+++ b/uncore/src/main/scala/util/Package.scala
@@ -2,7 +2,7 @@ package uncore
 
 import Chisel._
 
-package object Util {
+package object util {
   implicit class UIntIsOneOf(val x: UInt) extends AnyVal {
     def isOneOf(s: Seq[UInt]): Bool = s.map(x === _).reduce(_||_)