diff --git a/lib/api/commits.rb b/lib/api/commits.rb
index 4af37a2ad1d..e2d50b4e0a6 100644
--- a/lib/api/commits.rb
+++ b/lib/api/commits.rb
@@ -186,7 +186,7 @@ module API
 
             lines.each do |line|
               next unless line.new_pos == params[:line] && line.type == params[:line_type]
-              break opts[:line_code] = Gitlab::Diff::LineCode.generate(diff.new_path, line.new_pos, line.old_pos)
+              break opts[:line_code] = Gitlab::Git::DiffLineCode.generate(diff.new_path, line.new_pos, line.old_pos)
             end
 
             break if opts[:line_code]
diff --git a/lib/api/v3/commits.rb b/lib/api/v3/commits.rb
index 345cb7e7c11..042f4338d53 100644
--- a/lib/api/v3/commits.rb
+++ b/lib/api/v3/commits.rb
@@ -173,7 +173,7 @@ module API
 
               lines.each do |line|
                 next unless line.new_pos == params[:line] && line.type == params[:line_type]
-                break opts[:line_code] = Gitlab::Diff::LineCode.generate(diff.new_path, line.new_pos, line.old_pos)
+                break opts[:line_code] = Gitlab::Git::DiffLineCode.generate(diff.new_path, line.new_pos, line.old_pos)
               end
 
               break if opts[:line_code]
diff --git a/lib/github/representation/comment.rb b/lib/github/representation/comment.rb
index 1b5be91461b..b87a11672ed 100644
--- a/lib/github/representation/comment.rb
+++ b/lib/github/representation/comment.rb
@@ -23,7 +23,7 @@ module Github
       private
 
       def generate_line_code(line)
-        Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos)
+        Gitlab::Git::DiffLineCode.generate(file_path, line.new_pos, line.old_pos)
       end
 
       def on_diff?
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index d1979bb7ed3..f613d8e8179 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -241,7 +241,7 @@ module Gitlab
       end
 
       def generate_line_code(pr_comment)
-        Gitlab::Diff::LineCode.generate(pr_comment.file_path, pr_comment.new_pos, pr_comment.old_pos)
+        Gitlab::Git::DiffLineCode.generate(pr_comment.file_path, pr_comment.new_pos, pr_comment.old_pos)
       end
 
       def pull_request_comment_attributes(comment)
diff --git a/lib/gitlab/conflict/file.rb b/lib/gitlab/conflict/file.rb
index 98dfe900044..52f8fe27f3b 100644
--- a/lib/gitlab/conflict/file.rb
+++ b/lib/gitlab/conflict/file.rb
@@ -163,7 +163,7 @@ module Gitlab
       end
 
       def line_code(line)
-        Gitlab::Diff::LineCode.generate(our_path, line.new_pos, line.old_pos)
+        Gitlab::Git::DiffLineCode.generate(our_path, line.new_pos, line.old_pos)
       end
 
       def create_match_line(line)
diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb
index 599c3c5deab..bc2c25c9cb6 100644
--- a/lib/gitlab/diff/file.rb
+++ b/lib/gitlab/diff/file.rb
@@ -49,7 +49,7 @@ module Gitlab
       def line_code(line)
         return if line.meta?
 
-        Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos)
+        Gitlab::Git::DiffLineCode.generate(file_path, line.new_pos, line.old_pos)
       end
 
       def line_for_line_code(code)
diff --git a/lib/gitlab/diff/line_code.rb b/lib/gitlab/git/diff_line_code.rb
similarity index 85%
rename from lib/gitlab/diff/line_code.rb
rename to lib/gitlab/git/diff_line_code.rb
index f3578ab3d35..aab963ba928 100644
--- a/lib/gitlab/diff/line_code.rb
+++ b/lib/gitlab/git/diff_line_code.rb
@@ -1,6 +1,6 @@
 module Gitlab
-  module Diff
-    class LineCode
+  module Git
+    class DiffLineCode
       def self.generate(file_path, new_line_position, old_line_position)
         "#{Digest::SHA1.hexdigest(file_path)}_#{old_line_position}_#{new_line_position}"
       end
