diff --git a/Gruntfile.js b/Gruntfile.js
index 97968d81..914e7b33 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -616,18 +616,6 @@ module.exports = function (grunt) {
         'watch'
     ]);
 
-    /**
-     * Support the old non-verb form of invoking `serve` but warn.
-     */
-    grunt.registerTask('server',
-        'DEPRECATED TASK. Use the "serve" task instead',
-        function (target) {
-            grunt.log.warn('The `server` task has been deprecated. Use ' +
-                '`grunt serve` to start a server.');
-            grunt.task.run(['serve:' + target]);
-        }
-    );
-
     /**
      * grunt test:integration
      *
diff --git a/README.md b/README.md
index 692a800f..b4c5d423 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ First of all be sure to have tox installed on your machine then:
   - Source the new path containing grunt:
 `source .tox/venv/bin/activate`
   - Now you can launch the grunt tasks of storyboard-webclient, by default run
-the development server with the following command: `grunt server`
+the development server with the following command: `grunt serve`
 
 
 Grunt tasks
@@ -45,13 +45,13 @@ which is a plain css file is stored into `dist/styles/main.css`
   - `compile`: Compiles all of our sources in the dist directory.
   - `package`: Built code into a release package.
   - `build`: Compile and packages our code.
-  - `server:dist`:  This task performs a full build of our application,
+  - `serve:dist`:  This task performs a full build of our application,
 and then runs that source in a local web server. It does no watching,
 it simply hosts the files.
-  - `server:prod`: This task is identical to 'server:dist',
+  - `serve:prod`: This task is identical to 'server:dist',
 with the exception that it will proxy the API requests against the production
 API. *USE WITH CAUTION*
-  - `server`: Development server - runs a build and sets up concurrent watchers
+  - `serve`: Development server - runs a build and sets up concurrent watchers
 that will automatically lint, test, and refresh the code when a change is
 detected.
   - `test`: Run all the tests.