diff --git a/app/views/admin/account_activities/index.haml b/app/views/admin/account_activities/index.haml
index 0a60e0809..e8653a237 100644
--- a/app/views/admin/account_activities/index.haml
+++ b/app/views/admin/account_activities/index.haml
@@ -9,7 +9,7 @@
       .row
         .col-md-12
           .form-group
-            = f.label t(:registrar)
+            = f.label t(:registrar_name)
             = f.select :account_registrar_id_in, Registrar.all.map { |x| [x, x.id] }, {}, class: 'form-control js-combobox', placeholder: t(:choose), multiple: true
       .row
         .col-md-6
@@ -56,7 +56,7 @@
         %thead
           %tr
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'account_registrar_code', t(:registrar))
+              = sort_link(@q, 'account_registrar_code', t(:registrar_name))
             %th{class: 'col-xs-3'}
               = sort_link(@q, 'description')
             %th{class: 'col-xs-2'}
diff --git a/app/views/admin/api_users/_form.haml b/app/views/admin/api_users/_form.haml
index 00e6bb248..633f511ef 100644
--- a/app/views/admin/api_users/_form.haml
+++ b/app/views/admin/api_users/_form.haml
@@ -6,7 +6,7 @@
   - field_required = ''
 
 
-= form_for([:admin, @api_user], multipart: true, 
+= form_for([:admin, @api_user], multipart: true,
   html: {class: 'form-horizontal', autocomplete: 'off'}) do |f|
   = render 'shared/full_errors', object: @api_user
 
@@ -32,11 +32,11 @@
       .form-group
         .form-group.has-feedback.js-typeahead-container
           .col-md-4.control-label
-            = f.label :registrar_typeahead, t(:registrar), class: 'required'
+            = f.label :registrar_typeahead, t(:registrar_name), class: 'required'
           .col-md-7
-            = f.text_field(:registrar_typeahead, 
-              class: 'form-control js-registrar-typeahead typeahead required', 
-              placeholder: t(:registrar), autocomplete: 'off')
+            = f.text_field(:registrar_typeahead,
+              class: 'form-control js-registrar-typeahead typeahead required',
+              placeholder: t(:registrar_name), autocomplete: 'off')
             %span.glyphicon.glyphicon-ok.form-control-feedback.js-typeahead-ok.hidden
             %span.glyphicon.glyphicon-remove.form-control-feedback.js-typeahead-remove
             = f.hidden_field(:registrar_id, class: 'js-registrar-id')
@@ -45,7 +45,7 @@
         .col-md-4.control-label
           = f.label :role, class: 'required'
         .col-md-7
-          = select_tag 'api_user[roles][]', 
+          = select_tag 'api_user[roles][]',
             options_for_select(ApiUser::ROLES.map {|x| [t(x), x] }, @api_user.roles.try(:first)),
             class: 'form-control selectize'
           .checkbox
diff --git a/app/views/admin/api_users/index.haml b/app/views/admin/api_users/index.haml
index b8b9a53a5..954335100 100644
--- a/app/views/admin/api_users/index.haml
+++ b/app/views/admin/api_users/index.haml
@@ -11,7 +11,7 @@
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'username')
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'registrar_name', t(:registrar))
+              = sort_link(@q, 'registrar_name', t(:registrar_name))
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'active', t(:active))
         %tbody
diff --git a/app/views/admin/api_users/show.haml b/app/views/admin/api_users/show.haml
index 866084736..b410d784d 100644
--- a/app/views/admin/api_users/show.haml
+++ b/app/views/admin/api_users/show.haml
@@ -23,7 +23,7 @@
           %dt= t(:password)
           %dd= @api_user.password
 
-          %dt= t(:registrar)
+          %dt= t(:registrar_name)
           %dd= link_to(@api_user.registrar, admin_registrar_path(@api_user.registrar))
 
           %dt= t(:role)
diff --git a/app/views/admin/contact_versions/index.haml b/app/views/admin/contact_versions/index.haml
index 93699d4e3..85975d5be 100644
--- a/app/views/admin/contact_versions/index.haml
+++ b/app/views/admin/contact_versions/index.haml
@@ -50,7 +50,7 @@
             %th{class: 'col-xs-2'}
               = t(:ident)
             %th{class: 'col-xs-2'}
-              = t(:registrar)
+              = t(:registrar_name)
             %th{class: 'col-xs-2'}
               = t(:action)
             %th{class: 'col-xs-2'}
