diff --git a/app/services/after_branch_delete_service.rb b/app/services/after_branch_delete_service.rb
index c157cb68715..2be4d3e6ab5 100644
--- a/app/services/after_branch_delete_service.rb
+++ b/app/services/after_branch_delete_service.rb
@@ -16,7 +16,7 @@ class AfterBranchDeleteService < BaseService
   private
 
   def stop_environments
-    Ci::StopEnvironmentService
+    Ci::StopEnvironmentsService
       .new(project, current_user)
       .execute(branch_name)
   end
diff --git a/app/services/ci/stop_environment_service.rb b/app/services/ci/stop_environments_service.rb
similarity index 92%
rename from app/services/ci/stop_environment_service.rb
rename to app/services/ci/stop_environments_service.rb
index 79a0b1369c9..b7a49a424ce 100644
--- a/app/services/ci/stop_environment_service.rb
+++ b/app/services/ci/stop_environments_service.rb
@@ -1,5 +1,5 @@
 module Ci
-  class StopEnvironmentService < BaseService
+  class StopEnvironmentsService < BaseService
     attr_reader :ref
 
     def execute(branch_name)
diff --git a/spec/services/ci/stop_environment_service_spec.rb b/spec/services/ci/stop_environments_service_spec.rb
similarity index 97%
rename from spec/services/ci/stop_environment_service_spec.rb
rename to spec/services/ci/stop_environments_service_spec.rb
index e044b40679a..c3e1af3afe2 100644
--- a/spec/services/ci/stop_environment_service_spec.rb
+++ b/spec/services/ci/stop_environments_service_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Ci::StopEnvironmentService, services: true do
+describe Ci::StopEnvironmentsService, services: true do
   let(:project) { create(:project, :private) }
   let(:user) { create(:user) }