diff --git a/plugins/sbt/README.md b/plugins/sbt/README.md
index f1a5753b9..f0201938e 100644
--- a/plugins/sbt/README.md
+++ b/plugins/sbt/README.md
@@ -17,16 +17,16 @@ plugins=(... sbt)
 | sbcln | `sbt clean`           | Deletes all generated files                                  |
 | sbcc  | `sbt clean compile`   | Deletes generated files, compiles the main sources           |
 | sbco  | `sbt console`         | Starts Scala with the compiled sources and all dependencies  |
-| sbcq  | `sbt console-quick`   | Starts Scala with all dependencies                           |
-| sbcp  | `sbt console-project` | Starts Scala with sbt and the build definitions              |
+| sbcq  | `sbt consoleQuick`    | Starts Scala with all dependencies                           |
+| sbcp  | `sbt consoleProject`  | Starts Scala with sbt and the build definitions              |
 | sbd   | `sbt doc`             | Generates API documentation for Scala source files           |
 | sbdc  | `sbt dist:clean`      | Deletes the distribution packages                            |
 | sbdi  | `sbt dist`            | Creates the distribution packages                            |
-| sbgi  | `sbt gen-idea`        | Create Idea project files                                    |
+| sbgi  | `sbt genIdea`         | Create Idea project files                                    |
 | sbp   | `sbt publish`         | Publishes artifacts to the repository                        |
-| sbpl  | `sbt publish-local`   | Publishes artifacts to the local Ivy repository              |
+| sbpl  | `sbt publishLocal`    | Publishes artifacts to the local Ivy repository              |
 | sbr   | `sbt run`             | Runs the main class for the project                          |
-| sbrm  | `sbt run-main`        | Runs the specified main class for the project                |
+| sbrm  | `sbt runMain`         | Runs the specified main class for the project                |
 | sbu   | `sbt update`          | Resolves and retrieves external dependencies                 |
 | sbx   | `sbt test`            | Compiles and runs all tests                                  |
 | sba   | `sbt assembly`        | Create a fat JAR with all dependencies                       |
diff --git a/plugins/sbt/_sbt b/plugins/sbt/_sbt
index a601c9b97..2138a722f 100644
--- a/plugins/sbt/_sbt
+++ b/plugins/sbt/_sbt
@@ -6,23 +6,23 @@ _sbt_commands=(
   'clean:delete files produced by the build'
   'compile:compile sources'
   'console:start the Scala REPL with project classes on the classpath'
-  'console-quick:start the Scala REPL with project deps on the classpath'
-  'console-project:start the Scala REPL w/sbt+build-def on the classpath'
+  'consoleQuick:start the Scala REPL with project deps on the classpath'
+  'consoleProject:start the Scala REPL w/sbt+build-def on the classpath'
   'dist:generate distribution artifacts'
   'dist\:clean:clean distribution artifacts'
   'doc:generate API documentation'
-  'gen-idea:generate Intellij Idea project files'
+  'genIdea:generate Intellij Idea project files'
   'package:produce the main artifact, such as a binary jar'
-  'package-doc:produce a doc artifact, such as a jar containing API docs'
-  'package-src:produce a source artifact, such as a jar containing sources'
+  'packageDoc:produce a doc artifact, such as a jar containing API docs'
+  'packageSrc:produce a source artifact, such as a jar containing sources'
   'publish:publish artifacts to a repository'
-  'publish-local:publish artifacts to the local repository'
-  'publish-m2:publish artifacts to the local Maven 2 repository'
+  'publishLocal:publish artifacts to the local repository'
+  'publishM2:publish artifacts to the local Maven 2 repository'
   'run:run a main class'
-  'run-main:run the main class selected by the first argument'
+  'runMain:run the main class selected by the first argument'
   'test:execute all tests'
-  'test-only:execute the tests provided as arguments'
-  'test-quick:execute previously failed tests'
+  'testOnly:execute the tests provided as arguments'
+  'testQuick:execute previously failed tests'
   'update:resolve and optionally retrieve dependencies'
 )
 
diff --git a/plugins/sbt/sbt.plugin.zsh b/plugins/sbt/sbt.plugin.zsh
index f883b7fee..851302c68 100644
--- a/plugins/sbt/sbt.plugin.zsh
+++ b/plugins/sbt/sbt.plugin.zsh
@@ -9,17 +9,17 @@
 alias sbc='sbt compile'
 alias sbcc='sbt clean compile'
 alias sbco='sbt console'
-alias sbcq='sbt console-quick'
+alias sbcq='sbt consoleQuick'
 alias sbcln='sbt clean'
-alias sbcp='sbt console-project'
+alias sbcp='sbt consoleProject'
 alias sbd='sbt doc'
 alias sbdc='sbt dist:clean'
 alias sbdi='sbt dist'
-alias sbgi='sbt gen-idea'
+alias sbgi='sbt genIdea'
 alias sbp='sbt publish'
-alias sbpl='sbt publish-local'
+alias sbpl='sbt publishLocal'
 alias sbr='sbt run'
-alias sbrm='sbt run-main'
+alias sbrm='sbt runMain'
 alias sbu='sbt update'
 alias sbx='sbt test'
 alias sba='sbt assembly'