diff --git a/app/views/mailers/domain_delete_mailer/forced.html.erb b/app/views/mailers/domain_delete_mailer/forced/removed_company.html.erb
similarity index 100%
rename from app/views/mailers/domain_delete_mailer/forced.html.erb
rename to app/views/mailers/domain_delete_mailer/forced/removed_company.html.erb
diff --git a/app/views/mailers/domain_delete_mailer/forced.text.erb b/app/views/mailers/domain_delete_mailer/forced/removed_company.text.erb
similarity index 100%
rename from app/views/mailers/domain_delete_mailer/forced.text.erb
rename to app/views/mailers/domain_delete_mailer/forced/removed_company.text.erb
diff --git a/spec/views/mailers/domain_delete_mailer/forced.html.erb_spec.rb b/spec/views/mailers/domain_delete_mailer/forced/removed_company.html.erb_spec.rb
similarity index 76%
rename from spec/views/mailers/domain_delete_mailer/forced.html.erb_spec.rb
rename to spec/views/mailers/domain_delete_mailer/forced/removed_company.html.erb_spec.rb
index 4f38b7743..5a92165b0 100644
--- a/spec/views/mailers/domain_delete_mailer/forced.html.erb_spec.rb
+++ b/spec/views/mailers/domain_delete_mailer/forced/removed_company.html.erb_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
-require_relative 'forced_shared'
+require_relative 'removed_company'
 
-RSpec.describe 'mailers/domain_delete_mailer/forced.html.erb' do
+RSpec.describe 'mailers/domain_delete_mailer/forced/removed_company.html.erb' do
   before :example do
     stub_template 'mailers/shared/registrar/_registrar.et.html' => 'test registrar estonian'
     stub_template 'mailers/shared/registrar/_registrar.en.html' => 'test registrar english'
diff --git a/spec/views/mailers/domain_delete_mailer/forced_shared.rb b/spec/views/mailers/domain_delete_mailer/forced/removed_company.rb
similarity index 100%
rename from spec/views/mailers/domain_delete_mailer/forced_shared.rb
rename to spec/views/mailers/domain_delete_mailer/forced/removed_company.rb
diff --git a/spec/views/mailers/domain_delete_mailer/forced.text.erb_spec.rb b/spec/views/mailers/domain_delete_mailer/forced/removed_company.text.erb_spec.rb
similarity index 76%
rename from spec/views/mailers/domain_delete_mailer/forced.text.erb_spec.rb
rename to spec/views/mailers/domain_delete_mailer/forced/removed_company.text.erb_spec.rb
index a53c5beca..ec527b0d7 100644
--- a/spec/views/mailers/domain_delete_mailer/forced.text.erb_spec.rb
+++ b/spec/views/mailers/domain_delete_mailer/forced/removed_company.text.erb_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
-require_relative 'forced_shared'
+require_relative 'removed_company'
 
-RSpec.describe 'mailers/domain_delete_mailer/forced.text.erb' do
+RSpec.describe 'mailers/domain_delete_mailer/forced/removed_company.text.erb' do
   before :example do
     stub_template 'mailers/shared/registrar/_registrar.et.text' => 'test registrar estonian'
     stub_template 'mailers/shared/registrar/_registrar.en.text' => 'test registrar english'