diff --git a/MIGRATION.md b/MIGRATION.md
index 10fe5701b..f5753e214 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -7,6 +7,8 @@ Migration notes
 - `sbt.Plugin` is also gone. Use auto plugins.
 - The incremental compiler, called Zinc, uses class-based name hashing.
 - Zinc drops support for Scala 2.8.x and 2.9.x.
+- Removed the pre-0.13.7 *.sbt file parser (previously available under `-Dsbt.parser.simple=true`)
+- Removed old, hypher-separated key names (use `publishLocal` instead of `publish-local`)
 
 #### Additional import required
 
diff --git a/sbt/src/sbt-test/actions/depends-on/build.sbt b/sbt/src/sbt-test/actions/depends-on/build.sbt
index 2a2dfbf7f..ffcbfbc8a 100644
--- a/sbt/src/sbt-test/actions/depends-on/build.sbt
+++ b/sbt/src/sbt-test/actions/depends-on/build.sbt
@@ -2,24 +2,24 @@
 
 lazy val root = (project in file(".")).
   settings(
-    a <<= baseDirectory map (b =>  if( (b / "succeed").exists) () else sys.error("fail")),
-    b <<= a.task(at => nop dependsOn(at) ),
+    a <<= baseDirectory map (b =>  if ((b / "succeed").exists) () else sys.error("fail")),
+    b <<= a.task(at => nop dependsOn(at)),
     c <<= a map { _ => () },
     d <<= a flatMap { _ => task { () } }
   )
-lazy val a = TaskKey[Unit]("a")
-lazy val b = TaskKey[Unit]("b")
-lazy val c = TaskKey[Unit]("c")
-lazy val d = TaskKey[Unit]("d")
+lazy val a = taskKey[Unit]("")
+lazy val b = taskKey[Unit]("")
+lazy val c = taskKey[Unit]("")
+lazy val d = taskKey[Unit]("")
 
 lazy val input = (project in file("input")).
   settings(
-    f <<= inputTask { _ map { args => if(args(0) == "succeed") () else sys.error("fail") } },
+    f <<= inputTask { _ map { args => if (args(0) == "succeed") () else sys.error("fail") } },
     j := sys.error("j"),
     g <<= f dependsOn(j),
     h <<= f map { _ => IO.touch(file("h")) }
   )
-lazy val f = InputKey[Unit]("f")
-lazy val g = InputKey[Unit]("g")
-lazy val h = InputKey[Unit]("h")
-lazy val j = TaskKey[Unit]("j")
+lazy val f = inputKey[Unit]("")
+lazy val g = inputKey[Unit]("")
+lazy val h = inputKey[Unit]("")
+lazy val j = taskKey[Unit]("")
diff --git a/sbt/src/sbt-test/actions/reload/build.sbt b/sbt/src/sbt-test/actions/reload/build.sbt
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/actions/reload/changes/changed.sbt b/sbt/src/sbt-test/actions/reload/changes/changed.sbt
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/actions/reload/external/build.sbt b/sbt/src/sbt-test/actions/reload/external/build.sbt
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/actions/reload/test b/sbt/src/sbt-test/actions/reload/test
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/actions/run-task/build.sbt b/sbt/src/sbt-test/actions/run-task/build.sbt
index 6d71b2bbb..0166f62ed 100644
--- a/sbt/src/sbt-test/actions/run-task/build.sbt
+++ b/sbt/src/sbt-test/actions/run-task/build.sbt
@@ -6,8 +6,8 @@ lazy val root = (project in file(".")).
     myIn
   )
 
-lazy val demoIn = InputKey[Unit]("demo-in", "Demo run input task", demo)
-lazy val demo = TaskKey[Unit]("demo", "Demo run task")
+lazy val demoIn = InputKey[Unit]("demoIn", "Demo run input task", demo)
+lazy val demo = taskKey[Unit]("Demo run task")
 
-def myRun = fullRunTask( demo, Compile, "A", "1", "1")
-def myIn = fullRunInputTask( demoIn, Compile, "A", "1")
+def myRun = fullRunTask(demo, Compile, "A", "1", "1")
+def myIn = fullRunInputTask(demoIn, Compile, "A", "1")
diff --git a/sbt/src/sbt-test/actions/run-task/test b/sbt/src/sbt-test/actions/run-task/test
index f73891519..352014d06 100644
--- a/sbt/src/sbt-test/actions/run-task/test
+++ b/sbt/src/sbt-test/actions/run-task/test
@@ -1,5 +1,5 @@
 > demo
 -> demo 1
-> demo-in 1
--> demo-in 2
-> demo-in 1 2
+> demoIn 1
+-> demoIn 2
+> demoIn 1 2
diff --git a/sbt/src/sbt-test/actions/set/test b/sbt/src/sbt-test/actions/set/test
index 7426c5704..b50fd83e1 100644
--- a/sbt/src/sbt-test/actions/set/test
+++ b/sbt/src/sbt-test/actions/set/test
@@ -1,4 +1,4 @@
 > helloWorldTest
 > buildSbtTest
-> evil-clear-logger
-> set version := { sLog.value.info("yo"); version.value }
\ No newline at end of file
+> evilClearLogger
+> set version := { sLog.value.info("yo"); version.value }
diff --git a/sbt/src/sbt-test/actions/state/build.sbt b/sbt/src/sbt-test/actions/state/build.sbt
index fa3b59606..8d315c7f8 100644
--- a/sbt/src/sbt-test/actions/state/build.sbt
+++ b/sbt/src/sbt-test/actions/state/build.sbt
@@ -3,13 +3,13 @@ import complete.DefaultParsers._
 import sbinary.DefaultProtocol._
 import Def.Initialize
 
-val keep = TaskKey[Int]("keep")
-val persisted = TaskKey[Int]("persist")
-val checkKeep = InputKey[Unit]("check-keep")
-val checkPersisted = InputKey[Unit]("check-persist")
+val keep = taskKey[Int]("")
+val persist = taskKey[Int]("")
+val checkKeep = inputKey[Unit]("")
+val checkPersist = inputKey[Unit]("")
 
-val updateDemo = TaskKey[Int]("demo")
-val check = InputKey[Unit]("check")
+val updateDemo = taskKey[Int]("")
+val check = inputKey[Unit]("")
 val sample = AttributeKey[Int]("demo-key")
 
 def updateDemoInit = state map { s => (s get sample getOrElse 9) + 1 }
@@ -34,11 +34,11 @@ def checkInit: Initialize[InputTask[Unit]] = InputTask( (_: State) => token(Spac
   }
 }
 
-def inMemorySetting = keep <<= getPrevious(keep) map { case None => 3; case Some(x) => x + 1} keepAs(keep)
-def persistedSetting = persisted <<= loadPrevious(persisted) map { case None => 17; case Some(x) => x + 1} storeAs(persisted)
+def  inMemorySetting = keep    <<=  getPrevious(keep)    map { case None =>  3; case Some(x) => x + 1}  keepAs(keep)
+def persistedSetting = persist <<= loadPrevious(persist) map { case None => 17; case Some(x) => x + 1} storeAs(persist)
 
-def inMemoryCheck = checkKeep <<= inputCheck( (ctx, s) => Space ~> str(getFromContext(keep, ctx, s)) )
-def persistedCheck = checkPersisted <<= inputCheck( (ctx, s) => Space ~> str(loadFromContext(persisted, ctx, s)) )
+def  inMemoryCheck = checkKeep    <<= inputCheck( (ctx, s) => Space ~> str( getFromContext(   keep, ctx, s)) )
+def persistedCheck = checkPersist <<= inputCheck( (ctx, s) => Space ~> str(loadFromContext(persist, ctx, s)) )
 
 def inputCheck[T](f: (ScopedKey[_], State) => Parser[T]): Initialize[InputTask[Unit]] =
   InputTask( resolvedScoped(ctx => (s: State) => f(ctx, s)) )( dummyTask )
diff --git a/sbt/src/sbt-test/actions/state/test b/sbt/src/sbt-test/actions/state/test
index 3042edd51..bbd2168c8 100644
--- a/sbt/src/sbt-test/actions/state/test
+++ b/sbt/src/sbt-test/actions/state/test
@@ -5,35 +5,35 @@
 > check 16 15
 
 
