diff --git a/lib/epp-xml.rb b/lib/epp-xml.rb
index 1a3fa23..b9c445c 100644
--- a/lib/epp-xml.rb
+++ b/lib/epp-xml.rb
@@ -18,9 +18,7 @@ def domain
 
   def contact
     @cached_contact ||= EppXml::Contact.new(cl_trid: cl_trid,
-                                            cl_trid_prefix: cl_trid_prefix,
-                                            schema_version: schema_version,
-                                            schema_prefix: schema_prefix)
+                                            cl_trid_prefix: cl_trid_prefix)
   end
 
   def session
diff --git a/lib/epp-xml/contact.rb b/lib/epp-xml/contact.rb
index 5b67ac0..ca93256 100644
--- a/lib/epp-xml/contact.rb
+++ b/lib/epp-xml/contact.rb
@@ -34,7 +34,7 @@ def transfer(xml_params = {}, op = 'query', custom_params = {})
       xml.epp('xmlns' => 'https://epp.tld.ee/schema/epp-ee-1.0.xsd') do
         xml.command do
           xml.transfer('op' => op) do
-            xml.tag!('contact:transfer', 'xmlns:contact' => generate_path) do
+            xml.tag!('contact:transfer', 'xmlns:contact' =>  "https://epp.tld.ee/schema/contact-ee-1.1.xsd") do
               EppXml.generate_xml_from_hash(xml_params, xml, 'contact:')
             end
           end
@@ -54,7 +54,7 @@ def build(command, xml_params, custom_params)
       xml.epp('xmlns' => 'https://epp.tld.ee/schema/epp-ee-1.0.xsd') do
         xml.command do
           xml.tag!(command) do
-            xml.tag!("contact:#{command}", 'xmlns:contact' => generate_path) do
+            xml.tag!("contact:#{command}", 'xmlns:contact' =>  "https://epp.tld.ee/schema/contact-ee-1.1.xsd") do
               EppXml.generate_xml_from_hash(xml_params, xml, 'contact:')
             end
           end
diff --git a/lib/epp-xml/keyrelay.rb b/lib/epp-xml/keyrelay.rb
index 5e6084a..a9628ed 100644
--- a/lib/epp-xml/keyrelay.rb
+++ b/lib/epp-xml/keyrelay.rb
@@ -11,7 +11,7 @@ def keyrelay(xml_params = {}, custom_params = {})
       xml.epp(
         'xmlns' => 'https://epp.tld.ee/schema/epp-ee-1.0.xsd',
         'xmlns:secDNS' => 'urn:ietf:params:xml:ns:secDNS-1.1',
-        'xmlns:domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd',
+        'xmlns:domain' => 'https://epp.tld.ee/schema/domain-ee-1.1.xsd',
         'xmlns:ext' => 'urn:ietf:params:xml:ns:keyrelay-1.0'
       ) do
         xml.tag!('command') do
diff --git a/lib/epp-xml/session.rb b/lib/epp-xml/session.rb
index 64689f0..7672055 100644
--- a/lib/epp-xml/session.rb
+++ b/lib/epp-xml/session.rb
@@ -15,7 +15,7 @@ def login(xml_params = {})
         },
         svcs: {
           _objURIs: [
-            { objURI: { value: 'https://epp.tld.ee/schema/domain-eis-1.0.xsd' } },
+            { objURI: { value: 'https://epp.tld.ee/schema/domain-ee-1.1.xsd' } },
             { objURI: { value: 'https://epp.tld.ee/schema/contact-ee-1.1.xsd' } },
             { objURI: { value: 'urn:ietf:params:xml:ns:host-1.0' } },
             { objURI: { value: 'urn:ietf:params:xml:ns:keyrelay-1.0' } }
diff --git a/spec/keyrelay_spec.rb b/spec/keyrelay_spec.rb
index ff0c5de..a8fff69 100644
--- a/spec/keyrelay_spec.rb
+++ b/spec/keyrelay_spec.rb
@@ -7,7 +7,7 @@
     expected = Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="no"?>
       <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd"
       xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
-      xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd"
+      xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd"
       xmlns:ext="urn:ietf:params:xml:ns:keyrelay-1.0">
         <command>
           <ext:keyrelay>
@@ -61,7 +61,7 @@
     expected = Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="no"?>
       <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd"
       xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
-      xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd"
+      xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd"
       xmlns:ext="urn:ietf:params:xml:ns:keyrelay-1.0">
         <command>
           <ext:keyrelay>
diff --git a/spec/session_spec.rb b/spec/session_spec.rb
index 8b4d5f1..f2acab9 100644
--- a/spec/session_spec.rb
+++ b/spec/session_spec.rb
@@ -15,7 +15,7 @@
               <lang>en</lang>
             </options>
             <svcs>
-              <objURI>https://epp.tld.ee/schema/domain-eis-1.0.xsd</objURI>
+              <objURI>https://epp.tld.ee/schema/domain-ee-1.1.xsd</objURI>
               <objURI>https://epp.tld.ee/schema/contact-ee-1.1.xsd</objURI>
               <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
               <objURI>urn:ietf:params:xml:ns:keyrelay-1.0</objURI>
@@ -47,7 +47,7 @@
               <lang>en</lang>
             </options>
             <svcs>
-              <objURI>https://epp.tld.ee/schema/domain-eis-1.0.xsd</objURI>
+              <objURI>https://epp.tld.ee/schema/domain-ee-1.1.xsd</objURI>
               <objURI>https://epp.tld.ee/schema/contact-ee-1.1.xsd</objURI>
               <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
               <objURI>urn:ietf:params:xml:ns:keyrelay-1.0</objURI>