diff --git a/app/views/mailers/domain_mailer/expiration.html.erb b/app/views/mailers/domain_mailer/expiration.html.erb
index 3c66159e9..d9a96b50a 100644
--- a/app/views/mailers/domain_mailer/expiration.html.erb
+++ b/app/views/mailers/domain_mailer/expiration.html.erb
@@ -4,7 +4,7 @@ Lugupeetud .ee domeeni kasutaja<br>
 Domeeninimi <%= @domain.name %>  on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Alates <%= @domain.delete_date %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
 <br><br>
 Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja:
-<%= render 'mailers/domain_mailer/registrar/registrar.et.html', registrar: @registrar %>
+<%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
 <br><br>
 Domeeni <%= @domain.name %> kohta on registris järgmised andmed:
 <br><br>
@@ -27,7 +27,7 @@ Dear user of .ee domain,<br>
 The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= @domain.on_hold_date %>. From <%= @domain.delete_date %>, the <%= @domain.name %> domain will be available for registration on a first come first served basis.
 <br><br>
 To renew the domain registration, please contact your registrar:
-<%= render 'mailers/domain_mailer/registrar/registrar.en.html', registrar: @registrar %>
+<%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
 <br><br>
 The following data for the <%= @domain.name %> domain have been entered into the registry:
 <br><br>
@@ -53,7 +53,7 @@ Estonian Internet Foundation
 <br><br>
 
 Для продления регистрации домена просим обратиться к своему регистратору:
-<%= render 'mailers/domain_mailer/registrar/registrar.ru.html', registrar: @registrar %>
+<%= render 'mailers/shared/registrar/registrar.ru.html', registrar: @registrar %>
 <br><br>
 
 Относительно домена <%= @domain.name %> в реестр внесены следующие данные:
diff --git a/app/views/mailers/domain_mailer/expiration.text.erb b/app/views/mailers/domain_mailer/expiration.text.erb
index fc9351300..ab0ba5a14 100644
--- a/app/views/mailers/domain_mailer/expiration.text.erb
+++ b/app/views/mailers/domain_mailer/expiration.text.erb
@@ -5,7 +5,7 @@ Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_
 
 Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja:
 
-<%= render 'mailers/domain_mailer/registrar/registrar.et.text', registrar: @registrar %>
+<%= render 'mailers/shared/registrar/registrar.et.text', registrar: @registrar %>
 
 Domeeni <%= @domain.name %> kohta on registris järgmised andmed:
 
@@ -28,7 +28,7 @@ The domain name <%= @domain.name %> has expired and will not be available on the
 
 To renew the domain registration, please contact your registrar:
 
-<%= render 'mailers/domain_mailer/registrar/registrar.en.text', registrar: @registrar %>
+<%= render 'mailers/shared/registrar/registrar.en.text', registrar: @registrar %>
 
 The following data for the <%= @domain.name %> domain have been entered into the registry:
 
@@ -51,7 +51,7 @@ Estonian Internet Foundation
 
 Для продления регистрации домена просим обратиться к своему регистратору:
 
-<%= render 'mailers/domain_mailer/registrar/registrar.ru.text', registrar: @registrar %>
+<%= render 'mailers/shared/registrar/registrar.ru.text', registrar: @registrar %>
 
 Относительно домена <%= @domain.name %> в реестр внесены следующие данные:
 
diff --git a/spec/views/mailers/domain_mailer/expiration.html.erb_spec.rb b/spec/views/mailers/domain_mailer/expiration.html.erb_spec.rb
index 31f54be1b..ff9205c7d 100644
--- a/spec/views/mailers/domain_mailer/expiration.html.erb_spec.rb
+++ b/spec/views/mailers/domain_mailer/expiration.html.erb_spec.rb
@@ -3,9 +3,9 @@ require_relative 'expiration_shared'
 
 RSpec.describe 'mailers/domain_mailer/expiration.html.erb' do
   before :example do
-    stub_template 'mailers/domain_mailer/registrar/_registrar.et.html' => 'test registrar estonian'
-    stub_template 'mailers/domain_mailer/registrar/_registrar.en.html' => 'test registrar english'
-    stub_template 'mailers/domain_mailer/registrar/_registrar.ru.html' => 'test registrar russian'
+    stub_template 'mailers/shared/registrar/_registrar.et.html' => 'test registrar estonian'
+    stub_template 'mailers/shared/registrar/_registrar.en.html' => 'test registrar english'
+    stub_template 'mailers/shared/registrar/_registrar.ru.html' => 'test registrar russian'
   end
 
   include_examples 'domain mailer expiration'