--> check-keep 3
-> check-keep blue
+-> checkKeep 3
+> checkKeep blue
 
 > keep
-> check-keep 3
--> check-keep 4
-> check-keep 3
+> checkKeep 3
+-> checkKeep 4
+> checkKeep 3
 
 > keep
--> check-keep 3
-> check-keep 4
-> check-keep 4
+-> checkKeep 3
+> checkKeep 4
+> checkKeep 4
 
 > reload
-> check-keep blue
+> checkKeep blue
 > keep
-> check-keep 3
+> checkKeep 3
 
 
--> check-persist 17
-> check-persist blue
+-> checkPersist 17
+> checkPersist blue
 
 > persist
-> check-persist 17
--> check-persist blue
+> checkPersist 17
+-> checkPersist blue
 
 > persist
-> check-persist 18
+> checkPersist 18
 > reload
-> check-persist 18
+> checkPersist 18
 > persist
-> check-persist 19
+> checkPersist 19
diff --git a/sbt/src/sbt-test/actions/update-state-fail/build.sbt b/sbt/src/sbt-test/actions/update-state-fail/build.sbt
index abd5c4db3..0b21b91e0 100644
--- a/sbt/src/sbt-test/actions/update-state-fail/build.sbt
+++ b/sbt/src/sbt-test/actions/update-state-fail/build.sbt
@@ -1,6 +1,6 @@
 lazy val akey = AttributeKey[Int]("TestKey")
-lazy val t = TaskKey[String]("test-task")
-lazy val check = InputKey[Unit]("check")
+lazy val testTask = taskKey[String]("")
+lazy val check = inputKey[Unit]("")
 
 lazy val root = (project in file(".")).
   aggregate(a, b).