diff --git a/app/views/admin/contact_versions/show.haml b/app/views/admin/contact_versions/show.haml
index fc5c48352..82a96daba 100644
--- a/app/views/admin/contact_versions/show.haml
+++ b/app/views/admin/contact_versions/show.haml
@@ -49,7 +49,7 @@
           %dd{class: changing_css_class(@version,"updated_at")}
             = l(contact.updated_at, format: :short)
 
-          %dt= t(:registrar)
+          %dt= t(:registrar_name)
           %dd{class: changing_css_class(@version,"registrar_id")}
             - if contact.registrar.present?
               = link_to(contact.registrar, admin_registrar_path(contact.registrar))
@@ -105,4 +105,4 @@
               = l(vs.created_at, format: :short)
               = vs.event
       %span{:style => "padding-left:10px; position: absolute; bottom: 10px;"}
-        = paginate @versions, theme: :admin
\ No newline at end of file
+        = paginate @versions, theme: :admin
diff --git a/app/views/admin/contacts/index.haml b/app/views/admin/contacts/index.haml
index 2448fc1d7..9c015c372 100644
--- a/app/views/admin/contacts/index.haml
+++ b/app/views/admin/contacts/index.haml
@@ -36,7 +36,7 @@
       .row
         .col-md-3
           .form-group
-            = f.label t(:registrar)
+            = f.label t(:registrar_name)
             = f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize', placeholder: t(:choose)
         .col-md-3
           .form-group
@@ -88,7 +88,7 @@
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'email', t(:created_at))
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'registrar_name', t(:registrar))
+              = sort_link(@q, 'registrar_name', t(:registrar_name))
         %tbody
           - @contacts.each do |contact|
             %tr
diff --git a/app/views/admin/contacts/partials/_domains.haml b/app/views/admin/contacts/partials/_domains.haml
index 97eee3d5a..7736e62ac 100644
--- a/app/views/admin/contacts/partials/_domains.haml
+++ b/app/views/admin/contacts/partials/_domains.haml
@@ -16,7 +16,7 @@
       %thead
         %tr
           %th{class: 'col-xs-3'}=custom_sort_link t(:domain_name), :name
-          %th{class: 'col-xs-3'}=custom_sort_link t(:registrar), :registrar_name
+          %th{class: 'col-xs-3'}=custom_sort_link t(:registrar_name), :registrar_name
           %th{class: 'col-xs-3'}=custom_sort_link t(:valid_to), :valid_to
           %th{class: 'col-xs-3'}= t(:roles)
       %tbody
@@ -27,4 +27,4 @@
             %td= l(x.valid_to, format: :short)
             %td= x.roles.join(", ")
 
-= paginate domains, param_name: :domain_page
\ No newline at end of file
+= paginate domains, param_name: :domain_page
diff --git a/app/views/admin/contacts/partials/_general.haml b/app/views/admin/contacts/partials/_general.haml
index 64f17612e..73565ad64 100644
--- a/app/views/admin/contacts/partials/_general.haml
+++ b/app/views/admin/contacts/partials/_general.haml
@@ -39,7 +39,7 @@
         by
         = updator_link(@contact)
 
-      %dt= t(:registrar)
+      %dt= t(:registrar_name)
       %dd
         - if @contact.registrar.present?
           = link_to(@contact.registrar, admin_registrar_path(@contact.registrar))
diff --git a/app/views/admin/domain_versions/archive.haml b/app/views/admin/domain_versions/archive.haml
index 4e06f5ccb..b85e74b81 100644
--- a/app/views/admin/domain_versions/archive.haml
+++ b/app/views/admin/domain_versions/archive.haml
@@ -14,7 +14,7 @@
             = f.search_field :registrant, value: params[:q][:registrant], class: 'form-control', placeholder: t(:registrant)
         .col-md-3
           .form-group
-            = label_tag t(:registrar)
+            = label_tag t(:registrar_name)
             = f.search_field :registrar, value: params[:q][:registrar], class: 'form-control', placeholder: t(:registrant)
         .col-md-3
           .form-group
@@ -48,7 +48,7 @@
             %th{class: 'col-xs-2'}
               = t(:registrant)
             %th{class: 'col-xs-2'}
-              = t(:registrar)
+              = t(:registrar_name)
             %th{class: 'col-xs-2'}
               = t(:action)
             %th{class: 'col-xs-2'}