diff --git a/spec/views/mailers/domain_mailer/expiration.text.erb_spec.rb b/spec/views/mailers/domain_mailer/expiration.text.erb_spec.rb
index 3c315b47b..44e5642aa 100644
--- a/spec/views/mailers/domain_mailer/expiration.text.erb_spec.rb
+++ b/spec/views/mailers/domain_mailer/expiration.text.erb_spec.rb
@@ -3,9 +3,9 @@ require_relative 'expiration_shared'
 
 RSpec.describe 'mailers/domain_mailer/expiration.text.erb' do
   before :example do
-    stub_template 'mailers/domain_mailer/registrar/_registrar.et.text' => 'test registrar estonian'
-    stub_template 'mailers/domain_mailer/registrar/_registrar.en.text' => 'test registrar english'
-    stub_template 'mailers/domain_mailer/registrar/_registrar.ru.text' => 'test registrar russian'
+    stub_template 'mailers/shared/registrar/_registrar.et.text' => 'test registrar estonian'
+    stub_template 'mailers/shared/registrar/_registrar.en.text' => 'test registrar english'
+    stub_template 'mailers/shared/registrar/_registrar.ru.text' => 'test registrar russian'
   end
 
   include_examples 'domain mailer expiration'
diff --git a/spec/views/mailers/shared/registrant/_registrant.en.html.erb_spec.rb b/spec/views/mailers/shared/registrant/_registrant.en.html.erb_spec.rb
index b93b592e6..a5e0d353b 100644
--- a/spec/views/mailers/shared/registrant/_registrant.en.html.erb_spec.rb
+++ b/spec/views/mailers/shared/registrant/_registrant.en.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 require_relative 'registrant_shared'
 
-RSpec.describe 'mailers/domain_mailer/registrant/_registrant.en.html.erb' do
+RSpec.describe 'mailers/shared/registrant/_registrant.en.html.erb' do
   include_examples 'domain mailer registrant info'
 end
diff --git a/spec/views/mailers/shared/registrant/_registrant.en.text.erb_spec.rb b/spec/views/mailers/shared/registrant/_registrant.en.text.erb_spec.rb
index 3a2310fff..fcfb85657 100644
--- a/spec/views/mailers/shared/registrant/_registrant.en.text.erb_spec.rb
+++ b/spec/views/mailers/shared/registrant/_registrant.en.text.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 require_relative 'registrant_shared'
 
-RSpec.describe 'mailers/domain_mailer/registrant/_registrant.en.text.erb' do
+RSpec.describe 'mailers/shared/registrant/_registrant.en.text.erb' do
   include_examples 'domain mailer registrant info'
 end
diff --git a/spec/views/mailers/shared/registrant/_registrant.et.html.erb_spec.rb b/spec/views/mailers/shared/registrant/_registrant.et.html.erb_spec.rb
index 952bb5223..ec4d134a8 100644
--- a/spec/views/mailers/shared/registrant/_registrant.et.html.erb_spec.rb
+++ b/spec/views/mailers/shared/registrant/_registrant.et.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 require_relative 'registrant_shared'
 
-RSpec.describe 'mailers/domain_mailer/registrant/_registrant.et.html.erb' do
+RSpec.describe 'mailers/shared/registrant/_registrant.et.html.erb' do
   include_examples 'domain mailer registrant info'
 end
diff --git a/spec/views/mailers/shared/registrant/_registrant.et.text.erb_spec.rb b/spec/views/mailers/shared/registrant/_registrant.et.text.erb_spec.rb
index ea05cbfa5..41b4c52eb 100644
--- a/spec/views/mailers/shared/registrant/_registrant.et.text.erb_spec.rb
+++ b/spec/views/mailers/shared/registrant/_registrant.et.text.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 require_relative 'registrant_shared'
 
-RSpec.describe 'mailers/domain_mailer/registrant/_registrant.et.text.erb' do
+RSpec.describe 'mailers/shared/registrant/_registrant.et.text.erb' do
   include_examples 'domain mailer registrant info'
 end
