diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/markup_helper.rb
similarity index 99%
rename from app/helpers/gitlab_markdown_helper.rb
rename to app/helpers/markup_helper.rb
index 106feb87398b04d8868d35c356e4f26e9724c75c..a10714e81ae1bfd8fbc8f3c7bf5f2d32252a5d6a 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/markup_helper.rb
@@ -1,6 +1,6 @@
 require 'nokogiri'
 
-module GitlabMarkdownHelper
+module MarkupHelper
   # Use this in places where you would normally use link_to(gfm(...), ...).
   #
   # It solves a problem occurring with nested links (i.e.
diff --git a/app/mailers/base_mailer.rb b/app/mailers/base_mailer.rb
index a9b6b33eb5c728fc5e59ad49e80936d885444b61..d2980db218af601276b7767460d661372ccee789 100644
--- a/app/mailers/base_mailer.rb
+++ b/app/mailers/base_mailer.rb
@@ -1,6 +1,6 @@
 class BaseMailer < ActionMailer::Base
   helper ApplicationHelper
-  helper GitlabMarkdownHelper
+  helper MarkupHelper
 
   attr_accessor :current_user
   helper_method :current_user, :can?
diff --git a/spec/features/copy_as_gfm_spec.rb b/spec/features/copy_as_gfm_spec.rb
index 64a6c70061b714ba33f78c892adbf59626c106aa..344e31e5ef5c1e1eb1f3d23e4d980cc53dd3724a 100644
--- a/spec/features/copy_as_gfm_spec.rb
+++ b/spec/features/copy_as_gfm_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Copy as GFM', feature: true, js: true do
-  include GitlabMarkdownHelper
+  include MarkupHelper
   include RepoHelpers
   include ActionView::Helpers::JavaScriptHelper
 
diff --git a/spec/features/markdown_spec.rb b/spec/features/markdown_spec.rb
index 894df13a2dcc8b92688f9079da454b2e8c3fedde..ba930de937d272ede68ace0d7acbe4aef782b2ab 100644
--- a/spec/features/markdown_spec.rb
+++ b/spec/features/markdown_spec.rb
@@ -26,7 +26,7 @@ require 'erb'
 
 describe 'GitLab Markdown', feature: true do
   include Capybara::Node::Matchers
-  include GitlabMarkdownHelper
+  include MarkupHelper
   include MarkdownMatchers
 
   # Sometimes it can be useful to see the parsed output of the Markdown document
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/markup_helper_spec.rb
similarity index 99%
rename from spec/helpers/gitlab_markdown_helper_spec.rb
rename to spec/helpers/markup_helper_spec.rb
index b8fd54c66e449da0aa36cee7ec8485bf757d15bb..c8da995581e09e0c16a93051f8032b55b60015a6 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/markup_helper_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe GitlabMarkdownHelper do
+describe MarkupHelper do
   include ApplicationHelper
 
   let!(:project) { create(:project, :repository) }
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 42d63a9f9ba91cdeb033c12ac50a22202a743afb..75d7caf2508cd52ab71567c8862467e2abe83b6a 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -595,7 +595,7 @@ describe SystemNoteService, services: true do
     end
 
     shared_examples 'cross project mentionable' do
-      include GitlabMarkdownHelper
+      include MarkupHelper
 
       it 'contains cross reference to new noteable' do
         expect(subject.note).to include cross_project_reference(new_project, new_noteable)