32 files changed, 126 insertions, 126 deletions

diff --git a/build.sbt b/build.sbt
index c0f04fb2..f8c85428 100644
--- a/build.sbt
+++ b/build.sbt
@@ -3,7 +3,7 @@ val sharedSettings = Seq(
   organization := "com.lihaoyi",
   libraryDependencies += "com.lihaoyi" %% "utest" % "0.6.0" % "test",
 
-  testFrameworks += new TestFramework("forge.UTestFramework"),
+  testFrameworks += new TestFramework("mill.UTestFramework"),
 
   parallelExecution in Test := false,
   test in assembly := {},
@@ -32,7 +32,7 @@ val sharedSettings = Seq(
 lazy val core = project
   .settings(
     sharedSettings,
-    name := "forge-core",
+    name := "mill-core",
     libraryDependencies ++= Seq(
       "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided",
       "com.lihaoyi" %% "sourcecode" % "0.1.4",
@@ -47,5 +47,5 @@ lazy val scalaplugin = project
   .dependsOn(core % "compile->compile;test->test")
   .settings(
     sharedSettings,
-    name := "forge-scalaplugin"
+    name := "mill-scalaplugin"
   )
\ No newline at end of file
diff --git a/build.sc b/build.sc
index 8d91c3e1..63de65bf 100644
--- a/build.sc
+++ b/build.sc
@@ -1,12 +1,12 @@
 import $cp.scalaplugin.target.`scala-2.12`.classes
 import ammonite.ops.pwd
 import coursier.{Dependency => Dep, Module => Mod}
-import forge.discover.Discovered
-import forge.eval.{Evaluator, PathRef}
-import forge.scalaplugin.Subproject.ScalaDep
-import forge.util.OSet
-import forge._
-import forge.scalaplugin._
+import mill.discover.Discovered
+import mill.eval.{Evaluator, PathRef}
+import mill.scalaplugin.Subproject.ScalaDep
+import mill.util.OSet
+import mill._
+import mill.scalaplugin._
 
 object Build{
 
@@ -44,4 +44,4 @@ object Build{
     override def resources = T{ sources }
   }
 }
-@main def main(): Any = Build -> forge.discover.Discovered[Build.type]
+@main def main(): Any = Build -> mill.discover.Discovered[Build.type]
diff --git a/core/src/main/scala/forge/package.scala b/core/src/main/scala/forge/package.scala
deleted file mode 100644
index 6484c48e..00000000
--- a/core/src/main/scala/forge/package.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-import forge.util.JsonFormatters
-
-package object forge extends JsonFormatters{
-  val T = define.Task
-  type T[T] = define.Task[T]
-}
diff --git a/core/src/main/scala/forge/Main.scala b/core/src/main/scala/mill/Main.scala
index bb1d5d69..0d316530 100644
--- a/core/src/main/scala/forge/Main.scala
+++ b/core/src/main/scala/mill/Main.scala
@@ -1,11 +1,11 @@
-package forge
+package mill
 
 import ammonite.ops._
 import ammonite.util.{Name, Res}
-import forge.define.Task
-import forge.discover.{Discovered, NestedEntry}
-import forge.eval.Evaluator
-import forge.util.OSet
+import mill.define.Task
+import mill.discover.{Discovered, NestedEntry}
+import mill.eval.Evaluator
+import mill.util.OSet
 import play.api.libs.json.Format
 
 
@@ -43,9 +43,9 @@ object Main {
                   obj,
                   ammonite.main.Scripts.groupArgs(rest.toList)
                 ) match{
-                  case error: forge.discover.Router.Result.Error =>
+                  case error: mill.discover.Router.Result.Error =>
                     println("Failed to evaluate main method: " + error)
-                  case forge.discover.Router.Result.Success(target) =>
+                  case mill.discover.Router.Result.Success(target) =>
                     println("Found target! " + target)
                     val evaluated = evaluator.evaluate(OSet(target))
                     pprint.log(evaluated)
diff --git a/core/src/main/scala/forge/define/Applicative.scala b/core/src/main/scala/mill/define/Applicative.scala
index b2034d13..95e7e211 100644
--- a/core/src/main/scala/forge/define/Applicative.scala
+++ b/core/src/main/scala/mill/define/Applicative.scala
@@ -1,6 +1,6 @@
-package forge.define
+package mill.define
 
-import forge.util.Args
+import mill.util.Args
 
 import scala.annotation.compileTimeOnly
 import scala.collection.mutable
@@ -87,7 +87,7 @@ object Applicative {
         bound.append((q"${c.prefix}.underlying($fun)", c.internal.valDef(tempSym)))
         tempIdent
       case (t @ q"$prefix.ctx()", api)
-        if prefix.tpe.baseClasses.exists(_.fullName == "forge.define.Applicative.Applyer") =>
+        if prefix.tpe.baseClasses.exists(_.fullName == "mill.define.Applicative.Applyer") =>
 
         val tempIdent = Ident(ctxSym)
         c.internal.setType(tempIdent, t.tpe)
diff --git a/core/src/main/scala/forge/define/Cacher.scala b/core/src/main/scala/mill/define/Cacher.scala
index 56eeb892..192f9a3e 100644
--- a/core/src/main/scala/forge/define/Cacher.scala
+++ b/core/src/main/scala/mill/define/Cacher.scala
@@ -1,4 +1,4 @@
-package forge.define
+package mill.define
 
 import scala.collection.mutable
 import scala.reflect.macros.blackbox.Context
@@ -21,7 +21,7 @@ object Cacher{
     val owner = c.internal.enclosingOwner
     val ownerIsCacherClass =
       owner.owner.isClass &&
-      owner.owner.asClass.baseClasses.exists(_.fullName == "forge.define.Cacher")
+      owner.owner.asClass.baseClasses.exists(_.fullName == "mill.define.Cacher")
 
     if (ownerIsCacherClass && owner.isMethod) q"this.cachedTarget($t)"
     else c.abort(
diff --git a/core/src/main/scala/forge/define/Task.scala b/core/src/main/scala/mill/define/Task.scala
index 298815d5..31ac7f4b 100644
--- a/core/src/main/scala/forge/define/Task.scala
+++ b/core/src/main/scala/mill/define/Task.scala
@@ -1,8 +1,8 @@
-package forge.define
+package mill.define
 
-import forge.define.Applicative.Applyable
-import forge.eval.PathRef
-import forge.util.Args
+import mill.define.Applicative.Applyable
+import mill.eval.PathRef
+import mill.util.Args
 import scala.language.experimental.macros
 import scala.reflect.macros.blackbox.Context
 
@@ -36,7 +36,7 @@ object Task extends Applicative.Applyer[Task, Task, Args]{
 
   def underlying[A](v: Task[A]) = v
 
-  trait Cacher extends forge.define.Cacher[Task, Target]{
+  trait Cacher extends mill.define.Cacher[Task, Target]{
     def wrapCached[T](t: Task[T]): Target[T] = new Target(t)
   }
   class Target0[T](t: T) extends Task[T]{
@@ -64,7 +64,7 @@ object Task extends Applicative.Applyer[Task, Task, Args]{
   }
   def targetCachedImpl[T: c.WeakTypeTag](c: Context)(t: c.Expr[T]): c.Expr[Target[T]] = {
     c.Expr[Target[T]](
-      forge.define.Cacher.wrapCached(c)(
+      mill.define.Cacher.wrapCached(c)(
         Applicative.impl[Task, T, Args](c)(t).tree
       )
     )
diff --git a/core/src/main/scala/forge/discover/Discovered.scala b/core/src/main/scala/mill/discover/Discovered.scala
index 53536e49..c8edf26a 100644
--- a/core/src/main/scala/forge/discover/Discovered.scala
+++ b/core/src/main/scala/mill/discover/Discovered.scala
@@ -1,7 +1,7 @@
-package forge.discover
+package mill.discover
 
-import forge.define.Task
-import forge.discover.Router.{EntryPoint, Result}
+import mill.define.Task
+import mill.discover.Router.{EntryPoint, Result}
 import play.api.libs.json.Format
 
 import scala.language.experimental.macros
@@ -91,7 +91,7 @@ object Discovered {
         q"$prefix.${TermName(name)}"
       }
 
-      q"forge.discover.Discovered.makeTuple($segments, ($base: $tpe) => $ident)"
+      q"mill.discover.Discovered.makeTuple($segments, ($base: $tpe) => $ident)"
     }
 
     val nested = for{
@@ -102,11 +102,11 @@ object Discovered {
       val select = segments.foldLeft[Tree](Ident(arg)) { (prefix, name) =>
         q"$prefix.${TermName(name)}"
       }
-      q"forge.discover.NestedEntry.make(Seq(..$segments), ($arg: $tpe) => $select)($entry)"
+      q"mill.discover.NestedEntry.make(Seq(..$segments), ($arg: $tpe) => $select)($entry)"
     }
 
     c.Expr[Discovered[T]](q"""
-      new _root_.forge.discover.Discovered(
+      new _root_.mill.discover.Discovered(
         $result,
         ${nested.toList}
       )
diff --git a/core/src/main/scala/forge/discover/Router.scala b/core/src/main/scala/mill/discover/Router.scala
index 1034b46e..90e50075 100644
--- a/core/src/main/scala/forge/discover/Router.scala
+++ b/core/src/main/scala/mill/discover/Router.scala
@@ -1,7 +1,7 @@
-package forge.discover
+package mill.discover
 
 import ammonite.main.Compat
-import forge.define.Task
+import mill.define.Task
 import sourcecode.Compat.Context
 
 import scala.annotation.StaticAnnotation
@@ -324,7 +324,7 @@ class Router [C <: Context](val c: C) {
         case Some(s) => q"scala.Some($s)"
       }
       val argSig = q"""
-        forge.discover.Router.ArgSig(
+        mill.discover.Router.ArgSig(
           ${arg.name.toString},
           ${docUnwrappedType.toString + (if(vararg) "*" else "")},
           $docTree,
@@ -334,13 +334,13 @@ class Router [C <: Context](val c: C) {
 
       val reader =
         if(vararg) q"""
-          forge.discover.Router.readVarargs[$docUnwrappedType](
+          mill.discover.Router.readVarargs[$docUnwrappedType](
             $argSig,
             $extrasSymbol,
             implicitly[scopt.Read[$docUnwrappedType]].reads(_)
           )
         """ else q"""
-        forge.discover.Router.read[$docUnwrappedType](
+        mill.discover.Router.read[$docUnwrappedType](
           $argListSymbol,
           $default,
           $argSig,
@@ -363,7 +363,7 @@ class Router [C <: Context](val c: C) {
 
     val arg = TermName(c.freshName())
     q"""
-    forge.discover.Router.EntryPoint(
+    mill.discover.Router.EntryPoint(
       ${meth.name.toString},
       scala.Seq(..$argSigs),
       ${methodDoc match{
@@ -372,10 +372,10 @@ class Router [C <: Context](val c: C) {
       }},
       ${varargs.contains(true)},
       ($arg: $curCls, $argListSymbol: Map[String, String], $extrasSymbol: Seq[String]) =>
-        forge.discover.Router.validate(Seq(..$readArgs)) match{
-          case forge.discover.Router.Result.Success(List(..$argNames)) =>
-            forge.discover.Router.Result.Success($arg.${meth.name.toTermName}(..$argNameCasts))
-          case x: forge.discover.Router.Result.Error => x
+        mill.discover.Router.validate(Seq(..$readArgs)) match{
+          case mill.discover.Router.Result.Success(List(..$argNames)) =>
+            mill.discover.Router.Result.Success($arg.${meth.name.toTermName}(..$argNameCasts))
+          case x: mill.discover.Router.Result.Error => x
         }
     )
     """
@@ -384,7 +384,7 @@ class Router [C <: Context](val c: C) {
   def getAllRoutesForClass(curCls: Type): Iterable[c.universe.Tree] = {
     for{
       t <- getValsOrMeths(curCls)
-      if t.returnType <:< typeOf[forge.define.Command[_]]
+      if t.returnType <:< typeOf[mill.define.Command[_]]
     } yield {
       extractMethod(t, curCls)
     }
diff --git a/core/src/main/scala/forge/eval/Evaluator.scala b/core/src/main/scala/mill/eval/Evaluator.scala
index 7f50873a..de6d81cd 100644
--- a/core/src/main/scala/forge/eval/Evaluator.scala
+++ b/core/src/main/scala/mill/eval/Evaluator.scala
@@ -1,9 +1,9 @@
-package forge.eval
+package mill.eval
 
 import ammonite.ops._
-import forge.define.Task
-import forge.discover.Labelled
-import forge.util.{Args, MultiBiMap, OSet}
+import mill.define.Task
+import mill.discover.Labelled
+import mill.util.{Args, MultiBiMap, OSet}
 import play.api.libs.json.{Format, JsValue, Json}
 
 import scala.collection.mutable
@@ -51,7 +51,7 @@ class Evaluator(workspacePath: Path,
     val (targetDestPath, metadataPath) = labeling.get(terminals.items(0)) match{
       case Some(labeling) =>
         val targetDestPath = workspacePath / labeling.segments
-        val metadataPath = targetDestPath / up / (targetDestPath.last + ".forge.json")
+        val metadataPath = targetDestPath / up / (targetDestPath.last + ".mill.json")
         (Some(targetDestPath), Some(metadataPath))
       case None => (None, None)
     }
@@ -129,7 +129,7 @@ class Evaluator(workspacePath: Path,
 
 
 object Evaluator{
-  class TopoSorted private[Evaluator] (val values: OSet[Task[_]])
+  class TopoSorted private[Evaluator](val values: OSet[Task[_]])
   case class Results(values: Seq[Any], targets: OSet[Task[_]])
   def groupAroundNamedTargets(topoSortedTargets: TopoSorted,
                               labeling: Map[Task[_], Labelled[_]]): MultiBiMap[Int, Task[_]] = {
diff --git a/core/src/main/scala/forge/eval/PathRef.scala b/core/src/main/scala/mill/eval/PathRef.scala
index 1c9bc700..5f7efe89 100644
--- a/core/src/main/scala/forge/eval/PathRef.scala
+++ b/core/src/main/scala/mill/eval/PathRef.scala
@@ -1,4 +1,4 @@
-package forge.eval
+package mill.eval
 
 import java.io.IOException
 import java.nio.file.attribute.BasicFileAttributes
@@ -7,7 +7,7 @@ import java.nio.{file => jnio}
 import java.security.MessageDigest
 
 import ammonite.ops.Path
-import forge.util.JsonFormatters
+import mill.util.JsonFormatters
 import play.api.libs.json.{Format, Json}
 
 
diff --git a/core/src/main/scala/forge/eval/Tarjans.scala b/core/src/main/scala/mill/eval/Tarjans.scala
index 15d6779c..db2536b6 100644
--- a/core/src/main/scala/forge/eval/Tarjans.scala
+++ b/core/src/main/scala/mill/eval/Tarjans.scala
@@ -1,4 +1,4 @@
-package forge.eval
+package mill.eval
 
 import scala.collection.mutable
 
diff --git a/core/src/main/scala/forge/modules/Jvm.scala b/core/src/main/scala/mill/modules/Jvm.scala
index e707df29..bfb7defe 100644
--- a/core/src/main/scala/forge/modules/Jvm.scala
+++ b/core/src/main/scala/mill/modules/Jvm.scala
@@ -1,12 +1,12 @@
-package forge.modules
+package mill.modules
 
 import java.io.FileOutputStream
 import java.util.jar.{JarEntry, JarOutputStream}
 
 import ammonite.ops._
-import forge.define.Task
-import forge.eval.PathRef
-import forge.util.Args
+import mill.define.Task
+import mill.eval.PathRef
+import mill.util.Args
 
 
 object Jvm {
@@ -20,7 +20,7 @@ object Jvm {
   private def createManifest(mainClass: Option[String]) = {
     val m = new java.util.jar.Manifest()
     m.getMainAttributes.put(java.util.jar.Attributes.Name.MANIFEST_VERSION, "1.0")
-    m.getMainAttributes.putValue( "Created-By", "Scala Forge" )
+    m.getMainAttributes.putValue( "Created-By", "Scala mill" )
     mainClass.foreach(
       m.getMainAttributes.put(java.util.jar.Attributes.Name.MAIN_CLASS, _)
     )
diff --git a/core/src/main/scala/mill/package.scala b/core/src/main/scala/mill/package.scala
new file mode 100644
index 00000000..339a1a26
--- /dev/null
+++ b/core/src/main/scala/mill/package.scala
@@ -0,0 +1,6 @@
+import mill.util.JsonFormatters
+
+package object mill extends JsonFormatters{
+  val T = define.Task
+  type T[T] = define.Task[T]
+}
diff --git a/core/src/main/scala/forge/util/Args.scala b/core/src/main/scala/mill/util/Args.scala
index 23102572..4ac49df5 100644
--- a/core/src/main/scala/forge/util/Args.scala
+++ b/core/src/main/scala/mill/util/Args.scala
@@ -1,4 +1,4 @@
-package forge.util
+package mill.util
 
 class Args(val args: IndexedSeq[_], val dest: ammonite.ops.Path){
   def length = args.length
diff --git a/core/src/main/scala/forge/util/JsonFormatters.scala b/core/src/main/scala/mill/util/JsonFormatters.scala
index d9f07fc8..f3420448 100644
--- a/core/src/main/scala/forge/util/JsonFormatters.scala
+++ b/core/src/main/scala/mill/util/JsonFormatters.scala
@@ -1,4 +1,4 @@
-package forge.util
+package mill.util
 
 import ammonite.ops.{Bytes, Path}
 import play.api.libs.json._
diff --git a/core/src/main/scala/forge/util/MultiBiMap.scala b/core/src/main/scala/mill/util/MultiBiMap.scala
index cb6ff280..752d2b9d 100644
--- a/core/src/main/scala/forge/util/MultiBiMap.scala
+++ b/core/src/main/scala/mill/util/MultiBiMap.scala
@@ -1,4 +1,4 @@
-package forge.util
+package mill.util
 
 import scala.collection.mutable
 
diff --git a/core/src/main/scala/forge/util/OSet.scala b/core/src/main/scala/mill/util/OSet.scala
index 43743cdc..a1f59a22 100644
--- a/core/src/main/scala/forge/util/OSet.scala
+++ b/core/src/main/scala/mill/util/OSet.scala
@@ -1,4 +1,4 @@
-package forge.util
+package mill.util
 
 
 import play.api.libs.json._
diff --git a/core/src/test/examples/javac/build.sc b/core/src/test/examples/javac/build.sc
index 37d7a5a6..f8789eb7 100644
--- a/core/src/test/examples/javac/build.sc
+++ b/core/src/test/examples/javac/build.sc
@@ -1,5 +1,5 @@
-import forge.define.Task
-import forge.eval.PathRef
+import mill.define.Task
+import mill.eval.PathRef
 
 object Foo {
 
@@ -7,8 +7,8 @@ object Foo {
   import java.util.jar.JarEntry
 
   import ammonite.ops.{ls, pwd, read}
-  import forge.discover.Discovered
-  import forge.util.Args
+  import mill.discover.Discovered
+  import mill.util.Args
 
   val workspacePath = pwd / 'target / 'workspace / 'javac
   val javacSrcPath = pwd / 'src / 'test / 'examples / 'javac
@@ -66,4 +66,4 @@ object Foo {
 
 }
 
-@main def main(): Any = Foo -> forge.Discovered[Foo.type]
+@main def main(): Any = Foo -> mill.Discovered[Foo.type]
diff --git a/core/src/test/scala/forge/ApplicativeTests.scala b/core/src/test/scala/mill/ApplicativeTests.scala
index 682414d3..5bb9945c 100644
--- a/core/src/test/scala/forge/ApplicativeTests.scala
+++ b/core/src/test/scala/mill/ApplicativeTests.scala
@@ -1,5 +1,5 @@
-package forge
-import forge.define.Applicative
+package mill
+import mill.define.Applicative
 import utest._
 import language.experimental.macros
 
diff --git a/core/src/test/scala/forge/CacherTests.scala b/core/src/test/scala/mill/CacherTests.scala
index 5f40ee20..1a510e4c 100644
--- a/core/src/test/scala/forge/CacherTests.scala
+++ b/core/src/test/scala/mill/CacherTests.scala
@@ -1,9 +1,9 @@
-package forge
+package mill
 
-import forge.define.Task
-import forge.discover.Discovered
-import forge.eval.Evaluator
-import forge.util.OSet
+import mill.define.Task
+import mill.discover.Discovered
+import mill.eval.Evaluator
+import mill.util.OSet
 import utest._
 import utest.framework.TestPath
 
diff --git a/core/src/test/scala/forge/EvaluationTests.scala b/core/src/test/scala/mill/EvaluationTests.scala
index 5fe29446..48b42539 100644
--- a/core/src/test/scala/forge/EvaluationTests.scala
+++ b/core/src/test/scala/mill/EvaluationTests.scala
@@ -1,12 +1,12 @@
-package forge
+package mill
 
 
-import forge.TestUtil.{Test, test}
-import forge.define.{Target, Task}
-import forge.define.Task.Cacher
-import forge.discover.Discovered
-import forge.eval.Evaluator
-import forge.util.OSet
+import mill.TestUtil.{Test, test}
+import mill.define.{Target, Task}
+import mill.define.Task.Cacher
+import mill.discover.Discovered
+import mill.eval.Evaluator
+import mill.util.OSet
 import utest._
 import utest.framework.TestPath
 
diff --git a/core/src/test/scala/forge/GraphTests.scala b/core/src/test/scala/mill/GraphTests.scala
index db522fff..575b4a89 100644
--- a/core/src/test/scala/forge/GraphTests.scala
+++ b/core/src/test/scala/mill/GraphTests.scala
@@ -1,11 +1,11 @@
-package forge
+package mill
 
 import utest._
 import TestUtil.test
-import forge.define.Task
-import forge.discover.Discovered
-import forge.eval.Evaluator
-import forge.util.OSet
+import mill.define.Task
+import mill.discover.Discovered
+import mill.eval.Evaluator
+import mill.util.OSet
 
 object GraphTests extends TestSuite{
 
diff --git a/core/src/test/scala/forge/JavaCompileJarTests.scala b/core/src/test/scala/mill/JavaCompileJarTests.scala
index 1c9bf9b8..6e398540 100644
--- a/core/src/test/scala/forge/JavaCompileJarTests.scala
+++ b/core/src/test/scala/mill/JavaCompileJarTests.scala
@@ -1,13 +1,13 @@
-package forge
+package mill
 
 
 import ammonite.ops._
 import ImplicitWd._
-import forge.define.Task
-import forge.discover.Discovered
-import forge.eval.{Evaluator, PathRef}
-import forge.modules.Jvm.jarUp
-import forge.util.OSet
+import mill.define.Task
+import mill.discover.Discovered
+import mill.eval.{Evaluator, PathRef}
+import mill.modules.Jvm.jarUp
+import mill.util.OSet
 import utest._
 
 object JavaCompileJarTests extends TestSuite{
@@ -56,7 +56,7 @@ object JavaCompileJarTests extends TestSuite{
         val evaluated = evaluator.evaluate(OSet(t))
         Tuple2(
           evaluated.values(0).asInstanceOf[T],
-          evaluated.targets.filter(x => mapping.contains(x) || x.isInstanceOf[forge.define.Command[_]]).size
+          evaluated.targets.filter(x => mapping.contains(x) || x.isInstanceOf[mill.define.Command[_]]).size
         )
       }
       def check(targets: OSet[Task[_]], expected: OSet[Task[_]]) = {
diff --git a/core/src/test/scala/forge/MacroErrorTests.scala b/core/src/test/scala/mill/MacroErrorTests.scala
index 6e76cd17..20bf805a 100644
--- a/core/src/test/scala/forge/MacroErrorTests.scala
+++ b/core/src/test/scala/mill/MacroErrorTests.scala
@@ -1,4 +1,4 @@
-package forge
+package mill
 
 import utest._
 
@@ -10,7 +10,7 @@ object MacroErrorTests extends TestSuite{
       val expectedMsg =
         "T{} members must be defs defined in a Cacher class/trait/object body"
 
-      val err = compileError("object Foo extends forge.define.Target.Cacher{ val x = T{1} }")
+      val err = compileError("object Foo extends mill.define.Task.Cacher{ val x = T{1} }")
       assert(err.msg == expectedMsg)
     }
 
@@ -35,7 +35,7 @@ object MacroErrorTests extends TestSuite{
 
         val expectedMsg =
           "Target#apply() call cannot use `value n` defined within the T{...} block"
-        val err = compileError("""new forge.define.Target.Cacher{
+        val err = compileError("""new mill.define.Task.Cacher{
           def a = T{ 1 }
           val arr = Array(a)
           def b = {
@@ -51,7 +51,7 @@ object MacroErrorTests extends TestSuite{
 
         val expectedMsg =
           "Target#apply() call cannot use `value x` defined within the T{...} block"
-        val err = compileError("""new forge.define.Target.Cacher{
+        val err = compileError("""new mill.define.Task.Cacher{
           def a = T{ 1 }
           val arr = Array(a)
           def b = {
diff --git a/core/src/test/scala/forge/TarjanTests.scala b/core/src/test/scala/mill/TarjanTests.scala
index 58032b86..7ae7dd04 100644
--- a/core/src/test/scala/forge/TarjanTests.scala
+++ b/core/src/test/scala/mill/TarjanTests.scala
@@ -1,5 +1,5 @@
-package forge
-import forge.eval.Tarjans
+package mill
+import mill.eval.Tarjans
 import utest._
 object TarjanTests extends TestSuite{
   def check(input: Seq[Seq[Int]], expected: Seq[Seq[Int]]) = {
diff --git a/core/src/test/scala/forge/TestGraphs.scala b/core/src/test/scala/mill/TestGraphs.scala
index 9709979d..46fad053 100644
--- a/core/src/test/scala/forge/TestGraphs.scala
+++ b/core/src/test/scala/mill/TestGraphs.scala
@@ -1,7 +1,7 @@
-package forge
+package mill
 
-import forge.define.Task.Cacher
-import forge.TestUtil.test
+import mill.define.Task.Cacher
+import mill.TestUtil.test
 
 class TestGraphs(){
   // single
diff --git a/core/src/test/scala/forge/TestMain.scala b/core/src/test/scala/mill/TestMain.scala
index c94e13f0..d0ebfc9d 100644
--- a/core/src/test/scala/forge/TestMain.scala
+++ b/core/src/test/scala/mill/TestMain.scala
@@ -1,4 +1,4 @@
-package forge
+package mill
 import ammonite.ops._
 import java.io.File
 
@@ -57,7 +57,7 @@ object TestMain {
 
     val outputDir = pwd/'target/'zinc
     mkdir(outputDir)
-    val scalaFiles = ls.rec(pwd/'src/'main/'scala/'forge).filter(_.ext == "scala").map(_.toIO).toArray
+    val scalaFiles = ls.rec(pwd/'src/'main/'scala/'mill).filter(_.ext == "scala").map(_.toIO).toArray
 
     pprint.log(scalaFiles)
     scalac.apply(
diff --git a/core/src/test/scala/forge/TestUtil.scala b/core/src/test/scala/mill/TestUtil.scala
index 1ae60e6d..f2c4ad3a 100644
--- a/core/src/test/scala/forge/TestUtil.scala
+++ b/core/src/test/scala/mill/TestUtil.scala
@@ -1,7 +1,7 @@
-package forge
+package mill
 
-import forge.define.Task
-import forge.util.{Args, OSet}
+import mill.define.Task
+import mill.util.{Args, OSet}
 import utest.assert
 
 import scala.collection.mutable
diff --git a/core/src/test/scala/forge/UTestFramework.scala b/core/src/test/scala/mill/UTestFramework.scala
index 3435e9c0..6c0d5191 100644
--- a/core/src/test/scala/forge/UTestFramework.scala
+++ b/core/src/test/scala/mill/UTestFramework.scala
@@ -1,8 +1,8 @@
-package forge
+package mill
 
 class UTestFramework extends utest.runner.Framework {
   override def exceptionStackFrameHighlighter(s: StackTraceElement) = {
-    s.getClassName.startsWith("forge.")
+    s.getClassName.startsWith("mill.")
   }
   override def setup() = {
     import ammonite.ops._
diff --git a/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala b/scalaplugin/src/main/scala/mill/scalaplugin/Subproject.scala
index a94dac6b..59538a69 100644
--- a/scalaplugin/src/main/scala/forge/scalaplugin/Subproject.scala
+++ b/scalaplugin/src/main/scala/mill/scalaplugin/Subproject.scala
@@ -1,14 +1,14 @@
-package forge
+package mill
 package scalaplugin
 
 import java.io.File
 
 import ammonite.ops.{Path, ls, mkdir, pwd}
 import coursier.{Cache, Dependency, Fetch, MavenRepository, Module, Repository, Resolution}
-import forge.define.Task
-import forge.define.Task.Cacher
-import forge.eval.PathRef
-import forge.util.Args
+import mill.define.Task
+import mill.define.Task.Cacher
+import mill.eval.PathRef
+import mill.util.Args
 import play.api.libs.json._
 import sbt.internal.inc.{FreshCompilerCache, ScalaInstance, ZincUtil}
 import sbt.internal.util.{ConsoleOut, MainAppender}
diff --git a/scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala b/scalaplugin/src/test/scala/mill/scalaplugin/MetacircularTests.scala
index ac03074d..2d6d25e7 100644
--- a/scalaplugin/src/test/scala/forge/scalaplugin/MetacircularTests.scala
+++ b/scalaplugin/src/test/scala/mill/scalaplugin/MetacircularTests.scala
@@ -1,12 +1,12 @@
-package forge
+package mill
 package scalaplugin
 
 import ammonite.ops.pwd
 import coursier.{Dependency => Dep, Module => Mod}
-import forge.discover.Discovered
-import forge.eval.{Evaluator, PathRef}
-import forge.scalaplugin.Subproject.ScalaDep
-import forge.util.OSet
+import mill.discover.Discovered
+import mill.eval.{Evaluator, PathRef}
+import mill.scalaplugin.Subproject.ScalaDep
+import mill.util.OSet
 import utest._
 
 object MetacircularTests extends TestSuite{