@@ -10,12 +10,12 @@ lazy val root = (project in file(".")).
 
 lazy val a = project.
   settings(
-    t := sys.error("Failing")
+    testTask := sys.error("Failing")
   )
 
 lazy val b = project.
   settings(
-    t <<= Def.task("").updateState(updater)
+    testTask <<= Def.task("").updateState(updater)
   )
 
 def checkState(runs: Int, s: State): Unit = {
diff --git a/sbt/src/sbt-test/actions/update-state-fail/test b/sbt/src/sbt-test/actions/update-state-fail/test
index a3f2508c4..280edf6b3 100644
--- a/sbt/src/sbt-test/actions/update-state-fail/test
+++ b/sbt/src/sbt-test/actions/update-state-fail/test
@@ -1,9 +1,9 @@
 > check 0
--> test-task
+-> testTask
 > check 1
--> test-task
+-> testTask
 > check 2
-> b/test-task
+> b/testTask
+> check 3
+-> a/testTask
 > check 3
--> a/test-task
-> check 3
\ No newline at end of file
diff --git a/sbt/src/sbt-test/apiinfo/basic/src/main/scala/testCase/JFoo.java b/sbt/src/sbt-test/apiinfo/basic/src/main/scala/testCase/JFoo.java
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/apiinfo/show-circular-structure/test b/sbt/src/sbt-test/apiinfo/show-circular-structure/test
index 60ade5c1c..535ef6fcf 100644
--- a/sbt/src/sbt-test/apiinfo/show-circular-structure/test
+++ b/sbt/src/sbt-test/apiinfo/show-circular-structure/test
@@ -1,4 +1,4 @@
 # test case for http://github.com/sbt/sbt/issues/676
 > compile
 # fails with StackOverflowException
-> show-apis
+> showApis
diff --git a/sbt/src/sbt-test/apiinfo/unstable-existential-names/test b/sbt/src/sbt-test/apiinfo/unstable-existential-names/test
index 01486aa30..4a895eb1c 100644
--- a/sbt/src/sbt-test/apiinfo/unstable-existential-names/test
+++ b/sbt/src/sbt-test/apiinfo/unstable-existential-names/test
@@ -9,4 +9,4 @@ $ copy-file changes/Foo1.scala src/main/scala/Foo.scala
 # second iteration
 > compile
 # check if there are only two compile iterations being performed
-> check-number-of-compiler-iterations 2
+> checkNumberOfCompilerIterations 2
diff --git a/sbt/src/sbt-test/compiler-project/inc-package-class-dependency/test b/sbt/src/sbt-test/compiler-project/inc-package-class-dependency/test
index d68315137..81fe975d1 100644
--- a/sbt/src/sbt-test/compiler-project/inc-package-class-dependency/test
+++ b/sbt/src/sbt-test/compiler-project/inc-package-class-dependency/test
@@ -4,4 +4,4 @@
 > compile
 # verifies that there's no dependency on a class file corresponding
 # to a package
-> verify-binary-deps
+> verifyBinaryDeps
diff --git a/sbt/src/sbt-test/compiler-project/inc-pickled-existential/test b/sbt/src/sbt-test/compiler-project/inc-pickled-existential/test
index 8f70a72da..b671a0166 100644
--- a/sbt/src/sbt-test/compiler-project/inc-pickled-existential/test
+++ b/sbt/src/sbt-test/compiler-project/inc-pickled-existential/test
@@ -9,4 +9,4 @@ $ copy-file changes/B1.scala src/main/scala/B.scala
 # second iteration
 > compile
 # check if there are only two compile iterations being performed
-> check-number-of-compiler-iterations 2
+> checkNumberOfCompilerIterations 2
diff --git a/sbt/src/sbt-test/compiler-project/inc-pickled-refinement/test b/sbt/src/sbt-test/compiler-project/inc-pickled-refinement/test
index 5e53b6cc2..110af1ccb 100644
--- a/sbt/src/sbt-test/compiler-project/inc-pickled-refinement/test
+++ b/sbt/src/sbt-test/compiler-project/inc-pickled-refinement/test
@@ -11,4 +11,4 @@ $ copy-file changes/Impl1.scala src/main/scala/Impl.scala
 # second iteration
 > compile
 # check if there are only two compile iterations performed
-> check-number-of-compiler-iterations 2
+> checkNumberOfCompilerIterations 2
diff --git a/sbt/src/sbt-test/dependency-management/artifact/build.sbt b/sbt/src/sbt-test/dependency-management/artifact/build.sbt
index 6f85caf19..5ee15ab8a 100644
--- a/sbt/src/sbt-test/dependency-management/artifact/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/artifact/build.sbt
@@ -1,7 +1,7 @@
 import sbt.internal.inc.classpath.ClasspathUtilities
 
-lazy val checkFull = TaskKey[Unit]("check-full")
-lazy val check = TaskKey[Unit]("check")
+lazy val checkFull = taskKey[Unit]("")
+lazy val check = taskKey[Unit]("")
 
 lazy val root = (project in file(".")).
   settings(
diff --git a/sbt/src/sbt-test/dependency-management/artifact/test b/sbt/src/sbt-test/dependency-management/artifact/test
index 65b6db19b..e944dd35b 100644
--- a/sbt/src/sbt-test/dependency-management/artifact/test
+++ b/sbt/src/sbt-test/dependency-management/artifact/test
@@ -2,7 +2,7 @@
 -> check
 
 # verify that check-full succeeds
-> check-full
+> checkFull
 
 # publish test jar to test repository
 > publish
@@ -16,4 +16,4 @@ $ touch retrieve
 > reload
 
 # verify that artifact with extension, type, and classifier can be retreieved
-> check
\ No newline at end of file
+> check
diff --git a/sbt/src/sbt-test/dependency-management/cache-local/test b/sbt/src/sbt-test/dependency-management/cache-local/test
index 6b4e5c9f4..8919b5ea0 100644
--- a/sbt/src/sbt-test/dependency-management/cache-local/test
+++ b/sbt/src/sbt-test/dependency-management/cache-local/test
@@ -1,7 +1,7 @@
 $ copy-file changes/def.sbt build.sbt
 $ copy-file changes/resolver.sbt resolver.sbt
 > reload
-> publish-local
+> publishLocal
 > publish
 
 $ delete build.sbt
diff --git a/sbt/src/sbt-test/dependency-management/cache-resolver/test b/sbt/src/sbt-test/dependency-management/cache-resolver/test
index 82c7ea83d..ad07c2221 100644
--- a/sbt/src/sbt-test/dependency-management/cache-resolver/test
+++ b/sbt/src/sbt-test/dependency-management/cache-resolver/test
@@ -3,7 +3,7 @@
 $ copy-file changes/def/build.sbt build.sbt
 $ copy-file changes/def/Def.java b/Def.java
 > reload
-> publish-local
+> publishLocal
 > clean
 
 
@@ -27,7 +27,7 @@ $ delete build.sbt
 $ copy-file changes/both/build.sbt build.sbt
 $ copy-file changes/def/Def.java b/Def.java
 > reload
-> publish-local
+> publishLocal
 > clean
 
 
diff --git a/sbt/src/sbt-test/dependency-management/deliver-artifacts/test b/sbt/src/sbt-test/dependency-management/deliver-artifacts/test
index 3e3547aeb..e6adf0b4c 100644
--- a/sbt/src/sbt-test/dependency-management/deliver-artifacts/test
+++ b/sbt/src/sbt-test/dependency-management/deliver-artifacts/test
@@ -1,4 +1,4 @@
-> a/publish-local
+> a/publishLocal
 > b/update
 # verify that A's artifact was published and available for B to compile/run against
-> b/run
\ No newline at end of file
+> b/run
diff --git a/sbt/src/sbt-test/dependency-management/exclude-transitive/build.sbt b/sbt/src/sbt-test/dependency-management/exclude-transitive/build.sbt
index fc2b5379b..5e7f0cda8 100644
--- a/sbt/src/sbt-test/dependency-management/exclude-transitive/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/exclude-transitive/build.sbt
@@ -2,8 +2,8 @@ lazy val root = (project in file(".")).
   settings(
     ivyPaths <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache"))),
     libraryDependencies <+= baseDirectory(transitive("javax.mail" % "mail" % "1.4.1")),
-    TaskKey[Unit]("check-transitive") <<= check(true),
-    TaskKey[Unit]("check-intransitive") <<= check(false)
+    TaskKey[Unit]("checkTransitive") <<= check(true),
+    TaskKey[Unit]("checkIntransitive") <<= check(false)
   )
 
 def transitive(dep: ModuleID)(base: File) =
diff --git a/sbt/src/sbt-test/dependency-management/exclude-transitive/test b/sbt/src/sbt-test/dependency-management/exclude-transitive/test
index 511952ae3..bf78e6c17 100644
--- a/sbt/src/sbt-test/dependency-management/exclude-transitive/test
+++ b/sbt/src/sbt-test/dependency-management/exclude-transitive/test
@@ -8,8 +8,8 @@ $ touch transitive
 > reload
 #$ pause
 
-> check-transitive
--> check-intransitive
+> checkTransitive
+-> checkIntransitive
 
 
 # load the project definition with transitive dependencies disabled
@@ -19,5 +19,5 @@ $ delete ivy-cache
 $ delete transitive
 > reload
 
--> check-transitive
-> check-intransitive
\ No newline at end of file
+-> checkTransitive
+> checkIntransitive
diff --git a/sbt/src/sbt-test/dependency-management/force/build.sbt b/sbt/src/sbt-test/dependency-management/force/build.sbt
old mode 100755
new mode 100644
index 3d49d87a9..d3cf67d04
--- a/sbt/src/sbt-test/dependency-management/force/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/force/build.sbt
@@ -2,8 +2,8 @@ lazy val root = (project in file(".")).
   settings(
     ivyPaths <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache"))),
     libraryDependencies <++= baseDirectory (libraryDeps),
-    TaskKey[Unit]("check-forced") <<= check("1.2.14"),
-    TaskKey[Unit]("check-depend") <<= check("1.2.13")
+    TaskKey[Unit]("checkForced") <<= check("1.2.14"),
+    TaskKey[Unit]("checkDepend") <<= check("1.2.13")
   )
 
 def libraryDeps(base: File) = {
diff --git a/sbt/src/sbt-test/dependency-management/force/test b/sbt/src/sbt-test/dependency-management/force/test
old mode 100755
new mode 100644
index 2cb44cea7..46032d587
--- a/sbt/src/sbt-test/dependency-management/force/test
+++ b/sbt/src/sbt-test/dependency-management/force/test
@@ -2,11 +2,11 @@ $ touch force
 
 > reload
 
-> check-forced
--> check-depend
+> checkForced
+-> checkDepend
 
 $ delete force
 > reload
 
--> check-forced
-> check-depend
\ No newline at end of file
+-> checkForced
+> checkDepend
diff --git a/sbt/src/sbt-test/dependency-management/info/build.sbt b/sbt/src/sbt-test/dependency-management/info/build.sbt
index b1387ed93..bf0e7f1b6 100644
--- a/sbt/src/sbt-test/dependency-management/info/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/info/build.sbt
@@ -12,8 +12,8 @@ lazy val root = (project in file(".")).
     TaskKey[Unit]("check-info") <<= checkInfo
   )
 
-lazy val delivered = TaskKey[NodeSeq]("delivered")
-lazy val customInfo = SettingKey[Boolean]("custom-info")
+lazy val delivered = taskKey[NodeSeq]("")
+lazy val customInfo = settingKey[Boolean]("")
 
 def inlineXML(addInfo: Boolean, organization: String, moduleID: String, version: String): NodeSeq =
   if(addInfo)
diff --git a/sbt/src/sbt-test/dependency-management/info/test b/sbt/src/sbt-test/dependency-management/info/test
index 78c6f476f..6d6de709b 100644
--- a/sbt/src/sbt-test/dependency-management/info/test
+++ b/sbt/src/sbt-test/dependency-management/info/test
@@ -1,11 +1,11 @@
-> check-download
-> check-info
+> checkDownload
+> checkInfo
 
 > clean
 $ touch info
 > reload
 
-> show custom-info
-> check-download
-> show custom-info
-> check-info
\ No newline at end of file
+> show customInfo
+> checkDownload
+> show customInfo
+> checkInfo
diff --git a/sbt/src/sbt-test/dependency-management/make-pom-type/build.sbt b/sbt/src/sbt-test/dependency-management/make-pom-type/build.sbt
index 79a809bff..524b569d3 100644
--- a/sbt/src/sbt-test/dependency-management/make-pom-type/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/make-pom-type/build.sbt
@@ -31,7 +31,7 @@ lazy val expectedInter =
     <version>1.0</version>
   </dependency>
 
-def checkTask(expectedDep: xml.Elem) = TaskKey[Unit]("check-pom") <<= makePom map { file =>
+def checkTask(expectedDep: xml.Elem) = TaskKey[Unit]("checkPom") <<= makePom map { file =>
   val pom = xml.XML.loadFile(file)
   val actual = pom \\ "dependencies"
   val expected = <d>
diff --git a/sbt/src/sbt-test/dependency-management/make-pom-type/test b/sbt/src/sbt-test/dependency-management/make-pom-type/test
index 8f508390f..5d5c87e37 100644
--- a/sbt/src/sbt-test/dependency-management/make-pom-type/test
+++ b/sbt/src/sbt-test/dependency-management/make-pom-type/test
@@ -1,2 +1,2 @@
-> p1/check-pom
-> p2/check-pom
\ No newline at end of file
+> p1/checkPom
+> p2/checkPom
diff --git a/sbt/src/sbt-test/dependency-management/make-pom/build.sbt b/sbt/src/sbt-test/dependency-management/make-pom/build.sbt
index 48b9c916c..07e508a41 100644
--- a/sbt/src/sbt-test/dependency-management/make-pom/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/make-pom/build.sbt
@@ -3,9 +3,9 @@ import scala.xml._
 lazy val root = (project in file(".")).
   settings(
     readPom <<= makePom map XML.loadFile,
-    TaskKey[Unit]("check-pom") <<= checkPom,
-    TaskKey[Unit]("check-extra") <<= checkExtra,
-    TaskKey[Unit]("check-version-plus-mapping") <<= checkVersionPlusMapping,
+    TaskKey[Unit]("checkPom") <<= checkPom,
+    TaskKey[Unit]("checkExtra") <<= checkExtra,
+    TaskKey[Unit]("checkVersionPlusMapping") <<= checkVersionPlusMapping,
     resolvers += Resolver.sonatypeRepo("snapshots"),
     makePomConfiguration ~= { _.copy(extra = <extra-tag/>) },
     libraryDependencies += "com.google.code.findbugs" % "jsr305" % "1.3.+"
diff --git a/sbt/src/sbt-test/dependency-management/make-pom/test b/sbt/src/sbt-test/dependency-management/make-pom/test
index 4e3cfe973..1e92792f9 100644
--- a/sbt/src/sbt-test/dependency-management/make-pom/test
+++ b/sbt/src/sbt-test/dependency-management/make-pom/test
@@ -1,3 +1,3 @@
-> check-pom
-> check-extra
-> check-version-plus-mapping
\ No newline at end of file
+> checkPom
+> checkExtra
+> checkVersionPlusMapping
diff --git a/sbt/src/sbt-test/dependency-management/module-name/build.sbt b/sbt/src/sbt-test/dependency-management/module-name/build.sbt
index 15d182515..a850df961 100644
--- a/sbt/src/sbt-test/dependency-management/module-name/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/module-name/build.sbt
@@ -4,7 +4,7 @@ moduleName := "asdf"
 
 crossPaths := false
 
-TaskKey[Unit]("check-name") <<= (moduleName, name, packageBin in Compile) map { (module, n, f) =>
+TaskKey[Unit]("checkName") <<= (moduleName, name, packageBin in Compile) map { (module, n, f) =>
   val path = f.getAbsolutePath 
   assert(path contains module, "Path " + path + " did not contain module name " + module)
   assert(!path.contains(n), "Path " + path + " contained " + n)
diff --git a/sbt/src/sbt-test/dependency-management/module-name/test b/sbt/src/sbt-test/dependency-management/module-name/test
index 298be6118..ee7ea1a3f 100644
--- a/sbt/src/sbt-test/dependency-management/module-name/test
+++ b/sbt/src/sbt-test/dependency-management/module-name/test
@@ -1 +1 @@
-> check-name
+> checkName
diff --git a/sbt/src/sbt-test/dependency-management/multiple-classifiers/build.sbt b/sbt/src/sbt-test/dependency-management/multiple-classifiers/build.sbt
index 3af1b6e6c..d3fbdcf1e 100644
--- a/sbt/src/sbt-test/dependency-management/multiple-classifiers/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/multiple-classifiers/build.sbt
@@ -8,7 +8,7 @@ TaskKey[Unit]("check") <<= dependencyClasspath in Compile map { cp =>
 	assert(cp.size == 3, "Expected 3 jars, got: " + cp.files.mkString("(", ", ", ")"))
 }
 
-TaskKey[Unit]("check-pom") <<= makePom map { file =>
+TaskKey[Unit]("checkPom") <<= makePom map { file =>
 	val pom = xml.XML.loadFile(file)
 	val actual = pom \\ "dependencies"
 	def depSection(classifier: String) =
diff --git a/sbt/src/sbt-test/dependency-management/multiple-classifiers/test b/sbt/src/sbt-test/dependency-management/multiple-classifiers/test
index 0f60369cd..ca7319717 100644
--- a/sbt/src/sbt-test/dependency-management/multiple-classifiers/test
+++ b/sbt/src/sbt-test/dependency-management/multiple-classifiers/test
@@ -1,6 +1,6 @@
 > check
 
-> check-pom
+> checkPom
 
 $ delete build.sbt
 $ copy-file changes/non-mergeable.sbt build.sbt
diff --git a/sbt/src/sbt-test/dependency-management/no-file-fails-publish/test b/sbt/src/sbt-test/dependency-management/no-file-fails-publish/test
index 257b13711..ac00c2dae 100644
--- a/sbt/src/sbt-test/dependency-management/no-file-fails-publish/test
+++ b/sbt/src/sbt-test/dependency-management/no-file-fails-publish/test
@@ -1,4 +1,4 @@
--> publish-local
+-> publishLocal
 
 $ touch topublish.txt
-> publish-local
\ No newline at end of file
+> publishLocal
diff --git a/sbt/src/sbt-test/dependency-management/parent-publish/test b/sbt/src/sbt-test/dependency-management/parent-publish/test
index 262de7fc3..df1d8b9f9 100644
--- a/sbt/src/sbt-test/dependency-management/parent-publish/test
+++ b/sbt/src/sbt-test/dependency-management/parent-publish/test
@@ -1 +1 @@
-> publish-local
\ No newline at end of file
+> publishLocal
diff --git a/sbt/src/sbt-test/dependency-management/pom-advanced/build.sbt b/sbt/src/sbt-test/dependency-management/pom-advanced/build.sbt
index 96b2d46f9..dd14d2862 100644
--- a/sbt/src/sbt-test/dependency-management/pom-advanced/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/pom-advanced/build.sbt
@@ -3,7 +3,7 @@ import complete.DefaultParsers._
 lazy val root = (project in file(".")).
   settings(
     resolvers ++= Seq(local, Resolver.sonatypeRepo("releases"), Resolver.sonatypeRepo("snapshots")),
-    InputKey[Unit]("check-pom") <<= InputTask(_ => spaceDelimited("<args>")) { result => (makePom, result, streams) map checkPomRepositories },
+    InputKey[Unit]("checkPom") <<= InputTask(_ => spaceDelimited("<args>")) { result => (makePom, result, streams) map checkPomRepositories },
     makePomConfiguration <<= (makePomConfiguration, baseDirectory) { (conf, base) =>
       conf.copy(filterRepositories = pomIncludeRepository(base, conf.filterRepositories) )
     },
diff --git a/sbt/src/sbt-test/dependency-management/pom-advanced/test b/sbt/src/sbt-test/dependency-management/pom-advanced/test
index 792d32857..7d6449de8 100644
--- a/sbt/src/sbt-test/dependency-management/pom-advanced/test
+++ b/sbt/src/sbt-test/dependency-management/pom-advanced/test
@@ -1,11 +1,11 @@
 # write the default pom.  The only repositories should be Scala Tools Releases and Snapshots
-> check-pom https://oss.sonatype.org/content/repositories/releases/ https://oss.sonatype.org/content/repositories/snapshots/
+> checkPom https://oss.sonatype.org/content/repositories/releases/ https://oss.sonatype.org/content/repositories/snapshots/
 
 # include file:// repositories.  The generated repositories section should include the local Maven repository as well
 $ touch repo.all
-> check-pom https://oss.sonatype.org/content/repositories/releases/ https://oss.sonatype.org/content/repositories/snapshots/ file://*.m2/repository/
+> checkPom https://oss.sonatype.org/content/repositories/releases/ https://oss.sonatype.org/content/repositories/snapshots/ file://*.m2/repository/
 
 # include file:// repositories.  The generated repositories section should include the local Maven repository as well
 $ delete repo.all
 $ touch repo.none
-> check-pom
\ No newline at end of file
+> checkPom
diff --git a/sbt/src/sbt-test/dependency-management/pom-scope/build.sbt b/sbt/src/sbt-test/dependency-management/pom-scope/build.sbt
index c562e6403..d9c036978 100644
--- a/sbt/src/sbt-test/dependency-management/pom-scope/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/pom-scope/build.sbt
@@ -3,7 +3,7 @@ lazy val custom = config("custom")
 lazy val root = (project in file(".")).
   configs(custom).
   settings(
-    TaskKey[Unit]("check-pom") <<= checkPom,
+    TaskKey[Unit]("checkPom") <<= checkPom,
     libraryDependencies ++= Seq(
       "a" % "a" % "1.0",
       "b" % "b" % "1.0" % "runtime,optional",
diff --git a/sbt/src/sbt-test/dependency-management/pom-scope/test b/sbt/src/sbt-test/dependency-management/pom-scope/test
index c8edbfbcd..8d831496e 100644
--- a/sbt/src/sbt-test/dependency-management/pom-scope/test
+++ b/sbt/src/sbt-test/dependency-management/pom-scope/test
@@ -1 +1 @@
-> check-pom
\ No newline at end of file
+> checkPom
diff --git a/sbt/src/sbt-test/dependency-management/sources/build.sbt b/sbt/src/sbt-test/dependency-management/sources/build.sbt
index 7c204d337..08d617ea8 100644
--- a/sbt/src/sbt-test/dependency-management/sources/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/sources/build.sbt
@@ -7,8 +7,8 @@ lazy val root = (project in file(".")).
     autoScalaLibrary := false,
     managedScalaInstance := false,
     transitiveClassifiers := Seq("sources"),
-    TaskKey[Unit]("check-sources") <<= updateClassifiers map checkSources,
-    TaskKey[Unit]("check-binaries") <<= update map checkBinaries
+    TaskKey[Unit]("checkSources") <<= updateClassifiers map checkSources,
+    TaskKey[Unit]("checkBinaries") <<= update map checkBinaries
   )
 
 def getSources(report: UpdateReport)  = report.matching(artifactFilter(`classifier` = "sources") )
diff --git a/sbt/src/sbt-test/dependency-management/sources/test b/sbt/src/sbt-test/dependency-management/sources/test
index 2a28093f0..ca9281f91 100644
--- a/sbt/src/sbt-test/dependency-management/sources/test
+++ b/sbt/src/sbt-test/dependency-management/sources/test
@@ -1,3 +1,3 @@
-> check-binaries
-> show update-classifiers
-> check-sources
\ No newline at end of file
+> checkBinaries
+> show updateClassifiers
+> checkSources
diff --git a/sbt/src/sbt-test/dependency-management/t468/build.sbt b/sbt/src/sbt-test/dependency-management/t468/build.sbt
index 99b52332b..a2a7fce0e 100644
--- a/sbt/src/sbt-test/dependency-management/t468/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/t468/build.sbt
@@ -7,17 +7,17 @@ libraryDependencies ++= Seq(
 	"org.sat4j" % "org.sat4j.core" % "2.3.1"
 )
 
-TaskKey[Unit]("check-update") <<= update map { report =>
+TaskKey[Unit]("checkUpdate") <<= update map { report =>
 	val mods = report.configuration(Compile.name).get.allModules.map(_.name).toSet
 	val expected = Set("org.sat4j.pb", "org.sat4j.core")
 	if(mods != expected)
 		error("Expected modules " + expected  + ", got: " + mods)
 }
 
-TaskKey[Unit]("check-classpath") <<= dependencyClasspath in Compile map { cp =>
+TaskKey[Unit]("checkClasspath") <<= dependencyClasspath in Compile map { cp =>
 	val jars = cp.files.map(_.getName).toSet
 	// Note: pb depends on tests artifact in core for no good reason.  Previously this was not correctly added to the classpath.
 	val expected = Set("org.sat4j.pb-2.3.1.jar", "org.sat4j.core-2.3.1.jar", "org.sat4j.core-2.3.1-tests.jar")
 	if(jars != expected)
 		error("Expected jars " + expected  + ", got: " + jars)
-}
\ No newline at end of file
+}
diff --git a/sbt/src/sbt-test/dependency-management/t468/pending b/sbt/src/sbt-test/dependency-management/t468/pending
index 0006bc0f5..3b5ff15ac 100644
--- a/sbt/src/sbt-test/dependency-management/t468/pending
+++ b/sbt/src/sbt-test/dependency-management/t468/pending
@@ -1,2 +1,2 @@
-> check-update
-> check-classpath
+> checkUpdate
+> checkClasspath
diff --git a/sbt/src/sbt-test/dependency-management/test-artifact/test b/sbt/src/sbt-test/dependency-management/test-artifact/test
index fbb326ff1..e52a939c9 100644
--- a/sbt/src/sbt-test/dependency-management/test-artifact/test
+++ b/sbt/src/sbt-test/dependency-management/test-artifact/test
@@ -4,7 +4,7 @@
 $ copy-file changes/def/build.sbt build.sbt
 $ copy-file changes/def/Def.java src/test/java/Def.java
 > reload
-> publish-local
+> publishLocal
 > publish
 > clean
 
diff --git a/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/test b/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/test
index f7bc09621..00ad751bf 100644
--- a/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/test
+++ b/sbt/src/sbt-test/dependency-management/update-sbt-classifiers/test
@@ -1 +1 @@
-> update-sbt-classifiers
+> updateSbtClassifiers
diff --git a/sbt/src/sbt-test/dependency-management/url/build.sbt b/sbt/src/sbt-test/dependency-management/url/build.sbt
index ad1387fb7..d1d0d0e98 100644
--- a/sbt/src/sbt-test/dependency-management/url/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/url/build.sbt
@@ -5,8 +5,8 @@ lazy val root = (project in file(".")).
     ivyPaths <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache"))),
     libraryDependencies += "org.jsoup" % "jsoup" % "1.9.1" % Test from "http://jsoup.org/packages/jsoup-1.9.1.jar",
     ivyLoggingLevel := UpdateLogging.Full,
-    TaskKey[Unit]("check-in-test") <<= checkClasspath(Test),
-    TaskKey[Unit]("check-in-compile") <<= checkClasspath(Compile)
+    TaskKey[Unit]("checkInTest") <<= checkClasspath(Test),
+    TaskKey[Unit]("checkInCompile") <<= checkClasspath(Compile)
   )
 
 def checkClasspath(conf: Configuration) =
diff --git a/sbt/src/sbt-test/dependency-management/url/pending b/sbt/src/sbt-test/dependency-management/url/pending
index e5dae2249..691336b66 100644
--- a/sbt/src/sbt-test/dependency-management/url/pending
+++ b/sbt/src/sbt-test/dependency-management/url/pending
@@ -1,2 +1,2 @@
-> check-in-test
--> check-in-compile
+> checkInTest
+-> checkInCompile
diff --git a/sbt/src/sbt-test/java/track-anonymous/build.sbt b/sbt/src/sbt-test/java/track-anonymous/build.sbt
index af67d37cc..edcc050ff 100644
--- a/sbt/src/sbt-test/java/track-anonymous/build.sbt
+++ b/sbt/src/sbt-test/java/track-anonymous/build.sbt
@@ -1,7 +1,7 @@
 {
 		import complete.DefaultParsers._
 	val parser = token(Space ~> ( ("exists" ^^^ true) | ("absent" ^^^ false) ) )
-	InputKey[Unit]("check-output") := {
+	InputKey[Unit]("checkOutput") := {
 		val shouldExist = parser.parsed
 		val dir = (classDirectory in Compile).value
 		if((dir / "Anon.class").exists != shouldExist)
diff --git a/sbt/src/sbt-test/java/track-anonymous/test b/sbt/src/sbt-test/java/track-anonymous/test
index f196c06a0..2c48f4402 100644
--- a/sbt/src/sbt-test/java/track-anonymous/test
+++ b/sbt/src/sbt-test/java/track-anonymous/test
@@ -1,6 +1,6 @@
 $ copy-file changes/Anon.java src/main/java/Anon.java
 > compile
-> check-output exists
+> checkOutput exists
 $ delete src/main/java/Anon.java
 > compile
-> check-output absent
\ No newline at end of file
+> checkOutput absent
diff --git a/sbt/src/sbt-test/package/lazy-name/test b/sbt/src/sbt-test/package/lazy-name/test
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/project/Class.forName/changes/build2.sbt b/sbt/src/sbt-test/project/Class.forName/changes/build2.sbt
index 2f84cd7eb..d99bdb6d2 100644
--- a/sbt/src/sbt-test/project/Class.forName/changes/build2.sbt
+++ b/sbt/src/sbt-test/project/Class.forName/changes/build2.sbt
@@ -1,3 +1,3 @@
 crossPaths := false
 
-TaskKey[Unit]("use-jar") := { injar.Test.other; () }
+TaskKey[Unit]("useJar") := { injar.Test.other; () }
diff --git a/sbt/src/sbt-test/project/Class.forName/test b/sbt/src/sbt-test/project/Class.forName/test
index 7f9c0a4e2..9d10c6e28 100644
--- a/sbt/src/sbt-test/project/Class.forName/test
+++ b/sbt/src/sbt-test/project/Class.forName/test
@@ -11,4 +11,4 @@ $ copy-file changes/build2.sbt build.sbt
 
 # The project definition uses the class in test.jar and will fail here if sbt did not put the
 # jars in project/lib on the runtime classpath
-> use-jar
\ No newline at end of file
+> useJar
diff --git a/sbt/src/sbt-test/project/auto-import/project/P.scala b/sbt/src/sbt-test/project/auto-import/project/P.scala
index 77be945b3..cc5720ba2 100644
--- a/sbt/src/sbt-test/project/auto-import/project/P.scala
+++ b/sbt/src/sbt-test/project/auto-import/project/P.scala
@@ -16,8 +16,8 @@ package name.example {
 
     object autoImport {
       val xyz = 3
-      val checkMaxErrors = TaskKey[Unit]("check-max-errors")
-      val checkName = TaskKey[Unit]("check-name")
+      val checkMaxErrors = taskKey[Unit]("")
+      val checkName = taskKey[Unit]("")
     }
 
     import autoImport._
diff --git a/sbt/src/sbt-test/project/auto-import/test b/sbt/src/sbt-test/project/auto-import/test
index ae890957b..ee72c5abd 100644
--- a/sbt/src/sbt-test/project/auto-import/test
+++ b/sbt/src/sbt-test/project/auto-import/test
@@ -1,8 +1,8 @@
--> check-name
--> check-max-errors
+-> checkName
+-> checkMaxErrors
 
 $ copy-file changes/build.sbt build.sbt
 > reload
 
-> check-name
-> check-max-errors
\ No newline at end of file
+> checkName
+> checkMaxErrors
diff --git a/sbt/src/sbt-test/project/console/test b/sbt/src/sbt-test/project/console/test
index 04d7ca6ad..3b9a443b1 100644
--- a/sbt/src/sbt-test/project/console/test
+++ b/sbt/src/sbt-test/project/console/test
@@ -1,9 +1,9 @@
 $ mkdir sub3 sub1 sub2
-> console-project
-> 'sub3/console-project'
-> 'sub1/console-project'
+> consoleProject
+> 'sub3/consoleProject'
+> 'sub1/consoleProject'
 
 > project sub2
 # This can't actually fail, unfortunately.  The repl traps the exception and continues normally.
 > 'set initialCommands := """assert((name in currentRef get structure.data) == Some("sub2")) """ '
-> console-project
\ No newline at end of file
+> consoleProject
diff --git a/sbt/src/sbt-test/project/flatten/test b/sbt/src/sbt-test/project/flatten/test
index cc8a49a88..842d12a01 100644
--- a/sbt/src/sbt-test/project/flatten/test
+++ b/sbt/src/sbt-test/project/flatten/test
@@ -7,8 +7,8 @@
 
 # This part verifies that the package-src action works properly under a flattened/merged source hierarchy
 
-> package-src
-> test:package-src
+> packageSrc
+> test:packageSrc
 
 $ delete src
 $ delete test-src
diff --git a/sbt/src/sbt-test/project/lib/changes/build2.sbt b/sbt/src/sbt-test/project/lib/changes/build2.sbt
index e4fcd2a67..411630ac7 100644
--- a/sbt/src/sbt-test/project/lib/changes/build2.sbt
+++ b/sbt/src/sbt-test/project/lib/changes/build2.sbt
@@ -1,3 +1,3 @@
 crossPaths := false
 
-TaskKey[Option[String]]("use-jar") := { injar.Test.foo }
+TaskKey[Option[String]]("useJar") := { injar.Test.foo }
diff --git a/sbt/src/sbt-test/project/lib/test b/sbt/src/sbt-test/project/lib/test
index 334c74207..2f46e6eae 100644
--- a/sbt/src/sbt-test/project/lib/test
+++ b/sbt/src/sbt-test/project/lib/test
@@ -11,4 +11,4 @@ $ copy-file changes/build2.sbt build.sbt
 
 # The project definition uses the class in test.jar and will fail here if sbt did not put the
 # jar in project/lib on the runtime classpath
-> use-jar
+> useJar
diff --git a/sbt/src/sbt-test/project/load-hooks/build.sbt b/sbt/src/sbt-test/project/load-hooks/build.sbt
index 2b22f9a96..00e68d9b6 100644
--- a/sbt/src/sbt-test/project/load-hooks/build.sbt
+++ b/sbt/src/sbt-test/project/load-hooks/build.sbt
@@ -13,7 +13,7 @@
   )
 }
 
-InputKey[Unit]("check-count") <<= inputTask { argsTask =>
+InputKey[Unit]("checkCount") <<= inputTask { argsTask =>
 	(argsTask, state) map { (args, s) =>
 		def get(label: String) = s get AttributeKey[Int](label) getOrElse 0
 		val loadCount = get("load-count")
@@ -23,4 +23,4 @@ InputKey[Unit]("check-count") <<= inputTask { argsTask =>
 		assert(expectedLoad == loadCount, "Expected load count: " + expectedLoad + ", got: " + loadCount)
 		assert(expectedUnload == unloadCount, "Expected unload count: " + expectedUnload + ", got: " + unloadCount)
 	}
-}
\ No newline at end of file
+}
diff --git a/sbt/src/sbt-test/project/load-hooks/test b/sbt/src/sbt-test/project/load-hooks/test
index 3ccbea134..2e3f94ffd 100644
--- a/sbt/src/sbt-test/project/load-hooks/test
+++ b/sbt/src/sbt-test/project/load-hooks/test
@@ -1,8 +1,8 @@
-> check-count 1 0
-> check-count 1 0
+> checkCount 1 0
+> checkCount 1 0
 > reload
-> check-count 2 1
+> checkCount 2 1
 > set maxErrors := 1
-> check-count 3 2
+> checkCount 3 2
 > reboot
-> check-count 1 0
\ No newline at end of file
+> checkCount 1 0
diff --git a/sbt/src/sbt-test/project/provided/build.sbt b/sbt/src/sbt-test/project/provided/build.sbt
index f552d8929..04db88aea 100644
--- a/sbt/src/sbt-test/project/provided/build.sbt
+++ b/sbt/src/sbt-test/project/provided/build.sbt
@@ -13,7 +13,7 @@ lazy val sub = project
 
 lazy val rootRef = LocalProject("root")
 
-def rootSettings = Defaults.defaultSettings :+ ( TaskKey[Unit]("check") <<= checkTask )
+def rootSettings = (TaskKey[Unit]("check") <<= checkTask)
 def checkTask = (fullClasspath in (rootRef, Compile), fullClasspath in (rootRef, Runtime), fullClasspath in (rootRef, Test), fullClasspath in (sub, Test), fullClasspath in (superRoot, Compile)) map { (rc, rr, rt, st, pr) =>
   check0(st, "sub test", true)
   check0(pr, "superRoot main", false)
diff --git a/sbt/src/sbt-test/project/scala-loader/build.sbt b/sbt/src/sbt-test/project/scala-loader/build.sbt
index a8b38b0f7..5104db211 100644
--- a/sbt/src/sbt-test/project/scala-loader/build.sbt
+++ b/sbt/src/sbt-test/project/scala-loader/build.sbt
@@ -1,4 +1,4 @@
-lazy val checkLoader = TaskKey[Unit]("check-loaders")
+lazy val checkLoaders = taskKey[Unit]("")
 
 def checkTask = subs.map(sub => scalaInstance in LocalProject(sub.id)).join.map { sis =>
   assert(sis.sliding(2).forall{ case Seq(x,y) => x.loader == y.loader }, "Not all ScalaInstances had the same class loader.")
@@ -6,7 +6,7 @@ def checkTask = subs.map(sub => scalaInstance in LocalProject(sub.id)).join.map
 
 lazy val root = (project in file(".")).
   settings(
-    checkLoader <<= checkTask,
+    checkLoaders <<= checkTask,
     concurrentRestrictions := Nil
   )
 
diff --git a/sbt/src/sbt-test/project/scala-loader/test b/sbt/src/sbt-test/project/scala-loader/test
index 1549c7f19..3b6cca069 100644
--- a/sbt/src/sbt-test/project/scala-loader/test
+++ b/sbt/src/sbt-test/project/scala-loader/test
@@ -4,4 +4,4 @@
 #  problems in practice due to the different approach that substantially
 #  reduces the probability of simultaneous access.  The better test for 0.13+
 #  is the unit test on ClassLoaderCache
-> check-loaders
+> checkLoaders
diff --git a/sbt/src/sbt-test/project/session-save/build.check.1 b/sbt/src/sbt-test/project/session-save/build.check.1
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/project/session-save/build.check.2 b/sbt/src/sbt-test/project/session-save/build.check.2
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/project/session-save/build.check.3 b/sbt/src/sbt-test/project/session-save/build.check.3
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/project/session-save/build.sbt b/sbt/src/sbt-test/project/session-save/build.sbt
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/project/session-save/disabled b/sbt/src/sbt-test/project/session-save/disabled
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/source-dependencies/abstract-type-override/build.sbt b/sbt/src/sbt-test/source-dependencies/abstract-type-override/build.sbt
index 09b2b0a29..305240720 100644
--- a/sbt/src/sbt-test/source-dependencies/abstract-type-override/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/abstract-type-override/build.sbt
@@ -1,6 +1,6 @@
 import sbt.internal.inc.Analysis
 
-InputKey[Unit]("check-number-of-compiler-iterations") <<= inputTask { (argTask: TaskKey[Seq[String]]) =>
+InputKey[Unit]("checkNumberOfCompilerIterations") <<= inputTask { (argTask: TaskKey[Seq[String]]) =>
   (argTask, compile in Compile) map { case (args: Seq[String], a: Analysis) =>
     assert(args.size == 1)
     val expectedIterationsNumber = args(0).toInt
diff --git a/sbt/src/sbt-test/source-dependencies/abstract-type-override/test b/sbt/src/sbt-test/source-dependencies/abstract-type-override/test
index b0bec415e..9ffa4fb17 100644
--- a/sbt/src/sbt-test/source-dependencies/abstract-type-override/test
+++ b/sbt/src/sbt-test/source-dependencies/abstract-type-override/test
@@ -11,4 +11,4 @@ $ copy-file changes/Bar1.scala src/main/scala/Bar.scala
 # second iteration
 #> compile
 # check if there are only two compile iterations performed
-> check-number-of-compiler-iterations 2
+> checkNumberOfCompilerIterations 2
diff --git a/sbt/src/sbt-test/source-dependencies/compactify/build.sbt b/sbt/src/sbt-test/source-dependencies/compactify/build.sbt
index f44ca0862..37f0c4462 100644
--- a/sbt/src/sbt-test/source-dependencies/compactify/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/compactify/build.sbt
@@ -1,4 +1,4 @@
-TaskKey[Unit]("output-empty") <<= classDirectory in Configurations.Compile map { outputDirectory =>
+TaskKey[Unit]("outputEmpty") <<= classDirectory in Configurations.Compile map { outputDirectory =>
 	def classes = (outputDirectory ** "*.class").get
 	if(!classes.isEmpty) sys.error("Classes existed:\n\t" + classes.mkString("\n\t")) else ()
 }
diff --git a/sbt/src/sbt-test/source-dependencies/compactify/test b/sbt/src/sbt-test/source-dependencies/compactify/test
index e2abf578b..64be9af36 100644
--- a/sbt/src/sbt-test/source-dependencies/compactify/test
+++ b/sbt/src/sbt-test/source-dependencies/compactify/test
@@ -1,8 +1,8 @@
 # Marked pending due to https://github.com/sbt/sbt/issues/1553
 
-> output-empty
+> outputEmpty
 > compile
--> output-empty
+-> outputEmpty
 $ delete src/main/scala/For.scala src/main/scala/Nested.scala
 > compile
-> output-empty
\ No newline at end of file
+> outputEmpty
diff --git a/sbt/src/sbt-test/source-dependencies/inherited_type_params/build.sbt b/sbt/src/sbt-test/source-dependencies/inherited_type_params/build.sbt
index f653e0179..e622db1ed 100644
--- a/sbt/src/sbt-test/source-dependencies/inherited_type_params/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/inherited_type_params/build.sbt
@@ -1,8 +1,8 @@
 import sbt.internal.inc.Analysis
 name := "test"
 
-TaskKey[Unit]("check-same") <<= compile in Configurations.Compile map { case analysis: Analysis =>
+TaskKey[Unit]("checkSame") <<= compile in Configurations.Compile map { case analysis: Analysis =>
 	analysis.apis.internal foreach { case (_, api) =>
 		assert( xsbt.api.SameAPI(api.api, api.api) )
 	}
-}
\ No newline at end of file
+}
diff --git a/sbt/src/sbt-test/source-dependencies/inherited_type_params/test b/sbt/src/sbt-test/source-dependencies/inherited_type_params/test
index 8434347c5..26d40979c 100644
--- a/sbt/src/sbt-test/source-dependencies/inherited_type_params/test
+++ b/sbt/src/sbt-test/source-dependencies/inherited_type_params/test
@@ -1 +1 @@
-> check-same
\ No newline at end of file
+> checkSame
diff --git a/sbt/src/sbt-test/source-dependencies/replace-test-a/build.sbt b/sbt/src/sbt-test/source-dependencies/replace-test-a/build.sbt
index c719d724b..bb5bef7ce 100644
--- a/sbt/src/sbt-test/source-dependencies/replace-test-a/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/replace-test-a/build.sbt
@@ -2,8 +2,8 @@ import java.net.URLClassLoader
 
 lazy val root = (project in file(".")).
   settings(
-    TaskKey[Unit]("check-first") <<= checkTask("First"),
-    TaskKey[Unit]("check-second") <<= checkTask("Second")
+    TaskKey[Unit]("checkFirst") <<= checkTask("First"),
+    TaskKey[Unit]("checkSecond") <<= checkTask("Second")
   )
 
 def checkTask(className: String) =
diff --git a/sbt/src/sbt-test/source-dependencies/replace-test-a/test b/sbt/src/sbt-test/source-dependencies/replace-test-a/test
index 4b4ad3a2b..5c83fe6ff 100644
--- a/sbt/src/sbt-test/source-dependencies/replace-test-a/test
+++ b/sbt/src/sbt-test/source-dependencies/replace-test-a/test
@@ -1,9 +1,9 @@
 $ copy-file changes/first.scala src/main/scala/A.scala
 > compile
-> check-first
--> check-second
+> checkFirst
+-> checkSecond
 
 $ copy-file changes/second.scala src/main/scala/A.scala
 > compile
--> check-first
-> check-second
\ No newline at end of file
+-> checkFirst
+> checkSecond
diff --git a/sbt/src/sbt-test/source-dependencies/trait-member-modified/build.sbt b/sbt/src/sbt-test/source-dependencies/trait-member-modified/build.sbt
index 98282e4b6..77dc6c5b6 100644
--- a/sbt/src/sbt-test/source-dependencies/trait-member-modified/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/trait-member-modified/build.sbt
@@ -4,7 +4,7 @@ import sbt.internal.inc.Analysis
  *  a) checks in which compilation given set of files was recompiled
  *  b) checks overall number of compilations performed
  */
-TaskKey[Unit]("check-compilations") := {
+TaskKey[Unit]("checkCompilations") := {
   val analysis = (compile in Compile).value match { case a: Analysis => a }
   val srcDir = (scalaSource in Compile).value
   def relative(f: java.io.File): java.io.File =  f.relativeTo(srcDir) getOrElse f
diff --git a/sbt/src/sbt-test/source-dependencies/trait-member-modified/test b/sbt/src/sbt-test/source-dependencies/trait-member-modified/test
index f8f7cb076..183e1d40e 100644
--- a/sbt/src/sbt-test/source-dependencies/trait-member-modified/test
+++ b/sbt/src/sbt-test/source-dependencies/trait-member-modified/test
@@ -6,4 +6,4 @@ $ copy-file changes/A1.scala src/main/scala/A.scala
 # only A.scala should be recompiled
 > compile
 # check if there are only two compile iterations performed
-> check-compilations
+> checkCompilations
diff --git a/sbt/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt b/sbt/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt
index b0eaa9998..dcd1f99f2 100644
--- a/sbt/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/transitive-memberRef/build.sbt
@@ -12,7 +12,7 @@ incOptions := incOptions.value.withRecompileAllFraction(1.0)
  *  a) checks in which compilation given set of files was recompiled
  *  b) checks overall number of compilations performed
  */
-TaskKey[Unit]("check-compilations") := {
+TaskKey[Unit]("checkCompilations") := {
   val analysis = (compile in Compile).value match { case a: Analysis => a }
   val srcDir = (scalaSource in Compile).value
   def relative(f: java.io.File): java.io.File =  f.relativeTo(srcDir) getOrElse f
diff --git a/sbt/src/sbt-test/source-dependencies/transitive-memberRef/test b/sbt/src/sbt-test/source-dependencies/transitive-memberRef/test
index 395f90229..a39fe13a9 100644
--- a/sbt/src/sbt-test/source-dependencies/transitive-memberRef/test
+++ b/sbt/src/sbt-test/source-dependencies/transitive-memberRef/test
@@ -8,4 +8,4 @@ $ copy-file changes/A1.scala src/main/scala/A.scala
 # second iteration
 > compile
 # check in which compile iteration given source file got recompiled
-> check-compilations
+> checkCompilations
diff --git a/sbt/src/sbt-test/tests/fork/build.sbt b/sbt/src/sbt-test/tests/fork/build.sbt
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/tests/fork/src/test/scala/Ensemble.scala b/sbt/src/sbt-test/tests/fork/src/test/scala/Ensemble.scala
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/tests/fork/test b/sbt/src/sbt-test/tests/fork/test
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/tests/junit/test b/sbt/src/sbt-test/tests/junit/test
index b1cd8cbc4..73534741b 100644
--- a/sbt/src/sbt-test/tests/junit/test
+++ b/sbt/src/sbt-test/tests/junit/test
@@ -3,12 +3,12 @@
 $ copy-file changes/Success.scala src/test/scala/Success.scala
 > test
 
-> test-only com.foo.junit.test.blah.Success
+> testOnly com.foo.junit.test.blah.Success
 
 $ copy-file changes/Failure.scala src/test/scala/Failure.scala
 -> test
--> test-only com.foo.junit.test.blah.Failure
-> test-only com.foo.junit.test.blah.Success
+-> testOnly com.foo.junit.test.blah.Failure
+> testOnly com.foo.junit.test.blah.Success
 
 > set fork in Test := true
-> test-only com.foo.junit.test.blah.Success
+> testOnly com.foo.junit.test.blah.Success
diff --git a/sbt/src/sbt-test/tests/order/test b/sbt/src/sbt-test/tests/order/test
index 95d7efcc5..5e6d54876 100644
--- a/sbt/src/sbt-test/tests/order/test
+++ b/sbt/src/sbt-test/tests/order/test
@@ -1,2 +1,2 @@
--> test-only A B
-> test-only B A
\ No newline at end of file
+-> testOnly A B
+> testOnly B A
diff --git a/sbt/src/sbt-test/tests/t543/build.sbt b/sbt/src/sbt-test/tests/t543/build.sbt
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/tests/t543/src/test/scala/Test.scala b/sbt/src/sbt-test/tests/t543/src/test/scala/Test.scala
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/tests/t543/test b/sbt/src/sbt-test/tests/t543/test
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/tests/test-exclude/test b/sbt/src/sbt-test/tests/test-exclude/test
index 913c97312..f34def638 100644
--- a/sbt/src/sbt-test/tests/test-exclude/test
+++ b/sbt/src/sbt-test/tests/test-exclude/test
@@ -1,7 +1,7 @@
 # Test1 & Test2 create files Test1.run & Test2.run respectively
 
 # no parameters
-> test-only
+> testOnly
 $ exists target/Test1.run
 $ exists target/Test2.run
 
@@ -10,7 +10,7 @@ $ delete target/Test2.run
 
 
 # with explicit match
-> test-only Test1*
+> testOnly Test1*
 $ exists target/Test1.run
 -$ exists target/Test2.run
 
@@ -18,7 +18,7 @@ $ delete target/Test1.run
 
 
 # with explicit match and exclusion
-> test-only Test* -Test1
+> testOnly Test* -Test1
 -$ exists target/Test1.run
 $ exists target/Test2.run
 
@@ -26,7 +26,7 @@ $ delete target/Test2.run
 
 
 # with explicit match and exclusion
-> test-only Test* -Test2
+> testOnly Test* -Test2
 $ exists target/Test1.run
 -$ exists target/Test2.run
 
@@ -34,7 +34,7 @@ $ delete target/Test1.run
 
 
 # with only exclusion
-> test-only -Test2
+> testOnly -Test2
 $ exists target/Test1.run
 -$ exists target/Test2.run
 
@@ -42,7 +42,7 @@ $ delete target/Test1.run
 
 
 # with only exclusion
-> test-only -Test1
+> testOnly -Test1
 -$ exists target/Test1.run
 $ exists target/Test2.run
 
@@ -50,12 +50,12 @@ $ delete target/Test2.run
 
 
 # with only glob exclusion
-> test-only -Test*
+> testOnly -Test*
 -$ exists target/Test1.run
 -$ exists target/Test2.run
 
 
 # with only glob exclusion
-> test-only -T*1 -T*2
+> testOnly -T*1 -T*2
 -$ exists target/Test1.run
 -$ exists target/Test2.run
diff --git a/sbt/src/sbt-test/tests/test-quick/build.sbt b/sbt/src/sbt-test/tests/test-quick/build.sbt
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/tests/test-quick/changed/A.scala b/sbt/src/sbt-test/tests/test-quick/changed/A.scala
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/tests/test-quick/changed/B.scala b/sbt/src/sbt-test/tests/test-quick/changed/B.scala
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/tests/test-quick/changed/Base.scala b/sbt/src/sbt-test/tests/test-quick/changed/Base.scala
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/tests/test-quick/src/main/scala/A.scala b/sbt/src/sbt-test/tests/test-quick/src/main/scala/A.scala
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/tests/test-quick/src/main/scala/B.scala b/sbt/src/sbt-test/tests/test-quick/src/main/scala/B.scala
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/tests/test-quick/src/test/scala/Base.scala b/sbt/src/sbt-test/tests/test-quick/src/test/scala/Base.scala
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/tests/test-quick/src/test/scala/Create.scala b/sbt/src/sbt-test/tests/test-quick/src/test/scala/Create.scala
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/tests/test-quick/src/test/scala/Delete.scala b/sbt/src/sbt-test/tests/test-quick/src/test/scala/Delete.scala
old mode 100755
new mode 100644
diff --git a/sbt/src/sbt-test/tests/test-quick/test b/sbt/src/sbt-test/tests/test-quick/test
old mode 100755
new mode 100644
index 865e74a5a..d88f8a185
--- a/sbt/src/sbt-test/tests/test-quick/test
+++ b/sbt/src/sbt-test/tests/test-quick/test
@@ -1,34 +1,34 @@
-> test-quick Create
+> testQuick Create
 # Create not re-run, Delete deletes the file.
-> test-quick
+> testQuick
 # Re-create the file.
-> test-only Create
+> testOnly Create
 
 # Non-API change
 $ copy-file changed/A.scala src/main/scala/A.scala
 > compile
 $ sleep 2000
 # Create is run. Delete is not since it doesn't have src/main dependency.
--> test-quick
-> test-only Delete
+-> testQuick
+> testOnly Delete
 # Previous run of Create failed, re-run.
-> test-quick Create
+> testQuick Create
 # No-op.
-> test-quick Create
+> testQuick Create
 # API change.
 
 $ copy-file changed/B.scala src/main/scala/B.scala
 > compile
 $ sleep 2000
--> test-quick Create
-> test-only Delete
+-> testQuick Create
+> testOnly Delete
 # Previous run of Create failed, re-run.
-> test-quick Create
+> testQuick Create
 # src/test compilation group change.
 
 $ copy-file changed/Base.scala src/test/scala/Base.scala
 > test:compile
 $ sleep 2000
--> test-quick Create
-> test-quick Delete
-> test-quick Create
\ No newline at end of file
+-> testQuick Create
+> testQuick Delete
+> testQuick Create