diff --git a/app/views/admin/domain_versions/show.haml b/app/views/admin/domain_versions/show.haml
index add5920fb..4382b13ab 100644
--- a/app/views/admin/domain_versions/show.haml
+++ b/app/views/admin/domain_versions/show.haml
@@ -98,7 +98,7 @@
             %br
 
           - if domain.registrar
-            %dt= t(:registrar)
+            %dt= t(:registrar_name)
             %dd{class: changing_css_class(@version,"registrar_id")}
               = link_to admin_registrar_path(domain.registrar), target: "registrar_#{domain.registrar.id}" do
                 = domain.registrar.name
diff --git a/app/views/admin/domains/index.haml b/app/views/admin/domains/index.haml
index d6c2a9be9..f901354a6 100644
--- a/app/views/admin/domains/index.haml
+++ b/app/views/admin/domains/index.haml
@@ -23,7 +23,7 @@
       .row
         .col-md-6
           .form-group
-            = f.label t(:registrar)
+            = f.label t(:registrar_name)
             = f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize', placeholder: t(:choose)
         .col-md-3
           .form-group
@@ -63,7 +63,7 @@
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'valid_to', t(:valid_to))
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'registrar_name', t(:registrar))
+              = sort_link(@q, 'registrar_name', t(:registrar_name))
         %tbody
           - @domains.each do |x|
             %tr
diff --git a/app/views/admin/domains/partials/_general.haml b/app/views/admin/domains/partials/_general.haml
index d1a17c1cc..0e458abd8 100644
--- a/app/views/admin/domains/partials/_general.haml
+++ b/app/views/admin/domains/partials/_general.haml
@@ -9,7 +9,7 @@
       %dt= t(:registered_at)
       %dd= l(@domain.registered_at)
 
-      %dt= t(:registrar)
+      %dt= t(:registrar_name)
       %dd= link_to(@domain.registrar, admin_registrar_path(@domain.registrar))
 
       %dt= t(:authinfo_pw)
diff --git a/app/views/admin/domains/versions.haml b/app/views/admin/domains/versions.haml
index 6dbf706f6..9e2cf2803 100644
--- a/app/views/admin/domains/versions.haml
+++ b/app/views/admin/domains/versions.haml
@@ -16,7 +16,7 @@
             %th{class: 'col-xs-2'}= t(:tech)
             %th{class: 'col-xs-2'}= t(:nameservers)
             %th{class: 'col-xs-2'}= t(:dnskeys)
-            %th{class: 'col-xs-2'}= t(:registrar)
+            %th{class: 'col-xs-2'}= t(:registrar_name)
 
         %tbody
           -#- if @pending_domain.present?
diff --git a/app/views/admin/epp_logs/index.haml b/app/views/admin/epp_logs/index.haml
index 3bb8536d3..922a61fcb 100644
--- a/app/views/admin/epp_logs/index.haml
+++ b/app/views/admin/epp_logs/index.haml
@@ -27,7 +27,7 @@
         .col-md-3
           .form-group
             = f.label :registrar
-            = f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar), autocomplete: 'off'
+            = f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar_name), autocomplete: 'off'
         .col-md-3
           .form-group
             = f.label t(:created_after)
@@ -55,7 +55,7 @@
             %th{class: 'col-xs-2'}= t(:request_object)
             %th{class: 'col-xs-2'}= t(:request_successful)
             %th{class: 'col-xs-2'}= t(:api_user)
-            %th{class: 'col-xs-2'}= t(:registrar)
+            %th{class: 'col-xs-2'}= t(:registrar_name)
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'created_at')
         %tbody
diff --git a/app/views/admin/epp_logs/show.haml b/app/views/admin/epp_logs/show.haml
index 583124af7..91e82272a 100644
--- a/app/views/admin/epp_logs/show.haml
+++ b/app/views/admin/epp_logs/show.haml
@@ -21,7 +21,7 @@
           %dt= t(:api_user)
           %dd= @epp_log.api_user_name
 
-          %dt= t(:registrar)
+          %dt= t(:registrar_name)
           %dd= @epp_log.api_user_registrar
 
           %dt= t(:ip)
diff --git a/app/views/admin/repp_logs/index.haml b/app/views/admin/repp_logs/index.haml
index 49c74405b..c49eb889a 100644
--- a/app/views/admin/repp_logs/index.haml
+++ b/app/views/admin/repp_logs/index.haml
@@ -25,7 +25,7 @@
         .col-md-3
           .form-group
             = f.label :registrar
