diff --git a/main/src/main/scala/sbt/TemplateCommand.scala b/main/src/main/scala/sbt/TemplateCommandUtil.scala
similarity index 100%
rename from main/src/main/scala/sbt/TemplateCommand.scala
rename to main/src/main/scala/sbt/TemplateCommandUtil.scala
diff --git a/main/src/main/scala/sbt/internal/DslAst.scala b/main/src/main/scala/sbt/internal/DslEntry.scala
similarity index 100%
rename from main/src/main/scala/sbt/internal/DslAst.scala
rename to main/src/main/scala/sbt/internal/DslEntry.scala
diff --git a/main/src/main/scala/sbt/plugins/Giter8ResolverPlugin.scala b/main/src/main/scala/sbt/plugins/Giter8TemplatePlugin.scala
similarity index 100%
rename from main/src/main/scala/sbt/plugins/Giter8ResolverPlugin.scala
rename to main/src/main/scala/sbt/plugins/Giter8TemplatePlugin.scala
diff --git a/sbt/src/main/scala/AllSyntax.scala b/sbt/src/main/scala/sbt/AllSyntax.scala
similarity index 100%
rename from sbt/src/main/scala/AllSyntax.scala
rename to sbt/src/main/scala/sbt/AllSyntax.scala
diff --git a/sbt/src/main/scala/Import.scala b/sbt/src/main/scala/sbt/Import.scala
similarity index 100%
rename from sbt/src/main/scala/Import.scala
rename to sbt/src/main/scala/sbt/Import.scala