diff --git a/src/cli.js b/src/cli.js
index 8451ab38..47394513 100755
--- a/src/cli.js
+++ b/src/cli.js
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
-/* eslint no-unused-expressions:0, prefer-destructuring: 0, no-console: 0, import/no-dynamic-require: 0, quote-props: 0, max-len: 0 */
+/* eslint no-unused-expressions:0 */
+
 const yargs = require('yargs');
 require('./env');
 
@@ -8,6 +9,6 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'test';
 yargs
   .usage('aw <command>')
   .command(require('./node'))
-  .command(require('./webdriver'))
+  .command(require('./protractor'))
   .command(require('./cdp'))
   .argv;
diff --git a/src/webdriver/config.js b/src/protractor/config.js
similarity index 100%
rename from src/webdriver/config.js
rename to src/protractor/config.js
diff --git a/src/webdriver/index.js b/src/protractor/index.js
similarity index 91%
rename from src/webdriver/index.js
rename to src/protractor/index.js
index 34355ff5..cc04e650 100644
--- a/src/webdriver/index.js
+++ b/src/protractor/index.js
@@ -7,9 +7,9 @@ const extend = require('extend');
 const fs = require('fs');
 const options = require('./options');
 
-const webdriver = {
-  command: 'webdriver',
-  desc: 'Run webdriver',
+const protractor = {
+  command: 'protractor',
+  desc: 'Run protractor',
   getConfig(configPath) {
     let foundConfigPath = configPath;
     if (!fs.existsSync(configPath)) {
@@ -32,7 +32,6 @@ const webdriver = {
   },
   builder(yargs) {
     return yargs
-      .usage('webdriver')
       .options(options)
       .argv;
   },
@@ -51,7 +50,7 @@ const webdriver = {
         process.exit(0);
       }
     }
-    const config = webdriver.getConfig(argv.config);
+    const config = protractor.getConfig(argv.config);
     argv.require.map(require);
     if (argv.glob.length) {
       config.specs = argv.glob;
@@ -66,4 +65,4 @@ const webdriver = {
   },
 };
 
-module.exports = webdriver;
+module.exports = protractor;
diff --git a/src/webdriver/options.js b/src/protractor/options.js
similarity index 100%
rename from src/webdriver/options.js
rename to src/protractor/options.js
diff --git a/src/webdriver/plugins/reporter/aggregate.js b/src/protractor/plugins/reporter/aggregate.js
similarity index 100%
rename from src/webdriver/plugins/reporter/aggregate.js
rename to src/protractor/plugins/reporter/aggregate.js
diff --git a/src/webdriver/plugins/reporter/create-static.js b/src/protractor/plugins/reporter/create-static.js
similarity index 100%
rename from src/webdriver/plugins/reporter/create-static.js
rename to src/protractor/plugins/reporter/create-static.js
diff --git a/src/webdriver/plugins/reporter/css/agate.css b/src/protractor/plugins/reporter/css/agate.css
similarity index 100%
rename from src/webdriver/plugins/reporter/css/agate.css
rename to src/protractor/plugins/reporter/css/agate.css
diff --git a/src/webdriver/plugins/reporter/css/icons.css b/src/protractor/plugins/reporter/css/icons.css
similarity index 100%
rename from src/webdriver/plugins/reporter/css/icons.css
rename to src/protractor/plugins/reporter/css/icons.css
diff --git a/src/webdriver/plugins/reporter/css/imageview.css b/src/protractor/plugins/reporter/css/imageview.css
similarity index 100%
rename from src/webdriver/plugins/reporter/css/imageview.css
rename to src/protractor/plugins/reporter/css/imageview.css
diff --git a/src/webdriver/plugins/reporter/css/style.css b/src/protractor/plugins/reporter/css/style.css
similarity index 100%
rename from src/webdriver/plugins/reporter/css/style.css
rename to src/protractor/plugins/reporter/css/style.css
diff --git a/src/webdriver/plugins/reporter/index.js b/src/protractor/plugins/reporter/index.js
similarity index 100%
rename from src/webdriver/plugins/reporter/index.js
rename to src/protractor/plugins/reporter/index.js
diff --git a/src/webdriver/plugins/reporter/templates/main.handlebars b/src/protractor/plugins/reporter/templates/main.handlebars
similarity index 100%
rename from src/webdriver/plugins/reporter/templates/main.handlebars
rename to src/protractor/plugins/reporter/templates/main.handlebars
diff --git a/src/webdriver/plugins/reporter/utils.js b/src/protractor/plugins/reporter/utils.js
similarity index 100%
rename from src/webdriver/plugins/reporter/utils.js
rename to src/protractor/plugins/reporter/utils.js
diff --git a/src/webdriver/plugins/screenshoter/index.js b/src/protractor/plugins/screenshoter/index.js
similarity index 100%
rename from src/webdriver/plugins/screenshoter/index.js
rename to src/protractor/plugins/screenshoter/index.js
diff --git a/src/webdriver/plugins/screenshoter/utils.js b/src/protractor/plugins/screenshoter/utils.js
similarity index 100%
rename from src/webdriver/plugins/screenshoter/utils.js
rename to src/protractor/plugins/screenshoter/utils.js