diff --git a/.dockerignore b/.dockerignore
index d20c733313dba426338b9d612db17d7d5dd73deb..b2aef4d31cda7381aa64312f2e0147cd739883d9 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,7 +5,7 @@
 # Following are the files we need:
 # - ./config/initializers/0_inject_enterprise_edition_module.rb
 # - ./ee/app/models/license.rb
-# - ./lib/gitlab.rb
+# - ./lib/gitlab_edition.rb
 # - ./lib/gitlab/utils.rb
 # - ./qa/
 # - ./INSTALLATION_TYPE
diff --git a/config/initializers/0_inject_enterprise_edition_module.rb b/config/initializers/0_inject_enterprise_edition_module.rb
index 41d1043af38d32095239898fc26da5aee41ab57c..1951940a2a16971007d50b65f69a95414c557e1d 100644
--- a/config/initializers/0_inject_enterprise_edition_module.rb
+++ b/config/initializers/0_inject_enterprise_edition_module.rb
@@ -46,7 +46,7 @@ def prepend_module(mod, with_descendants)
   end
 
   def each_extension_for(constant_name, namespace)
-    Gitlab.extensions.each do |extension_name|
+    GitlabEdition.extensions.each do |extension_name|
       extension_namespace =
         const_get_maybe_false(namespace, extension_name.upcase)
 
diff --git a/qa/Dockerfile b/qa/Dockerfile
index 13213c7c8c8b770d2a7c3a5a110d509e812ac13c..54de65095186037c405cc749bafda51dc2ee7ab0 100644
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -77,7 +77,7 @@ COPY ./config/initializers/0_inject_enterprise_edition_module.rb /home/gitlab/co
 # The [b] part makes ./ee/app/models/license.r[b] a pattern that is allowed to return no files (which is the case in FOSS)
 COPY VERSION ./ee/app/models/license.r[b] /home/gitlab/ee/app/models/
 COPY ./config/bundler_setup.rb /home/gitlab/config/
-COPY ./lib/gitlab.rb /home/gitlab/lib/
+COPY ./lib/gitlab_edition.rb /home/gitlab/lib/
 COPY ./lib/gitlab/utils.rb /home/gitlab/lib/gitlab/
 COPY ./INSTALLATION_TYPE ./VERSION /home/gitlab/
 
diff --git a/qa/qa.rb b/qa/qa.rb
index 1cdf6bc89cab1a6081e64359bfe4f1c04ce6fa62..703ed4ffe1dbbc5a43985986a8b2a364cbef3916 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -2,7 +2,7 @@
 
 Encoding.default_external = 'UTF-8'
 
-require_relative '../lib/gitlab'
+require_relative '../lib/gitlab_edition'
 require_relative '../lib/gitlab/utils'
 require_relative '../config/initializers/0_inject_enterprise_edition_module'
 
diff --git a/spec/config/inject_enterprise_edition_module_spec.rb b/spec/config/inject_enterprise_edition_module_spec.rb
index 61b40e4600154ca08a67a145612645832d38ab0b..6ef74a2b616fe6f7c6698565e78647e41194aab0 100644
--- a/spec/config/inject_enterprise_edition_module_spec.rb
+++ b/spec/config/inject_enterprise_edition_module_spec.rb
@@ -11,7 +11,7 @@
 
   before do
     # Make sure we're not relying on which mode we're running under
-    allow(Gitlab).to receive(:extensions).and_return([extension_name.downcase])
+    allow(GitlabEdition).to receive(:extensions).and_return([extension_name.downcase])
 
     # Test on an imagined extension and imagined class
     stub_const(fish_name, fish_class) # Fish