diff --git a/CHANGELOG b/CHANGELOG
index 6406c4bf72f49774618d35c05f19f9445d2a1913..1847c5193ab41208951464216f975f447da7ef4e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -82,7 +82,7 @@ v 8.5.1
 v 8.5.0
   - Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji (Stan Hu)
   - Cache various Repository methods to improve performance (Yorick Peterse)
-  - Fix duplicated branch creation/deletion Web hooks/service notifications when using Web UI (Stan Hu)
+  - Fix duplicated branch creation/deletion Webhooks/service notifications when using Web UI (Stan Hu)
   - Ensure rake tasks that don't need a DB connection can be run without one
   - Update New Relic gem to 3.14.1.311 (Stan Hu)
   - Add "visibility" flag to GET /projects api endpoint
@@ -215,7 +215,7 @@ v 8.4.0
   - Add housekeeping function to project settings page
   - The default GitLab logo now acts as a loading indicator
   - Fix caching issue where build status was not updating in project dashboard (Stan Hu)
-  - Accept 2xx status codes for successful Web hook triggers (Stan Hu)
+  - Accept 2xx status codes for successful Webhook triggers (Stan Hu)
   - Fix missing date of month in network graph when commits span a month (Stan Hu)
   - Expire view caches when application settings change (e.g. Gravatar disabled) (Stan Hu)
   - Don't notify users twice if they are both project watchers and subscribers (Stan Hu)
@@ -315,7 +315,7 @@ v 8.3.0
   - Fix broken group avatar upload under "New group" (Stan Hu)
   - Update project repositorize size and commit count during import:repos task (Stan Hu)
   - Fix API setting of 'public' attribute to false will make a project private (Stan Hu)
-  - Handle and report SSL errors in Web hook test (Stan Hu)
+  - Handle and report SSL errors in Webhook test (Stan Hu)
   - Bump Redis requirement to 2.8 for Sidekiq 4 (Stan Hu)
   - Fix: Assignee selector is empty when 'Unassigned' is selected (Jose Corcuera)
   - WIP identifier on merge requests no longer requires trailing space
@@ -535,7 +535,7 @@ v 8.1.0
   - Ensure code blocks are properly highlighted after a note is updated
   - Fix wrong access level badge on MR comments
   - Hide password in the service settings form
-  - Move CI web hooks page to project settings area
+  - Move CI webhooks page to project settings area
   - Fix User Identities API. It now allows you to properly create or update user's identities.
   - Add user preference to change layout width (Peter Göbel)
   - Use commit status in merge request widget as preferred source of CI status
@@ -578,7 +578,7 @@ v 8.0.3
   - Fix URL shown in Slack notifications
   - Fix bug where projects would appear to be stuck in the forked import state (Stan Hu)
   - Fix Error 500 in creating merge requests with > 1000 diffs (Stan Hu)
-  - Add work_in_progress key to MR web hooks (Ben Boeckel)
+  - Add work_in_progress key to MR webhooks (Ben Boeckel)
 
 v 8.0.2
   - Fix default avatar not rendering in network graph (Stan Hu)
@@ -869,7 +869,7 @@ v 7.12.0
   - Fix milestone "Browse Issues" button.
   - Set milestone on new issue when creating issue from index with milestone filter active.
   - Make namespace API available to all users (Stan Hu)
-  - Add web hook support for note events (Stan Hu)
+  - Add webhook support for note events (Stan Hu)
   - Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings (Stan Hu)
   - Remove Rack Attack monkey patches and bump to version 4.3.0 (Stan Hu)
   - Fix clone URL losing selection after a single click in Safari and Chrome (Stan Hu)
@@ -976,7 +976,7 @@ v 7.11.0
   - Add "Create Merge Request" buttons to commits and branches pages and push event.
   - Show user roles by comments.
   - Fix automatic blocking of auto-created users from Active Directory.
-  - Call merge request web hook for each new commits (Arthur Gautier)
+  - Call merge request webhook for each new commits (Arthur Gautier)
   - Use SIGKILL by default in Sidekiq::MemoryKiller
   - Fix mentioning of private groups.
   - Add style for <kbd> element in markdown
@@ -1150,7 +1150,7 @@ v 7.9.0
   - Add brakeman (security scanner for Ruby on Rails)
   - Slack username and channel options
   - Add grouped milestones from all projects to dashboard.
