diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 4965653a4..4c958c62d 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -2119,7 +2119,7 @@ object Classpaths {
       else (evictionWarningOptions in update).value
     }
 
-    DependencyResolver.cachedUpdate(
+    LibraryManagement.cachedUpdate(
       s.cacheStoreFactory.sub(updateCacheName.value),
       Reference.display(thisProjectRef.value),
       ivyModule.value,
diff --git a/main/src/main/scala/sbt/internal/librarymanagement/AltLibraryManagementCodec.scala b/main/src/main/scala/sbt/internal/AltLibraryManagementCodec.scala
similarity index 98%
rename from main/src/main/scala/sbt/internal/librarymanagement/AltLibraryManagementCodec.scala
rename to main/src/main/scala/sbt/internal/AltLibraryManagementCodec.scala
index c6ceeff73..12caa6c47 100644
--- a/main/src/main/scala/sbt/internal/librarymanagement/AltLibraryManagementCodec.scala
+++ b/main/src/main/scala/sbt/internal/AltLibraryManagementCodec.scala
@@ -1,11 +1,12 @@
-package sbt.internal.librarymanagement
+package sbt.internal
 
-import sbt.internal.util.{ HList, HNil }
+import sbt.internal.librarymanagement._
 import sbt.internal.util.Types._
+import sbt.internal.util.{ HList, HNil }
 import sbt.io.{ Hash, IO }
 import sbt.librarymanagement._
-import sbt.util._
 import sbt.util.CacheImplicits._
+import sbt.util._
 import sjsonnew.JsonFormat
 
 object AltLibraryManagementCodec extends LibraryManagementCodec {
diff --git a/main/src/main/scala/sbt/internal/librarymanagement/DependencyResolver.scala b/main/src/main/scala/sbt/internal/LibraryManagement.scala
similarity index 94%
rename from main/src/main/scala/sbt/internal/librarymanagement/DependencyResolver.scala
rename to main/src/main/scala/sbt/internal/LibraryManagement.scala
index a63a1e19f..fa78eff39 100644
--- a/main/src/main/scala/sbt/internal/librarymanagement/DependencyResolver.scala
+++ b/main/src/main/scala/sbt/internal/LibraryManagement.scala
@@ -1,15 +1,16 @@
-package sbt.internal.librarymanagement
+package sbt.internal
 
 import java.io.File
 
-import sbt.internal.util.Types._
+import sbt.internal.librarymanagement._
 import sbt.internal.util.HNil
+import sbt.internal.util.Types._
 import sbt.librarymanagement._
-import sbt.util.{ CacheStore, CacheStoreFactory, Logger, Tracked }
 import sbt.librarymanagement.syntax._
 import sbt.util.CacheImplicits._
+import sbt.util.{ CacheStore, CacheStoreFactory, Logger, Tracked }
 
-object DependencyResolver {
+object LibraryManagement {
 
   private type UpdateInputs = IvyConfiguration :+: ModuleSettings :+: UpdateConfiguration :+: HNil
 
@@ -90,16 +91,13 @@ object DependencyResolver {
             val culprit = t.getClass.getSimpleName
             log.warn(s"Update task caching failed due to $culprit.")
             log.warn("Report the following output to sbt:")
-            resolvedAgain.toString.lines foreach {
-              log.warn(_)
-            }
+            resolvedAgain.toString.lines.foreach(log.warn(_))
             log.trace(t)
             resolvedAgain
           }
           .apply(cachedResolve(updateInputs))
       }
-
-      import sbt.internal.librarymanagement.AltLibraryManagementCodec._
+      import AltLibraryManagementCodec._
       Tracked.inputChanged(cacheStoreFactory.make("inputs"))(doCachedResolve)
     }
 
diff --git a/sbt/src/sbt-test/dependency-management/cache-update/build.sbt b/sbt/src/sbt-test/dependency-management/cache-update/build.sbt
index 28e616e9c..2043ff2f4 100644
--- a/sbt/src/sbt-test/dependency-management/cache-update/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/cache-update/build.sbt
@@ -22,7 +22,7 @@ TaskKey[Unit]("check") := {
   type In = IvyConfiguration :+: ModuleSettings :+: UpdateConfiguration :+: HNil
 
   import sbt.util.CacheImplicits._
-  import sbt.internal.librarymanagement.AltLibraryManagementCodec._
+  import sbt.internal.AltLibraryManagementCodec._
 
   val f: In => Unit =
     Tracked.inputChanged(cacheStoreFactory make "inputs") { (inChanged: Boolean, in: In) =>