diff --git a/app/controllers/importers/githubs_controller.rb b/app/controllers/importers/githubs_controller.rb
index 5bb64c4a6ced996624c82b3bc554efb6c8025955..b3d42e32dfa64a5d306937423614d126afb75adb 100644
--- a/app/controllers/importers/githubs_controller.rb
+++ b/app/controllers/importers/githubs_controller.rb
@@ -47,13 +47,13 @@ class Importers::GithubsController < ApplicationController
       namespace.add_owner(current_user)
     end
 
-    @project = Gitlab::Github::ProjectCreator.new(repo, namespace, current_user).execute
+    @project = Gitlab::GithubImport::ProjectCreator.new(repo, namespace, current_user).execute
   end
 
   private
 
   def client
-    @client ||= Gitlab::Github::Client.new.client
+    @client ||= Gitlab::GithubImport::Client.new.client
   end
 
   def octo_client
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index 1ceea7ff07fd198bf2392525f5f2ec3be80f98fb..3fb41a528c2bfba8286d8942026201b80215e371 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -11,7 +11,7 @@ class RepositoryImportWorker
                                project.import_url)
 
     if project.import_type == 'github'
-      result_of_data_import = Gitlab::Github::Importer.new(project).execute
+      result_of_data_import = Gitlab::GithubImport::Importer.new(project).execute
     elsif project.import_type == 'gitlab'
       result_of_data_import = Gitlab::GitlabImport::Importer.new(project).execute
     else
diff --git a/lib/gitlab/github/client.rb b/lib/gitlab/github_import/client.rb
similarity index 96%
rename from lib/gitlab/github/client.rb
rename to lib/gitlab/github_import/client.rb
index d6b936c649c74ca33e4ed2edc0926fe4835e6944..2e454e7c10ff0c536d7559e893b74cb723a0ab8a 100644
--- a/lib/gitlab/github/client.rb
+++ b/lib/gitlab/github_import/client.rb
@@ -1,5 +1,5 @@
 module Gitlab
-  module Github
+  module GithubImport
     class Client
       attr_reader :client
 
diff --git a/lib/gitlab/github/importer.rb b/lib/gitlab/github_import/importer.rb
similarity index 98%
rename from lib/gitlab/github/importer.rb
rename to lib/gitlab/github_import/importer.rb
index 9f0fc6c4471d4474b5f0ef82a371c017d0a4f153..180ad6c301864f60ff2668d05f8c766ad28ddaac 100644
--- a/lib/gitlab/github/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -1,5 +1,5 @@
 module Gitlab
-  module Github
+  module GithubImport
     class Importer
       attr_reader :project
 
diff --git a/lib/gitlab/github/project_creator.rb b/lib/gitlab/github_import/project_creator.rb
similarity index 97%
rename from lib/gitlab/github/project_creator.rb
rename to lib/gitlab/github_import/project_creator.rb
index 7b04926071f6180d67233f23e8463dd5c7b1e263..9439ca6cbf4803f12a50dcf416f519b32026a37d 100644
--- a/lib/gitlab/github/project_creator.rb
+++ b/lib/gitlab/github_import/project_creator.rb
@@ -1,5 +1,5 @@
 module Gitlab
-  module Github
+  module GithubImport
     class ProjectCreator
       attr_reader :repo, :namespace, :current_user