-            = f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar), autocomplete: 'off'
+            = f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar_name), autocomplete: 'off'
         .col-md-3
           .form-group
             = f.label t(:created_after)
@@ -52,7 +52,7 @@
             %th{class: 'col-xs-2'}= t(:request_method)
             %th{class: 'col-xs-2'}= t(:response_code)
             %th{class: 'col-xs-2'}= t(:api_user)
-            %th{class: 'col-xs-2'}= t(:registrar)
+            %th{class: 'col-xs-2'}= t(:registrar_name)
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'created_at')
         %tbody
diff --git a/app/views/admin/repp_logs/show.haml b/app/views/admin/repp_logs/show.haml
index a2bc6c4cc..bbaae977f 100644
--- a/app/views/admin/repp_logs/show.haml
+++ b/app/views/admin/repp_logs/show.haml
@@ -21,7 +21,7 @@
           %dt= t(:api_user)
           %dd= @repp_log.api_user_name
 
-          %dt= t(:registrar)
+          %dt= t(:registrar_name)
           %dd= @repp_log.api_user_registrar
 
           %dt= t(:ip)
diff --git a/app/views/admin/white_ips/show.haml b/app/views/admin/white_ips/show.haml
index 0cfec654c..33688d9fe 100644
--- a/app/views/admin/white_ips/show.haml
+++ b/app/views/admin/white_ips/show.haml
@@ -11,7 +11,7 @@
         %h3.panel-title= t(:general)
       .panel-body
         %dl.dl-horizontal
-          %dt= t(:registrar)
+          %dt= t(:registrar_name)
           %dd= link_to(@registrar, [:admin, @registrar])
 
           %dt= t(:ipv4)
diff --git a/app/views/registrant/contacts/partials/_domains.haml b/app/views/registrant/contacts/partials/_domains.haml
index eb893053d..8787f088a 100644
--- a/app/views/registrant/contacts/partials/_domains.haml
+++ b/app/views/registrant/contacts/partials/_domains.haml
@@ -16,7 +16,7 @@
       %thead
         %tr
           %th{class: 'col-xs-3'}=custom_sort_link t(:domain_name), :name
-          %th{class: 'col-xs-3'}=custom_sort_link t(:registrar), :registrar_name
+          %th{class: 'col-xs-3'}=custom_sort_link t(:registrar_name), :registrar_name
           %th{class: 'col-xs-3'}=custom_sort_link t(:valid_to), :valid_to
           %th{class: 'col-xs-3'}=custom_sort_link t(:roles), :roles
       %tbody
@@ -27,4 +27,4 @@
             %td= l(x.valid_to, format: :short)
             %td= x.roles.join(", ")
 
-= paginate domains, param_name: :domain_page
\ No newline at end of file
+= paginate domains, param_name: :domain_page
diff --git a/app/views/registrant/contacts/partials/_general.haml b/app/views/registrant/contacts/partials/_general.haml
index 114988bcc..4b221714a 100644
--- a/app/views/registrant/contacts/partials/_general.haml
+++ b/app/views/registrant/contacts/partials/_general.haml
@@ -42,7 +42,7 @@
         by
         = @contact.name
 
-      %dt= t(:registrar)
+      %dt= t(:registrar_name)
       %dd
         - if @contact.registrar.present?
           = link_to(@contact.registrar, registrant_registrar_path(@contact.registrar))
diff --git a/app/views/registrant/domains/download_list.haml b/app/views/registrant/domains/download_list.haml
index 40212812c..481324e62 100644
--- a/app/views/registrant/domains/download_list.haml
+++ b/app/views/registrant/domains/download_list.haml
@@ -16,7 +16,7 @@
             %th{class: 'col-xs-2'}
               =t(:valid_to)
             %th{class: 'col-xs-2'}
-              =t(:registrar)
+              =t(:registrar_name)
         %tbody
           - @domains.result.each do |x|
             %tr
diff --git a/app/views/registrant/domains/index.haml b/app/views/registrant/domains/index.haml
index ca31d127d..319ff7688 100644
--- a/app/views/registrant/domains/index.haml
+++ b/app/views/registrant/domains/index.haml
@@ -61,7 +61,7 @@
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'valid_to', t(:valid_to))
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'registrar_name', t(:registrar))
+              = sort_link(@q, 'registrar_name', t(:registrar_name))
         %tbody
           - @domains.each do |x|
             %tr
