diff --git a/app/views/registrar/xml_consoles/epp_requests/domain/update.xml b/app/views/registrar/xml_consoles/epp_requests/domain/update.xml
index ad828fdb1..190939d9b 100644
--- a/app/views/registrar/xml_consoles/epp_requests/domain/update.xml
+++ b/app/views/registrar/xml_consoles/epp_requests/domain/update.xml
@@ -7,14 +7,20 @@
         <domain:name>example.ee</domain:name>
         <domain:add>
           <domain:ns>
-            <domain:hostObj>ns1.example.com</domain:hostObj>
-            <domain:hostObj>ns2.example.com</domain:hostObj>
+            <domain:hostAttr>
+              <domain:hostName>ns1.example.com</domain:hostName>
+            </domain:hostAttr>
+            <domain:hostAttr>
+              <domain:hostName>ns2.example.com</domain:hostName>
+            </domain:hostAttr>
           </domain:ns>
           <domain:contact type="tech">mak21</domain:contact>
         </domain:add>
         <domain:rem>
           <domain:ns>
-            <domain:hostObj>ns1.example.com</domain:hostObj>
+            <domain:hostAttr>
+              <domain:hostName>ns1.example.net</domain:hostName>
+            </domain:hostAttr>
           </domain:ns>
           <domain:contact type="tech">mak21</domain:contact>
         </domain:rem>
diff --git a/doc/epp/contact.md b/doc/epp/contact.md
index b09284c36..5e45e491b 100644
--- a/doc/epp/contact.md
+++ b/doc/epp/contact.md
@@ -62,8 +62,8 @@ Contact Mapping protocol short version:
               <contact:cc>      0-1      Country code, 2 letters uppercase, in ISO_3166-1 alpha 2
           <contact:voice>       0-1      Phone number in format \+ddd.d+
           <contact:email>       0-1      E-mail
-        <contact:authInfo>      0-1      Required if registrar is not the owner of the contact.
-          <contact:pw>          1        Contact password. Attribute: roid="String"
+          <contact:authInfo>    0-1      Required if registrar is not the owner of the contact.
+            <contact:pw>        1        Contact password. Attribute: roid="String"
     <extension>                 0-1       
       <eis:extdata>             0-1      Attribute: xmlns:eis="https://epp.tld.ee/schema/eis-1.0.xsd"
         <eis:ident>             0-1      Contact identificator 
diff --git a/doc/epp/domain.md b/doc/epp/domain.md
index fb03e40a4..524deee1e 100644
--- a/doc/epp/domain.md
+++ b/doc/epp/domain.md
@@ -19,14 +19,14 @@ Domain name mapping protocol short version:
                                         Must add up to 1 / 2 / 3 years.
                                         Attribute: unit="y/m/d"
                                         Default is 1 year.
-        <domain:registrant>    1        Contact reference to the registrant
-        <domain:contact>       0-n      Contact reference. Admin contact is required if registrant is
-                                        a juridical person. Attribute: type="admin / tech"
         <domain:ns>            1       
           <domain:hostAttr>    2-11    
             <domain:hostName>  1        Hostname of the nameserver
             <domain:hostAddr>  0-2      Required if nameserver is under domain zone. 
                                         Attribute ip="v4 / v6"
+        <domain:registrant>    1        Contact reference to the registrant
+        <domain:contact>       0-n      Contact reference. Admin contact is required if registrant is
+                                        a juridical person. Attribute: type="admin / tech"
     <extension>                1       
       <secDNS:create>          0-1      Attribute: xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
         <secDNS:keyData>       1-n     
@@ -74,15 +74,15 @@ Domain name mapping protocol short version:
                                              Optional attribute: verified="yes/no"
     <extension>                  0-1       Required if registrant is changing
       <secDNS:update>            0-1       Attribute: xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
+        <secDNS:rem>             0-1      
+          <secDNS:keyData>       1-n      
+            <secDNS:pubKey>      1         Public key
         <secDNS:add>             0-1      
           <secDNS:keyData>       1-n      
             <secDNS:flags>       1         Allowed values: 0, 256, 257
             <secDNS:protocol>    1         Allowed values: 3
             <secDNS:alg>         1         Allowed values: 3, 5, 6, 7, 8, 252, 253, 254, 255
             <secDNS:pubKey>      1         Public key
-        <secDNS:rem>             0-1      
-          <secDNS:keyData>       1-n      
-            <secDNS:pubKey>      1         Public key
       <eis:extdata>              0-1       Attribute: xmlns:eis="https://epp.tld.ee/schema/eis-1.0.xsd"
         <eis:legalDocument>      0-1       Base64 encoded document. Required if registrant is changing. 
                                              Attribute: type="pdf/bdoc/ddoc/zip/rar/gz/tar/7z"
diff --git a/lib/tasks/convert.rake b/lib/tasks/convert.rake
new file mode 100644
index 000000000..6345c9097
--- /dev/null
+++ b/lib/tasks/convert.rake
@@ -0,0 +1,19 @@
+namespace :convert do
+  desc 'Convert punycodes to unicode'
+  task punycode: :environment do
+    start = Time.zone.now.to_f
+    puts "-----> Convert domain punycodes to unicode..."
+    count = 0
+    Domain.find_each(:batch_size => 1000) do |x|
+      old_name = x.name
+      if old_name != SimpleIDN.to_unicode(x.name.strip.downcase)
+        x.update_column(:name, (SimpleIDN.to_unicode(x.name.strip.downcase)))
+        x.update_column(:name_puny, (SimpleIDN.to_ascii(x.name.strip.downcase)))
+        count += 1
+        puts "Domain #{x.id} changed from #{old_name} to #{SimpleIDN.to_unicode(old_name)} "
+      end
+     end
+    puts "-----> all done in #{(Time.zone.now.to_f - start).round(2)} seconds. #{count} domains changed."
+  end
+end
+