diff --git a/lib/gitlab/github_import/comment_formatter.rb b/lib/gitlab/github_import/comment_formatter.rb
index e21922070c1..6490cd7002d 100644
--- a/lib/gitlab/github_import/comment_formatter.rb
+++ b/lib/gitlab/github_import/comment_formatter.rb
@@ -38,7 +38,7 @@ module Gitlab
       end
 
       def generate_line_code(line)
-        Gitlab::Diff::LineCode.generate(file_path, line.new_pos, line.old_pos)
+        Gitlab::Git::DiffLineCode.generate(file_path, line.new_pos, line.old_pos)
       end
 
       def on_diff?
diff --git a/spec/lib/gitlab/diff/position_spec.rb b/spec/lib/gitlab/diff/position_spec.rb
index 9bf54fdecc4..79c47653d55 100644
--- a/spec/lib/gitlab/diff/position_spec.rb
+++ b/spec/lib/gitlab/diff/position_spec.rb
@@ -40,7 +40,7 @@ describe Gitlab::Diff::Position do
 
     describe "#line_code" do
       it "returns the correct line code" do
-        line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.new_line, 0)
+        line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, subject.new_line, 0)
 
         expect(subject.line_code(project.repository)).to eq(line_code)
       end
@@ -108,7 +108,7 @@ describe Gitlab::Diff::Position do
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.new_line, 15)
+          line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, subject.new_line, 15)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -149,7 +149,7 @@ describe Gitlab::Diff::Position do
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.new_line, subject.old_line)
+          line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, subject.new_line, subject.old_line)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -189,7 +189,7 @@ describe Gitlab::Diff::Position do
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, 13, subject.old_line)
+          line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, 13, subject.old_line)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -233,7 +233,7 @@ describe Gitlab::Diff::Position do
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.new_line, 5)
+          line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, subject.new_line, 5)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -274,7 +274,7 @@ describe Gitlab::Diff::Position do
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.new_line, subject.old_line)
+          line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, subject.new_line, subject.old_line)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -314,7 +314,7 @@ describe Gitlab::Diff::Position do
 
       describe "#line_code" do
         it "returns the correct line code" do
-          line_code = Gitlab::Diff::LineCode.generate(subject.file_path, 4, subject.old_line)
+          line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, 4, subject.old_line)
 
           expect(subject.line_code(project.repository)).to eq(line_code)
         end
@@ -357,7 +357,7 @@ describe Gitlab::Diff::Position do
 
     describe "#line_code" do
       it "returns the correct line code" do
-        line_code = Gitlab::Diff::LineCode.generate(subject.file_path, 0, subject.old_line)
+        line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, 0, subject.old_line)
 
         expect(subject.line_code(project.repository)).to eq(line_code)
       end
@@ -399,7 +399,7 @@ describe Gitlab::Diff::Position do
 
     describe "#line_code" do
       it "returns the correct line code" do
-        line_code = Gitlab::Diff::LineCode.generate(subject.file_path, subject.new_line, 0)
+        line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, subject.new_line, 0)
 
         expect(subject.line_code(project.repository)).to eq(line_code)
       end
@@ -447,7 +447,7 @@ describe Gitlab::Diff::Position do
 
     describe "#line_code" do
       it "returns the correct line code" do
-        line_code = Gitlab::Diff::LineCode.generate(subject.file_path, 0, subject.old_line)
+        line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, 0, subject.old_line)
 
         expect(subject.line_code(project.repository)).to eq(line_code)
       end
diff --git a/spec/models/diff_note_spec.rb b/spec/models/diff_note_spec.rb
index eb0a3e9e0d3..67a8efa6524 100644
--- a/spec/models/diff_note_spec.rb
+++ b/spec/models/diff_note_spec.rb
@@ -105,7 +105,7 @@ describe DiffNote do
 
   describe "#line_code" do
     it "returns the correct line code" do
-      line_code = Gitlab::Diff::LineCode.generate(position.file_path, position.formatter.new_line, 15)
+      line_code = Gitlab::Git::DiffLineCode.generate(position.file_path, position.formatter.new_line, 15)
 
       expect(subject.line_code).to eq(line_code)
     end