diff --git a/app/assets/javascripts/app/views/layout_ref/twitter_conversation.jst.eco b/app/assets/javascripts/app/views/layout_ref/twitter_conversation.jst.eco
index 7761ae209..f225fcf29 100644
--- a/app/assets/javascripts/app/views/layout_ref/twitter_conversation.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/twitter_conversation.jst.eco
@@ -106,7 +106,7 @@
                   From
                 </div>
                 <div class="article-meta-value flex contain-text">
-                  Test Master Agent
+                  Test Admin Agent
                 </div>
               </div>
             </div>
@@ -156,7 +156,7 @@
                   From
                 </div>
                 <div class="article-meta-value flex contain-text">
-                  Test Master Agent
+                  Test Admin Agent
                 </div>
               </div>
             </div>
@@ -206,7 +206,7 @@
                   From
                 </div>
                 <div class="article-meta-value flex contain-text">
-                  Test Master Agent
+                  Test Admin Agent
                 </div>
               </div>
             </div>
@@ -256,7 +256,7 @@
                   From
                 </div>
                 <div class="article-meta-value flex contain-text">
-                  Test Master Agent
+                  Test Admin Agent
                 </div>
               </div>
             </div>
@@ -306,7 +306,7 @@
                   From
                 </div>
                 <div class="article-meta-value flex contain-text">
-                  Test Master Agent
+                  Test Admin Agent
                 </div>
               </div>
             </div>
