diff --git a/internal/util-collection/src/test/scala/HListFormatSpec.scala b/internal/util-collection/src/test/scala/HListFormatSpec.scala
index 8f6e9a73b..6b9040f2e 100644
--- a/internal/util-collection/src/test/scala/HListFormatSpec.scala
+++ b/internal/util-collection/src/test/scala/HListFormatSpec.scala
@@ -2,7 +2,7 @@ package sbt
 package internal
 package util
 
-import scalajson.ast.unsafe._
+import sjsonnew.shaded.scalajson.ast.unsafe._
 import sjsonnew._, BasicJsonProtocol._, support.scalajson.unsafe._
 import HListFormats._
 
diff --git a/main-command/src/main/contraband-scala/sbt/CommandSource.scala b/main-command/src/main/contraband-scala/sbt/CommandSource.scala
index 795fe47fb..e57e91857 100644
--- a/main-command/src/main/contraband-scala/sbt/CommandSource.scala
+++ b/main-command/src/main/contraband-scala/sbt/CommandSource.scala
@@ -14,7 +14,7 @@ final class CommandSource private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (17 + "CommandSource".##) + channelName.##)
+    37 * (37 * (17 + "sbt.CommandSource".##) + channelName.##)
   }
   override def toString: String = {
     "CommandSource(" + channelName + ")"
diff --git a/main-command/src/main/contraband-scala/sbt/Exec.scala b/main-command/src/main/contraband-scala/sbt/Exec.scala
index 2dd335fa1..829c885ae 100644
--- a/main-command/src/main/contraband-scala/sbt/Exec.scala
+++ b/main-command/src/main/contraband-scala/sbt/Exec.scala
@@ -16,7 +16,7 @@ final class Exec private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (37 * (37 * (17 + "Exec".##) + commandLine.##) + execId.##) + source.##)
+    37 * (37 * (37 * (37 * (17 + "sbt.Exec".##) + commandLine.##) + execId.##) + source.##)
   }
   override def toString: String = {
     "Exec(" + commandLine + ", " + execId + ", " + source + ")"
diff --git a/project/plugins.sbt b/project/plugins.sbt
index dc6316c97..d47e0f288 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -7,6 +7,6 @@ scalacOptions ++= Seq("-feature", "-language:postfixOps")
 // addSbtPlugin("com.typesafe.sbt" % "sbt-javaversioncheck" % "0.1.0")
 // addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.2.0")
 addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.4.0")
-addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.0-M7")
+addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.0-M9")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
 addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.3")
diff --git a/protocol/src/main/contraband-scala/sbt/protocol/ChannelAcceptedEvent.scala b/protocol/src/main/contraband-scala/sbt/protocol/ChannelAcceptedEvent.scala
index a0bc57bdf..8bb6dffcb 100644
--- a/protocol/src/main/contraband-scala/sbt/protocol/ChannelAcceptedEvent.scala
+++ b/protocol/src/main/contraband-scala/sbt/protocol/ChannelAcceptedEvent.scala
@@ -14,7 +14,7 @@ final class ChannelAcceptedEvent private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (17 + "ChannelAcceptedEvent".##) + channelName.##)
+    37 * (37 * (17 + "sbt.protocol.ChannelAcceptedEvent".##) + channelName.##)
   }
   override def toString: String = {
     "ChannelAcceptedEvent(" + channelName + ")"
diff --git a/protocol/src/main/contraband-scala/sbt/protocol/CommandMessage.scala b/protocol/src/main/contraband-scala/sbt/protocol/CommandMessage.scala
index e35614207..9292dbd16 100644
--- a/protocol/src/main/contraband-scala/sbt/protocol/CommandMessage.scala
+++ b/protocol/src/main/contraband-scala/sbt/protocol/CommandMessage.scala
@@ -15,7 +15,7 @@ override def equals(o: Any): Boolean = o match {
   case _ => false
 }
 override def hashCode: Int = {
-  37 * (17 + "CommandMessage".##)
+  37 * (17 + "sbt.protocol.CommandMessage".##)
 }
 override def toString: String = {
   "CommandMessage()"
diff --git a/protocol/src/main/contraband-scala/sbt/protocol/EventMessage.scala b/protocol/src/main/contraband-scala/sbt/protocol/EventMessage.scala
index 623f3399a..6e934413e 100644
--- a/protocol/src/main/contraband-scala/sbt/protocol/EventMessage.scala
+++ b/protocol/src/main/contraband-scala/sbt/protocol/EventMessage.scala
@@ -15,7 +15,7 @@ override def equals(o: Any): Boolean = o match {
   case _ => false
 }
 override def hashCode: Int = {
-  37 * (17 + "EventMessage".##)
+  37 * (17 + "sbt.protocol.EventMessage".##)
 }
 override def toString: String = {
   "EventMessage()"
diff --git a/protocol/src/main/contraband-scala/sbt/protocol/ExecCommand.scala b/protocol/src/main/contraband-scala/sbt/protocol/ExecCommand.scala
index 776f0d99d..df022897d 100644
--- a/protocol/src/main/contraband-scala/sbt/protocol/ExecCommand.scala
+++ b/protocol/src/main/contraband-scala/sbt/protocol/ExecCommand.scala
@@ -16,7 +16,7 @@ final class ExecCommand private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (37 * (17 + "ExecCommand".##) + commandLine.##) + execId.##)
+    37 * (37 * (37 * (17 + "sbt.protocol.ExecCommand".##) + commandLine.##) + execId.##)
   }
   override def toString: String = {
     "ExecCommand(" + commandLine + ", " + execId + ")"
diff --git a/protocol/src/main/contraband-scala/sbt/protocol/ExecStatusEvent.scala b/protocol/src/main/contraband-scala/sbt/protocol/ExecStatusEvent.scala
index 4b72f223b..5ce579397 100644
--- a/protocol/src/main/contraband-scala/sbt/protocol/ExecStatusEvent.scala
+++ b/protocol/src/main/contraband-scala/sbt/protocol/ExecStatusEvent.scala
@@ -18,7 +18,7 @@ final class ExecStatusEvent private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (37 * (37 * (37 * (17 + "ExecStatusEvent".##) + status.##) + channelName.##) + execId.##) + commandQueue.##)
+    37 * (37 * (37 * (37 * (37 * (17 + "sbt.protocol.ExecStatusEvent".##) + status.##) + channelName.##) + execId.##) + commandQueue.##)
   }
   override def toString: String = {
     "ExecStatusEvent(" + status + ", " + channelName + ", " + execId + ", " + commandQueue + ")"
diff --git a/protocol/src/main/contraband-scala/sbt/protocol/ExecutionEvent.scala b/protocol/src/main/contraband-scala/sbt/protocol/ExecutionEvent.scala
index 8b055187a..f47c3b741 100644
--- a/protocol/src/main/contraband-scala/sbt/protocol/ExecutionEvent.scala
+++ b/protocol/src/main/contraband-scala/sbt/protocol/ExecutionEvent.scala
@@ -16,7 +16,7 @@ final class ExecutionEvent private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (37 * (17 + "ExecutionEvent".##) + success.##) + commandLine.##)
+    37 * (37 * (37 * (17 + "sbt.protocol.ExecutionEvent".##) + success.##) + commandLine.##)
   }
   override def toString: String = {
     "ExecutionEvent(" + success + ", " + commandLine + ")"
diff --git a/protocol/src/main/contraband-scala/sbt/protocol/LogEvent.scala b/protocol/src/main/contraband-scala/sbt/protocol/LogEvent.scala
index 69364ba7c..694635252 100644
--- a/protocol/src/main/contraband-scala/sbt/protocol/LogEvent.scala
+++ b/protocol/src/main/contraband-scala/sbt/protocol/LogEvent.scala
@@ -16,7 +16,7 @@ final class LogEvent private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (37 * (17 + "LogEvent".##) + level.##) + message.##)
+    37 * (37 * (37 * (17 + "sbt.protocol.LogEvent".##) + level.##) + message.##)
   }
   override def toString: String = {
     "LogEvent(" + level + ", " + message + ")"
diff --git a/protocol/src/main/contraband-scala/sbt/protocol/SettingQuery.scala b/protocol/src/main/contraband-scala/sbt/protocol/SettingQuery.scala
index 7acf463ec..a00fd05d6 100644
--- a/protocol/src/main/contraband-scala/sbt/protocol/SettingQuery.scala
+++ b/protocol/src/main/contraband-scala/sbt/protocol/SettingQuery.scala
@@ -14,7 +14,7 @@ final class SettingQuery private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (17 + "SettingQuery".##) + setting.##)
+    37 * (37 * (17 + "sbt.protocol.SettingQuery".##) + setting.##)
   }
   override def toString: String = {
     "SettingQuery(" + setting + ")"
diff --git a/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryFailure.scala b/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryFailure.scala
index 2ec5c1dec..9c5305b96 100644
--- a/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryFailure.scala
+++ b/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryFailure.scala
@@ -14,7 +14,7 @@ final class SettingQueryFailure private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (17 + "SettingQueryFailure".##) + message.##)
+    37 * (37 * (17 + "sbt.protocol.SettingQueryFailure".##) + message.##)
   }
   override def toString: String = {
     "SettingQueryFailure(" + message + ")"
diff --git a/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryResponse.scala b/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryResponse.scala
index 722969d6c..a63a99897 100644
--- a/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryResponse.scala
+++ b/protocol/src/main/contraband-scala/sbt/protocol/SettingQueryResponse.scala
@@ -14,7 +14,7 @@ override def equals(o: Any): Boolean = o match {
   case _ => false
 }
 override def hashCode: Int = {
-  37 * (17 + "SettingQueryResponse".##)
+  37 * (17 + "sbt.protocol.SettingQueryResponse".##)
 }
 override def toString: String = {
   "SettingQueryResponse()"
diff --git a/protocol/src/main/contraband-scala/sbt/protocol/SettingQuerySuccess.scala b/protocol/src/main/contraband-scala/sbt/protocol/SettingQuerySuccess.scala
index 95e103d6d..be6af35fc 100644
--- a/protocol/src/main/contraband-scala/sbt/protocol/SettingQuerySuccess.scala
+++ b/protocol/src/main/contraband-scala/sbt/protocol/SettingQuerySuccess.scala
@@ -15,7 +15,7 @@ final class SettingQuerySuccess private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (37 * (17 + "SettingQuerySuccess".##) + value.##) + contentType.##)
+    37 * (37 * (37 * (17 + "sbt.protocol.SettingQuerySuccess".##) + value.##) + contentType.##)
   }
   override def toString: String = {
     "SettingQuerySuccess(" + value + ", " + contentType + ")"
diff --git a/run/src/main/contraband-scala/sbt/ForkOptions.scala b/run/src/main/contraband-scala/sbt/ForkOptions.scala
index 29ebb7f57..ece8ca699 100644
--- a/run/src/main/contraband-scala/sbt/ForkOptions.scala
+++ b/run/src/main/contraband-scala/sbt/ForkOptions.scala
@@ -38,7 +38,7 @@ final class ForkOptions private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "ForkOptions".##) + javaHome.##) + outputStrategy.##) + bootJars.##) + workingDirectory.##) + runJVMOptions.##) + connectInput.##) + envVars.##)
+    37 * (37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + "sbt.ForkOptions".##) + javaHome.##) + outputStrategy.##) + bootJars.##) + workingDirectory.##) + runJVMOptions.##) + connectInput.##) + envVars.##)
   }
   override def toString: String = {
     "ForkOptions(" + javaHome + ", " + outputStrategy + ", " + bootJars + ", " + workingDirectory + ", " + runJVMOptions + ", " + connectInput + ", " + envVars + ")"
diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/EndTestGroupErrorEvent.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/EndTestGroupErrorEvent.scala
index 4cb6777c1..afeeef6ac 100644
--- a/testing/src/main/contraband-scala/sbt/protocol/testing/EndTestGroupErrorEvent.scala
+++ b/testing/src/main/contraband-scala/sbt/protocol/testing/EndTestGroupErrorEvent.scala
@@ -16,7 +16,7 @@ final class EndTestGroupErrorEvent private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (37 * (17 + "EndTestGroupErrorEvent".##) + name.##) + error.##)
+    37 * (37 * (37 * (17 + "sbt.protocol.testing.EndTestGroupErrorEvent".##) + name.##) + error.##)
   }
   override def toString: String = {
     "EndTestGroupErrorEvent(" + name + ", " + error + ")"
diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/EndTestGroupEvent.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/EndTestGroupEvent.scala
index f08a0ad6a..db3893a84 100644
--- a/testing/src/main/contraband-scala/sbt/protocol/testing/EndTestGroupEvent.scala
+++ b/testing/src/main/contraband-scala/sbt/protocol/testing/EndTestGroupEvent.scala
@@ -16,7 +16,7 @@ final class EndTestGroupEvent private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (37 * (17 + "EndTestGroupEvent".##) + name.##) + result.##)
+    37 * (37 * (37 * (17 + "sbt.protocol.testing.EndTestGroupEvent".##) + name.##) + result.##)
   }
   override def toString: String = {
     "EndTestGroupEvent(" + name + ", " + result + ")"
diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/StartTestGroupEvent.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/StartTestGroupEvent.scala
index 68b7a279c..156c4ba57 100644
--- a/testing/src/main/contraband-scala/sbt/protocol/testing/StartTestGroupEvent.scala
+++ b/testing/src/main/contraband-scala/sbt/protocol/testing/StartTestGroupEvent.scala
@@ -15,7 +15,7 @@ final class StartTestGroupEvent private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (17 + "StartTestGroupEvent".##) + name.##)
+    37 * (37 * (17 + "sbt.protocol.testing.StartTestGroupEvent".##) + name.##)
   }
   override def toString: String = {
     "StartTestGroupEvent(" + name + ")"
diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/TestCompleteEvent.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/TestCompleteEvent.scala
index 8811feef8..e44188084 100644
--- a/testing/src/main/contraband-scala/sbt/protocol/testing/TestCompleteEvent.scala
+++ b/testing/src/main/contraband-scala/sbt/protocol/testing/TestCompleteEvent.scala
@@ -15,7 +15,7 @@ final class TestCompleteEvent private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (17 + "TestCompleteEvent".##) + result.##)
+    37 * (37 * (17 + "sbt.protocol.testing.TestCompleteEvent".##) + result.##)
   }
   override def toString: String = {
     "TestCompleteEvent(" + result + ")"
diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/TestInitEvent.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/TestInitEvent.scala
index 90e97c801..978524687 100644
--- a/testing/src/main/contraband-scala/sbt/protocol/testing/TestInitEvent.scala
+++ b/testing/src/main/contraband-scala/sbt/protocol/testing/TestInitEvent.scala
@@ -14,7 +14,7 @@ override def equals(o: Any): Boolean = o match {
   case _ => false
 }
 override def hashCode: Int = {
-  37 * (17 + "TestInitEvent".##)
+  37 * (17 + "sbt.protocol.testing.TestInitEvent".##)
 }
 override def toString: String = {
   "TestInitEvent()"
diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/TestItemDetail.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/TestItemDetail.scala
index 6cdaa09c7..50762dcb5 100644
--- a/testing/src/main/contraband-scala/sbt/protocol/testing/TestItemDetail.scala
+++ b/testing/src/main/contraband-scala/sbt/protocol/testing/TestItemDetail.scala
@@ -26,7 +26,7 @@ final class TestItemDetail private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (37 * (37 * (17 + "TestItemDetail".##) + fullyQualifiedName.##) + status.##) + duration.##)
+    37 * (37 * (37 * (37 * (17 + "sbt.protocol.testing.TestItemDetail".##) + fullyQualifiedName.##) + status.##) + duration.##)
   }
   override def toString: String = {
     "TestItemDetail(" + fullyQualifiedName + ", " + status + ", " + duration + ")"
diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/TestItemEvent.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/TestItemEvent.scala
index 068b6dca6..d7f343f7b 100644
--- a/testing/src/main/contraband-scala/sbt/protocol/testing/TestItemEvent.scala
+++ b/testing/src/main/contraband-scala/sbt/protocol/testing/TestItemEvent.scala
@@ -16,7 +16,7 @@ final class TestItemEvent private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (37 * (17 + "TestItemEvent".##) + result.##) + detail.##)
+    37 * (37 * (37 * (17 + "sbt.protocol.testing.TestItemEvent".##) + result.##) + detail.##)
   }
   override def toString: String = {
     "TestItemEvent(" + result + ", " + detail + ")"
diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/TestMessage.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/TestMessage.scala
index ea8283043..406807c6f 100644
--- a/testing/src/main/contraband-scala/sbt/protocol/testing/TestMessage.scala
+++ b/testing/src/main/contraband-scala/sbt/protocol/testing/TestMessage.scala
@@ -15,7 +15,7 @@ override def equals(o: Any): Boolean = o match {
   case _ => false
 }
 override def hashCode: Int = {
-  37 * (17 + "TestMessage".##)
+  37 * (17 + "sbt.protocol.testing.TestMessage".##)
 }
 override def toString: String = {
   "TestMessage()"
diff --git a/testing/src/main/contraband-scala/sbt/protocol/testing/TestStringEvent.scala b/testing/src/main/contraband-scala/sbt/protocol/testing/TestStringEvent.scala
index 85e295ad9..618faf180 100644
--- a/testing/src/main/contraband-scala/sbt/protocol/testing/TestStringEvent.scala
+++ b/testing/src/main/contraband-scala/sbt/protocol/testing/TestStringEvent.scala
@@ -14,7 +14,7 @@ final class TestStringEvent private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (17 + "TestStringEvent".##) + value.##)
+    37 * (37 * (17 + "sbt.protocol.testing.TestStringEvent".##) + value.##)
   }
   override def toString: String = {
     value