diff --git a/build.sbt b/build.sbt
index 128fc9dfa0..7a37cc6f39 100644
--- a/build.sbt
+++ b/build.sbt
@@ -8,7 +8,6 @@
  */
 
 import net.bzzt.reproduciblebuilds.ReproducibleBuildsPlugin.reproducibleBuildsCheckResolver
-import org.apache.pekko._
 
 ThisBuild / scalafixScalaBinaryVersion := scalaBinaryVersion.value
 
@@ -47,8 +46,8 @@ addCommandAlias(
 
 addCommandAlias(name = "sortImports", value = ";scalafixEnable; scalafixAll SortImports; scalafmtAll")
 
-import org.apache.pekko.PekkoBuild._
-import com.typesafe.sbt.MultiJvmPlugin.MultiJvmKeys.MultiJvm
+import PekkoBuild._
+import MultiJvmPlugin.MultiJvmKeys.MultiJvm
 import com.typesafe.tools.mima.plugin.MimaPlugin
 import sbt.Keys.{ initialCommands, parallelExecution }
 import spray.boilerplate.BoilerplatePlugin
diff --git a/project/AddLogTimestamps.scala b/project/AddLogTimestamps.scala
index c3248736bb..0ba0c0d00e 100644
--- a/project/AddLogTimestamps.scala
+++ b/project/AddLogTimestamps.scala
@@ -11,15 +11,13 @@
  * Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import java.io.PrintWriter
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import sbt.{ Def, _ }
 import Keys._
-import sbt.internal.{ AppenderSupplier, LogManager }
+import sbt.internal.LogManager
 import sbt.internal.util.ConsoleOut
 
 object AddLogTimestamps extends AutoPlugin {
diff --git a/project/AutomaticModuleName.scala b/project/AutomaticModuleName.scala
index 217b4fda7e..92b4e895f5 100644
--- a/project/AutomaticModuleName.scala
+++ b/project/AutomaticModuleName.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2016-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import sbt.{ Def, _ }
 import sbt.Keys._
 
diff --git a/project/CliOptions.scala b/project/CliOptions.scala
index a7fa04c72d..64646546ee 100644
--- a/project/CliOptions.scala
+++ b/project/CliOptions.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 case class CliOption[T](private val value: T) {
   def get: T = value
 }
diff --git a/project/CopyrightHeader.scala b/project/CopyrightHeader.scala
index e3bdc8675c..d4dba69293 100644
--- a/project/CopyrightHeader.scala
+++ b/project/CopyrightHeader.scala
@@ -11,15 +11,14 @@
  * Copyright (C) 2018-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
 import de.heikoseeberger.sbtheader.{ CommentCreator, HeaderPlugin, NewLine }
-import com.typesafe.sbt.MultiJvmPlugin.MultiJvmKeys._
 import org.apache.commons.lang3.StringUtils
 import sbt.Keys._
 import sbt._
 
+import MultiJvmPlugin.MultiJvmKeys._
+
 trait CopyrightHeader extends AutoPlugin {
 
   override def requires: Plugins = HeaderPlugin
diff --git a/project/CopyrightHeaderForBoilerplate.scala b/project/CopyrightHeaderForBoilerplate.scala
index c39dd4caa3..4fcec1af57 100644
--- a/project/CopyrightHeaderForBoilerplate.scala
+++ b/project/CopyrightHeaderForBoilerplate.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import de.heikoseeberger.sbtheader.HeaderPlugin
 import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
 import sbt.Keys.sourceDirectory
diff --git a/project/CopyrightHeaderForBuild.scala b/project/CopyrightHeaderForBuild.scala
index fe946d7ba6..5546334668 100644
--- a/project/CopyrightHeaderForBuild.scala
+++ b/project/CopyrightHeaderForBuild.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport.{ headerMappings, headerSources, HeaderFileType }
 import sbt.Keys.baseDirectory
 import sbt.{ inConfig, Compile, Def, PluginTrigger, Test, _ }
diff --git a/project/CopyrightHeaderForJdk9.scala b/project/CopyrightHeaderForJdk9.scala
index 4ad0695a27..9c2fc537b9 100644
--- a/project/CopyrightHeaderForJdk9.scala
+++ b/project/CopyrightHeaderForJdk9.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport.headerSources
 import sbt.Keys.sourceDirectory
 import sbt.{ Compile, Def, Test, _ }
diff --git a/project/CopyrightHeaderForProtobuf.scala b/project/CopyrightHeaderForProtobuf.scala
index 9de948499c..61c0895368 100644
--- a/project/CopyrightHeaderForProtobuf.scala
+++ b/project/CopyrightHeaderForProtobuf.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport.{ headerMappings, headerSources, HeaderFileType }
 import sbt.Keys.sourceDirectory
 import sbt.{ inConfig, Compile, Def, Test, _ }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 7990c339f2..e389f55fbd 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2016-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import sbt._
 import Keys._
 import scala.language.implicitConversions
diff --git a/project/Doc.scala b/project/Doc.scala
index bc7127b35c..daf28a8c1b 100644
--- a/project/Doc.scala
+++ b/project/Doc.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import sbt._
 import sbtunidoc.BaseUnidocPlugin.autoImport.{ unidoc, unidocAllSources, unidocProjectFilter }
 import sbtunidoc.JavaUnidocPlugin.autoImport.JavaUnidoc
diff --git a/project/GitHub.scala b/project/GitHub.scala
index 1e3132643c..d0aad013dd 100644
--- a/project/GitHub.scala
+++ b/project/GitHub.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2016-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 object GitHub {
 
   def envTokenOrThrow: Option[String] =
diff --git a/project/JavaFormatter.scala b/project/JavaFormatter.scala
index cd6dca1847..9944b231a3 100644
--- a/project/JavaFormatter.scala
+++ b/project/JavaFormatter.scala
@@ -11,7 +11,6 @@
  * Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-import org.apache.pekko.ProjectFileIgnoreSupport
 import com.lightbend.sbt.JavaFormatterPlugin
 import sbt.{ AutoPlugin, PluginTrigger, Plugins }
 
diff --git a/project/Jdk9.scala b/project/Jdk9.scala
index 7b196041e3..305c681f14 100644
--- a/project/Jdk9.scala
+++ b/project/Jdk9.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2017-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import sbt._
 import sbt.Keys._
 
diff --git a/project/JdkOptions.scala b/project/JdkOptions.scala
index dfa6b7b726..bc452c6394 100644
--- a/project/JdkOptions.scala
+++ b/project/JdkOptions.scala
@@ -11,12 +11,8 @@
  * Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import java.io.File
 
-import scala.annotation.tailrec
-import scala.collection.immutable.ListMap
 import sbt._
 import sbt.librarymanagement.SemanticSelector
 import sbt.librarymanagement.VersionNumber
diff --git a/project/Jvm.scala b/project/Jvm.scala
index 117dd81c95..5afd85f593 100644
--- a/project/Jvm.scala
+++ b/project/Jvm.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.sbt.multijvm
-
 import java.io.File
 import java.lang.{ ProcessBuilder => JProcessBuilder }
 
diff --git a/project/MiMa.scala b/project/MiMa.scala
index 27da70fb25..3e32e8b398 100644
--- a/project/MiMa.scala
+++ b/project/MiMa.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import scala.collection.immutable
 import sbt._
 import sbt.Keys._
diff --git a/project/MultiNode.scala b/project/MultiNode.scala
index 5962ab8d5e..6c0d71e1ae 100644
--- a/project/MultiNode.scala
+++ b/project/MultiNode.scala
@@ -11,12 +11,10 @@
  * Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
+import TestExtras.Filter.Keys._
+import MultiJvmPlugin.MultiJvmKeys.multiJvmCreateLogger
+import MultiJvmPlugin.MultiJvmKeys._
 
-import org.apache.pekko.TestExtras.Filter.Keys._
-import com.typesafe.sbt.MultiJvmPlugin.MultiJvmKeys.multiJvmCreateLogger
-import com.typesafe.sbt.{ MultiJvmPlugin => SbtMultiJvm }
-import com.typesafe.sbt.MultiJvmPlugin.MultiJvmKeys._
 import sbt.{ Def, _ }
 import sbt.Keys._
 import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
@@ -74,7 +72,7 @@ object MultiNode extends AutoPlugin {
   private val anyConfigsInThisProject = ScopeFilter(configurations = inAnyConfiguration)
 
   private val multiJvmSettings =
-    SbtMultiJvm.multiJvmSettings ++
+    MultiJvmPlugin.multiJvmSettings ++
     inConfig(MultiJvm)(scalafmtConfigSettings) ++
     Seq(
       // Hack because 'provided' dependencies by default are not picked up by the multi-jvm plugin:
diff --git a/project/OSGi.scala b/project/OSGi.scala
index b11ef22dae..e3e8946199 100644
--- a/project/OSGi.scala
+++ b/project/OSGi.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2016-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import com.typesafe.sbt.osgi.OsgiKeys
 import com.typesafe.sbt.osgi.SbtOsgi._
 import sbt._
diff --git a/project/Paradox.scala b/project/Paradox.scala
index ee4f17c6af..98aa3dac72 100644
--- a/project/Paradox.scala
+++ b/project/Paradox.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import com.lightbend.paradox.sbt.ParadoxPlugin
 import com.lightbend.paradox.sbt.ParadoxPlugin.autoImport._
 import com.lightbend.paradox.apidoc.ApidocPlugin
diff --git a/project/ParadoxBrowse.scala b/project/ParadoxBrowse.scala
index cf5f6d1200..26df824d9a 100644
--- a/project/ParadoxBrowse.scala
+++ b/project/ParadoxBrowse.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2018-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import com.lightbend.paradox.sbt.ParadoxPlugin
 import com.lightbend.paradox.sbt.ParadoxPlugin.autoImport._
 import sbt.Keys._
diff --git a/project/PekkoBuild.scala b/project/PekkoBuild.scala
index 48f2ad2577..b637f8c647 100644
--- a/project/PekkoBuild.scala
+++ b/project/PekkoBuild.scala
@@ -11,11 +11,10 @@
  * Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
+import JdkOptions.autoImport._
+import MultiJvmPlugin.autoImport.MultiJvm
 
-import org.apache.pekko.JdkOptions.autoImport._
 import com.lightbend.paradox.projectinfo.ParadoxProjectInfoPluginKeys._
-import com.typesafe.sbt.MultiJvmPlugin.autoImport.MultiJvm
 import sbt.Def
 import sbt.Keys._
 import sbt._
diff --git a/project/PekkoDisciplinePlugin.scala b/project/PekkoDisciplinePlugin.scala
index f6bfc7a449..6c5ceefb8f 100644
--- a/project/PekkoDisciplinePlugin.scala
+++ b/project/PekkoDisciplinePlugin.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import sbt._
 import Keys.{ scalacOptions, _ }
 import sbt.plugins.JvmPlugin
diff --git a/project/ProjectFileIgnoreSupport.scala b/project/ProjectFileIgnoreSupport.scala
index bdabe8c319..2416912f78 100644
--- a/project/ProjectFileIgnoreSupport.scala
+++ b/project/ProjectFileIgnoreSupport.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import java.io.File
 
 import com.typesafe.config.ConfigFactory
diff --git a/project/Protobuf.scala b/project/Protobuf.scala
index ba549a065e..32d069c52b 100644
--- a/project/Protobuf.scala
+++ b/project/Protobuf.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import java.io.File
 import java.io.PrintWriter
 
diff --git a/project/Publish.scala b/project/Publish.scala
index 0bc2455595..f15216ef0c 100644
--- a/project/Publish.scala
+++ b/project/Publish.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import sbt._
 import sbt.Keys._
 import org.mdedetrich.apache.sonatype.ApacheSonatypePlugin
diff --git a/project/SbtMultiJvm.scala b/project/SbtMultiJvm.scala
index 86d6889f70..d107c82311 100644
--- a/project/SbtMultiJvm.scala
+++ b/project/SbtMultiJvm.scala
@@ -11,9 +11,6 @@
  * Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package com.typesafe.sbt
-
-import com.typesafe.sbt.multijvm.{ Jvm, JvmLogger }
 import scala.sys.process.Process
 import sjsonnew.BasicJsonProtocol._
 import sbt._
diff --git a/project/ScalaFixExtraRulesPlugin.scala b/project/ScalaFixExtraRulesPlugin.scala
index 9f094bbe47..a8bb2be2d3 100644
--- a/project/ScalaFixExtraRulesPlugin.scala
+++ b/project/ScalaFixExtraRulesPlugin.scala
@@ -11,9 +11,7 @@
  * Copyright (C) 2020-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
-import sbt.{ AutoPlugin, PluginTrigger, Plugins, ScalafixSupport }
+import sbt.{ AutoPlugin, PluginTrigger, Plugins }
 import scalafix.sbt.ScalafixPlugin
 
 object ScalaFixExtraRulesPlugin extends AutoPlugin with ScalafixSupport {
diff --git a/project/ScalaFixForJdk9Plugin.scala b/project/ScalaFixForJdk9Plugin.scala
index ac44525cbe..0ffed10da4 100644
--- a/project/ScalaFixForJdk9Plugin.scala
+++ b/project/ScalaFixForJdk9Plugin.scala
@@ -11,10 +11,9 @@
  * Copyright (C) 2020-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
-import sbt.{ AutoPlugin, PluginTrigger, Plugins, ScalafixSupport }
+import sbt.{ AutoPlugin, PluginTrigger, Plugins }
 import scalafix.sbt.ScalafixPlugin
+
 object ScalaFixForJdk9Plugin extends AutoPlugin with ScalafixSupport {
   override def trigger: PluginTrigger = allRequirements
   import Jdk9._
diff --git a/project/ScalafixForMultiNodePlugin.scala b/project/ScalafixForMultiNodePlugin.scala
index 11c35f4407..e504e4917a 100644
--- a/project/ScalafixForMultiNodePlugin.scala
+++ b/project/ScalafixForMultiNodePlugin.scala
@@ -11,10 +11,7 @@
  * Copyright (C) 2018-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
-import com.typesafe.sbt.MultiJvmPlugin
-import sbt.{ inConfig, AutoPlugin, Def, PluginTrigger, Plugins, ScalafixSupport, Setting }
+import sbt.{ inConfig, AutoPlugin, Def, PluginTrigger, Plugins, Setting }
 import scalafix.sbt.ScalafixPlugin
 import scalafix.sbt.ScalafixPlugin.autoImport.scalafixConfigSettings
 
diff --git a/project/ScalafixIgnoreFilePlugin.scala b/project/ScalafixIgnoreFilePlugin.scala
index 225856434d..652ec8a842 100644
--- a/project/ScalafixIgnoreFilePlugin.scala
+++ b/project/ScalafixIgnoreFilePlugin.scala
@@ -11,10 +11,8 @@
  * Copyright (C) 2018-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import sbt.plugins.JvmPlugin
-import sbt.{ AutoPlugin, PluginTrigger, Plugins, ScalafixSupport }
+import sbt.{ AutoPlugin, PluginTrigger, Plugins }
 import scalafix.sbt.ScalafixPlugin
 
 object ScalafixIgnoreFilePlugin extends AutoPlugin with ScalafixSupport {
diff --git a/project/ScalafixSupport.scala b/project/ScalafixSupport.scala
index 0fa1cf5184..9528e2a7de 100644
--- a/project/ScalafixSupport.scala
+++ b/project/ScalafixSupport.scala
@@ -11,11 +11,9 @@
  * Copyright (C) 2018-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package sbt
-import Keys.baseDirectory
+import sbt._
 
-import org.apache.pekko.ProjectFileIgnoreSupport
-import sbt.Keys.unmanagedSources
+import Keys._
 
 trait ScalafixSupport {
   private val ignoreConfigFileName: String = ".scalafix.conf"
@@ -32,13 +30,9 @@ trait ScalafixSupport {
     }
   }
 
-  import sbt.Keys._
-
   def addProjectCommandsIfAbsent(alias: String, value: String): Def.Setting[Seq[Command]] = {
     commands := {
-      val currentCommands = commands.value.collect {
-        case command: SimpleCommand => command.name
-      }.toSet
+      val currentCommands = commands.value.flatMap(_.nameOption).toSet
       val isPresent = currentCommands(alias)
       if (isPresent)
         commands.value
@@ -49,10 +43,7 @@ trait ScalafixSupport {
 
   def updateProjectCommands(alias: String, value: String): Def.Setting[Seq[Command]] = {
     commands := {
-      commands.value.filterNot {
-        case command: SimpleCommand => command.name == alias
-        case _                      => false
-      } :+ BasicCommands.newAlias(name = alias, value = value)
+      commands.value.filterNot(_.nameOption.contains("alias")) :+ BasicCommands.newAlias(name = alias, value = value)
     }
   }
 }
diff --git a/project/SigarLoader.scala b/project/SigarLoader.scala
index 703ba8776b..933908b1ae 100644
--- a/project/SigarLoader.scala
+++ b/project/SigarLoader.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import sbt._
 import sbt.Keys._
 
diff --git a/project/TestExtras.scala b/project/TestExtras.scala
index 1a59945d8b..0b04ab9f71 100644
--- a/project/TestExtras.scala
+++ b/project/TestExtras.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2016-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import sbt.Keys._
 import sbt._
 
diff --git a/project/ValidatePullRequest.scala b/project/ValidatePullRequest.scala
index 6fd6094ffe..66c5efa7a3 100644
--- a/project/ValidatePullRequest.scala
+++ b/project/ValidatePullRequest.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import com.hpe.sbt.ValidatePullRequest
 import com.hpe.sbt.ValidatePullRequest.PathGlobFilter
 import com.lightbend.paradox.sbt.ParadoxPlugin
@@ -87,7 +85,7 @@ object PekkoValidatePullRequest extends AutoPlugin {
  */
 object MultiNodeWithPrValidation extends AutoPlugin {
   import PekkoValidatePullRequest._
-  import com.typesafe.sbt.MultiJvmPlugin.MultiJvmKeys.MultiJvm
+  import MultiJvmPlugin.MultiJvmKeys.MultiJvm
 
   override def trigger = allRequirements
   override def requires = PekkoValidatePullRequest && MultiNode
diff --git a/project/VersionGenerator.scala b/project/VersionGenerator.scala
index 85440cad63..dc22a87842 100644
--- a/project/VersionGenerator.scala
+++ b/project/VersionGenerator.scala
@@ -11,8 +11,6 @@
  * Copyright (C) 2016-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-package org.apache.pekko
-
 import sbt._
 import sbt.Keys._