diff --git a/contrib/auto_wizard_test.json b/contrib/auto_wizard_test.json
index cc711b95f..fc9bf34c5 100644
--- a/contrib/auto_wizard_test.json
+++ b/contrib/auto_wizard_test.json
@@ -2,7 +2,7 @@
   "Users": [
     {
       "login": "admin@example.com",
-      "firstname": "Test Master",
+      "firstname": "Test Admin",
       "lastname": "Agent",
       "email": "admin@example.com",
       "password": "test"
diff --git a/public/assets/tests/html_utils.js b/public/assets/tests/html_utils.js
index c45278a76..1835a895f 100644
--- a/public/assets/tests/html_utils.js
+++ b/public/assets/tests/html_utils.js
@@ -1878,7 +1878,7 @@ test("check form diff", function() {
 
 
   dataNow = {}
-  dataLast = {"number":"10012","title":"some subject 123äöü","group_id":1,"owner_id":1,"customer_id":2,"state_id":3,"priority_id":2,"article":{"from":"Test Master Agent","to":"","cc":"","body":"dasdad","content_type":"text/html","ticket_id":12,"type_id":9,"sender_id":1,"internal":false,"form_id":"523405147"},"updated_at":"2015-01-29T09:22:23.000Z","pending_time":"2015-01-28T22:22:00.000Z","id":12}
+  dataLast = {"number":"10012","title":"some subject 123äöü","group_id":1,"owner_id":1,"customer_id":2,"state_id":3,"priority_id":2,"article":{"from":"Test Admin Agent","to":"","cc":"","body":"dasdad","content_type":"text/html","ticket_id":12,"type_id":9,"sender_id":1,"internal":false,"form_id":"523405147"},"updated_at":"2015-01-29T09:22:23.000Z","pending_time":"2015-01-28T22:22:00.000Z","id":12}
   diff = {}
   result = App.Utils.formDiff(dataNow, dataLast)
   deepEqual(result, diff, 'check form diff')
diff --git a/public/assets/tests/ticket_selector.js b/public/assets/tests/ticket_selector.js
index fd3b37e9e..c4bd22083 100644
--- a/public/assets/tests/ticket_selector.js
+++ b/public/assets/tests/ticket_selector.js
@@ -87,10 +87,10 @@ window.onload = function() {
         "id": 2
       },
       "article": {
-        "from": "Test Master Agent",
+        "from": "Test Admin Agent",
         "to": "agent1@example.com",
         "cc": "agent1+cc@example.com",
-        "body": "asdfasdfasdf<br><br><div data-signature=\"true\" data-signature-id=\"1\">  Test Master Agent<br><br>--<br> Super Support - Waterford Business Park<br> 5201 Blue Lagoon Drive - 8th Floor &amp; 9th Floor - Miami, 33126 USA<br> Email: hot@example.com - Web: http://www.example.com/<br>--</div>",
+        "body": "asdfasdfasdf<br><br><div data-signature=\"true\" data-signature-id=\"1\">  Test Admin Agent<br><br>--<br> Super Support - Waterford Business Park<br> 5201 Blue Lagoon Drive - 8th Floor &amp; 9th Floor - Miami, 33126 USA<br> Email: hot@example.com - Web: http://www.example.com/<br>--</div>",
         "content_type": "text/html",
         "ticket_id": "2",
         "type_id": 1,
@@ -930,7 +930,7 @@ window.onload = function() {
     ticket = new App.Ticket();
     ticket.load(ticketData);
 
-    testContains('article.from', 'Master', ticket);
+    testContains('article.from', 'Admin', ticket);
   });
 
   test("article to", function() {
diff --git a/spec/lib/auto_wizard_spec.rb b/spec/lib/auto_wizard_spec.rb
index 02b0c13d0..aad2304f3 100644
--- a/spec/lib/auto_wizard_spec.rb
+++ b/spec/lib/auto_wizard_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe AutoWizard do
           Users: [
             {
               login:     'master_unit_test01@example.com',
-              firstname: 'Test Master',
+              firstname: 'Test Admin',
               lastname:  'Agent',
               email:     'master_unit_test01@example.com',
               password:  'test',
@@ -60,7 +60,7 @@ RSpec.describe AutoWizard do
           .to change(User, :count).by(1)
           .and change { User.last.roles }.to(Role.where(name: 'Agent'))
           .and change { User.last.login }.to('master_unit_test01@example.com')
-          .and change { User.last.firstname }.to('Test Master')
+          .and change { User.last.firstname }.to('Test Admin')
           .and change { User.last.lastname }.to('Agent')
           .and change { User.last.email }.to('master_unit_test01@example.com')
           .and change { Auth.new(User.last.email, 'test').valid? }.from(false)
@@ -73,7 +73,7 @@ RSpec.describe AutoWizard do
           Users: [
             {
               login:     'master_unit_test01@example.com',
-              firstname: 'Test Master',
+              firstname: 'Test Admin',
               lastname:  'Agent',
               email:     'master_unit_test01@example.com',
               password:  'test'
@@ -87,7 +87,7 @@ RSpec.describe AutoWizard do
           .to change(User, :count).by(1)
           .and change { User.last.roles }.to(Role.where(name: %w[Admin Agent]))
           .and change { User.last.login }.to('master_unit_test01@example.com')
-          .and change { User.last.firstname }.to('Test Master')
+          .and change { User.last.firstname }.to('Test Admin')
           .and change { User.last.lastname }.to('Agent')
           .and change { User.last.email }.to('master_unit_test01@example.com')
           .and change { Auth.new(User.last.email, 'test').valid? }.from(false)
diff --git a/spec/system/setup/system_spec.rb b/spec/system/setup/system_spec.rb
index 2c14514a3..499bed64d 100644
--- a/spec/system/setup/system_spec.rb
+++ b/spec/system/setup/system_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe 'System setup process', type: :system, set_up: false, authenticat
     expect(page).to have_css('.js-admin h2', text: 'Administrator Account')
 
     within('.js-admin') do
-      fill_in 'firstname',        with: 'Test Master'
+      fill_in 'firstname',        with: 'Test Admin'
       fill_in 'lastname',         with: 'Agent'
       fill_in 'email',            with: 'admin@example.com'
       fill_in 'password',         with: 'TEst1234äöüß'
@@ -117,7 +117,7 @@ RSpec.describe 'System setup process', type: :system, set_up: false, authenticat
     click_on('Setup new System')
 
     within('.js-admin') do
-      fill_in 'firstname',        with: 'Test Master'
+      fill_in 'firstname',        with: 'Test Admin'
       fill_in 'lastname',         with: 'Agent'
       fill_in 'email',            with: 'admin@example.com'
       fill_in 'password',         with: 'asd'
diff --git a/spec/system/ticket/zoom_spec.rb b/spec/system/ticket/zoom_spec.rb
index 7898d0c31..55943ef3e 100644
--- a/spec/system/ticket/zoom_spec.rb
+++ b/spec/system/ticket/zoom_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe 'Ticket zoom', type: :system do
           expect(page).to have_css('select[name=owner_id]')
           expect(page).to have_select('owner_id',
                                       selected: '-',
-                                      options:  ['-', 'Agent 1 Test', 'Test Master Agent'])
+                                      options:  ['-', 'Agent 1 Test', 'Test Admin Agent'])
         end
       end
     end
@@ -46,7 +46,7 @@ RSpec.describe 'Ticket zoom', type: :system do
             expect(page).to have_css('.content.active select[name=owner_id]')
             expect(page).to have_select('owner_id',
                                         selected: session_user.fullname,
-                                        options:  ['-', 'Agent 1 Test', 'Test Master Agent'])
+                                        options:  ['-', 'Agent 1 Test', 'Test Admin Agent'])
           end
         end
       end
@@ -61,7 +61,7 @@ RSpec.describe 'Ticket zoom', type: :system do
             expect(page).to have_css('select[name=owner_id]')
             expect(page).to have_select('owner_id',
                                         selected: '-',
-                                        options:  ['-', 'Agent 1 Test', 'Test Master Agent'])
+                                        options:  ['-', 'Agent 1 Test', 'Test Admin Agent'])
           end
         end
       end
@@ -76,7 +76,7 @@ RSpec.describe 'Ticket zoom', type: :system do
             expect(page).to have_css('select[name=owner_id]')
             expect(page).to have_select('owner_id',
                                         selected: '-',
-                                        options:  ['-', 'Agent 1 Test', 'Test Master Agent'])
+                                        options:  ['-', 'Agent 1 Test', 'Test Admin Agent'])
           end
         end
       end
@@ -91,7 +91,7 @@ RSpec.describe 'Ticket zoom', type: :system do
             expect(page).to have_css('select[name=owner_id]')
             expect(page).to have_select('owner_id',
                                         selected: '-',
-                                        options:  ['-', 'Agent 1 Test', 'Test Master Agent'])
+                                        options:  ['-', 'Agent 1 Test', 'Test Admin Agent'])
           end
         end
       end
@@ -106,7 +106,7 @@ RSpec.describe 'Ticket zoom', type: :system do
             expect(page).to have_css('select[name=owner_id]')
             expect(page).to have_select('owner_id',
                                         selected: '-',
-                                        options:  ['-', 'Agent 1 Test', 'Test Master Agent'])
+                                        options:  ['-', 'Agent 1 Test', 'Test Admin Agent'])
           end
         end
       end
@@ -121,7 +121,7 @@ RSpec.describe 'Ticket zoom', type: :system do
             expect(page).to have_css('select[name=owner_id]')
             expect(page).to have_select('owner_id',
                                         selected: session_user.fullname,
-                                        options:  ['-', 'Agent 1 Test', 'Test Master Agent'])
+                                        options:  ['-', 'Agent 1 Test', 'Test Admin Agent'])
           end
         end
       end
diff --git a/test/browser/aaa_getting_started_test.rb b/test/browser/aaa_getting_started_test.rb
index dbe17d842..d2b72391b 100644
--- a/test/browser/aaa_getting_started_test.rb
+++ b/test/browser/aaa_getting_started_test.rb
@@ -25,7 +25,7 @@ class AaaGettingStartedTest < TestCase
     )
     set(
       css:   '.js-admin input[name="firstname"]',
-      value: 'Test Master',
+      value: 'Test Admin',
     )
     set(
       css:   '.js-admin input[name="lastname"]',
@@ -37,7 +37,7 @@ class AaaGettingStartedTest < TestCase
     )
     set(
       css:   '.js-admin input[name="firstname"]',
-      value: 'Test Master',
+      value: 'Test Admin',
     )
     set(
       css:   '.js-admin input[name="password"]',
diff --git a/test/browser/agent_ticket_create_reset_customer_selection_test.rb b/test/browser/agent_ticket_create_reset_customer_selection_test.rb
index 7307623f2..ff66981ae 100644
--- a/test/browser/agent_ticket_create_reset_customer_selection_test.rb
+++ b/test/browser/agent_ticket_create_reset_customer_selection_test.rb
@@ -192,7 +192,7 @@ class AgentTicketCreateResetCustomerSelectionTest < TestCase
 
     set(
       css:   '.content.active .modal input[name="customer_id_completion"]',
-      value: 'master',
+      value: 'admin',
     )
     click(css: '.content.active .modal .js-submit')
 
@@ -202,11 +202,11 @@ class AgentTicketCreateResetCustomerSelectionTest < TestCase
 
     set(
       css:   '.content.active .modal input[name="customer_id_completion"]',
-      value: 'master',
+      value: 'admin',
     )
     watch_for(
       css:     '.content.active .modal .js-recipientDropdown .recipientList.is-shown',
-      value:   'Master',
+      value:   'Admin',
       timeout: 3,
     )
     sendkey(value: :enter)
@@ -227,11 +227,11 @@ class AgentTicketCreateResetCustomerSelectionTest < TestCase
 
     set(
       css:   '.content.active .modal input[name="customer_id_completion"]',
-      value: 'master',
+      value: 'admin',
     )
     watch_for(
       css:     '.content.active .modal .js-recipientDropdown .recipientList.is-shown',
-      value:   'Master',
+      value:   'Admin',
       timeout: 3,
     )
     sendkey(value: :enter)
diff --git a/test/browser/agent_ticket_overview_level0_test.rb b/test/browser/agent_ticket_overview_level0_test.rb
index adeee71e7..4243e646a 100644
--- a/test/browser/agent_ticket_overview_level0_test.rb
+++ b/test/browser/agent_ticket_overview_level0_test.rb
@@ -311,7 +311,7 @@ class AgentTicketOverviewLevel0Test < TestCase
 
     select(
       css:   '.content.active .bulkAction [name="owner_id"]',
-      value: 'Test Master Agent',
+      value: 'Test Admin Agent',
     )
 
     click(
@@ -434,7 +434,7 @@ class AgentTicketOverviewLevel0Test < TestCase
 
     select(
       css:   '.content.active .bulkAction [name="owner_id"]',
-      value: 'Test Master Agent',
+      value: 'Test Admin Agent',
     )
 
     select(
diff --git a/test/browser/user_access_permissions_test.rb b/test/browser/user_access_permissions_test.rb
index ba298e388..cc435b152 100644
--- a/test/browser/user_access_permissions_test.rb
+++ b/test/browser/user_access_permissions_test.rb
@@ -96,11 +96,11 @@ class AgentProfilePermissionsTest < TestCase
     )
     tasks_close_all
 
-    user_open_by_search(value: 'Test Master')
+    user_open_by_search(value: 'Test Admin')
 
     verify_task(
       data: {
-        title: 'Test Master Agent',
+        title: 'Test Admin Agent',
       }
     )
 
@@ -131,7 +131,7 @@ class AgentProfilePermissionsTest < TestCase
 
     ticket1 = ticket_create(
       data: {
-        customer: 'master',
+        customer: 'admin',
         group:    'Users',
         title:    'test_user_access_permissions - ticket 1',
         body:     'test_user_access_permissions - ticket 1',
@@ -336,7 +336,7 @@ class AgentProfilePermissionsTest < TestCase
 
     ticket1 = ticket_create(
       data: {
-        customer: 'master',
+        customer: 'admin',
         group:    'Users',
         title:    'test_user_access_permissions - ticket 4',
         body:     'test_user_access_permissions - ticket 4',
diff --git a/test/unit/email_build_test.rb b/test/unit/email_build_test.rb
index 36eb48e2e..4c5c28eb4 100644
--- a/test/unit/email_build_test.rb
+++ b/test/unit/email_build_test.rb
@@ -337,8 +337,8 @@ text
     quoted_in_one_line = Channel::EmailBuild.recipient_line('Somebody | Some Org', 'some.body@example.com')
     assert_equal('"Somebody | Some Org" <some.body@example.com>', quoted_in_one_line)
 
-    quoted_in_one_line = Channel::EmailBuild.recipient_line('Test Master Agent via Support', 'some.body@example.com')
-    assert_equal('"Test Master Agent via Support" <some.body@example.com>', quoted_in_one_line)
+    quoted_in_one_line = Channel::EmailBuild.recipient_line('Test Admin Agent via Support', 'some.body@example.com')
+    assert_equal('"Test Admin Agent via Support" <some.body@example.com>', quoted_in_one_line)
 
   end