diff --git a/spec/views/mailers/shared/registrar/_registrar.en.html.erb_spec.rb b/spec/views/mailers/shared/registrar/_registrar.en.html.erb_spec.rb
index 62fe5d068..eddb968dc 100644
--- a/spec/views/mailers/shared/registrar/_registrar.en.html.erb_spec.rb
+++ b/spec/views/mailers/shared/registrar/_registrar.en.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 require_relative 'registrar_shared'
 
-RSpec.describe 'mailers/domain_mailer/registrar/_registrar.en.html.erb' do
+RSpec.describe 'mailers/shared/registrar/_registrar.en.html.erb' do
   include_examples 'domain mailer registrar info'
 end
diff --git a/spec/views/mailers/shared/registrar/_registrar.en.text.erb_spec.rb b/spec/views/mailers/shared/registrar/_registrar.en.text.erb_spec.rb
index 542d8aaee..cea5d1d65 100644
--- a/spec/views/mailers/shared/registrar/_registrar.en.text.erb_spec.rb
+++ b/spec/views/mailers/shared/registrar/_registrar.en.text.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 require_relative 'registrar_shared'
 
-RSpec.describe 'mailers/domain_mailer/registrar/_registrar.en.text.erb' do
+RSpec.describe 'mailers/shared/registrar/_registrar.en.text.erb' do
   include_examples 'domain mailer registrar info'
 end
diff --git a/spec/views/mailers/shared/registrar/_registrar.et.html.erb_spec.rb b/spec/views/mailers/shared/registrar/_registrar.et.html.erb_spec.rb
index e9eab5b94..d68203306 100644
--- a/spec/views/mailers/shared/registrar/_registrar.et.html.erb_spec.rb
+++ b/spec/views/mailers/shared/registrar/_registrar.et.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 require_relative 'registrar_shared'
 
-RSpec.describe 'mailers/domain_mailer/registrar/_registrar.et.html.erb' do
+RSpec.describe 'mailers/shared/registrar/_registrar.et.html.erb' do
   include_examples 'domain mailer registrar info'
 end
diff --git a/spec/views/mailers/shared/registrar/_registrar.et.text.erb_spec.rb b/spec/views/mailers/shared/registrar/_registrar.et.text.erb_spec.rb
index 6493be41c..230750db3 100644
--- a/spec/views/mailers/shared/registrar/_registrar.et.text.erb_spec.rb
+++ b/spec/views/mailers/shared/registrar/_registrar.et.text.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 require_relative 'registrar_shared'
 
-RSpec.describe 'mailers/domain_mailer/registrar/_registrar.et.text.erb' do
+RSpec.describe 'mailers/shared/registrar/_registrar.et.text.erb' do
   include_examples 'domain mailer registrar info'
 end
diff --git a/spec/views/mailers/shared/registrar/_registrar.ru.html.erb_spec.rb b/spec/views/mailers/shared/registrar/_registrar.ru.html.erb_spec.rb
index 384beec23..4cb251ca2 100644
--- a/spec/views/mailers/shared/registrar/_registrar.ru.html.erb_spec.rb
+++ b/spec/views/mailers/shared/registrar/_registrar.ru.html.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 require_relative 'registrar_shared'
 
-RSpec.describe 'mailers/domain_mailer/registrar/_registrar.ru.html.erb' do
+RSpec.describe 'mailers/shared/registrar/_registrar.ru.html.erb' do
   include_examples 'domain mailer registrar info'
 end
diff --git a/spec/views/mailers/shared/registrar/_registrar.ru.text.erb_spec.rb b/spec/views/mailers/shared/registrar/_registrar.ru.text.erb_spec.rb
index f26eca18f..e51aba95b 100644
--- a/spec/views/mailers/shared/registrar/_registrar.ru.text.erb_spec.rb
+++ b/spec/views/mailers/shared/registrar/_registrar.ru.text.erb_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 require_relative 'registrar_shared'
 
-RSpec.describe 'mailers/domain_mailer/registrar/_registrar.ru.text.erb' do
+RSpec.describe 'mailers/shared/registrar/_registrar.ru.text.erb' do
   include_examples 'domain mailer registrar info'
 end