diff --git a/app/models/concerns/epp_errors.rb b/app/models/concerns/epp_errors.rb
index 93c2a47f9..d21c85b0c 100644
--- a/app/models/concerns/epp_errors.rb
+++ b/app/models/concerns/epp_errors.rb
@@ -26,7 +26,7 @@ module EppErrors
       else
         next unless code = find_epp_code(err)
         err = {code: code, msg: err}
-        err[:value] = {val: send(key), obj: self.class::EPP_OBJ} unless self.class.reflect_on_association(key)
+        err[:value] = {val: send(key), obj: self.class::EPP_ATTR_MAP[key]} unless self.class.reflect_on_association(key)
         epp_errors << err
       end
     end
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 0a73d6fa4..d59b623ee 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -10,7 +10,7 @@ class Contact < ActiveRecord::Base
     '2005' => ['Phone nr is invalid', 'Email is invalid']
   }
 
-  EPP_OBJ = 'contact'
+  EPP_ATTR_MAP = {}
 
   has_one :address
   has_many :domain_contacts
diff --git a/app/models/domain.rb b/app/models/domain.rb
index 33d7911ce..ee6ca3caf 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -11,7 +11,9 @@ class Domain < ActiveRecord::Base
     '2303' => ['Contact was not found'] # Object does not exist
   }
 
-  EPP_OBJ = 'domain'
+  EPP_ATTR_MAP = {
+    owner_contact: 'registrant'
+  }
 
   belongs_to :registrar
   belongs_to :owner_contact, class_name: 'Contact'
diff --git a/app/models/nameserver.rb b/app/models/nameserver.rb
index be807294a..e8b24b0a8 100644
--- a/app/models/nameserver.rb
+++ b/app/models/nameserver.rb
@@ -5,7 +5,9 @@ class Nameserver < ActiveRecord::Base
     '2005' => ['Hostname is invalid', 'IP is invalid']
   }
 
-  EPP_OBJ = 'ns'
+  EPP_ATTR_MAP = {
+    hostname: 'hostName'
+  }
 
   belongs_to :registrar
   has_and_belongs_to_many :domains