diff --git a/Gruntfile.js b/Gruntfile.js
index 526a81ff1..8b4954bda 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -23,9 +23,10 @@ module.exports = function(grunt) {
   grunt.registerTask('build-templates', ['clean:templates', 'internal-build-templates', 'assetFingerprint']);
 
   grunt.registerTask('release-composer', ['build', 'copy:composer']);
-  grunt.registerTask('webjars', ['build', 'maven:webjars']);
-  grunt.registerTask('install', ['build', 'maven:install', 'clean:dist']);
-  grunt.registerTask('release', ['build', 'maven:release', 'clean:dist']);
+  
+  grunt.registerTask('build-webjar', ['build', 'maven:webjars']);
+  grunt.registerTask('install-webjar', ['build', 'maven:install', 'clean:dist']);
+  grunt.registerTask('release-webjar', ['build', 'maven:release', 'clean:dist']);
 
   grunt.registerTask('publish', ['gh-pages-clean', 'build', 'gh-pages']);
 
diff --git a/README.md b/README.md
index 82b1cd27b..8cf38f66a 100644
--- a/README.md
+++ b/README.md
@@ -87,11 +87,11 @@ Building the generated site also performs these tasks:
 
 Create a WebJars file from this theme and apply it to any Sunrise project. There are three possible ways to achieve this:
 
-- `grunt webjars` to create the WebJars file in the root directory of the project, so that you can apply it by placing the generated JAR file in the folder for unmanaged dependencies of your Sunrise project (i.e. `lib/` is the default folder for Sunrise)
+- `grunt build-webjar` to create the WebJar in the root directory of the project, so that you can apply it by placing the generated JAR file in the folder for unmanaged dependencies of your Sunrise project (i.e. `lib/` is the default folder for Sunrise)
 
-- `grunt install` to install the current snapshot version to your local maven repository (`~/.m2/repository/io/commercetools/sunrise/commercetools-sunrise-theme`) and apply it to your project as a dependency from a local environment
+- `grunt install-webjar` to install the current snapshot version to your local maven repository (`~/.m2/repository/io/commercetools/sunrise/commercetools-sunrise-theme`) and apply it to your project as a dependency from a local environment
 
-- `grunt release` to release the current version to a remote Maven repository and move to the next development version, this way you could publicly distribute your theme and let anyone apply it to their Sunrise application as a project dependency (requires that you set up `config.maven` in `package.json` accordingly to your remote Maven repository)
+- `grunt release-webjar` to release the current version to a remote Maven repository and move to the next development version, this way you could publicly distribute your theme and let anyone apply it to their Sunrise application as a project dependency (requires that you set up `config.maven` in `package.json` accordingly to your remote Maven repository)
 
 #### Publish to GitHub Pages