-  - Web hook sends pusher email as well as commiter
+  - Webhook sends pusher email as well as commiter
   - Add Bitbucket omniauth provider.
   - Add Bitbucket importer.
   - Support referencing issues to a project whose name starts with a digit
@@ -1273,7 +1273,7 @@ v 7.8.0
   - Allow notification email to be set separately from primary email.
   - API: Add support for editing an existing project (Mika Mäenpää and Hannes Rosenögger)
   - Don't have Markdown preview fail for long comments/wiki pages.
-  - When test web hook - show error message instead of 500 error page if connection to hook url was reset
+  - When test webhook - show error message instead of 500 error page if connection to hook url was reset
   - Added support for firing system hooks on group create/destroy and adding/removing users to group (Boyan Tabakov)
   - Added persistent collapse button for left side nav bar (Jason Blanchard)
   - Prevent losing unsaved comments by automatically restoring them when comment page is loaded again.
@@ -1290,7 +1290,7 @@ v 7.8.0
   - Show projects user contributed to on user page. Show stars near project on user page.
   - Improve database performance for GitLab
   - Add Asana service (Jeremy Benoist)
-  - Improve project web hooks with extra data
+  - Improve project webhooks with extra data
 
 v 7.7.2
   - Update GitLab Shell to version 2.4.2 that fixes a bug when developers can push to protected branch
@@ -1775,7 +1775,7 @@ v 6.4.0
   - Side-by-side diff view (Steven Thonus)
   - Internal projects (Jason Hollingsworth)
   - Allow removal of avatar (Drew Blessing)
-  - Project web hooks now support issues and merge request events
+  - Project webhooks now support issues and merge request events
   - Visiting project page while not logged in will redirect to sign-in instead of 404 (Jason Hollingsworth)
   - Expire event cache on avatar creation/removal (Drew Blessing)
   - Archiving old projects (Steven Thonus)
@@ -1845,7 +1845,7 @@ v 6.2.0
   - Added search for projects by name to api (Izaak Alpert)
   - Make default user theme configurable (Izaak Alpert)
   - Update logic for validates_merge_request for tree of MR (Andrew Kumanyaev)
-  - Rake tasks for web hooks management (Jonhnny Weslley)
+  - Rake tasks for webhooks management (Jonhnny Weslley)
   - Extended User API to expose admin and can_create_group for user creation/updating (Boyan Tabakov)
   - API: Remove group
   - API: Remove project
@@ -2048,7 +2048,7 @@ v 4.2.0
   - Async gitolite calls
   - added satellites logs
   - can_create_group, can_create_team booleans for User
-  - Process web hooks async
+  - Process webhooks async
   - GFM: Fix images escaped inside links
   - Network graph improved
   - Switchable branches for network graph
@@ -2082,7 +2082,7 @@ v 4.1.0
 
 v 4.0.0
   - Remove project code and path from API. Use id instead
-  - Return valid cloneable url to repo for web hook
+  - Return valid cloneable url to repo for webhook
   - Fixed backup issue
   - Reorganized settings
   - Fixed commits compare
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 1eb790b1796f78a6c355ca4ef4f87bc9550dd457..494dad0b41ef0980f683fc208bbcdf51e627c5b1 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -40,7 +40,7 @@ module SearchHelper
       { label: "help: Rake Tasks Help",    url: help_page_path("raketasks", "README") },
       { label: "help: SSH Keys Help",      url: help_page_path("ssh", "README") },
       { label: "help: System Hooks Help",  url: help_page_path("system_hooks", "system_hooks") },
-      { label: "help: Web Hooks Help",     url: help_page_path("web_hooks", "web_hooks") },
+      { label: "help: Webhooks Help",      url: help_page_path("web_hooks", "web_hooks") },
       { label: "help: Workflow Help",      url: help_page_path("workflow", "README") },
     ]
   end
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index 93a16e88967b3cb5b14b919be5755e215d57ad5b..bd31a617747c0c60a81cafcd5419f2c50c3cc3a2 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -12,7 +12,7 @@ class GitPushService < BaseService
   #  1. Creates the push event
   #  2. Updates merge requests
   #  3. Recognizes cross-references from commit messages
