diff --git a/xep-0114.xml b/xep-0114.xml
index 55589750..67485e0f 100644
--- a/xep-0114.xml
+++ b/xep-0114.xml
@@ -147,8 +147,8 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:import namespace='urn:ietf:params:xml:ns:xmpp-streams'
-             schemaLocation='http://xmpp.org/schemas/streamerror.xsd'/>
+  <xs:import namespace='urn:ietf:params:xml:ns:xmpp-stanzas'
+             schemaLocation='http://xmpp.org/schemas/stanzaerror.xsd'/>
 
   <xs:import namespace='http://www.w3.org/XML/1998/namespace'
              schemaLocation='http://www.w3.org/2001/03/xml.xsd'/>
@@ -313,16 +313,16 @@
 
   <xs:element name='error'>
     <xs:complexType>
-      <xs:sequence  xmlns:err='urn:ietf:params:xml:ns:xmpp-streams'>
+      <xs:sequence  xmlns:err='urn:ietf:params:xml:ns:xmpp-stanzas'>
         <xs:group   ref='err:stanzaErrorGroup'/>
         <xs:element ref='err:text'
                     minOccurs='0'
                     maxOccurs='1'/>
       </xs:sequence>
-      <xs:attribute name='code' type='xs:byte' use='optional'/>
+      <xs:attribute name='by' type='xs:string' use='optional'/>
       <xs:attribute name='type' use='required'>
         <xs:simpleType>
-          <xs:restriction base='xs:NCName'>
+          <xs:restriction base='xs:NMTOKEN'>
             <xs:enumeration value='cancel'/>
             <xs:enumeration value='continue'/>
             <xs:enumeration value='modify'/>
@@ -355,8 +355,8 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:import namespace='urn:ietf:params:xml:ns:xmpp-streams'
-             schemaLocation='http://xmpp.org/schemas/streamerror.xsd'/>
+  <xs:import namespace='urn:ietf:params:xml:ns:xmpp-stanzas'
+             schemaLocation='http://xmpp.org/schemas/stanzaerror.xsd'/>
 
   <xs:import namespace='http://www.w3.org/XML/1998/namespace'
              schemaLocation='http://www.w3.org/2001/03/xml.xsd'/>
@@ -521,16 +521,16 @@
 
   <xs:element name='error'>
     <xs:complexType>
-      <xs:sequence  xmlns:err='urn:ietf:params:xml:ns:xmpp-streams'>
+      <xs:sequence  xmlns:err='urn:ietf:params:xml:ns:xmpp-stanzas'>
         <xs:group   ref='err:streamErrorGroup'/>
         <xs:element ref='err:text'
                     minOccurs='0'
                     maxOccurs='1'/>
       </xs:sequence>
-      <xs:attribute name='code' type='xs:byte' use='optional'/>
+      <xs:attribute name='by' type='xs:string' use='optional'/>
       <xs:attribute name='type' use='required'>
         <xs:simpleType>
-          <xs:restriction base='xs:NCName'>
+          <xs:restriction base='xs:NMTOKEN'>
             <xs:enumeration value='cancel'/>
             <xs:enumeration value='continue'/>
             <xs:enumeration value='modify'/>