diff --git a/app/views/registrant/domains/partials/_general.haml b/app/views/registrant/domains/partials/_general.haml
index d80c1ce6a..7fb355c1f 100644
--- a/app/views/registrant/domains/partials/_general.haml
+++ b/app/views/registrant/domains/partials/_general.haml
@@ -9,7 +9,7 @@
       %dt= t(:registered_at)
       %dd= l(@domain.registered_at)
 
-      %dt= t(:registrar)
+      %dt= t(:registrar_name)
       %dd= link_to(@domain.registrar, registrant_registrar_path(@domain.registrar))
 
       %dt= t(:authinfo_pw)
diff --git a/app/views/registrar/contacts/download_list.haml b/app/views/registrar/contacts/download_list.haml
index b8944d254..51423a3f2 100644
--- a/app/views/registrar/contacts/download_list.haml
+++ b/app/views/registrar/contacts/download_list.haml
@@ -19,7 +19,7 @@
               %th{class: 'col-xs-2'}
                 =t(:created_at)
               %th{class: 'col-xs-2'}
-                =t(:registrar)
+                =t(:registrar_name)
           %tbody
             - @contacts.each do |contact|
               %tr
diff --git a/app/views/registrar/contacts/index.haml b/app/views/registrar/contacts/index.haml
index 2226f7c6a..3e0e59826 100644
--- a/app/views/registrar/contacts/index.haml
+++ b/app/views/registrar/contacts/index.haml
@@ -38,7 +38,7 @@
       .row
         .col-md-3
           .form-group
-            = f.label t(:registrar)
+            = f.label t(:registrar_name)
             = f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize', placeholder: t(:choose)
         .col-md-3
           .form-group
@@ -97,7 +97,7 @@
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'email', t(:created_at))
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'registrar_name', t(:registrar))
+              = sort_link(@q, 'registrar_name', t(:registrar_name))
             %th{class: 'col-xs-2'}= t(:actions)
         %tbody
           - @contacts.each do |contact|
diff --git a/app/views/registrar/contacts/partials/_domains.haml b/app/views/registrar/contacts/partials/_domains.haml
index efdf78504..f58019567 100644
--- a/app/views/registrar/contacts/partials/_domains.haml
+++ b/app/views/registrar/contacts/partials/_domains.haml
@@ -16,7 +16,7 @@
       %thead
         %tr
           %th{class: 'col-xs-3'}=custom_sort_link t(:domain_name), :name
-          %th{class: 'col-xs-3'}=custom_sort_link t(:registrar), :registrar_name
+          %th{class: 'col-xs-3'}=custom_sort_link t(:registrar_name), :registrar_name
           %th{class: 'col-xs-3'}=custom_sort_link t(:valid_to), :valid_to
           %th{class: 'col-xs-3'}= t(:roles)
       %tbody
@@ -27,4 +27,4 @@
             %td= l(x.valid_to, format: :short)
             %td= x.roles.join(", ")
 
-= paginate domains, param_name: :domain_page
\ No newline at end of file
+= paginate domains, param_name: :domain_page
diff --git a/app/views/registrar/domains/partials/_general.haml b/app/views/registrar/domains/partials/_general.haml
index 5381d0865..0f1a2a831 100644
--- a/app/views/registrar/domains/partials/_general.haml
+++ b/app/views/registrar/domains/partials/_general.haml
@@ -7,7 +7,7 @@
       %dd= @data.css('pw').text.present? ? @data.css('pw').text : t('hidden')
 
       - if @data.css('pw').text.blank?
-        %dt= t(:registrar)
+        %dt= t(:registrar_name)
         %dd= @data.css('clID').text
 
       - registrant = Contact.find_by_code(@data.css('registrant').text)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cc211c4b3..abb9fb289 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -285,7 +285,7 @@ en:
   valid_to: 'Valid to'
   name: 'Name'
   transfer_can_be_approved_only_by_current_registrar: 'Transfer can be approved only by current domain registrar'
-  registrar: 'Registrar'
+  registrar_name: 'Registrar'
   owner: 'Registrant'
   domain_details: 'Domain details'
   registered_at: 'Registered at'
@@ -440,7 +440,6 @@ en:
 
   setting: 'Setting'
 
-  registrar: 'Registrar'
   transfer_requested: 'Transfer requested.'
   message_was_not_found: 'Message was not found'
   host_obj_is_not_allowed: 'hostObj object is not allowed'