-  #  4. Executes the project's web hooks
+  #  4. Executes the project's webhooks
   #  5. Executes the project's services
   #  6. Checks if the project's main language has changed
   #
diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml
index 970da78a5c9ca59abb7eb2271d19718e6b394154..3359716202f1392f63024f38336258add5911e43 100644
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
@@ -19,10 +19,10 @@
         %span
           Deploy Keys
     = nav_link(controller: :hooks) do
-      = link_to namespace_project_hooks_path(@project.namespace, @project), title: 'Web Hooks' do
+      = link_to namespace_project_hooks_path(@project.namespace, @project), title: 'Webhooks' do
         = icon('link fw')
         %span
-          Web Hooks
+          Webhooks
     = nav_link(controller: :services) do
       = link_to namespace_project_services_path(@project.namespace, @project), title: 'Services' do
         = icon('cogs fw')
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml
index a0511819c9f956467a330b2c25002ccae0402be4..67d016bd871015f2c414e03eea5ea413c19a92f6 100644
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
@@ -1,9 +1,9 @@
-- page_title "Web Hooks"
+- page_title "Webhooks"
 %h3.page-title
-  Web hooks
+  Webhooks
 
 %p.light
-  #{link_to "Web hooks ", help_page_path("web_hooks", "web_hooks"), class: "vlink"} can be
+  #{link_to "Webhooks ", help_page_path("web_hooks", "web_hooks"), class: "vlink"} can be
   used for binding events when something is happening within the project.
 
 %hr.clearfix
@@ -70,12 +70,12 @@
           = f.check_box :enable_ssl_verification
           %strong Enable SSL verification
   .form-actions
-    = f.submit "Add Web Hook", class: "btn btn-create"
+    = f.submit "Add Webhook", class: "btn btn-create"
 
 -if @hooks.any?
   .panel.panel-default
     .panel-heading
