diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml
index e01f8ea587858007f5e2a54c35cb603f33676209..d12fff96835e5f77adba037c8ade5535d524bfb5 100644
--- a/app/views/commits/show.html.haml
+++ b/app/views/commits/show.html.haml
@@ -1,6 +1,6 @@
 = render "commits/commit_box"
 = render "commits/diffs", diffs: @commit.diffs
-= render "notes/notes", tid: @commit.id, tt: "commit"
+= render "notes/notes_with_form", tid: @commit.id, tt: "commit"
 = render "notes/per_line_form"
 
 
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 9b1c72a3a12c6e5331edfa59596b653f81c1586c..0b72a820bb4e2536a8b3f0f0e19f96dca0c30479 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -61,4 +61,4 @@
         = markdown @issue.description
 
 
-.issue_notes#notes= render "notes/notes", tid: @issue.id, tt: "issue"
+.issue_notes#notes= render "notes/notes_with_form", tid: @issue.id, tt: "issue"
diff --git a/app/views/merge_requests/_show.html.haml b/app/views/merge_requests/_show.html.haml
index f1b3fa9fe984458532ce63c95cda14108cfa3282..40b7219019967e6b30c7416f76109d4d132e4ece 100644
--- a/app/views/merge_requests/_show.html.haml
+++ b/app/views/merge_requests/_show.html.haml
@@ -16,7 +16,7 @@
         Diff
 
 .merge_request_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
-  = render("notes/notes", tid: @merge_request.id, tt: "merge_request")
+  = render("notes/notes_with_form", tid: @merge_request.id, tt: "merge_request")
 .merge-request-diffs
   = render "merge_requests/show/diffs" if @diffs
 .status
diff --git a/app/views/merge_requests/show.js.haml b/app/views/merge_requests/show.js.haml
index 7a27b1668499571c454383d9f85b88da627911c2..f44ccbb5127a52c7ea8031de48b588b19dc66c07 100644
--- a/app/views/merge_requests/show.js.haml
+++ b/app/views/merge_requests/show.js.haml
@@ -1,2 +1,2 @@
 :plain
-  $(".merge-request-notes").html("#{escape_javascript(render("notes/notes", tid: @merge_request.id, tt: "merge_request"))}");
+  $(".merge-request-notes").html("#{escape_javascript(render notes/notes_with_form", tid: @merge_request.id, tt: "merge_request")}");
diff --git a/app/views/notes/_notes.html.haml b/app/views/notes/_notes_with_form.html.haml
similarity index 100%
rename from app/views/notes/_notes.html.haml
rename to app/views/notes/_notes_with_form.html.haml
diff --git a/app/views/projects/wall.html.haml b/app/views/projects/wall.html.haml
index 97765d7ac887ad8fb86deb0684376b57eb88a2b1..1a07bc3d39227a3276a7ea2f08affd49b0cb7d15 100644
--- a/app/views/projects/wall.html.haml
+++ b/app/views/projects/wall.html.haml
@@ -1,2 +1,2 @@
 %div.wall_page
-  = render "notes/notes", tid: nil, tt: "wall"
+  = render "notes/notes_with_form", tid: nil, tt: "wall"
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index 0800b81d330d6fff31a0067a775e805067c49ffe..4188a9f198c976698a96f3e6a7176c71282a02fd 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -17,4 +17,4 @@
     %div{class: current_user.dark_scheme ? "black" : ""}
       = raw @snippet.colorize(options: { linenos: 'True'})
 
-= render "notes/notes", tid: @snippet.id, tt: "snippet"
+= render "notes/notes_with_form", tid: @snippet.id, tt: "snippet"
diff --git a/app/views/wikis/show.html.haml b/app/views/wikis/show.html.haml
index fc2352271d586758f21c802793ce41c7a0198eba..579ea1b3ad68719a54e336e3365ca3b334567796 100644
--- a/app/views/wikis/show.html.haml
+++ b/app/views/wikis/show.html.haml
@@ -21,4 +21,4 @@
     Delete this page
 
 %hr
-.wiki_notes#notes= render "notes/notes", tid: @wiki.id, tt: "wiki"
+.wiki_notes#notes= render "notes/notes_with_form", tid: @wiki.id, tt: "wiki"