diff --git a/main-settings/src/main/scala/sbt/unchecked.scala b/main-settings/src/main/scala/sbt/sbtUnchecked.scala
similarity index 100%
rename from main-settings/src/main/scala/sbt/unchecked.scala
rename to main-settings/src/main/scala/sbt/sbtUnchecked.scala
diff --git a/main/src/main/scala/sbt/internal/AbstractTaskProgress.scala b/main/src/main/scala/sbt/internal/AbstractTaskExecuteProgress.scala
similarity index 100%
rename from main/src/main/scala/sbt/internal/AbstractTaskProgress.scala
rename to main/src/main/scala/sbt/internal/AbstractTaskExecuteProgress.scala
diff --git a/util-cache/src/main/scala/sbt/internal/util/codec/HashedVirtualRefFormats.scala b/util-cache/src/main/scala/sbt/internal/util/codec/HashedVirtualFileRefFormats.scala
similarity index 100%
rename from util-cache/src/main/scala/sbt/internal/util/codec/HashedVirtualRefFormats.scala
rename to util-cache/src/main/scala/sbt/internal/util/codec/HashedVirtualFileRefFormats.scala