-      Web hooks (#{@hooks.count})
+      Webhooks (#{@hooks.count})
     %ul.well-list
       - @hooks.each do |hook|
         %li
diff --git a/doc/README.md b/doc/README.md
index be6c5f96ea15d8583d8856fe5bf567e8297d29d2..0ca30e4e0f230178d2d15016597036c4097c81fa 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -13,7 +13,7 @@
 - [Project Services](project_services/project_services.md) Integrate a project with external services, such as CI and chat.
 - [Public access](public_access/public_access.md) Learn how you can allow public and internal access to projects.
 - [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects.
-- [Web hooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project.
+- [Webhooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project.
 - [Workflow](workflow/README.md) Using GitLab functionality and importing projects from GitHub and SVN.
 
 ## CI User documentation
@@ -54,7 +54,7 @@ be linked with your base image. Below is a list of examples you may use:
 
 ## Administrator documentation
 
-- [Custom git hooks](hooks/custom_hooks.md) Custom git hooks (on the filesystem) for when web hooks aren't enough.
+- [Custom git hooks](hooks/custom_hooks.md) Custom git hooks (on the filesystem) for when webhooks aren't enough.
 - [Install](install/README.md) Requirements, directory structures and installation from source.
 - [Restart GitLab](administration/restart_gitlab.md) Learn how to restart GitLab and its components
 - [Integration](integration/README.md) How to integrate with systems such as JIRA, Redmine, LDAP and Twitter.
@@ -63,7 +63,7 @@ be linked with your base image. Below is a list of examples you may use:
 - [Log system](logs/logs.md) Log system.
 - [Environment Variables](administration/environment_variables.md) to configure GitLab.
 - [Operations](operations/README.md) Keeping GitLab up and running
-- [Raketasks](raketasks/README.md) Backups, maintenance, automatic web hook setup and the importing of projects.
+- [Raketasks](raketasks/README.md) Backups, maintenance, automatic webhook setup and the importing of projects.
 - [Security](security/README.md) Learn what you can do to further secure your GitLab instance.
 - [System hooks](system_hooks/system_hooks.md) Notifications when users, projects and keys are changed.
 - [Update](update/README.md) Update guides to upgrade your installation.
diff --git a/doc/hooks/custom_hooks.md b/doc/hooks/custom_hooks.md
index 5a4b2f43ba778d55d38da373a5102c6f3a6a5467..15051dd76f97abaf65dd5c083ee63cb7e40872cf 100644
--- a/doc/hooks/custom_hooks.md
+++ b/doc/hooks/custom_hooks.md
@@ -2,7 +2,7 @@
 
 **Note: Custom git hooks must be configured on the filesystem of the GitLab
 server. Only GitLab server administrators will be able to complete these tasks.
-Please explore [web hooks](doc/web_hooks/web_hooks.md) as an option if you do not have filesystem access. For a user configurable Git Hooks interface, please see [GitLab Enterprise Edition Git Hooks](http://doc.gitlab.com/ee/git_hooks/git_hooks.html).**
+Please explore [webhooks](doc/web_hooks/web_hooks.md) as an option if you do not have filesystem access. For a user configurable Git Hooks interface, please see [GitLab Enterprise Edition Git Hooks](http://doc.gitlab.com/ee/git_hooks/git_hooks.html).**
 
 Git natively supports hooks that are executed on different actions.
 Examples of server-side git hooks include pre-receive, post-receive, and update.
diff --git a/doc/raketasks/README.md b/doc/raketasks/README.md
index cc8a22cd003269b388c25adfe007ff1f8ab2a3d8..6be954ad68ba65ec530da46f4c270dda9b2fb9c7 100644
--- a/doc/raketasks/README.md
+++ b/doc/raketasks/README.md
@@ -6,6 +6,6 @@
 - [Features](features.md)
 - [Maintenance](maintenance.md) and self-checks
 - [User management](user_management.md)
-- [Web hooks](web_hooks.md)
+- [Webhooks](web_hooks.md)
 - [Import](import.md) of git repositories in bulk
 - [Rebuild authorized_keys file](http://doc.gitlab.com/ce/raketasks/maintenance.html#rebuild-authorized_keys-file) task for administrators
diff --git a/doc/raketasks/web_hooks.md b/doc/raketasks/web_hooks.md
index 5a8b94af9b4bdd034bba760ec6ef53371f9e9c85..2ebf7c48f4e969eed4a72632ea533dbebaeaf842 100644
--- a/doc/raketasks/web_hooks.md
+++ b/doc/raketasks/web_hooks.md
@@ -1,41 +1,41 @@
-# Web hooks
+# Webhooks
 
-## Add a web hook for **ALL** projects:
+## Add a webhook for **ALL** projects:
 
     # omnibus-gitlab
     sudo gitlab-rake gitlab:web_hook:add URL="http://example.com/hook"
     # source installations
     bundle exec rake gitlab:web_hook:add URL="http://example.com/hook" RAILS_ENV=production
 
-## Add a web hook for projects in a given **NAMESPACE**:
+## Add a webhook for projects in a given **NAMESPACE**:
 
     # omnibus-gitlab
     sudo gitlab-rake gitlab:web_hook:add URL="http://example.com/hook" NAMESPACE=acme
     # source installations
     bundle exec rake gitlab:web_hook:add URL="http://example.com/hook" NAMESPACE=acme RAILS_ENV=production
 
-## Remove a web hook from **ALL** projects using:
+## Remove a webhook from **ALL** projects using:
 
     # omnibus-gitlab
     sudo gitlab-rake gitlab:web_hook:rm URL="http://example.com/hook"
     # source installations
     bundle exec rake gitlab:web_hook:rm URL="http://example.com/hook" RAILS_ENV=production
 
-## Remove a web hook from projects in a given **NAMESPACE**:
+## Remove a webhook from projects in a given **NAMESPACE**:
 
     # omnibus-gitlab
     sudo gitlab-rake gitlab:web_hook:rm URL="http://example.com/hook" NAMESPACE=acme
     # source installations
     bundle exec rake gitlab:web_hook:rm URL="http://example.com/hook" NAMESPACE=acme RAILS_ENV=production
 
-## List **ALL** web hooks:
+## List **ALL** webhooks:
 
     # omnibus-gitlab
     sudo gitlab-rake gitlab:web_hook:list
     # source installations
     bundle exec rake gitlab:web_hook:list RAILS_ENV=production
 
-## List the web hooks from projects in a given **NAMESPACE**:
+## List the webhooks from projects in a given **NAMESPACE**:
 
     # omnibus-gitlab
     sudo gitlab-rake gitlab:web_hook:list NAMESPACE=/
diff --git a/doc/security/README.md b/doc/security/README.md
index be1abb88c3db6d19a12efb0378107bcb614bdb7e..4cd0fdd409443e6889a8232fc28cdd7603c61393 100644
--- a/doc/security/README.md
+++ b/doc/security/README.md
@@ -2,7 +2,7 @@
 
 - [Password length limits](password_length_limits.md)
 - [Rack attack](rack_attack.md)
-- [Web Hooks and insecure internal web services](webhooks.md)
+- [Webhooks and insecure internal web services](webhooks.md)
 - [Information exclusivity](information_exclusivity.md)
 - [Reset your root password](reset_root_password.md)
 - [User File Uploads](user_file_uploads.md)
diff --git a/doc/security/webhooks.md b/doc/security/webhooks.md
index 1e9d33e87c314a3b9353a623b4806114b47c5939..bb46aebf4b5a41f83b3351e74a3d5d08c28e0035 100644
--- a/doc/security/webhooks.md
+++ b/doc/security/webhooks.md
@@ -1,13 +1,13 @@
-# Web Hooks and insecure internal web services
+# Webhooks and insecure internal web services
 
-If you have non-GitLab web services running on your GitLab server or within its local network, these may be vulnerable to exploitation via Web Hooks.
+If you have non-GitLab web services running on your GitLab server or within its local network, these may be vulnerable to exploitation via Webhooks.
 
-With [Web Hooks](../web_hooks/web_hooks.md), you and your project masters and owners can set up URLs to be triggered when specific things happen to projects. Normally, these requests are sent to external web services specifically set up for this purpose, that process the request and its attached data in some appropriate way. 
+With [Webhooks](../web_hooks/web_hooks.md), you and your project masters and owners can set up URLs to be triggered when specific things happen to projects. Normally, these requests are sent to external web services specifically set up for this purpose, that process the request and its attached data in some appropriate way. 
 
-Things get hairy, however, when a Web Hook is set up with a URL that doesn't point to an external, but to an internal service, that may do something completely unintended when the web hook is triggered and the POST request is sent.
+Things get hairy, however, when a Webhook is set up with a URL that doesn't point to an external, but to an internal service, that may do something completely unintended when the webhook is triggered and the POST request is sent.
 
-Because Web Hook requests are made by the GitLab server itself, these have complete access to everything running on the server (http://localhost:123) or within the server's local network (http://192.168.1.12:345), even if these services are otherwise protected and inaccessible from the outside world.
+Because Webhook requests are made by the GitLab server itself, these have complete access to everything running on the server (http://localhost:123) or within the server's local network (http://192.168.1.12:345), even if these services are otherwise protected and inaccessible from the outside world.
 
-If a web service does not require authentication, Web Hooks can be used to trigger destructive commands by getting the GitLab server to make POST requests to endpoints like "http://localhost:123/some-resource/delete". 
+If a web service does not require authentication, Webhooks can be used to trigger destructive commands by getting the GitLab server to make POST requests to endpoints like "http://localhost:123/some-resource/delete". 
 
 To prevent this type of exploitation from happening, make sure that you are aware of every web service GitLab could potentially have access to, and that all of these are set up to require authentication for every potentially destructive command. Enabling authentication but leaving a default password is not enough.
\ No newline at end of file
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index e2b53c45ab180dfc7298764c2fe1938a6ba5e6c0..87049427139594b586f81b6eb3ca714c4ad15673 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -1,4 +1,4 @@
-# Web hooks
+# Webhooks
 
 _**Note:**
 Starting from GitLab 8.5:_
@@ -7,11 +7,11 @@ Starting from GitLab 8.5:_
 - _the `project.ssh_url` key is deprecated in favor of the `project.git_ssh_url` key_
 - _the `project.http_url` key is deprecated in favor of the `project.git_http_url` key_
 
-Project web hooks allow you to trigger an URL if new code is pushed or a new issue is created.
+Project webhooks allow you to trigger an URL if new code is pushed or a new issue is created.
 
-You can configure web hooks to listen for specific events like pushes, issues or merge requests. GitLab will send a POST request with data to the web hook URL.
+You can configure webhooks to listen for specific events like pushes, issues or merge requests. GitLab will send a POST request with data to the webhook URL.
 
-Web hooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server.
+Webhooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server.
 
 ## SSL Verification
 
@@ -19,7 +19,7 @@ By default, the SSL certificate of the webhook endpoint is verified based on
 an internal list of Certificate Authorities,
 which means the certificate cannot be self-signed.
 
-You can turn this off in the web hook settings in your GitLab projects.
+You can turn this off in the webhook settings in your GitLab projects.
 
 ![SSL Verification](ssl.png)
 
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index 9e96fa5ba4945d4a23d28a9a87a955160146adca..19d81453d8cd7f67cf32bf7847e969eec83f9287 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -26,7 +26,7 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
   end
 
   step 'I click the "Hooks" tab' do
-    click_link('Web Hooks')
+    click_link('Webhooks')
   end
 
   step 'I click the "Deploy Keys" tab' do
@@ -42,7 +42,7 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
   end
 
   step 'the active sub nav should be Hooks' do
-    ensure_active_sub_nav('Web Hooks')
+    ensure_active_sub_nav('Webhooks')
   end
 
   step 'the active sub nav should be Deploy Keys' do
diff --git a/features/steps/project/hooks.rb b/features/steps/project/hooks.rb
index be4db770948cc3391592c4a79251930be02f943a..4994df589a7e4354e507b16534a649bdd5bc9de0 100644
--- a/features/steps/project/hooks.rb
+++ b/features/steps/project/hooks.rb
@@ -25,14 +25,14 @@ class Spinach::Features::ProjectHooks < Spinach::FeatureSteps
   step 'I submit new hook' do
     @url = FFaker::Internet.uri("http")
     fill_in "hook_url", with: @url
-    expect { click_button "Add Web Hook" }.to change(ProjectHook, :count).by(1)
+    expect { click_button "Add Webhook" }.to change(ProjectHook, :count).by(1)
   end
 
   step 'I submit new hook with SSL verification enabled' do
     @url = FFaker::Internet.uri("http")
     fill_in "hook_url", with: @url
     check "hook_enable_ssl_verification"
-    expect { click_button "Add Web Hook" }.to change(ProjectHook, :count).by(1)
+    expect { click_button "Add Webhook" }.to change(ProjectHook, :count).by(1)
   end
 
   step 'I should see newly created hook' do
diff --git a/lib/gitlab/push_data_builder.rb b/lib/gitlab/push_data_builder.rb
index da1c15fef6193acc4e46a9fb14d70804947e2c4b..97d1edab9c13510ad7641196245e0a6d64c64098 100644
--- a/lib/gitlab/push_data_builder.rb
+++ b/lib/gitlab/push_data_builder.rb
@@ -63,7 +63,7 @@ module Gitlab
       end
 
       # This method provide a sample data generated with
-      # existing project and commits to test web hooks
+      # existing project and commits to test webhooks
       def build_sample(project, user)
         commits = project.repository.commits(project.default_branch, nil, 3)
         ref = "#{Gitlab::Git::BRANCH_REF_PREFIX}#{project.default_branch}"
diff --git a/lib/tasks/gitlab/web_hook.rake b/lib/tasks/gitlab/web_hook.rake
index 76e443e55ee2564198f1f1658b503c75aec21764..cc0f668474eda09b889908580466d14e86fbb59e 100644
--- a/lib/tasks/gitlab/web_hook.rake
+++ b/lib/tasks/gitlab/web_hook.rake
@@ -1,13 +1,13 @@
 namespace :gitlab do
   namespace :web_hook do
-    desc "GitLab | Adds a web hook to the projects"
+    desc "GitLab | Adds a webhook to the projects"
     task :add => :environment do
       web_hook_url = ENV['URL']
       namespace_path = ENV['NAMESPACE']
 
       projects = find_projects(namespace_path)
 
-      puts "Adding web hook '#{web_hook_url}' to:"
+      puts "Adding webhook '#{web_hook_url}' to:"
       projects.find_each(batch_size: 1000) do |project|
         print "- #{project.name} ... "
         web_hook = project.hooks.new(url: web_hook_url)
@@ -20,7 +20,7 @@ namespace :gitlab do
       end
     end
 
-    desc "GitLab | Remove a web hook from the projects"
+    desc "GitLab | Remove a webhook from the projects"
     task :rm => :environment do
       web_hook_url = ENV['URL']
       namespace_path = ENV['NAMESPACE']
@@ -28,12 +28,12 @@ namespace :gitlab do
       projects = find_projects(namespace_path)
       projects_ids = projects.pluck(:id)
 
-      puts "Removing web hooks with the url '#{web_hook_url}' ... "
+      puts "Removing webhooks with the url '#{web_hook_url}' ... "
       count = WebHook.where(url: web_hook_url, project_id: projects_ids, type: 'ProjectHook').delete_all
-      puts "#{count} web hooks were removed."
+      puts "#{count} webhooks were removed."
     end
 
-    desc "GitLab | List web hooks"
+    desc "GitLab | List webhooks"
     task :list => :environment do
       namespace_path = ENV['NAMESPACE']
 
@@ -43,7 +43,7 @@ namespace :gitlab do
         puts "#{hook.project.name.truncate(20).ljust(20)} -> #{hook.url}"
       end
 
-      puts "\n#{web_hooks.size} web hooks found."
+      puts "\n#{web_hooks.size} webhooks found."
     end
   end
 
diff --git a/spec/models/hooks/service_hook_spec.rb b/spec/models/hooks/service_hook_spec.rb
index 1455661485bf5a993a0a9f5c89d2e67fa9ea8545..f800f415bd2d94a37e76218d925d67f182a8b313 100644
--- a/spec/models/hooks/service_hook_spec.rb
+++ b/spec/models/hooks/service_hook_spec.rb
@@ -31,7 +31,7 @@ describe ServiceHook, models: true do
       WebMock.stub_request(:post, @service_hook.url)
     end
 
-    it "POSTs to the web hook URL" do
+    it "POSTs to the webhook URL" do
       @service_hook.execute(@data)
       expect(WebMock).to have_requested(:post, @service_hook.url).with(
         headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'Service Hook' }
diff --git a/spec/models/hooks/web_hook_spec.rb b/spec/models/hooks/web_hook_spec.rb
index 6ea99952a8f4021d06308ce9bc10c14b922eabea..04bc2dcfb16a80c9b8ebc062262b6c9aebdf465f 100644
--- a/spec/models/hooks/web_hook_spec.rb
+++ b/spec/models/hooks/web_hook_spec.rb
@@ -52,7 +52,7 @@ describe WebHook, models: true do
       WebMock.stub_request(:post, @project_hook.url)
     end
 
-    it "POSTs to the web hook URL" do
+    it "POSTs to the webhook URL" do
       @project_hook.execute(@data, 'push_hooks')
       expect(WebMock).to have_requested(:post, @project_hook.url).with(
         headers: { 'Content-Type'=>'application/json', 'X-Gitlab-Event'=>'Push Hook' }
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index 82813cee227272ca94d7911e2dce81b693583010..a7e2e1b1792014af87e0feb0b47a00cb72c1eeb2 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -172,8 +172,8 @@ describe GitPushService, services: true do
   end
 
 
-  describe "Web Hooks" do
-    context "execute web hooks" do
+  describe "Webhooks" do
+    context "execute webhooks" do
       it "when pushing a branch for the first time" do
         expect(project).to receive(:execute_hooks)
         expect(project.default_branch).to eq("master")
diff --git a/spec/services/git_tag_push_service_spec.rb b/spec/services/git_tag_push_service_spec.rb
index b982274c529073ee106ed318bf56d49d9c68c9d4..cc780587e74a01b54ad5b67b4ff15016abdf01ca 100644
--- a/spec/services/git_tag_push_service_spec.rb
+++ b/spec/services/git_tag_push_service_spec.rb
@@ -78,8 +78,8 @@ describe GitTagPushService, services: true do
     end
   end
 
-  describe "Web Hooks" do
-    context "execute web hooks" do
+  describe "Webhooks" do
+    context "execute webhooks" do
       it "when pushing tags" do
         expect(project).to receive(:execute_hooks)
         service.execute(project, user, 'oldrev', 'newrev', 'refs/tags/v1.0.0')
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index e4151b9bb6a62bb6e306bfc262af2affba83c32e..0265dbe9c666707bab07214ff8b696b396326c41 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -11,7 +11,7 @@ describe PostReceive do
     end
   end
 
-  context "web hook" do
+  context "webhook" do
     let(:project) { create(:project) }
     let(:key) { create(:key, user: project.owner) }
     let(:key_id) { key.shell_id }