diff --git a/app/views/notify/repository_push_email.html.haml b/app/views/notify/repository_push_email.html.haml
index ab0d6c6..85a01a5 100644
--- a/app/views/notify/repository_push_email.html.haml
+++ b/app/views/notify/repository_push_email.html.haml
@@ -7,7 +7,7 @@
     %li
       #{commit.short_id} - #{commit.title}
 
-%h4 Diff:
+%h4 Changes:
 - @diffs.each do |diff|
   %li
     %strong
@@ -23,6 +23,6 @@
     %br
 
 - if @compare.timeout
-  %h5 Huge diff. To prevent performance issues it was hidden
+  %h5 To prevent performance issues changes are hidden
 - elsif @compare.commits_over_limit?
-  %h5 Diff for big amount of commits is disabled
+  %h5 Changes are not shown due to large amount of commits
diff --git a/app/views/notify/repository_push_email.text.haml b/app/views/notify/repository_push_email.text.haml
index 93b344d..b8d7fbe 100644
--- a/app/views/notify/repository_push_email.text.haml
+++ b/app/views/notify/repository_push_email.text.haml
@@ -6,7 +6,7 @@ Commits:
   #{commit.short_id} - #{truncate(commit.title, length: 40)}
 \
 \
-Diff:
+Changes:
 - @diffs.each do |diff|
   \
   \=====================================
@@ -22,4 +22,4 @@ Diff:
 - if @compare.timeout
   Huge diff. To prevent performance issues it was hidden
 - elsif @compare.commits_over_limit?
-  Diff for big amount of commits is disabled
+  Changes are not shown due to large amount of commits
diff --git a/app/views/projects/commits/_text_file.html.haml b/app/views/projects/commits/_text_file.html.haml
index c827d96..ba83d2e 100644
--- a/app/views/projects/commits/_text_file.html.haml
+++ b/app/views/projects/commits/_text_file.html.haml
@@ -1,6 +1,6 @@
 - too_big = diff.diff.lines.count > 1000
 - if too_big
-  %a.supp_diff_link Diff suppressed. Click to show
+  %a.supp_diff_link Changes suppressed. Click to show
 
 %table.text-file{class: "#{'hide' if too_big}"}
   - each_diff_line(diff, index) do |line, type, line_code, line_new, line_old, raw_line|
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index 9bd4985..57331bf 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -18,17 +18,17 @@
     - else
       %ul.well-list= render Commit.decorate(@commits), project: @project
 
-  %h4 Diff
+  %h4 Changes
   - if @diffs.present?
     = render "projects/commits/diffs", diffs: @diffs, project: @project
   - elsif @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
     .bs-callout.bs-callout-danger
       %h4 This comparison includes more than #{MergeRequestDiff::COMMITS_SAFE_SIZE} commits.
-      %p To preserve performance the line diff is not shown.
+      %p To preserve performance the line changes are not shown.
   - elsif @timeout
     .bs-callout.bs-callout-danger
-      %h4 Diff for this comparison is extremely large.
-      %p Use command line to browse diff for this comparison.
+      %h4 Number of changed files for this comparison is extremely large.
+      %p Use command line to browse through changes for this comparison.
 
 
 - else
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 809b019..7a21c0d 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -20,7 +20,7 @@
       %li.diffs-tab{data: {action: 'diffs'}}
         = link_to diffs_project_merge_request_path(@project, @merge_request) do
           %i.icon-list-alt
-          Diff
+          Changes
 
   - content_for :note_actions do
     - if can?(current_user, :modify_merge_request, @merge_request)
diff --git a/app/views/projects/merge_requests/show/_diffs.html.haml b/app/views/projects/merge_requests/show/_diffs.html.haml
index 7c4f43d..3d48514 100644
--- a/app/views/projects/merge_requests/show/_diffs.html.haml
+++ b/app/views/projects/merge_requests/show/_diffs.html.haml
@@ -5,7 +5,7 @@
 - else
   .bs-callout.bs-callout-warning
     %h4
-      Diff for this comparison is extremely large.
+      Changes view for this comparison is extremely large.
     %p
       You can
       = link_to "download it", project_merge_request_path(@merge_request.source_project, @merge_request, format: :diff), class: "vlink"
--
libgit2 0.21.2