diff --git a/lib/api/files.rb b/lib/api/files.rb
index 6a5419a580f108025a9de0e8e0fdf82b039df82c..5e2a68809e5cf9c724c1efe13fa96dfe902687c5 100644
--- a/lib/api/files.rb
+++ b/lib/api/files.rb
@@ -21,7 +21,7 @@ module API
         attrs = attributes_for_keys [:file_path, :branch_name, :content, :commit_message]
         branch_name = attrs.delete(:branch_name)
         file_path = attrs.delete(:file_path)
-        result = ::Files::CreateContext.new(user_project, current_user, attrs, branch_name, file_path).execute
+        result = ::Files::CreateService.new(user_project, current_user, attrs, branch_name, file_path).execute
 
         if result[:status] == :success
           status(201)
@@ -51,7 +51,7 @@ module API
         attrs = attributes_for_keys [:file_path, :branch_name, :content, :commit_message]
         branch_name = attrs.delete(:branch_name)
         file_path = attrs.delete(:file_path)
-        result = ::Files::UpdateContext.new(user_project, current_user, attrs, branch_name, file_path).execute
+        result = ::Files::UpdateService.new(user_project, current_user, attrs, branch_name, file_path).execute
 
         if result[:status] == :success
           status(200)
@@ -81,7 +81,7 @@ module API
         attrs = attributes_for_keys [:file_path, :branch_name, :commit_message]
         branch_name = attrs.delete(:branch_name)
         file_path = attrs.delete(:file_path)
-        result = ::Files::DeleteContext.new(user_project, current_user, attrs, branch_name, file_path).execute
+        result = ::Files::DeleteService.new(user_project, current_user, attrs, branch_name, file_path).execute
 
         if result[:status] == :success
           status(200)
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 66e0d1ba3ef732eaba47590317b4f5d1e7cdfb9b..a4c8f7fc87e941db4a6593d6d4aaa96812814452 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -102,7 +102,7 @@ module API
                                      :visibility_level,
                                      :import_url]
         attrs = map_public_to_visibility_level(attrs)
-        @project = ::Projects::CreateContext.new(current_user, attrs).execute
+        @project = ::Projects::CreateService.new(current_user, attrs).execute
         if @project.saved?
           present @project, with: Entities::Project
         else
@@ -143,7 +143,7 @@ module API
                                      :public,
                                      :visibility_level]
         attrs = map_public_to_visibility_level(attrs)
-        @project = ::Projects::CreateContext.new(user, attrs).execute
+        @project = ::Projects::CreateService.new(user, attrs).execute
         if @project.saved?
           present @project, with: Entities::Project
         else
diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake
index 8fa8927085493f919535d79c5a12791f55d40651..83e941adcb18476a5efba5df44254cd38946544e 100644
--- a/lib/tasks/gitlab/import.rake
+++ b/lib/tasks/gitlab/import.rake
@@ -66,7 +66,7 @@ namespace :gitlab do
             project_params[:namespace_id] = group.id
           end
 
-          project = Projects::CreateContext.new(user, project_params).execute
+          project = Projects::CreateService.new(user, project_params).execute
 
           if project.valid?
             puts " * Created #{project.name} (#{repo_path})".green