diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05a954b..6bd7a26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@
 1.0.5
 * lib/epp-xml/domain.rb : all tag strings moved to class constants
 
+2.0.0
+* EPP XML schema "eis-1.0.xsd" replaced with "ee-1.1.xsd"
+
 * lib/epp-xml/domain.rb (delete method):
   - added extra argument for 'delete' action verification
   - deleted usage of 'build' method
diff --git a/epp-xml.gemspec b/epp-xml.gemspec
index 6c3f6d3..51d1e70 100644
--- a/epp-xml.gemspec
+++ b/epp-xml.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'epp-xml'
-  s.version     = '1.1.0'
+  s.version     = '2.0.0'
   s.summary     = 'Gem for generating XML for EIS EPP requests'
   s.description = 'Gem for generating valid XML for EIS Extensible Provisioning Protocol requests'
   s.author      = 'Estonian Internet Foundation'
diff --git a/lib/epp-xml/domain.rb b/lib/epp-xml/domain.rb
index a2893b1..3d009e5 100644
--- a/lib/epp-xml/domain.rb
+++ b/lib/epp-xml/domain.rb
@@ -6,7 +6,7 @@ class Domain
 
     XMLNS         = 'https://epp.tld.ee/schema/epp-ee-1.0.xsd'.freeze
 
-    XMLNS_DOMAIN  = 'https://epp.tld.ee/schema/domain-eis-1.0.xsd'.freeze
+    XMLNS_DOMAIN  = 'https://epp.tld.ee/schema/domain-ee-1.1.xsd'.freeze
 
     XMLNS_SECDNS  = 'urn:ietf:params:xml:ns:secDNS-1.1'.freeze
 
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/domain_spec.rb b/spec/domain_spec.rb
index 2621ea7..66d44a0 100644
--- a/spec/domain_spec.rb
+++ b/spec/domain_spec.rb
@@ -9,7 +9,7 @@
         <command>
           <create>
             <domain:create
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd" />
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd" />
           </create>
           <clTRID>ABC-12345</clTRID>
         </command>
@@ -26,7 +26,7 @@
         <command>
           <create>
             <domain:create
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
               <domain:name>one.ee</domain:name>
               <domain:period unit="d">345</domain:period>
               <domain:ns>
@@ -69,7 +69,7 @@
         <command>
           <create>
             <domain:create
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
               <domain:name>one.ee</domain:name>
             </domain:create>
           </create>
@@ -96,7 +96,7 @@
         <command>
           <create>
             <domain:create
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
               <domain:name>one.ee</domain:name>
               <domain:period unit="d">345</domain:period>
               <domain:ns>
@@ -187,7 +187,7 @@
         <command>
           <create>
             <domain:create
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
               <domain:name>one.ee</domain:name>
               <domain:period unit="d">345</domain:period>
               <domain:ns>
@@ -255,7 +255,7 @@
         <command>
           <info>
             <domain:info
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd" />
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd" />
           </info>
           <clTRID>ABC-12345</clTRID>
         </command>
@@ -271,7 +271,7 @@
         <command>
           <info>
             <domain:info
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
               <domain:name hosts="sub">one.ee</domain:name>
               <domain:authInfo>
                 <domain:pw>b3rafsla</domain:pw>
@@ -300,7 +300,7 @@
         <command>
           <check>
             <domain:check
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd" />
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd" />
           </check>
           <clTRID>ABC-12345</clTRID>
         </command>
@@ -315,7 +315,7 @@
         <command>
           <check>
             <domain:check
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
               <domain:name>example.ee</domain:name>
               <domain:name>example2.ee</domain:name>
               <domain:name>example3.ee</domain:name>
@@ -345,7 +345,7 @@
         <command>
           <update>
             <domain:update
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
               <domain:name>example.ee</domain:name>
               <domain:add>
                 <domain:ns>
@@ -408,7 +408,7 @@
         <command>
           <update>
             <domain:update
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
               <domain:name>one.ee</domain:name>
               <domain:add>
                 <domain:contact type="admin">sh8013</domain:contact>
@@ -469,7 +469,7 @@
         <command>
           <update>
             <domain:update
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
               <domain:name>example.ee</domain:name>
               <domain:chg>
                 <domain:registrant>mak21</domain:registrant>
@@ -496,7 +496,7 @@
       <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
         <command>
           <update>
-            <domain:update xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+            <domain:update xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
               <domain:name>example.ee</domain:name>
             </domain:update>
           </update>
@@ -586,7 +586,7 @@
         <command>
           <delete>
             <domain:delete
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd" />
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd" verified="no" />
           </delete>
           <clTRID>ABC-12345</clTRID>
         </command>
@@ -596,12 +596,13 @@
     generated = Nokogiri::XML(epp_xml.domain.delete).to_s.squish
     expect(generated).to eq(expected)
 
+
     expected = Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="no"?>
       <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
         <command>
           <delete>
             <domain:delete
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd" verified="no">
               <domain:name>one.ee</domain:name>
             </domain:delete>
           </delete>
@@ -614,7 +615,7 @@
           <clTRID>ABC-12345</clTRID>
         </command>
       </epp>
-    ').to_s.squish
+	').to_s.squish
 
     xml = epp_xml.domain.delete({
       name: { value: 'one.ee' }
@@ -634,7 +635,7 @@
         <command>
           <renew>
             <domain:renew
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd" />
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd" />
           </renew>
           <clTRID>ABC-12345</clTRID>
         </command>
@@ -649,7 +650,7 @@
         <command>
           <renew>
             <domain:renew
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
               <domain:name>one.ee</domain:name>
               <domain:curExpDate>2009-11-15</domain:curExpDate>
               <domain:period unit="d">365</domain:period>
@@ -676,7 +677,7 @@
         <command>
           <transfer op="query">
             <domain:transfer
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd" />
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd" />
           </transfer>
           <clTRID>ABC-12345</clTRID>
         </command>
@@ -691,7 +692,7 @@
         <command>
           <transfer op="approve">
             <domain:transfer
-             xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
+             xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd">
               <domain:name>one.ee</domain:name>
               <domain:authInfo>
                 <domain:pw roid="askdf">test</domain:pw>
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>