diff --git a/xep-0322.xml b/xep-0322.xml
index 8a672d89..838985ed 100644
--- a/xep-0322.xml
+++ b/xep-0322.xml
@@ -26,13 +26,7 @@
     <supersedes/>
     <supersededby/>
     <shortname>exi</shortname>
-    <author>
-      <firstname>Peter</firstname>
-      <surname>Waher</surname>
-      <email>peter.waher@clayster.com</email>
-      <jid>peter.waher@jabber.org</jid>
-      <uri>http://www.linkedin.com/in/peterwaher</uri>
-    </author>
+    &peterwaher;
     <author>
       <firstname>Yusuke</firstname>
       <surname>DOI</surname>
@@ -40,6 +34,15 @@
       <jid>yusuke.doi@gmail.com</jid>
       <uri>http://www.linkedin.com/in/yusukedoi</uri>
     </author>
+    <revision>
+      <version>0.5</version>
+      <date>2015-11-09</date>
+      <initials>pw</initials>
+      <remark>
+        <p>Updated contact information.</p>
+	<p>Updated example JIDs to example.org</p>
+      </remark>
+    </revision>
     <revision>
       <version>0.4</version>
       <date>2014-03-10</date>
@@ -501,7 +504,7 @@
         </p>
         <example caption='Invalid URL'>
           <![CDATA[
-    <downloadSchemaResponse xmlns='http://jabber.org/protocol/compress/exi' url='urk://example.com/schema.xsd' result='false'>
+    <downloadSchemaResponse xmlns='http://jabber.org/protocol/compress/exi' url='urk://example.org/schema.xsd' result='false'>
         <invalidUrl message='Unrecognized schema.'/>
     </downloadSchemaResponse>]]>
         </example>
@@ -625,8 +628,8 @@
         </p>
         <example caption='Start of EXI-compressed stream'>
           <![CDATA[
-    <exi:streamStart from='client@im.example.com'
-                     to='im.example.com'
+    <exi:streamStart from='client@im.example.org'
+                     to='im.example.org'
                      version='1.0'
                      xml:lang='en'
                      xmlns:exi='http://jabber.org/protocol/compress/exi'>
diff --git a/xep-0323.xml b/xep-0323.xml
index fa293f6f..79058465 100644
--- a/xep-0323.xml
+++ b/xep-0323.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE xep SYSTEM 'xep.dtd' [
 	<!ENTITY % ents SYSTEM 'xep.ent'>
 	%ents;
@@ -22,13 +22,16 @@
     <supersedes/>
     <supersededby/>
     <shortname>sensor-data</shortname>
-    <author>
-      <firstname>Peter</firstname>
-      <surname>Waher</surname>
-      <email>peter.waher@clayster.com</email>
-      <jid>peter.waher@jabber.org</jid>
-      <uri>http://www.linkedin.com/in/peterwaher</uri>
-    </author>
+    &peterwaher;
+    <revision>
+      <version>0.5</version>
+      <date>2015-11-09</date>
+      <initials>pw</initials>
+      <remark>
+        <p>Updated contact information.</p>
+	<p>Updated example JIDs to example.org</p>
+      </remark>
+    </revision>
     <revision>
       <version>0.4</version>
       <date>2015-03-02</date>
@@ -463,8 +466,8 @@
       <example caption='Read-out request of momentary values from a device'>
         <![CDATA[
    <iq type='get'
-       from='client@clayster.com/amr'
-       to='device@clayster.com'
+       from='client@example.org/amr'
+       to='device@example.org'
        id='S0001'>
       <req xmlns='urn:xmpp:iot:sensordata' seqnr='1' momentary='true'/>
    </iq>]]>
@@ -477,8 +480,8 @@
       <example caption='Read-out request accepted by device'>
         <![CDATA[
    <iq type='result'
-       from='device@clayster.com'
-       to='client@clayster.com/amr'
+       from='device@example.org'
+       to='client@example.org/amr'
        id='S0001'>
       <accepted xmlns='urn:xmpp:iot:sensordata' seqnr='1'/>
    </iq>]]>
@@ -490,8 +493,8 @@
 
       <example caption='Momentary read-out response'>
         <![CDATA[
-   <message from='device@clayster.com'
-            to='client@clayster.com/amr'>
+   <message from='device@example.org'
+            to='client@example.org/amr'>
       <fields xmlns='urn:xmpp:iot:sensordata' seqnr='1' done='true'>
          <node nodeId='Device01'>
             <timestamp value='2013-03-07T16:24:30'>
@@ -511,21 +514,21 @@
       <example caption='Momentary read-out failure'>
         <![CDATA[
    <iq type='get'
-       from='client@clayster.com/amr'
-       to='device@clayster.com'
+       from='client@example.org/amr'
+       to='device@example.org'
        id='S0002'>
       <req xmlns='urn:xmpp:iot:sensordata' seqnr='2' momentary='true'/>
    </iq>
    
    <iq type='result'
-       from='device@clayster.com'
-       to='client@clayster.com/amr'
+       from='device@example.org'
+       to='client@example.org/amr'
        id='S0002'>
       <accepted xmlns='urn:xmpp:iot:sensordata' seqnr='2'/>
    </iq>
    
-   <message from='device@clayster.com'
-            to='client@clayster.com/amr'>
+   <message from='device@example.org'
+            to='client@example.org/amr'>
       <failure xmlns='urn:xmpp:iot:sensordata' seqnr='2' done='true'>
          <error nodeId='Device01' timestamp='2013-03-07T17:13:30'>Timeout.</error>
       </failure>
@@ -540,15 +543,15 @@
       <example caption='Momentary read-out rejected'>
         <![CDATA[
    <iq type='get'
-       from='client@clayster.com/amr'
-       to='device@clayster.com'
+       from='client@example.org/amr'
+       to='device@example.org'
        id='S0003'>
       <req xmlns='urn:xmpp:iot:sensordata' seqnr='3' momentary='true'/>
    </iq>
    
    <iq type='error'
-       from='device@clayster.com'
-       to='client@clayster.com/amr'
+       from='device@example.org'
+       to='client@example.org/amr'
        id='S0003'>
       <error type='cancel'>
          <forbidden xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -595,26 +598,26 @@
       <example caption='Scheduled read-out of device with multiple responses'>
         <![CDATA[
    <iq type='get'
-       from='client@clayster.com/amr'
-       to='device@clayster.com'
+       from='client@example.org/amr'
+       to='device@example.org'
        id='S0004'>
       <req xmlns='urn:xmpp:iot:sensordata' seqnr='4' all='true' when='2013-03-07T19:00:00'/>
    </iq>
    
    <iq type='result'
-       from='device@clayster.com'
-       to='client@clayster.com/amr'
+       from='device@example.org'
+       to='client@example.org/amr'
        id='S0004'>
       <accepted xmlns='urn:xmpp:iot:sensordata' seqnr='4' queued='true'/>
    </iq>
    
-   <message from='device@clayster.com'
-            to='client@clayster.com/amr'>
+   <message from='device@example.org'
+            to='client@example.org/amr'>
       <started xmlns='urn:xmpp:iot:sensordata' seqnr='4'/>
    </message>
    
-   <message from='device@clayster.com'
-            to='client@clayster.com/amr'>
+   <message from='device@example.org'
+            to='client@example.org/amr'>
       <fields xmlns='urn:xmpp:iot:sensordata' seqnr='4'>
          <node nodeId='Device01'>
             <timestamp value='2013-03-07T19:00:00'>
@@ -626,8 +629,8 @@
       </fields>
    </message>
    
-   <message from='device@clayster.com'
-            to='client@clayster.com/amr'>
+   <message from='device@example.org'
+            to='client@example.org/amr'>
       <fields xmlns='urn:xmpp:iot:sensordata' seqnr='4'>
          <node nodeId='Device01'>
             <timestamp value='2013-03-07T19:00:00'>
@@ -639,8 +642,8 @@
       </fields>
    </message>
    
-   <message from='device@clayster.com'
-            to='client@clayster.com/amr'>
+   <message from='device@example.org'
+            to='client@example.org/amr'>
       <fields xmlns='urn:xmpp:iot:sensordata' seqnr='4'>
          <node nodeId='Device01'>
             <timestamp value='2013-03-07T18:00:00'>
@@ -660,8 +663,8 @@
       </fields>
    </message>
    
-   <message from='device@clayster.com'
-            to='client@clayster.com/amr'>
+   <message from='device@example.org'
+            to='client@example.org/amr'>
       <done xmlns='urn:xmpp:iot:sensordata' seqnr='4'/>
    </message>]]>
       </example>
@@ -674,8 +677,8 @@
       <example caption='Read-out of multiple devices'>
         <![CDATA[
    <iq type='get'
-       from='client@clayster.com/amr'
-       to='device@clayster.com'
+       from='client@example.org/amr'
+       to='device@example.org'
        id='S0005'>
       <req xmlns='urn:xmpp:iot:sensordata' seqnr='5' momentary='true'>
          <node nodeId='Device02'/>
@@ -684,14 +687,14 @@
    </iq>
    
    <iq type='result'
-       from='device@clayster.com'
-       to='client@clayster.com/amr'
+       from='device@example.org'
+       to='client@example.org/amr'
        id='S0005'>
       <accepted xmlns='urn:xmpp:iot:sensordata' seqnr='5'/>
    </iq>
    
-   <message from='device@clayster.com'
-            to='client@clayster.com/amr'>
+   <message from='device@example.org'
+            to='client@example.org/amr'>
       <fields xmlns='urn:xmpp:iot:sensordata' seqnr='5'>
          <node nodeId='Device02'>
             <timestamp value='2013-03-07T19:31:15'>
@@ -701,8 +704,8 @@
       </fields>
    </message>
    
-   <message from='device@clayster.com'
-            to='client@clayster.com/amr'>
+   <message from='device@example.org'
+            to='client@example.org/amr'>
       <fields xmlns='urn:xmpp:iot:sensordata' seqnr='5' done='true'>
          <node nodeId='Device03'>
             <timestamp value='2013-03-07T19:31:16'>
@@ -730,8 +733,8 @@
       <example caption='Read-out of multiple devices'>
         <![CDATA[
    <iq type='get'
-       from='client@clayster.com/amr'
-       to='device@clayster.com'
+       from='client@example.org/amr'
+       to='device@example.org'
        id='S0006'>
       <req xmlns='urn:xmpp:iot:sensordata' seqnr='6' momentary='true'>
          <node nodeId='Device04'/>
@@ -741,14 +744,14 @@
    </iq>
    
    <iq type='result'
-       from='device@clayster.com'
-       to='client@clayster.com/amr'
+       from='device@example.org'
+       to='client@example.org/amr'
        id='S0006'>
       <accepted xmlns='urn:xmpp:iot:sensordata' seqnr='6'/>
    </iq>
    
-   <message from='device@clayster.com'
-            to='client@clayster.com/amr'>
+   <message from='device@example.org'
+            to='client@example.org/amr'>
       <fields xmlns='urn:xmpp:iot:sensordata' seqnr='6' done='true'>
          <node nodeId='Device04'>
             <timestamp value='2013-03-07T22:03:15'>
@@ -767,29 +770,29 @@
       <example caption='Scheduled read-out of device with multiple responses'>
         <![CDATA[
    <iq type='get'
-       from='client@clayster.com/amr'
-       to='device@clayster.com'
+       from='client@example.org/amr'
+       to='device@example.org'
        id='S0007'>
       <req xmlns='urn:xmpp:iot:sensordata' seqnr='8' all='true' when='2013-03-09T23:30:00'/>
    </iq>
    
    <iq type='result'
-       from='device@clayster.com'
-       to='client@clayster.com/amr'
+       from='device@example.org'
+       to='client@example.org/amr'
        id='S0007'>
       <accepted xmlns='urn:xmpp:iot:sensordata' seqnr='8' queued='true'/>
    </iq>
    
    <iq type='get'
-       from='client@clayster.com/amr'
-       to='device@clayster.com'
+       from='client@example.org/amr'
+       to='device@example.org'
        id='S0008'>
       <cancel xmlns='urn:xmpp:iot:sensordata' seqnr='8'/>
    </iq>
    
    <iq type='result'
-       from='device@clayster.com'
-       to='client@clayster.com/amr'
+       from='device@example.org'
+       to='client@example.org/amr'
        id='S0008'>
       <cancelled xmlns='urn:xmpp:iot:sensordata' seqnr='8'/>
    </iq>]]>
@@ -801,8 +804,8 @@
     <example caption="Service discovery information request">
       <![CDATA[
 <iq type='get'
-    from='client@clayster.com/amr'
-    to='device@clayster.com'
+    from='client@example.org/amr'
+    to='device@example.org'
     id='disco1'>
   <query xmlns='http://jabber.org/protocol/disco#info'/>
 </iq>]]>
@@ -810,8 +813,8 @@
     <example caption="Service discovery information response">
       <![CDATA[
 <iq type='result'
-    from='device@clayster.com'
-    to='client@clayster.com/amr'
+    from='device@example.org'
+    to='client@example.org/amr'
     id='disco1'>
   <query xmlns='http://jabber.org/protocol/disco#info'>
     ...
@@ -1244,21 +1247,21 @@
       <example caption='Localized field names'>
         <![CDATA[
    <iq type='get'
-       from='client@clayster.com/amr'
-       to='device@clayster.com'
+       from='client@example.org/amr'
+       to='device@example.org'
        id='S0009'>
       <req xmlns='urn:xmpp:iot:sensordata' seqnr='7' all='true'/>
    </iq>
    
    <iq type='result'
-       from='device@clayster.com'
-       to='client@clayster.com/amr'
+       from='device@example.org'
+       to='client@example.org/amr'
        id='S0009'>
       <accepted xmlns='urn:xmpp:iot:sensordata' seqnr='7'/>
    </iq>
    
-   <message from='device@clayster.com'
-            to='client@clayster.com/amr'>
+   <message from='device@example.org'
+            to='client@example.org/amr'>
       <fields xmlns='urn:xmpp:iot:sensordata' seqnr='7' done='true'>
          <node nodeId='Device05'>
             <timestamp value='2013-03-07T22:20:45'>
diff --git a/xep-0324.xml b/xep-0324.xml
index 94b3ff5c..d8be3a9d 100644
--- a/xep-0324.xml
+++ b/xep-0324.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE xep SYSTEM 'xep.dtd' [
   <!ENTITY % ents SYSTEM 'xep.ent'>
 %ents;
@@ -25,13 +25,16 @@
         <supersedes/>
         <supersededby/>
         <shortname>sensor-network-provisioning</shortname>
-        <author>
-            <firstname>Peter</firstname>
-            <surname>Waher</surname>
-            <email>peter.waher@clayster.com</email>
-            <jid>peter.waher@jabber.org</jid>
-            <uri>http://www.linkedin.com/in/peterwaher</uri>
-        </author>
+        &peterwaher;
+		<revision>
+			<version>0.4</version>
+			<date>2015-11-09</date>
+			<initials>pw</initials>
+			<remark>
+				<p>Updated contact information.</p>
+				<p>Updated example JIDs to example.org</p>
+			</remark>
+		</revision>
 		<revision>
 			<version>0.3</version>
 			<date>2014-05-21</date>
@@ -464,11 +467,11 @@
 				</p>
 				<example caption="Checking if server supports components">
 					<![CDATA[
-   <iq from='device@clayster.com/device' to='clayster.com' type='get' id='1'>
+   <iq from='device@example.org/device' to='example.org' type='get' id='1'>
       <query xmlns="http://jabber.org/protocol/disco#info"/>
    </iq>
    
-   <iq type="result" id="1" from="clayster.com" to="device@clayster.com/device">
+   <iq type="result" id="1" from="example.org" to="device@example.org/device">
       <query xmlns="http://jabber.org/protocol/disco#info">
          ...
          <feature var="http://jabber.org/protocol/disco#items"/>
@@ -481,14 +484,14 @@
 				</p>
 				<example caption="Requesting list of server components">
 					<![CDATA[
-   <iq from='device@clayster.com/device' to='clayster.com' type='get' id='2'>
+   <iq from='device@example.org/device' to='example.org' type='get' id='2'>
       <query xmlns="http://jabber.org/protocol/disco#items"/>
    </iq>
    
-   <iq type="result" id="2" from="clayster.com" to="995fab3dd759452ca9c370647323af0c@clayster.com/ebe2348e">
+   <iq type="result" id="2" from="example.org" to="995fab3dd759452ca9c370647323af0c@example.org/ebe2348e">
       <query xmlns="http://jabber.org/protocol/disco#items">
          ...
-         <item jid="provisioning.clayster.com" name="Provisioning"/>
+         <item jid="provisioning.example.org" name="Provisioning"/>
          ...
       </query>
    </iq>]]>
@@ -499,15 +502,15 @@
 				<example caption="Service discovery information request made to each component">
 					<![CDATA[
    <iq type='get'
-       from='device@clayster.com/device'
-       to='provisioning.clayster.com'
+       from='device@example.org/device'
+       to='provisioning.example.org'
        id='3'>
       <query xmlns='http://jabber.org/protocol/disco#info'/>
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning.example.org'
+       to='device@example.org/device'
        id='3'>
       <query xmlns='http://jabber.org/protocol/disco#info'>
          ...
@@ -548,29 +551,29 @@
 					<example caption='Requesting a token'>
 						<![CDATA[
    <iq type='get'
-       from='device@clayster.com/device'
-       to='provisioning.clayster.com'
+       from='device@example.org/device'
+       to='provisioning.example.org'
        id='4'>
       <getToken xmlns='urn:xmpp:iot:provisioning'>BASE-64 ENCODED PUBLIC X.509 CERTIFICATE</getToken>
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning.example.org'
+       to='device@example.org/device'
        id='4'>
       <getTokenChallenge xmlns='urn:xmpp:iot:provisioning' seqnr='1'>BASE-64 ENCODED CHALLENGE</getTokenChallenge>
    </iq>
    
    <iq type='get'
-       from='device@clayster.com/device'
-       to='provisioning.clayster.com'
+       from='device@example.org/device'
+       to='provisioning.example.org'
        id='5'>
       <getTokenChallengeResponse xmlns='urn:xmpp:iot:provisioning' seqnr='1'>BASE-64 ENCODED RESPONSE</getTokenChallengeResponse>
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning.example.org'
+       to='device@example.org/device'
        id='5'>
       <getTokenResponse xmlns='urn:xmpp:iot:provisioning' token='TOKEN'/>
    </iq>]]>
@@ -590,8 +593,8 @@
 					<example caption='Challenge reponse incorrect'>
 						<![CDATA[
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning.example.org'
+       to='device@example.org/device'
        id='5'>
       <error type='modify'>
          <bad-request xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -604,8 +607,8 @@
 					<example caption='Challenge sequence number not found'>
 						<![CDATA[
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning.example.org'
+       to='device@example.org/device'
        id='5'>
       <error type='cancel'>
          <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -637,15 +640,15 @@
 					<example caption='Requesting a token'>
 						<![CDATA[
    <iq type='get'
-       from='provisioning.clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning.example.org'
+       to='device@example.org/device'
        id='6'>
       <tokenChallenge xmlns='urn:xmpp:iot:provisioning' token='TOKEN'>BASE-64 encoded challenge</tokenChallenge>
    </iq>
    
    <iq type='result'
-       from='device@clayster.com/device'
-       to='provisioning.clayster.com'
+       from='device@example.org/device'
+       to='provisioning.example.org'
        id='6'>
       <tokenChallengeResponse xmlns='urn:xmpp:iot:provisioning'>BASE-64 encoded response</tokenChallengeResponse>
    </iq>]]>
@@ -657,8 +660,8 @@
 					<example caption='Invalid token challenge'>
 						<![CDATA[
    <iq type='error'
-       from='device@clayster.com/device'
-       to='provisioning.clayster.com'
+       from='device@example.org/device'
+       to='provisioning.example.org'
        id='6'>
       <error type='cancel'>
          <forbidden xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -693,29 +696,29 @@
                 <example caption='Readout request using multiple tokens'>
                     <![CDATA[
    <iq type='get'
-       from='master@clayster.com/amr'
-       to='device@clayster.com'
+       from='master@example.org/amr'
+       to='device@example.org'
        id='7'>
       <req xmlns='urn:xmpp:iot:sensordata' momentary='true' serviceToken='SERVICETOKEN1 SERVICETOKEN2' userToken='USERTOKEN1' seqnr='4'/>
    </iq>
    
    <iq type='get'
-       from='device@clayster.com/device'
-       to='provisioning.clayster.com'
+       from='device@example.org/device'
+       to='provisioning.example.org'
        id='8'>
-      <canRead xmlns='urn:xmpp:iot:provisioning' jid='master@clayster.com' serviceToken='SERVICETOKEN1 SERVICETOKEN2' userToken='USERTOKEN1' momentary='true'/>
+      <canRead xmlns='urn:xmpp:iot:provisioning' jid='master@example.org' serviceToken='SERVICETOKEN1 SERVICETOKEN2' userToken='USERTOKEN1' momentary='true'/>
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning.example.org'
+       to='device@example.org/device'
        id='8'>
-      <canReadResponse xmlns='urn:xmpp:iot:provisioning' jid='master@clayster.com' momentary='true' result='true'/>
+      <canReadResponse xmlns='urn:xmpp:iot:provisioning' jid='master@example.org' momentary='true' result='true'/>
    </iq>
    
    <iq type='result'
-       from='device@clayster.com'
-       to='master@clayster.com/amr'
+       from='device@example.org'
+       to='master@example.org/amr'
        id='7'>
       <accepted xmlns='urn:xmpp:iot:sensordata' seqnr='4'/>
    </iq>]]>
@@ -739,17 +742,17 @@
                 <example caption='Friendship request accepted'>
                     <![CDATA[
    <iq type='get'
-       from='device@clayster.com/device'
-       to='provisioning.clayster.com'
+       from='device@example.org/device'
+       to='provisioning.example.org'
        id='9'>
-      <isFriend xmlns='urn:xmpp:iot:provisioning' jid='client1@clayster.com'/>
+      <isFriend xmlns='urn:xmpp:iot:provisioning' jid='client1@example.org'/>
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning.example.org'
+       to='device@example.org/device'
        id='9'>
-      <isFriendResponse xmlns='urn:xmpp:iot:provisioning' jid='client1@clayster.com' result='true'/>
+      <isFriendResponse xmlns='urn:xmpp:iot:provisioning' jid='client1@example.org' result='true'/>
    </iq>]]>
                 </example>
                 <p>
@@ -773,17 +776,17 @@
                 <example caption='Friendship request rejected'>
                     <![CDATA[
    <iq type='get'
-       from='device@clayster.com/device'
-       to='provisioning.clayster.com'
+       from='device@example.org/device'
+       to='provisioning.example.org'
        id='10'>
-      <isFriend xmlns='urn:xmpp:iot:provisioning' jid='client2@clayster.com'/>
+      <isFriend xmlns='urn:xmpp:iot:provisioning' jid='client2@example.org'/>
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning.example.org'
+       to='device@example.org/device'
        id='10'>
-      <isFriendResponse xmlns='urn:xmpp:iot:provisioning' jid='client2@clayster.com' result='false'/>
+      <isFriendResponse xmlns='urn:xmpp:iot:provisioning' jid='client2@example.org' result='false'/>
    </iq>]]>
                 </example>
             </section3>
@@ -805,9 +808,9 @@
 
                 <example caption='Unfriending existing friend'>
                     <![CDATA[
-   <message from='provisioning.clayster.com'
-            to='device@clayster.com'>
-      <unfriend xmlns='urn:xmpp:iot:provisioning' jid='client2@clayster.com'/>
+   <message from='provisioning.example.org'
+            to='device@example.org'>
+      <unfriend xmlns='urn:xmpp:iot:provisioning' jid='client2@example.org'/>
    </message>]]>
                 </example>
             </section3>
@@ -821,9 +824,9 @@
                 </p>
                 <example caption='Recommending friendships'>
                     <![CDATA[
-   <message from='provisioning.clayster.com'
-            to='device@clayster.com'>
-      <friend xmlns='urn:xmpp:iot:provisioning' jid='client2@clayster.com'/>
+   <message from='provisioning.example.org'
+            to='device@example.org'>
+      <friend xmlns='urn:xmpp:iot:provisioning' jid='client2@example.org'/>
    </message>]]>
                 </example>
                 <p>
@@ -850,29 +853,29 @@
                 <example caption='Rejecting read-outs'>
                     <![CDATA[
    <iq type='get'
-       from='master@clayster.com/amr'
-       to='device@clayster.com'
+       from='master@example.org/amr'
+       to='device@example.org'
        id='11'>
       <req xmlns='urn:xmpp:iot:sensordata' momentary='true' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1' seqnr='1'/>
    </iq>
    
    <iq type='get'
-       from='device@clayster.com/device'
-       to='provisioning.clayster.com'
+       from='device@example.org/device'
+       to='provisioning.example.org'
        id='12'>
-      <canRead xmlns='urn:xmpp:iot:provisioning' jid='master@clayster.com' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1' momentary='true'/>
+      <canRead xmlns='urn:xmpp:iot:provisioning' jid='master@example.org' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1' momentary='true'/>
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning.example.org'
+       to='device@example.org/device'
        id='12'>
-      <canReadResponse xmlns='urn:xmpp:iot:provisioning' jid='master@clayster.com' momentary='true' result='false'/>
+      <canReadResponse xmlns='urn:xmpp:iot:provisioning' jid='master@example.org' momentary='true' result='false'/>
    </iq>
    
    <iq type='error'
-       from='device@clayster.com'
-       to='master@clayster.com/amr'
+       from='device@example.org'
+       to='master@example.org/amr'
        id='11'>
       <rejected xmlns='urn:xmpp:iot:sensordata' seqnr='1'>
          <error>Access denied.</error>
@@ -903,8 +906,8 @@
                 <example caption='Restricting nodes during read-out'>
                     <![CDATA[
    <iq type='get'
-       from='master@clayster.com/amr'
-       to='device@clayster.com'
+       from='master@example.org/amr'
+       to='device@example.org'
        id='13'>
       <req xmlns='urn:xmpp:iot:sensordata' momentary='true' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1' seqnr='2'>
          <node nodeId='Device02'/>
@@ -913,27 +916,27 @@
    </iq>
    
    <iq type='get'
-       from='device@clayster.com/device'
-       to='provisioning.clayster.com'
+       from='device@example.org/device'
+       to='provisioning.example.org'
        id='14'>
-      <canRead xmlns='urn:xmpp:iot:provisioning' jid='master@clayster.com' momentary='true' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1'>
+      <canRead xmlns='urn:xmpp:iot:provisioning' jid='master@example.org' momentary='true' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1'>
          <node nodeId='Device02'/>
          <node nodeId='Device03'/>
       </canRead>
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning.example.org'
+       to='device@example.org/device'
        id='14'>
-      <canReadResponse xmlns='urn:xmpp:iot:provisioning' jid='master@clayster.com' momentary='true' result='true'>
+      <canReadResponse xmlns='urn:xmpp:iot:provisioning' jid='master@example.org' momentary='true' result='true'>
          <node nodeId='Device02'/>
       </canReadResponse>
    </iq>
    
    <iq type='result'
-       from='device@clayster.com'
-       to='master@clayster.com/amr'
+       from='device@example.org'
+       to='master@example.org/amr'
        id='13'>
       <accepted xmlns='urn:xmpp:iot:sensordata' seqnr='2'/>
    </iq>]]>
@@ -963,32 +966,32 @@
                 <example caption='Restricting fields during read-out'>
                     <![CDATA[
    <iq type='get'
-       from='master@clayster.com/amr'
-       to='device@clayster.com'
+       from='master@example.org/amr'
+       to='device@example.org'
        id='15'>
       <req xmlns='urn:xmpp:iot:sensordata' momentary='true' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1' seqnr='3'/>
    </iq>
    
    <iq type='get'
-       from='device@clayster.com/device'
-       to='provisioning.clayster.com'
+       from='device@example.org/device'
+       to='provisioning.example.org'
        id='16'>
-      <canRead xmlns='urn:xmpp:iot:provisioning' jid='master@clayster.com' momentary='true' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1'/>
+      <canRead xmlns='urn:xmpp:iot:provisioning' jid='master@example.org' momentary='true' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1'/>
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning.example.org'
+       to='device@example.org/device'
        id='16'>
-      <canReadResponse xmlns='urn:xmpp:iot:provisioning' jid='master@clayster.com' momentary='true' result='true'>
+      <canReadResponse xmlns='urn:xmpp:iot:provisioning' jid='master@example.org' momentary='true' result='true'>
          <field name='Energy'/>
          <field name='Power'/>
       </canReadResponse>
    </iq>
    
    <iq type='result'
-       from='device@clayster.com'
-       to='master@clayster.com/amr'
+       from='device@example.org'
+       to='master@example.org/amr'
        id='15'>
       <accepted xmlns='urn:xmpp:iot:sensordata' seqnr='3'/>
    </iq>]]>
@@ -1019,8 +1022,8 @@
                 <example caption='Rejecting control action'>
                     <![CDATA[
    <iq type='set'
-       from='master@clayster.com/amr'
-       to='device@clayster.com'
+       from='master@example.org/amr'
+       to='device@example.org'
        id='17'>
       <set xmlns='urn:xmpp:iot:control' xml:lang='en'>
          <boolean name='Output' value='true'/>
@@ -1028,24 +1031,24 @@
    </iq>
  
    <iq type='get'
-       from='device@clayster.com/device'
-       to='provisioning.clayster.com'
+       from='device@example.org/device'
+       to='provisioning.example.org'
        id='18'>
-      <canControl xmlns='urn:xmpp:iot:provisioning' jid='master@clayster.com' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1'>
+      <canControl xmlns='urn:xmpp:iot:provisioning' jid='master@example.org' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1'>
           <parameter name='Output'/>
       </canControl>
    </iq>
  
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning.example.org'
+       to='device@example.org/device'
        id='18'>
-      <canControlResponse xmlns='urn:xmpp:iot:provisioning' jid='master@clayster.com' result='false'/>
+      <canControlResponse xmlns='urn:xmpp:iot:provisioning' jid='master@example.org' result='false'/>
    </iq>
    
    <iq type='error'
-       from='device@clayster.com'
-       to='master@clayster.com/amr'
+       from='device@example.org'
+       to='master@example.org/amr'
        id='17'>
       <setResponse xmlns='urn:xmpp:iot:control' responseCode='InsufficientPrivileges'/>
    </iq>]]>
@@ -1071,8 +1074,8 @@
 				<example caption='Restricting nodes during control'>
 					<![CDATA[
    <iq type='set'
-       from='master@clayster.com/amr'
-       to='concentrator@clayster.com'
+       from='master@example.org/amr'
+       to='concentrator@example.org'
        id='19'>
       <set xmlns='urn:xmpp:iot:control' xml:lang='en'>
          <node nodeId='DigitalOutput1'/>
@@ -1084,10 +1087,10 @@
    </iq>
    
    <iq type='get'
-       from='concentrator@clayster.com/plc'
-       to='provisioning.clayster.com'
+       from='concentrator@example.org/plc'
+       to='provisioning.example.org'
        id='20'>
-      <canControl xmlns='urn:xmpp:iot:provisioning' jid='master@clayster.com' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1'>
+      <canControl xmlns='urn:xmpp:iot:provisioning' jid='master@example.org' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1'>
           <node nodeId='DigitalOutput1'/>
           <node nodeId='DigitalOutput2'/>
           <node nodeId='DigitalOutput3'/>
@@ -1097,18 +1100,18 @@
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='concentrator@clayster.com/plc'
+       from='provisioning.example.org'
+       to='concentrator@example.org/plc'
        id='20'>
-      <canControlResponse xmlns='urn:xmpp:iot:provisioning' jid='master@clayster.com' result='true'>
+      <canControlResponse xmlns='urn:xmpp:iot:provisioning' jid='master@example.org' result='true'>
           <node nodeId='DigitalOutput2'/>
           <node nodeId='DigitalOutput3'/>
       </canControlResponse>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='master@clayster.com/amr'
+       from='concentrator@example.org'
+       to='master@example.org/amr'
        id='19'>
       <setResponse xmlns='urn:xmpp:iot:control' responseCode='OK'>
           <node nodeId='DigitalOutput2'/>
@@ -1146,8 +1149,8 @@
                 <example caption='Restricting parameters during control'>
                     <![CDATA[
    <iq type='set'
-       from='master@clayster.com/amr'
-       to='plc@clayster.com'
+       from='master@example.org/amr'
+       to='plc@example.org'
        id='21'>
       <set xmlns='urn:xmpp:iot:control' xml:lang='en'>
          <boolean name='DigitalOutput1' value='true'/>
@@ -1162,10 +1165,10 @@
    </iq>
    
    <iq type='get'
-       from='plc@clayster.com/plc'
-       to='provisioning.clayster.com'
+       from='plc@example.org/plc'
+       to='provisioning.example.org'
        id='22'>
-      <canControl xmlns='urn:xmpp:iot:provisioning' jid='master@clayster.com' serviceToken='SERVICETOKEN1' userToken='user0001'>
+      <canControl xmlns='urn:xmpp:iot:provisioning' jid='master@example.org' serviceToken='SERVICETOKEN1' userToken='user0001'>
           <parameter name='DigitalOutput1'/>
           <parameter name='DigitalOutput2'/>
           <parameter name='DigitalOutput3'/>
@@ -1178,10 +1181,10 @@
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='plc@clayster.com/plc'
+       from='provisioning.example.org'
+       to='plc@example.org/plc'
        id='22'>
-      <canControlResponse xmlns='urn:xmpp:iot:provisioning' jid='master@clayster.com' result='true'>
+      <canControlResponse xmlns='urn:xmpp:iot:provisioning' jid='master@example.org' result='true'>
           <parameter name='DigitalOutput1'/>
           <parameter name='DigitalOutput2'/>
           <parameter name='DigitalOutput3'/>
@@ -1190,8 +1193,8 @@
    </iq>
    
    <iq type='result'
-       from='plc@clayster.com'
-       to='master@clayster.com/amr'
+       from='plc@example.org'
+       to='master@example.org/amr'
        id='21'>
       <setResponse xmlns='urn:xmpp:iot:control' responseCode='OK'>
           <parameter name='DigitalOutput1'/>
@@ -1229,15 +1232,15 @@
                 <example caption='Clear cache'>
                     <![CDATA[
    <iq type='set'
-       from='provisioning.clayster.com'
-       to='device@clayster.com'
+       from='provisioning.example.org'
+       to='device@example.org'
        id='23'>
       <clearCache xmlns='urn:xmpp:iot:provisioning'/>
    </iq>
    
    <iq type='result'
-       from='device@clayster.com'
-       to='provisioning.clayster.com'
+       from='device@example.org'
+       to='provisioning.example.org'
        id='23'>
       <clearCacheResponse xmlns='urn:xmpp:iot:provisioning'/>
    </iq>]]>
@@ -1253,29 +1256,29 @@
                 <example caption='Requesting a service token'>
                     <![CDATA[
    <iq type='get'
-       from='device@clayster.com/device'
-       to='provisioning.clayster.com'
+       from='device@example.org/device'
+       to='provisioning.example.org'
        id='24'>
       <getToken xmlns='urn:xmpp:iot:provisioning'>BASE-64 ENCODED PUBLIC X.509 CERTIFICATE</getToken>
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning.example.org'
+       to='device@example.org/device'
        id='24'>
       <getTokenChallenge xmlns='urn:xmpp:iot:provisioning' seqnr='1'>BASE-64 ENCODED CHALLENGE</getTokenChallenge>
    </iq>
    
    <iq type='get'
-       from='device@clayster.com/device'
-       to='provisioning.clayster.com'
+       from='device@example.org/device'
+       to='provisioning.example.org'
        id='25'>
       <getTokenChallengeResponse xmlns='urn:xmpp:iot:provisioning' seqnr='1'>BASE-64 ENCODED RESPONSE</getTokenChallengeResponse>
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning.example.org'
+       to='device@example.org/device'
        id='25'>
       <getTokenResponse xmlns='urn:xmpp:iot:provisioning' token='TOKEN'/>
    </iq>]]>
@@ -1373,8 +1376,8 @@
    <!-- user connects to service -->
    
    <iq type='get'
-       from='service@clayster.com/service'
-       to='provisioning.clayster.com'
+       from='service@example.org/service'
+       to='provisioning.example.org'
        id='26'>
       <canAccess xmlns='urn:xmpp:iot:provisioning' serviceToken='SERVICETOKEN1'>
           <credentials type='IpAddress' value='10.0.0.1'/>
@@ -1384,16 +1387,16 @@
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='service@clayster.com/service'
+       from='provisioning.example.org'
+       to='service@example.org/service'
        id='26'>
       <canAccessResponse xmlns='urn:xmpp:iot:provisioning' userToken='USERTOKEN1' result='true'/>
    </iq>
  
    <!-- user performs login into service -->
  
-   <message from='service@clayster.com/service'
-            to='provisioning.clayster.com'>
+   <message from='service@example.org/service'
+            to='provisioning.example.org'>
       <userLoggedIn xmlns='urn:xmpp:iot:provisioning' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1' userName='Kermit' />
    </message>
    
@@ -1471,15 +1474,15 @@
    <!-- user wants to perform action -->
    
    <iq type='get'
-       from='service@clayster.com/service'
-       to='provisioning.clayster.com'
+       from='service@example.org/service'
+       to='provisioning.example.org'
        id='27'>
       <hasPrivilege xmlns='urn:xmpp:iot:provisioning' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1' privilegeId='Sensors.View'/>
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='service@clayster.com/service'
+       from='provisioning.example.org'
+       to='service@example.org/service'
        id='27'>
       <hasPrivilegeResponse xmlns='urn:xmpp:iot:provisioning' result='true'/>
    </iq>
@@ -1505,8 +1508,8 @@
    <!-- user connects to service -->
    
    <iq type='get'
-       from='service@clayster.com/service'
-       to='provisioning.clayster.com'
+       from='service@example.org/service'
+       to='provisioning.example.org'
        id='28'>
       <canAccess xmlns='urn:xmpp:iot:provisioning' serviceToken='SERVICETOKEN1'>
           <credentials type='IpAddress' value='10.0.0.1'/>
@@ -1516,29 +1519,29 @@
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='service@clayster.com/service'
+       from='provisioning.example.org'
+       to='service@example.org/service'
        id='28'>
       <canAccessResponse xmlns='urn:xmpp:iot:provisioning' userToken='USERTOKEN1' result='true'/>
    </iq>
  
    <!-- user performs login into service -->
  
-   <message from='service@clayster.com/service'
-            to='provisioning.clayster.com'>
+   <message from='service@example.org/service'
+            to='provisioning.example.org'>
       <userLoggedIn xmlns='urn:xmpp:iot:provisioning' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1' userName='Kermit' />
    </message>
    
    <iq type='get'
-       from='service@clayster.com/service'
-       to='provisioning.clayster.com'
+       from='service@example.org/service'
+       to='provisioning.example.org'
        id='29'>
       <downloadPrivileges xmlns='urn:xmpp:iot:provisioning' serviceToken='SERVICETOKEN1' userToken='USERTOKEN1'/>
    </iq>
    
    <iq type='result'
-       from='provisioning.clayster.com'
-       to='service@clayster.com/service'
+       from='provisioning.example.org'
+       to='service@example.org/service'
        id='29'>
        <downloadPrivilegesResponse>
            <exclude id='Sensors.Delete'/>
@@ -1563,8 +1566,8 @@
 		<example caption="Service discovery information request">
             <![CDATA[
 <iq type='get'
-    from='device@clayster.com/device'
-    to='provisioning.clayster.com'
+    from='device@example.org/device'
+    to='provisioning.example.org'
     id='disco1'>
   <query xmlns='http://jabber.org/protocol/disco#info'/>
 </iq>]]>
@@ -1572,8 +1575,8 @@
         <example caption="Service discovery information response">
             <![CDATA[
 <iq type='result'
-    from='provisioning.clayster.com'
-    to='device@clayster.com/device'
+    from='provisioning.example.org'
+    to='device@example.org/device'
     id='disco1'>
   <query xmlns='http://jabber.org/protocol/disco#info'>
     ...
diff --git a/xep-0325.xml b/xep-0325.xml
index 193d933d..1e9902ae 100644
--- a/xep-0325.xml
+++ b/xep-0325.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE xep SYSTEM 'xep.dtd' [
     <!ENTITY % ents SYSTEM 'xep.ent'>
     %ents;
@@ -29,13 +29,16 @@
         <supersedes/>
         <supersededby/>
         <shortname>sensor-network-control</shortname>
-        <author>
-            <firstname>Peter</firstname>
-            <surname>Waher</surname>
-            <email>peter.waher@clayster.com</email>
-            <jid>peter.waher@jabber.org</jid>
-            <uri>http://www.linkedin.com/in/peterwaher</uri>
-        </author>
+        &peterwaher;
+		<revision>
+			<version>0.4</version>
+			<date>2015-11-09</date>
+			<initials>psa</initials>
+			<remark>
+				<p>Updated contact information.</p>
+				<p>Updated example JIDs to example.org</p>
+			</remark>
+		</revision>
 		<revision>
 			<version>0.3</version>
 			<date>2014-04-07</date>
@@ -378,8 +381,8 @@
                 </p>
                 <example caption='Message stanza for setting a value'>
                     <![CDATA[
-   <message from='master@clayster.com/amr'
-            to='digital.output@clayster.com'>
+   <message from='master@example.org/amr'
+            to='digital.output@example.org'>
       <set xmlns='urn:xmpp:iot:control'>
          <boolean name='Output' value='true'/>
       </set>
@@ -397,8 +400,8 @@
                 <example caption='IQ stanza for setting a value'>
                     <![CDATA[
    <iq type='set'
-       from='master@clayster.com/amr'
-       to='digital.output@clayster.com'
+       from='master@example.org/amr'
+       to='digital.output@example.org'
        id='1'>
       <set xmlns='urn:xmpp:iot:control' xml:lang='en'>
          <boolean name='Output' value='true'/>
@@ -406,8 +409,8 @@
    </iq>
    
    <iq type='result'
-       from='digital.output@clayster.com'
-       to='master@clayster.com/amr'
+       from='digital.output@example.org'
+       to='master@example.org/amr'
        id='1'>
       <setResponse xmlns='urn:xmpp:iot:control'/>
    </iq>]]>
@@ -429,8 +432,8 @@
                 <example caption='Control failure response'>
                     <![CDATA[
    <iq type='set'
-       from='master@clayster.com/amr'
-       to='analog.output@clayster.com'
+       from='master@example.org/amr'
+       to='analog.output@example.org'
        id='2'>
       <set xmlns='urn:xmpp:iot:control' xml:lang='en'>
          <boolean name='Output' value='true'/>
@@ -438,8 +441,8 @@
    </iq>
    
    <iq type='error'
-       from='analog.output@clayster.com'
-       to='master@clayster.com/amr'
+       from='analog.output@example.org'
+       to='master@example.org/amr'
        id='2'>
       <error type='modify'>
          <bad-request xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -463,8 +466,8 @@
                 </p>
                 <example caption='Setting a single boolean-valued control parameter'>
                     <![CDATA[
-   <message from='master@clayster.com/amr'
-            to='digital.output@clayster.com'>
+   <message from='master@example.org/amr'
+            to='digital.output@example.org'>
       <set xmlns='urn:xmpp:iot:control'>
          <boolean name='Output' value='true'/>
       </set>
@@ -478,8 +481,8 @@
                 </p>
                 <example caption='Setting a single 32-bit integer-valued control parameter'>
                     <![CDATA[
-   <message from='master@clayster.com/amr'
-            to='analog.output@clayster.com'>
+   <message from='master@example.org/amr'
+            to='analog.output@example.org'>
       <set xmlns='urn:xmpp:iot:control'>
          <int name='Output' value='50000'/>
       </set>
@@ -494,8 +497,8 @@
                 </p>
                 <example caption='Setting a single 64-bit integer-valued control parameter'>
                     <![CDATA[
-   <message from='master@clayster.com/amr'
-            to='megaprecision.analog.output@clayster.com'>
+   <message from='master@example.org/amr'
+            to='megaprecision.analog.output@example.org'>
       <set xmlns='urn:xmpp:iot:control'>
          <long name='Output' value='500000000000000'/>
       </set>
@@ -509,8 +512,8 @@
                 </p>
                 <example caption='Setting a single string-valued control parameter'>
                     <![CDATA[
-   <message from='master@clayster.com/amr'
-            to='text.display@clayster.com'>
+   <message from='master@example.org/amr'
+            to='text.display@example.org'>
       <set xmlns='urn:xmpp:iot:control'>
          <string name='Row1' value='Temperature: 21.4 °C'/>
       </set>
@@ -524,8 +527,8 @@
                 </p>
                 <example caption='Setting a single double-valued control parameter'>
                     <![CDATA[
-   <message from='master@clayster.com/amr'
-            to='analog.output2@clayster.com'>
+   <message from='master@example.org/amr'
+            to='analog.output2@example.org'>
       <set xmlns='urn:xmpp:iot:control'>
          <double name='4-20mA' value='8.192'/>
       </set>
@@ -539,8 +542,8 @@
                 </p>
                 <example caption='Setting a single date-valued control parameter'>
                     <![CDATA[
-   <message from='master@clayster.com/amr'
-            to='alarm@clayster.com'>
+   <message from='master@example.org/amr'
+            to='alarm@example.org'>
       <set xmlns='urn:xmpp:iot:control'>
          <date name='TariffStartDate' value='2013-05-01'/>
       </set>
@@ -554,8 +557,8 @@
                 </p>
                 <example caption='Setting a single time-valued control parameter'>
                     <![CDATA[
-   <message from='master@clayster.com/amr'
-            to='alarm@clayster.com'>
+   <message from='master@example.org/amr'
+            to='alarm@example.org'>
       <set xmlns='urn:xmpp:iot:control'>
          <time name='Alarm Time' value='08:00:00'/>
       </set>
@@ -569,8 +572,8 @@
                 </p>
                 <example caption='Setting a single date &amp; time-valued control parameter'>
                     <![CDATA[
-   <message from='master@clayster.com/amr'
-            to='alarm@clayster.com'>
+   <message from='master@example.org/amr'
+            to='alarm@example.org'>
       <set xmlns='urn:xmpp:iot:control'>
          <dateTime name='Alarm Time' value='2013-04-02T08:00:00'/>
       </set>
@@ -584,8 +587,8 @@
                 </p>
                 <example caption='Setting a single duration-valued control parameter'>
                     <![CDATA[
-   <message from='master@clayster.com/amr'
-            to='alarm@clayster.com'>
+   <message from='master@example.org/amr'
+            to='alarm@example.org'>
       <set xmlns='urn:xmpp:iot:control'>
          <duration name='Alarm Duration' value='PT3M30S'/>
       </set>
@@ -599,8 +602,8 @@
                 </p>
                 <example caption='Setting a single color-valued control parameter'>
                     <![CDATA[
-   <message from='master@clayster.com/amr'
-            to='spotlight@clayster.com'>
+   <message from='master@example.org/amr'
+            to='spotlight@example.org'>
       <set xmlns='urn:xmpp:iot:control'>
          <color name='Color' value='3399FF'/>
       </set>
@@ -614,8 +617,8 @@
                 </p>
                 <example caption='Setting multiple control parameters at once'>
                     <![CDATA[
-   <message from='master@clayster.com/amr'
-            to='dimmer@clayster.com'>
+   <message from='master@example.org/amr'
+            to='dimmer@example.org'>
       <set xmlns='urn:xmpp:iot:control'>
          <int name='FadeTimeMilliseconds' value='500'/>
          <int name='OutputPercent' value='10'/>
@@ -644,15 +647,15 @@
                 <example caption='Getting a control form'>
                     <![CDATA[
    <iq type='get'
-       from='master@clayster.com/amr'
-       to='dimmer@clayster.com'
+       from='master@example.org/amr'
+       to='dimmer@example.org'
        id='3'>
       <getForm xmlns='urn:xmpp:iot:control' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='dimmer@clayster.com'
-       to='master@clayster.com/amr'
+       from='dimmer@example.org'
+       to='master@example.org/amr'
        id='3'>
        <x type='form' 
           xmlns='jabber:x:data' 
@@ -724,15 +727,15 @@
                 <example caption='Getting a control form, Failure'>
                     <![CDATA[
    <iq type='get'
-       from='master@clayster.com/amr'
-       to='dimmer@clayster.com'
+       from='master@example.org/amr'
+       to='dimmer@example.org'
        id='4'>
       <getForm xmlns='urn:xmpp:iot:control' xml:lang='en'/>
    </iq>
    
    <iq type='error'
-       from='dimmer@clayster.com'
-       to='master@clayster.com/amr'
+       from='dimmer@example.org'
+       to='master@example.org/amr'
        id='4'>
       <error type='cancel'>
          <forbidden xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -752,8 +755,8 @@
                 <example caption='Setting a (partial) control form'>
                     <![CDATA[
    <iq type='set'
-       from='master@clayster.com/amr'
-       to='dimmer@clayster.com'
+       from='master@example.org/amr'
+       to='dimmer@example.org'
        id='5'>
       <set xmlns='urn:xmpp:iot:control' xml:lang='en'>
           <x type='submit' xmlns='jabber:x:data'>
@@ -771,8 +774,8 @@
    </iq>
    
    <iq type='result'
-       from='dimmer@clayster.com'
-       to='master@clayster.com/amr'
+       from='dimmer@example.org'
+       to='master@example.org/amr'
        id='5'>
       <setResponse xmlns='urn:xmpp:iot:control' />
    </iq>]]>
@@ -790,8 +793,8 @@
                 <example caption='Setting a (partial) control form, Failure'>
                     <![CDATA[
    <iq type='set'
-       from='master@clayster.com/amr'
-       to='dimmer@clayster.com'
+       from='master@example.org/amr'
+       to='dimmer@example.org'
        id='6'>
       <set xmlns='urn:xmpp:iot:control' xml:lang='en'>
           <x type='submit' xmlns='jabber:x:data'>
@@ -809,8 +812,8 @@
    </iq>
    
    <iq type='error'
-       from='dimmer@clayster.com'
-       to='master@clayster.com/amr'
+       from='dimmer@example.org'
+       to='master@example.org/amr'
        id='6'>
       <error type='modify'>
          <bad-request xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -832,8 +835,8 @@
                 </p>
                 <example caption='Sending a control command to a node behind a concentrator'>
                     <![CDATA[
-   <message from='master@clayster.com/amr'
-            to='concentrator@clayster.com'>
+   <message from='master@example.org/amr'
+            to='concentrator@example.org'>
       <set xmlns='urn:xmpp:iot:control'>
          <node nodeId='DigitalOutput1'/>
          <boolean name='Output' value='false'/>
@@ -848,8 +851,8 @@
                 </p>
                 <example caption='Sending a control command to multiple nodes'>
                     <![CDATA[
-   <message from='master@clayster.com/amr'
-            to='concentrator@clayster.com'>
+   <message from='master@example.org/amr'
+            to='concentrator@example.org'>
       <set xmlns='urn:xmpp:iot:control'>
          <node nodeId='DigitalOutput1'/>
          <node nodeId='DigitalOutput2'/>
@@ -870,8 +873,8 @@
                 <example caption='Sending a control command to multiple nodes, Failure'>
                     <![CDATA[
    <iq type='set'
-       from='master@clayster.com/amr'
-       to='concentrator@clayster.com'
+       from='master@example.org/amr'
+       to='concentrator@example.org'
        id='7'>
       <set xmlns='urn:xmpp:iot:control' xml:lang='en'>
          <node nodeId='DigitalOutput1'/>
@@ -887,8 +890,8 @@
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='master@clayster.com/amr'
+       from='concentrator@example.org'
+       to='master@example.org/amr'
        id='7'>
       <error type='modify'>
          <bad-request xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -905,8 +908,8 @@
                 <example caption='Getting a control form from multiple nodes'>
                     <![CDATA[
    <iq type='get'
-       from='master@clayster.com/amr'
-       to='concentrator@clayster.com'
+       from='master@example.org/amr'
+       to='concentrator@example.org'
        id='8'>
       <getForm xmlns='urn:xmpp:iot:control' xml:lang='en'>
           <node nodeId='DigitalOutput1'/>
@@ -917,8 +920,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='master@clayster.com/amr'
+       from='concentrator@example.org'
+       to='master@example.org/amr'
        id='8'>
        <x type='form' 
           xmlns='jabber:x:data' 
@@ -953,8 +956,8 @@
                 <example caption='Getting a control form from multiple nodes, Failure'>
                     <![CDATA[
    <iq type='get'
-       from='master@clayster.com/amr'
-       to='concentrator@clayster.com'
+       from='master@example.org/amr'
+       to='concentrator@example.org'
        id='9'>
       <getForm xmlns='urn:xmpp:iot:control' xml:lang='en'>
           <node nodeId='DigitalOutput1'/>
@@ -965,8 +968,8 @@
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='master@clayster.com/amr'
+       from='concentrator@example.org'
+       to='master@example.org/amr'
        id='9'>
       <error type='cancel'>
          <feature-not-implemented xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -983,8 +986,8 @@
                 <example caption='Setting a (partial) control form to multiple nodes'>
                     <![CDATA[
    <iq type='set'
-       from='master@clayster.com/amr'
-       to='concentrator@clayster.com'
+       from='master@example.org/amr'
+       to='concentrator@example.org'
        id='10'>
       <set xmlns='urn:xmpp:iot:control' xml:lang='en'>
           <node nodeId='DigitalOutput1'/>
@@ -1003,8 +1006,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='master@clayster.com/amr'
+       from='concentrator@example.org'
+       to='master@example.org/amr'
        id='10'>
       <setResponse xmlns='urn:xmpp:iot:control' />
    </iq>]]>
@@ -1018,8 +1021,8 @@
                 <example caption='Setting a (partial) control form to multiple nodes'>
                     <![CDATA[
    <iq type='set'
-       from='master@clayster.com/amr'
-       to='concentrator@clayster.com'
+       from='master@example.org/amr'
+       to='concentrator@example.org'
        id='11'>
       <set xmlns='urn:xmpp:iot:control' xml:lang='en'>
           <node nodeId='DigitalOutput1'/>
@@ -1042,8 +1045,8 @@
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='master@clayster.com/amr'
+       from='concentrator@example.org'
+       to='master@example.org/amr'
        id='11'>
       <error type='modify'>
          <bad-request xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -1059,8 +1062,8 @@
 		<example caption="Service discovery information request">
 			<![CDATA[
 <iq type='get'
-    from='device@clayster.com/device'
-    to='provisioning@clayster.com'
+    from='device@example.org/device'
+    to='provisioning@example.org'
     id='disco1'>
   <query xmlns='http://jabber.org/protocol/disco#info'/>
 </iq>]]>
@@ -1068,8 +1071,8 @@
 		<example caption="Service discovery information response">
 			<![CDATA[
 <iq type='result'
-    from='provisioning@clayster.com'
-    to='device@clayster.com/device'
+    from='provisioning@example.org'
+    to='device@example.org/device'
     id='disco1'>
   <query xmlns='http://jabber.org/protocol/disco#info'>
     ...
@@ -1544,15 +1547,15 @@
             <example caption='Grouping control parameters'>
                 <![CDATA[
    <iq type='get'
-       from='master@clayster.com/amr'
-       to='spotlight@clayster.com'
+       from='master@example.org/amr'
+       to='spotlight@example.org'
        id='12'>
       <getForm xmlns='urn:xmpp:iot:control' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='spotlight@clayster.com'
-       to='master@clayster.com/amr'
+       from='spotlight@example.org'
+       to='master@example.org/amr'
        id='12'>
        <x type='form' 
           xmlns='jabber:x:data' 
diff --git a/xep-0326.xml b/xep-0326.xml
index cc295963..47966821 100644
--- a/xep-0326.xml
+++ b/xep-0326.xml
@@ -34,14 +34,17 @@
         <supersedes/>
         <supersededby/>
         <shortname>sensor-network-concentrators</shortname>
-        <author>
-            <firstname>Peter</firstname>
-            <surname>Waher</surname>
-            <email>peter.waher@clayster.com</email>
-            <jid>peter.waher@jabber.org</jid>
-            <uri>http://www.linkedin.com/in/peterwaher</uri>
-        </author>
-		<revision>
+        &peterwaher;
+    <revision>
+        <version>0.3</version>
+        <date>2015-11-09</date>
+        <initials>pw</initials>
+        <remark>
+           <p>Updated contact information.</p>
+           <p>Updated example JIDs to example.org</p>
+        </remark>
+    </revision>
+	<revision>
 			<version>0.2</version>
 			<date>2014-03-10</date>
 			<initials>pw</initials>
@@ -427,15 +430,15 @@
                 <example caption='Full capabilities'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='subsystem@clayster.com'
+       from='client@example.org/client'
+       to='subsystem@example.org'
        id='1'>
       <getCapabilities xmlns='urn:xmpp:iot:concentrators'/>
    </iq>
    
    <iq type='result'
-       from='subsystem@clayster.com'
-       to='client@clayster.com/client'
+       from='subsystem@example.org'
+       to='client@example.org/client'
        id='1'>
       <getCapabilitiesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <value>getCapabilities</value>
@@ -491,15 +494,15 @@
                 <example caption='No database capabilities'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='subsystem@clayster.com'
+       from='client@example.org/client'
+       to='subsystem@example.org'
        id='63'>
       <getCapabilities xmlns='urn:xmpp:iot:concentrators'/>
    </iq>
    
    <iq type='result'
-       from='subsystem@clayster.com'
-       to='client@clayster.com/client'
+       from='subsystem@example.org'
+       to='client@example.org/client'
        id='63'>
       <getCapabilitiesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <value>getCapabilities</value>
@@ -552,15 +555,15 @@
                 <example caption='No batch command capabilities'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='gateway@clayster.com'
+       from='client@example.org/client'
+       to='gateway@example.org'
        id='2'>
       <getCapabilities xmlns='urn:xmpp:iot:concentrators'/>
    </iq>
    
    <iq type='result'
-       from='gateway@clayster.com'
-       to='client@clayster.com/client'
+       from='gateway@example.org'
+       to='client@example.org/client'
        id='2'>
       <getCapabilitiesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <value>getCapabilities</value>
@@ -599,15 +602,15 @@
                 <example caption='No edit capabilities'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='plc@clayster.com'
+       from='client@example.org/client'
+       to='plc@example.org'
        id='3'>
       <getCapabilities xmlns='urn:xmpp:iot:concentrators'/>
    </iq>
    
    <iq type='result'
-       from='plc@clayster.com'
-       to='client@clayster.com/client'
+       from='plc@example.org'
+       to='client@example.org/client'
        id='3'>
       <getCapabilitiesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <value>getCapabilities</value>
@@ -637,15 +640,15 @@
                 <example caption='Get All Data Sources'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='4'>
       <getAllDataSources xmlns='urn:xmpp:iot:concentrators' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='4'>
       <getAllDataSourcesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <dataSource sourceId='Applications' name='Applications' hasChildren='false' lastChanged='2013-03-19T17:58:01'/>
@@ -664,15 +667,15 @@
                 <example caption='Get Root Data Sources'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='5'>
       <getRootDataSources xmlns='urn:xmpp:iot:concentrators' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='5'>
       <getRootDataSourcesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <dataSource sourceId='MeteringRoot' name='Metering' hasChildren='true' lastChanged='2013-03-19T17:58:01'/>
@@ -690,15 +693,15 @@
                 <example caption='Get Child Data Sources'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='6'>
       <getChildDataSources xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringRoot' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='6'>
       <getChildDataSourcesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <dataSource sourceId='MeteringFieldImports' name='Field Imports' hasChildren='false' lastChanged='2013-03-19T17:58:01'/>
@@ -720,15 +723,15 @@
                 <example caption='Subscribing to data source events'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='57'>
       <subscribe xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='57'>
       <subscribeResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>]]>
@@ -749,15 +752,15 @@
                 <example caption='Subscribing to data source events with localized parameters'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='60'>
       <subscribe xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' parameters='true' messages='true' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='60'>
       <subscribeResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>]]>
@@ -776,16 +779,16 @@
                 <example caption='Subscribing to data source events, avoiding state events'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='61'>
       <subscribe xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' parameters='true' messages='false' xml:lang='en'
                  nodeAdded='true' nodeUpdated='true' nodeStatusChanged='false' nodeRemoved='true' nodeMovedUp='false' nodeMovedDown='false'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='61'>
       <subscribeResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>]]>
@@ -802,15 +805,15 @@
                 <example caption='Unsubscribing from data source events'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='58'>
       <unsubscribe xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='58'>
       <unsubscribeResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>]]>
@@ -829,16 +832,16 @@
                 <example caption='Unsubscribing from state events'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='62'>
       <unsubscribe xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' parameters='true' messages='false' xml:lang='en'
                  nodeAdded='false' nodeUpdated='false' nodeStatusChanged='true' nodeRemoved='false' nodeMovedUp='false' nodeMovedDown='false'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='62'>
       <subscribeResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>]]>
@@ -853,15 +856,15 @@
                 <example caption='Get changes since given timestamp before subscribing'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='59'>
       <subscribe xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' getEventsSince='2013-03-21T19:24:00'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='59'>
       <subscribeResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>
@@ -894,15 +897,15 @@
                 <example caption='Get changes since given timestamp before subscribing, Failure'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='73'>
       <subscribe xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' getEventsSince='2001-01-01T00:00:00'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='73'>
       <subscribeResponse xmlns='urn:xmpp:iot:concentrators' result='NotImplemented'/>
    </iq>]]>
@@ -917,15 +920,15 @@
                 <example caption='Checking the existence of a node'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='7'>
       <containsNode xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='7'>
       <containsNodeResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>true</containsNodeResponse>
    </iq>]]>
@@ -938,8 +941,8 @@
                 <example caption='Checking the existence of a multiple nodes'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='8'>
       <containsNodes xmlns='urn:xmpp:iot:concentrators'>
          <node sourceId='MeteringTopology' nodeId='Node1'/>
@@ -950,8 +953,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='8'>
       <containsNodesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
          <value>true</value>
@@ -972,15 +975,15 @@
                 <example caption='Get Node'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='9'>
       <getNode xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='9'>
       <getNodeResponse xmlns='urn:xmpp:iot:concentrators' 
                        result='OK'
@@ -1007,8 +1010,8 @@
                 <example caption='Get Nodes'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='10'>
       <getNodes xmlns='urn:xmpp:iot:concentrators' xml:lang='en'>
           <node sourceId='MeteringTopology' nodeId='Node1'/>
@@ -1018,8 +1021,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='10'>
       <getNodesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='WarningUnsigned' hasChildren='false' isReadable='true' 
@@ -1042,15 +1045,15 @@
                 <example caption='Get Node with parameters'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='11'>
       <getNode xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' xml:lang='en' parameters='true'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='11'>
       <getNodeResponse xmlns='urn:xmpp:iot:concentrators' result='OK' nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' 
                        state='WarningUnsigned' hasChildren='false' isReadable='true' isControllable='true' hasCommands='true' 
@@ -1077,8 +1080,8 @@
                 <example caption='Get Nodes with parameters'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='12'>
       <getNodes xmlns='urn:xmpp:iot:concentrators' parameters='true' xml:lang='en'>
           <node sourceId='MeteringTopology' nodeId='Node1'/>
@@ -1088,8 +1091,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='12'>
       <getNodesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='WarningUnsigned' hasChildren='false' isReadable='true' 
@@ -1139,15 +1142,15 @@
                 <example caption='Get All Nodes'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='13'>
       <getAllNodes xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='13'>
       <getAllNodesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='WarningUnsigned' hasChildren='false' 
@@ -1169,15 +1172,15 @@
                 <example caption='Get All Nodes with Parameters'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='14'>
       <getAllNodes xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' parameters='true' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='14'>
       <getAllNodesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='WarningUnsigned' hasChildren='false' 
@@ -1229,8 +1232,8 @@
                 <example caption='Get All Nodes derived from'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='15'>
       <getAllNodes xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' xml:lang='en'>
           <onlyIfDerivedFrom>Namespace.BaseClass1</onlyIfDerivedFrom>
@@ -1238,8 +1241,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='15'>
       <getAllNodesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='WarningUnsigned' hasChildren='false' 
@@ -1258,8 +1261,8 @@
                 <example caption='Get All Nodes derived from, with Parameters'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='16'>
       <getAllNodes xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' parameters='true' xml:lang='en'>
           <onlyIfDerivedFrom>Namespace.BaseClass1</onlyIfDerivedFrom>
@@ -1267,8 +1270,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='16'>
       <getAllNodesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='WarningUnsigned' hasChildren='false' 
@@ -1309,15 +1312,15 @@
                 <example caption='Get node inheritance'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='17'>
       <getNodeInheritance xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='17'>
       <getNodeInheritanceResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <baseClasses>
@@ -1340,15 +1343,15 @@
                 <example caption='Get Root Nodes'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='18'>
       <getRootNodes xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='18'>
       <getRootNodesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='WarningUnsigned' hasChildren='false' 
@@ -1365,15 +1368,15 @@
                 <example caption='Get Root Nodes with Parameters'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='19'>
       <getRootNodes xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' parameters='true' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='19'>
       <getRootNodesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='WarningUnsigned' hasChildren='false' 
@@ -1398,15 +1401,15 @@
                 <example caption='Get Child Nodes'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='20'>
       <getChildNodes xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='20'>
       <getChildNodesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node2' nodeType='Namespace.NodeType2' cacheType='Node' state='None' hasChildren='false' 
@@ -1424,15 +1427,15 @@
                 <example caption='Get Child Nodes with Parameters'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='21'>
       <getChildNodes xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' parameters='true' xml:lang='en' />
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='21'>
       <getChildNodesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node2' nodeType='Namespace.NodeType2' cacheType='Node' state='None' hasChildren='false' 
@@ -1468,15 +1471,15 @@
                 <example caption='Get Indices of Data Source'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='22'>
       <getIndices xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' />
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='22'>
       <getIndicesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <value>country</value>
@@ -1498,15 +1501,15 @@
                 <example caption='Get Nodes from index'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='23'>
       <getNodesFromIndex xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' index='apartment' indexValue='A1-1' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='23'>
       <getNodesFromIndexResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node2' nodeType='Namespace.MeteringTopologyReference' state='None' hasChildren='false' 
@@ -1522,16 +1525,16 @@
                 <example caption='Get Nodes from index with Parameters'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='24'>
       <getNodesFromIndex xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' index='apartment' indexValue='A1-1' 
                          parameters='true' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='24'>
       <getNodesFromIndexResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node2' nodeType='Namespace.MeteringTopologyReference' state='None' hasChildren='false' 
@@ -1551,8 +1554,8 @@
                 <example caption='Get Nodes from indices'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='25'>
       <getNodesFromIndices xmlns='urn:xmpp:iot:concentrators' xml:lang='en'>
           <indexRef sourceId='MeteringGroups' index='apartment' indexValue='A1-1'/>
@@ -1561,8 +1564,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='25'>
       <getNodesFromIndicesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node2' nodeType='Namespace.MeteringTopologyReference' state='None' hasChildren='false' 
@@ -1580,8 +1583,8 @@
                 <example caption='Get Nodes from indices with Parameters'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='26'>
       <getNodesFromIndices xmlns='urn:xmpp:iot:concentrators' parameters='true' xml:lang='en'>
           <indexRef sourceId='MeteringGroups' index='apartment' indexValue='A1-1'/>
@@ -1590,8 +1593,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='26'>
       <getNodesFromIndicesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node2' nodeType='Namespace.MeteringTopologyReference' state='None' hasChildren='false' 
@@ -1617,15 +1620,15 @@
                 <example caption='Get All Index Values'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='27'>
       <getAllIndexValues xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' index='apartment'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='27'>
       <getAllIndexValuesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <value>A1-1</value>
@@ -1643,15 +1646,15 @@
                 <example caption='Get Node Ancestors'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='42'>
       <getAncestors xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Node2' parameters='false' messages='false' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='42'>
       <getAncestorsResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node2' nodeType='Namespace.MeteringTopologyReference' state='None' hasChildren='false' 
@@ -1688,15 +1691,15 @@
                 <example caption='Move Node Up'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='53'>
       <moveNodeUp xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringFieldProcessors' nodeId='LogicalOperator'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='53'>
       <moveNodeUpResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>]]>
@@ -1713,15 +1716,15 @@
                 <example caption='Move Node Up'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='54'>
       <moveNodeDown xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringFieldProcessors' nodeId='LogicalOperator'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='54'>
       <moveNodeDownResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>]]>
@@ -1737,8 +1740,8 @@
                 <example caption='Move Nodes Up'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='55'>
       <moveNodesUp xmlns='urn:xmpp:iot:concentrators'>
           <node sourceId='MeteringFieldProcessors' nodeId='LogicalOperator3'/>
@@ -1748,8 +1751,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='55'>
       <moveNodesUpResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>]]>
@@ -1766,8 +1769,8 @@
                 <example caption='Move Node Down'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='56'>
       <moveNodesDown xmlns='urn:xmpp:iot:concentrators'>
           <node sourceId='MeteringFieldProcessors' nodeId='LogicalOperator3'/>
@@ -1777,8 +1780,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='56'>
       <moveNodesDownResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>]]>
@@ -1805,15 +1808,15 @@
                 <example caption='Get Node Parameters for editing'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='28'>
       <getNodeParametersForEdit xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='28'>
       <getNodeParametersForEditResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <x type='form' 
@@ -1941,8 +1944,8 @@
                 <example caption='Set Node Parameters after editing'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='29'>
       <setNodeParametersAfterEdit xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' xml:lang='en'>
           <x type='submit' xmlns='jabber:x:data'>
@@ -1975,8 +1978,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='29'>
       <setNodeParametersAfterEditResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='WarningUnsigned' hasChildren='false' 
@@ -2008,8 +2011,8 @@
                 <example caption='Set Node Parameters after editing, Failure'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='30'>
       <setNodeParametersAfterEdit xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node2' xml:lang='en'>
           <x type='submit' xmlns='jabber:x:data'>
@@ -2042,8 +2045,8 @@
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='30'>
       <setNodeParametersAfterEditResponse xmlns='urn:xmpp:iot:concentrators' result='FormError'>
           <error var='id'>There already exists a node with this ID.</error>
@@ -2074,8 +2077,8 @@
                 <example caption='Get Common Node Parameters for editing'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='31'>
       <getCommonNodeParametersForEdit xmlns='urn:xmpp:iot:concentrators' xml:lang='en'>
          <node sourceId='MeteringTopology' nodeId='Node1'/>
@@ -2085,8 +2088,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='31'>
       <getCommonNodeParametersForEditResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <x type='form' 
@@ -2183,8 +2186,8 @@
                 <example caption='Set Common Node Parameters after editing'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='32'>
       <setCommonNodeParametersAfterEdit xmlns='urn:xmpp:iot:concentrators' xml:lang='en'>
           <node sourceId='MeteringTopology' nodeId='Node1'/>
@@ -2202,8 +2205,8 @@
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='32'>
       <setCommonNodeParametersAfterEditResponse xmlns='urn:xmpp:iot:concentrators' result='FormError'>
           <node nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='WarningUnsigned' hasChildren='false' 
@@ -2261,8 +2264,8 @@
                 <example caption='Set Common Node Parameters after editing, Failure'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='33'>
       <setCommonNodeParametersAfterEdit xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' xml:lang='en'>
           <node sourceId='MeteringTopology' nodeId='Node1'/>
@@ -2283,8 +2286,8 @@
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='33'>
       <setCommonNodeParametersAfterEditResponse xmlns='urn:xmpp:iot:concentrators' result='FormError'>
           <error var='id'>Parameter not available.</error>
@@ -2367,15 +2370,15 @@
                 <example caption='Get Node Messages'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='34'>
       <getNode xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' messages='true' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='34'>
       <getNodeResponse xmlns='urn:xmpp:iot:concentrators' result='OK' 
                        nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='WarningUnsigned' hasChildren='false'
@@ -2392,15 +2395,15 @@
                 <example caption='Get Node with parameters and messages'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='35'>
       <getNode xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' xml:lang='en' parameters='true' messages='true'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='35'>
       <getNodeResponse xmlns='urn:xmpp:iot:concentrators' result='OK' 
                        nodeId='Node1' nodeType='Namespace.NodeType1' cacheType='Node' state='WarningUnsigned' hasChildren='false' 
@@ -2429,15 +2432,15 @@
                 <example caption='Get Addable Node Types'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='36'>
       <getAddableNodeTypes xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='B1' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='36'>
       <getAddableNodeTypesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <nodeType type='Namespace.Apartment' name='Apartment'/>
@@ -2455,16 +2458,16 @@
                 <example caption='Get Parameters for New Node'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='37'>
       <getParametersForNewNode xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='B1' 
                                type='Namespace.MeteringTopologyReference' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='37'>
       <getParametersForNewNodeResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <x type='form' 
@@ -2502,8 +2505,8 @@
                 <example caption='Create New Node after editing'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='38'>
       <createNewNode xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='B1' 
                      type='Namespace.MeteringTopologyReference' xml:lang='en'>
@@ -2522,8 +2525,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='38'>
       <createNewNodeResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <node nodeId='Reference to Node1' nodeType='Namespace.MeteringTopologyReference' state='None' hasChildren='false' 
@@ -2550,8 +2553,8 @@
                 <example caption='Create New Node, Failure'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='39'>
       <createNewNode xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='B1' 
                      type='Namespace.MeteringTopologyReference' xml:lang='en'>
@@ -2570,8 +2573,8 @@
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='39'>
       <createNewNodeResponse xmlns='urn:xmpp:iot:concentrators' result='FormError'>
           <error var='id'>There already exists a node with this ID.</error>
@@ -2592,15 +2595,15 @@
                 <example caption='Destroy Node'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='40'>
       <destroyNode xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='B1' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='40'>
       <destroyNodeResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>]]>
@@ -2617,15 +2620,15 @@
                 <example caption='Destroy Node, Failure'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='41'>
       <destroyNode xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='B1' xml:lang='en'/>
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='41'>
       <destroyNodeResponse xmlns='urn:xmpp:iot:concentrators' result='InsufficientPrivileges'/>
    </iq>]]>
@@ -2642,15 +2645,15 @@
                 <example caption='Get Node Commands'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='43'>
       <getNodeCommands xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='43'>
       <getNodeCommandsResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <command command='knockDoor' name='Knock on door' type='Simple' 
@@ -2684,15 +2687,15 @@
                 <example caption='Execute Simple Node Command'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='44'>
       <executeNodeCommand xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' command='knockDoor' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='44'>
       <executeNodeCommandResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>]]>
@@ -2706,16 +2709,16 @@
                 <example caption='Get Node Command Parameters'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='45'>
       <getCommandParameters xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' 
                             command='scheduleWakeupCall' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='45'>
       <getCommandParametersResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <x type='form' 
@@ -2755,8 +2758,8 @@
                 <example caption='Execute Parameterized Node Command'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='46'>
       <executeNodeCommand xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' 
                           command='scheduleWakeupCall' xml:lang='en'>
@@ -2775,8 +2778,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='46'>
       <executeNodeCommandResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>]]>
@@ -2792,8 +2795,8 @@
                 <example caption='Execute Node Command, Failure'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='47'>
       <executeNodeCommand xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' 
                           command='scheduleWakeupCall' xml:lang='en'>
@@ -2812,8 +2815,8 @@
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='47'>
       <executeNodeCommandResponse xmlns='urn:xmpp:iot:concentrators' result='FormError'>
           <error var='mode'>You are not allowed to harass people at 04:30:00!</error>
@@ -2829,16 +2832,16 @@
                 <example caption='Get Node Query Parameters'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='74'>
       <getCommandParameters xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' 
                             command='searchEvents' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='74'>
       <getCommandParametersResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <x type='form' 
@@ -2882,8 +2885,8 @@
                 <example caption='Execute Node Query'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='75'>
       <executeNodeQuery xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' command='searchEvents' xml:lang='en'>
           <x type='submit' xmlns='jabber:x:data'>
@@ -2901,8 +2904,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='75'>
       <executeNodeQueryResponse xmlns='urn:xmpp:iot:concentrators' result='OK' queryId='Query0001'/>
    </iq>
@@ -2930,8 +2933,8 @@
                 <example caption='Execute Node Query, Failure'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='76'>
       <executeNodeQuery xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' command='searchEvents' xml:lang='en'>
           <x type='submit' xmlns='jabber:x:data'>
@@ -2949,8 +2952,8 @@
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='76'>
       <executeNodeQueryResponse xmlns='urn:xmpp:iot:concentrators' result='FormError'>
           <error var='to'>The TO timestamp needs to be later than the FROM timestamp.</error>
@@ -2966,16 +2969,16 @@
                 <example caption='Abort Node Query'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='77'>
       <abortNodeQuery xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' command='searchEvents' 
                       queryId='Query0001' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='77'>
       <abortNodeQueryResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>]]>
@@ -2995,8 +2998,8 @@
                 <example caption='Get Common Commands for Nodes'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='48'>
       <getCommonNodeCommands xmlns='urn:xmpp:iot:concentrators' xml:lang='en'>
           <node sourceId='MeteringGroups' nodeId='Apartment 1-1'/>
@@ -3009,8 +3012,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='48'>
       <getCommonNodeCommandsResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <command command='knockDoor' name='Knock on door' type='Simple' 
@@ -3032,8 +3035,8 @@
                 <example caption='Execute Simple Command on multiple nodes'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='49'>
       <executeCommonNodeCommand xmlns='urn:xmpp:iot:concentrators' command='knockDoor' xml:lang='en'>
           <node sourceId='MeteringGroups' nodeId='Apartment 1-1'/>
@@ -3046,8 +3049,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='49'>
       <executeCommonNodeCommandResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <result>true</result>
@@ -3068,8 +3071,8 @@
                 <example caption='Get Common Command Parameters from command on multiple nodes'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='50'>
       <getCommonCommandParameters xmlns='urn:xmpp:iot:concentrators' command='scheduleWakeupCall' xml:lang='en'>
           <node sourceId='MeteringGroups' nodeId='Apartment 1-1'/>
@@ -3082,8 +3085,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='50'>
       <getCommonCommandParametersResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <x type='form' 
@@ -3123,8 +3126,8 @@
                 <example caption='Execute Common Parameterized Command on multiple nodes'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='51'>
       <executeCommonNodeCommand xmlns='urn:xmpp:iot:concentrators' command='scheduleWakeupCall' xml:lang='en'>
           <node sourceId='MeteringGroups' nodeId='Apartment 1-1'/>
@@ -3148,8 +3151,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='51'>
       <executeCommonNodeCommandResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <result>true</result>
@@ -3172,8 +3175,8 @@
                 <example caption='Execute Parameterized Command on Multiple Nodes, Failure'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='52'>
       <executeCommonNodeCommand xmlns='urn:xmpp:iot:concentrators' command='scheduleWakeupCall' xml:lang='en'>
           <node sourceId='MeteringGroups' nodeId='Apartment 1-1'/>
@@ -3197,8 +3200,8 @@
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='52'>
       <executeCommonNodeCommandResponse xmlns='urn:xmpp:iot:concentrators' result='FormError'>
           <error var='mode'>You are not allowed to harass people at 04:30:00!</error>
@@ -3220,8 +3223,8 @@
                 <example caption='Execute Command on Multiple Nodes, Partial Failure'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='72'>
       <executeCommonNodeCommand xmlns='urn:xmpp:iot:concentrators' command='scheduleWakeupCall' xml:lang='en'>
           <node sourceId='MeteringGroups' nodeId='Apartment 1-1'/>
@@ -3245,8 +3248,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='72'>
       <executeCommonNodeCommandResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <result>true</result>
@@ -3267,8 +3270,8 @@
                 <example caption='Get Common Query Parameters from query on multiple nodes'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='78'>
       <getCommonCommandParameters xmlns='urn:xmpp:iot:concentrators' command='searchEvents' xml:lang='en'>
           <node sourceId='MeteringGroups' nodeId='Apartment 1-1'/>
@@ -3281,8 +3284,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='78'>
       <getCommonCommandParametersResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <x type='form' 
@@ -3325,8 +3328,8 @@
                 <example caption='Execute Common Query on multiple nodes'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='79'>
       <executeCommonNodeQuery xmlns='urn:xmpp:iot:concentrators' command='searchEvents' xml:lang='en'>
           <node sourceId='MeteringGroups' nodeId='Apartment 1-1'/>
@@ -3350,8 +3353,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='79'>
       <executeCommonNodeQueryResponse xmlns='urn:xmpp:iot:concentrators' result='OK' queryId='Query0001'/>
    </iq>
@@ -3380,8 +3383,8 @@
                 <example caption='Execute Parameterized Query on multiple nodes, Failure'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='80'>
       <executeCommonNodeQuery xmlns='urn:xmpp:iot:concentrators' command='searchEvents' xml:lang='en'>
           <node sourceId='MeteringGroups' nodeId='Apartment 1-1'/>
@@ -3405,8 +3408,8 @@
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='80'>
       <executeCommonNodeQueryResponse xmlns='urn:xmpp:iot:concentrators' result='FormError'>
           <error var='to'>The TO timestamp needs to be later than the FROM timestamp.</error>
@@ -3428,8 +3431,8 @@
                 <example caption='Execute Common Query on multiple nodes, Partial Failure'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='81'>
       <executeCommonNodeQuery xmlns='urn:xmpp:iot:concentrators' command='searchEvents' xml:lang='en'>
           <node sourceId='MeteringGroups' nodeId='Apartment 1-1'/>
@@ -3453,8 +3456,8 @@
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='81'>
       <executeCommonNodeQueryResponse xmlns='urn:xmpp:iot:concentrators' result='OK' queryId='Query0002'>
           <result>true</result>
@@ -3474,8 +3477,8 @@
                 <example caption='Abort Common Query on multiple nodes'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='82'>
       <abortCommonNodeQuery xmlns='urn:xmpp:iot:concentrators' queryId='Query0002' xml:lang='en'>
           <node sourceId='MeteringGroups' nodeId='Apartment 1-1'/>
@@ -3488,8 +3491,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='82'>
       <abortCommonNodeQueryResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>]]>
@@ -3527,8 +3530,8 @@
                 </p>
                 <example caption='Query Started'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <queryProgress xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' cacheType='Apartment' queryId='Query0001'>
           <queryStarted/>
           ...
@@ -3543,8 +3546,8 @@
                 </p>
                 <example caption='Query Done'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <queryProgress xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' cacheType='Apartment' queryId='Query0001'>
           ...
           <queryDone/>
@@ -3559,8 +3562,8 @@
                 </p>
                 <example caption='Query Aborted'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <queryProgress xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' cacheType='Apartment' queryId='Query0001'>
           ...
           <queryAborted/>
@@ -3576,8 +3579,8 @@
                 </p>
                 <example caption='New Table'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <queryProgress xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' cacheType='Apartment' queryId='Query0001'>
           ...
           <newTable tableId='table1' tableName='Events'>
@@ -3598,8 +3601,8 @@
                 </p>
                 <example caption='New Records'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <queryProgress xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' cacheType='Apartment' queryId='Query0001'>
           ...
           <newRecords tableId='table1'>
@@ -3624,8 +3627,8 @@
                 </p>
                 <example caption='Table Done'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <queryProgress xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' cacheType='Apartment' queryId='Query0001'>
           ...
           <tableDone tableId='table1'/>
@@ -3642,8 +3645,8 @@
                 </p>
                 <example caption='New Object'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <queryProgress xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' cacheType='Apartment' queryId='Query0001'>
           ...
           <newObject contentType='image/png'>...</newObject>
@@ -3659,8 +3662,8 @@
                 </p>
                 <example caption='Query Message'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <queryProgress xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' cacheType='Apartment' queryId='Query0001'>
           ...
           <queryMessage type='Information' level='Minor'>30 events found.</queryMessage>
@@ -3678,8 +3681,8 @@
                 </p>
                 <example caption='Title'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <queryProgress xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' cacheType='Apartment' queryId='Query0001'>
           ...
           <title name='Current state'/>
@@ -3695,8 +3698,8 @@
                 </p>
                 <example caption='Status'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <queryProgress xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' cacheType='Apartment' queryId='Query0001'>
           ...
           <status message='Processing. 67% done.'/>
@@ -3713,8 +3716,8 @@
                 </p>
                 <example caption='Starting a section or subsection'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <queryProgress xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' cacheType='Apartment' queryId='Query0001'>
           ...
           <beginSection header='1. Stockholm'/>
@@ -3737,8 +3740,8 @@
             </section3>
             <example caption='Starting a section or subsection'>
                 <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <queryProgress xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringGroups' nodeId='Apartment 1-1' cacheType='Apartment' queryId='Query0001'>
           ...
           <endSection/>
@@ -3776,8 +3779,8 @@
                 </p>
                 <example caption='Node added event, without parameters'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <nodeAdded xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' nodeType='Namespace.NodeType1' 
                  cacheType='Node' state='None' hasChildren='false' isReadable='true' isControllable='true' hasCommands='true' 
                  parentId='Root' lastChanged='2013-03-19T17:58:01'/>
@@ -3785,8 +3788,8 @@
                 </example>
                 <example caption='Node added event, with parameters'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <nodeAdded xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' nodeType='Namespace.NodeType1' 
                  cacheType='Node' state='None' hasChildren='false' isReadable='true' isControllable='true' hasCommands='true' 
                  parentId='Root' lastChanged='2013-03-19T17:58:01'>
@@ -3812,8 +3815,8 @@
                 </p>
                 <example caption='Ordered Node added event, without parameters'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <nodeAdded xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node2' nodeType='Namespace.NodeType1' 
                  cacheType='Node' state='None' hasChildren='false' isReadable='true' isControllable='true' hasCommands='true' 
                  parentId='Root' lastChanged='2013-03-19T17:58:01' afterNodeId='Node1' afterNodeCacheType='Node'/>
@@ -3827,8 +3830,8 @@
                 </p>
                 <example caption='Node removed'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <nodeRemoved xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1'/>
    </message>]]>
                 </example>
@@ -3845,8 +3848,8 @@
                 </p>
                 <example caption='Node updated event, without parameters'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <nodeUpdated xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' nodeType='Namespace.NodeType1' 
                    cacheType='Node' state='None' hasChildren='false' isReadable='true' isControllable='true' hasCommands='true' 
                    parentId='Root' lastChanged='2013-03-19T17:58:01'/>
@@ -3854,8 +3857,8 @@
                 </example>
                 <example caption='Node updated event, with parameters'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <nodeUpdated xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' nodeType='Namespace.NodeType1' 
                    cacheType='Node' state='None' hasChildren='false' isReadable='true' isControllable='true' hasCommands='true' 
                    parentId='Root' lastChanged='2013-03-19T17:58:01'>
@@ -3876,8 +3879,8 @@
                 </p>
                 <example caption='Node renamed event, without parameters'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <nodeUpdated xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' oldId='OldNode1' nodeId='Node1' 
                    nodeType='Namespace.NodeType1' cacheType='Node' state='None' hasChildren='false' isReadable='true' 
                    isControllable='true' hasCommands='true' parentId='Root' lastChanged='2013-03-19T17:58:01'/>
@@ -3885,8 +3888,8 @@
                 </example>
                 <example caption='Node renamed event, with parameters'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <nodeUpdated xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' oldId='OldNode1' nodeId='Node1' 
                    nodeType='Namespace.NodeType1' cacheType='Node' state='None' hasChildren='false' isReadable='true' 
                    isControllable='true' hasCommands='true' parentId='Root' lastChanged='2013-03-19T17:58:01'>
@@ -3913,15 +3916,15 @@
                 </p>
                 <example caption='Node status changed event, without messages'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <nodeStatusChanged xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' cacheType='Node' state='ErrorUnsigned'/>
    </message>]]>
                 </example>
                 <example caption='Node status changed event, with messages'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <nodeStatusChanged xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1' cacheType='Node' state='ErrorUnsigned'>
           <message timestamp='2013-03-22T12:49:34' type='Error'>Sensor does not respond to read-out requests.</message>
       </nodeStatusChanged>
@@ -3935,8 +3938,8 @@
                 </p>
                 <example caption='Node moved up'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <nodeMovedUp xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1'/>
    </message>]]>
                 </example>
@@ -3953,8 +3956,8 @@
                 </p>
                 <example caption='Node moved down'>
                     <![CDATA[
-   <message from='concentrator@clayster.com'
-            to='client@clayster.com/client'>
+   <message from='concentrator@example.org'
+            to='client@example.org/client'>
       <nodeMovedDown xmlns='urn:xmpp:iot:concentrators' sourceId='MeteringTopology' nodeId='Node1'/>
    </message>]]>
                 </example>
@@ -3982,15 +3985,15 @@
                 <example caption='Get All Databases'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='64'>
       <getDatabases xmlns='urn:xmpp:iot:concentrators' xml:lang='en'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='64'>
       <getDatabasesResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <database databaseId='LocalDB' name='Local Database'/>
@@ -4009,15 +4012,15 @@
                 <example caption='Get Database Readout Parameters'>
                     <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='65'>
       <getDatabaseReadoutParameters xmlns='urn:xmpp:iot:concentrators' xml:lang='en' databaseId='LocalDB'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='65'>
       <getDatabaseReadoutParametersResponse xmlns='urn:xmpp:iot:concentrators' result='OK'>
           <x type='form' 
@@ -4265,8 +4268,8 @@
                 <example caption='Start Database Readout'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='66'>
       <startDatabaseReadout xmlns='urn:xmpp:iot:concentrators' xml:lang='en' databaseId='LocalDB' seqnr='1' userToken='12392748927492834'>
           <node sourceId='MeteringTopology' nodeId='Node1'/>
@@ -4376,8 +4379,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='66'>
       <startDatabaseReadoutResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>
@@ -4392,8 +4395,8 @@
                 <example caption='Start Database Readout, Failure'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='67'>
       <startDatabaseReadout xmlns='urn:xmpp:iot:concentrators' xml:lang='en' databaseId='LocalDB' seqnr='2' userToken='12392748927492834'>
           <node sourceId='MeteringTopology' nodeId='Node1'/>
@@ -4406,8 +4409,8 @@
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='67'>
       <startDatabaseReadoutResponse xmlns='urn:xmpp:iot:concentrators' result='InsufficientPrivileges'/>
    </iq>]]>
@@ -4418,8 +4421,8 @@
                 <example caption='Start Database Readout, Failure 2'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='68'>
       <startDatabaseReadout xmlns='urn:xmpp:iot:concentrators' xml:lang='en' databaseId='LocalDB' seqnr='3' userToken='12392748927492834'>
           <node sourceId='MeteringTopology' nodeId='Node1'/>
@@ -4439,8 +4442,8 @@
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='68'>
       <startDatabaseReadoutResponse xmlns='urn:xmpp:iot:concentrators' result='FormError'>
           <error var='to'>The To timestamp cannot be older than the From timestamp.</error>
@@ -4456,8 +4459,8 @@
                 <example caption='Cancelling a database read-out'>
                     <![CDATA[
    <iq type='set'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='70'>
       <startDatabaseReadout xmlns='urn:xmpp:iot:concentrators' xml:lang='en' databaseId='LocalDB' seqnr='4' userToken='12392748927492834'>
           <node sourceId='MeteringTopology' nodeId='Node1'/>
@@ -4470,8 +4473,8 @@
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='70'>
       <startDatabaseReadoutResponse xmlns='urn:xmpp:iot:concentrators' result='OK'/>
    </iq>
@@ -4479,15 +4482,15 @@
    ...
    
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='71'>
       <cancel xmlns='urn:xmpp:iot:sensordata' seqnr='4'/>
    </iq>
    
    <iq type='result'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='71'>
       <cancelled xmlns='urn:xmpp:iot:sensordata' seqnr='4'/>
    </iq>]]>
@@ -4500,8 +4503,8 @@
         <example caption="Service discovery information request">
             <![CDATA[
 <iq type='get'
-    from='device@clayster.com/device'
-    to='provisioning@clayster.com'
+    from='device@example.org/device'
+    to='provisioning@example.org'
     id='disco1'>
   <query xmlns='http://jabber.org/protocol/disco#info'/>
 </iq>]]>
@@ -4509,8 +4512,8 @@
         <example caption="Service discovery information response">
             <![CDATA[
 <iq type='result'
-    from='provisioning@clayster.com'
-    to='device@clayster.com/device'
+    from='provisioning@example.org'
+    to='device@example.org/device'
     id='disco1'>
   <query xmlns='http://jabber.org/protocol/disco#info'>
     ...
@@ -4755,8 +4758,8 @@
             <example caption='Unimplemented commands'>
                 <![CDATA[
    <iq type='get'
-       from='client@clayster.com/client'
-       to='concentrator@clayster.com'
+       from='client@example.org/client'
+       to='concentrator@example.org'
        id='69'>
       <holabandola xmlns='urn:xmpp:iot:concentrators' ...>
           ...
@@ -4764,8 +4767,8 @@
    </iq>
    
    <iq type='error'
-       from='concentrator@clayster.com'
-       to='client@clayster.com/client'
+       from='concentrator@example.org'
+       to='client@example.org/client'
        id='69'>
       <holabandolaResponse xmlns='urn:xmpp:iot:concentrators' result='NotImplemented'/>
    </iq>]]>
diff --git a/xep-0331.xml b/xep-0331.xml
index 53f13538..ead08259 100644
--- a/xep-0331.xml
+++ b/xep-0331.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE xep SYSTEM 'xep.dtd' [
   <!ENTITY % ents SYSTEM 'xep.ent'>
 %ents;
@@ -24,13 +24,16 @@
         <supersedes/>
         <supersededby/>
         <shortname>color-parameter</shortname>
-        <author>
-            <firstname>Peter</firstname>
-            <surname>Waher</surname>
-            <email>peter.waher@clayster.com</email>
-            <jid>peter.waher@jabber.org</jid>
-            <uri>http://www.linkedin.com/in/peterwaher</uri>
-        </author>
+        &peterwaher;
+		<revision>
+			<version>0.3</version>
+			<date>2015-11-09</date>
+			<initials>pw</initials>
+			<remark>
+				<p>Updated contact information.</p>
+				<p>Updated example JIDs to example.org</p>
+			</remark>
+		</revision>
 		<revision>
 			<version>0.2</version>
 			<date>2014-03-10</date>
diff --git a/xep-0332.xml b/xep-0332.xml
index 0d5c45b4..4a6ea7c4 100644
--- a/xep-0332.xml
+++ b/xep-0332.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE xep SYSTEM 'xep.dtd' [
   <!ENTITY % ents SYSTEM 'xep.ent'>
 %ents;
@@ -27,13 +27,16 @@
         <supersedes/>
         <supersededby/>
         <shortname>NOT_YET_ASSIGNED</shortname>
-        <author>
-            <firstname>Peter</firstname>
-            <surname>Waher</surname>
-            <email>peter.waher@clayster.com</email>
-            <jid>peter.waher@jabber.org</jid>
-            <uri>http://www.linkedin.com/in/peterwaher</uri>
-        </author>
+        &peterwaher;
+		<revision>
+			<version>0.4</version>
+			<date>2015-11-09</date>
+			<initials>pw</initials>
+			<remark>
+				<p>Updated contact information.</p>
+				<p>Updated example JIDs to example.org</p>
+			</remark>
+		</revision>
 		<revision>
 			<version>0.3</version>
 			<date>2014-08-12</date>
@@ -384,19 +387,19 @@
                 <example caption='OPTIONS'>
                     <![CDATA[
    <iq type='set'
-       from='httpclient@clayster.com/browser'
-       to='httpserver@clayster.com'
+       from='httpclient@example.org/browser'
+       to='httpserver@example.org'
        id='1'>
       <req xmlns='urn:xmpp:http' method='OPTIONS' resource='*' version='1.1'>
           <headers xmlns='http://jabber.org/protocol/shim'>
-              <header name='Host'>clayster.com</header>
+              <header name='Host'>example.org</header>
           </headers>
       </req>
    </iq>
 
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='1'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -415,19 +418,19 @@
                 <example caption='GET'>
                     <![CDATA[
    <iq type='set'
-       from='httpclient@clayster.com/browser'
-       to='httpserver@clayster.com'
+       from='httpclient@example.org/browser'
+       to='httpserver@example.org'
        id='2'>
       <req xmlns='urn:xmpp:http' method='GET' resource='/rdf/xep' version='1.1'>
           <headers xmlns='http://jabber.org/protocol/shim'>
-              <header name='Host'>clayster.com</header>
+              <header name='Host'>example.org</header>
           </headers>
       </req>
    </iq>
 
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='2'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -439,7 +442,7 @@
           </headers>
           <data>
               <text>@prefix dc: &lt;http://purl.org/dc/elements/1.1/&gt;.
-@base &lt;http://clayster.com/&gt;.
+@base &lt;http://example.org/&gt;.
 
 &lt;xep&gt; dc:title "HTTP over XMPP";
       dc:creator &lt;PeterWaher&gt;;
@@ -461,19 +464,19 @@
                 <example caption='HEAD'>
                     <![CDATA[
    <iq type='set'
-       from='httpclient@clayster.com/browser'
-       to='httpserver@clayster.com'
+       from='httpclient@example.org/browser'
+       to='httpserver@example.org'
        id='3'>
       <req xmlns='urn:xmpp:http' method='HEAD' resource='/video/video1.m4' version='1.1'>
           <headers xmlns='http://jabber.org/protocol/shim'>
-              <header name='Host'>clayster.com</header>
+              <header name='Host'>example.org</header>
           </headers>
       </req>
    </iq>
 
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='3'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -493,19 +496,19 @@
                 <example caption='POST'>
                     <![CDATA[
    <iq type='set'
-       from='httpclient@clayster.com/browser'
-       to='httpserver@clayster.com'
+       from='httpclient@example.org/browser'
+       to='httpserver@example.org'
        id='4'>
-      <req xmlns='urn:xmpp:http' method='POST' resource='/sparql/?default-graph-uri=http%3A%2F%2Fclayster.com%2Frdf/xep' version='1.1'>
+      <req xmlns='urn:xmpp:http' method='POST' resource='/sparql/?default-graph-uri=http%3A%2F%2Fexample.org%2Frdf/xep' version='1.1'>
           <headers xmlns='http://jabber.org/protocol/shim'>
-              <header name='Host'>clayster.com</header>
+              <header name='Host'>example.org</header>
               <header name='User-agent'>Clayster HTTP/XMPP Client</header>
               <header name='Content-Type'>application/sparql-query</header>
               <header name='Content-Length'>...</header>
           </headers>
           <data>
               <text>PREFIX dc: &lt;http://purl.org/dc/elements/1.1/&gt;
-BASE &lt;http://clayster.com/&gt;
+BASE &lt;http://example.org/&gt;
 
 SELECT ?title ?creator ?publisher
 WHERE  { ?x dc:title ?title .
@@ -516,8 +519,8 @@ WHERE  { ?x dc:title ?title .
    </iq>
 
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='4'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -539,7 +542,7 @@ WHERE  { ?x dc:title ?title .
                                   <literal>HTTP over XMPP</literal>
                               </binding>
                               <binding name="creator">
-                                  <uri>http://clayster.com/PeterWaher</uri>
+                                  <uri>http://example.org/PeterWaher</uri>
                               </binding>
                           </result>
                       </results>
@@ -563,12 +566,12 @@ WHERE  { ?x dc:title ?title .
                 <example caption='PUT'>
                     <![CDATA[
    <iq type='set'
-       from='httpclient@clayster.com/browser'
-       to='httpserver@clayster.com'
+       from='httpclient@example.org/browser'
+       to='httpserver@example.org'
        id='5'>
       <req xmlns='urn:xmpp:http' method='PUT' resource='/index.html' version='1.1'>
           <headers xmlns='http://jabber.org/protocol/shim'>
-              <header name='Host'>clayster.com</header>
+              <header name='Host'>example.org</header>
               <header name='Content-Type'>text/html</header>
               <header name='Content-Length'>...</header>
           </headers>
@@ -579,8 +582,8 @@ WHERE  { ?x dc:title ?title .
    </iq>
 
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='5'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='204' statusMessage='No Content'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -598,19 +601,19 @@ WHERE  { ?x dc:title ?title .
                 <example caption='DELETE'>
                     <![CDATA[
    <iq type='set'
-       from='httpclient@clayster.com/browser'
-       to='httpserver@clayster.com'
+       from='httpclient@example.org/browser'
+       to='httpserver@example.org'
        id='6'>
       <req xmlns='urn:xmpp:http' method='DELETE' resource='/index.html' version='1.1'>
           <headers xmlns='http://jabber.org/protocol/shim'>
-              <header name='Host'>clayster.com</header>
+              <header name='Host'>example.org</header>
           </headers>
       </req>
    </iq>
 
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='6'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='403' statusMessage='Forbidden'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -632,19 +635,19 @@ WHERE  { ?x dc:title ?title .
                 <example caption='TRACE'>
                     <![CDATA[
    <iq type='set'
-       from='httpclient@clayster.com/browser'
-       to='httpserver@clayster.com'
+       from='httpclient@example.org/browser'
+       to='httpserver@example.org'
        id='7'>
       <req xmlns='urn:xmpp:http' method='TRACE' resource='/rdf/ex1.turtle' version='1.1'>
           <headers xmlns='http://jabber.org/protocol/shim'>
-              <header name='Host'>clayster.com</header>
+              <header name='Host'>example.org</header>
           </headers>
       </req>
    </iq>
 
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='7'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -655,7 +658,7 @@ WHERE  { ?x dc:title ?title .
           </headers>
           <data>
               <text>GET /rdf/ex1.turtle HTTP/1.1
-Host: clayster.com</text>
+Host: example.org</text>
           </data>
       </resp>
    </iq>]]>
@@ -675,8 +678,8 @@ Host: clayster.com</text>
                 <example caption='PATCH'>
                     <![CDATA[
    <iq type='set'
-       from='httpclient@clayster.com/browser'
-       to='httpserver@clayster.com'
+       from='httpclient@example.org/browser'
+       to='httpserver@example.org'
        id='8'>
       <req xmlns='urn:xmpp:http' method='PATCH' resource='/file.txt' version='1.1'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -692,8 +695,8 @@ Host: clayster.com</text>
    </iq>
 
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='8'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='204' statusMessage='No Content'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -721,8 +724,8 @@ Host: clayster.com</text>
                 <example caption='text'>
                     <![CDATA[
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='2'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -734,7 +737,7 @@ Host: clayster.com</text>
           </headers>
           <data>
               <text>@prefix dc: &lt;http://purl.org/dc/elements/1.1/&gt;.
-@base &lt;http://clayster.com/&gt;.
+@base &lt;http://example.org/&gt;.
 
 &lt;xep&gt; dc:title "HTTP over XMPP";
       dc:creator &lt;PeterWaher&gt;;
@@ -765,8 +768,8 @@ Host: clayster.com</text>
                 <example caption='xml'>
                     <![CDATA[
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='4'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -788,7 +791,7 @@ Host: clayster.com</text>
                                   <literal>HTTP over XMPP</literal>
                               </binding>
                               <binding name="creator">
-                                  <uri>http://clayster.com/PeterWaher</uri>
+                                  <uri>http://example.org/PeterWaher</uri>
                               </binding>
                           </result>
                       </results>
@@ -816,8 +819,8 @@ Host: clayster.com</text>
                 <example caption='base64'>
                     <![CDATA[
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='9'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -851,8 +854,8 @@ Host: clayster.com</text>
                 <example caption='chunkedBase64'>
                     <![CDATA[
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='10'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -867,15 +870,15 @@ Host: clayster.com</text>
       </resp>
    </iq>
 
-   <message from='httpserver@clayster.com'
-            to='httpclient@clayster.com/browser'>
+   <message from='httpserver@example.org'
+            to='httpclient@example.org/browser'>
       <chunk xmlns='urn:xmpp:http' streamId='Stream0001' nr='0'>iVBORw0KGgoAAAANSUhEUgAAASwAAAGQCAYAA ...</chunk>
    </message>
 
    ...
 
-   <message from='httpserver@clayster.com'
-            to='httpclient@clayster.com/browser'>
+   <message from='httpserver@example.org'
+            to='httpclient@example.org/browser'>
       <chunk xmlns='urn:xmpp:http' streamId='Stream0001' nr='5' last='true'>... 2uPzi9u+tVWJd+e+y1AAAAABJRU5ErkJggg==</chunk>
    </message>]]>
                 </example>
@@ -909,8 +912,8 @@ Host: clayster.com</text>
                 <example caption='sipub'>
                     <![CDATA[
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='11'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -921,7 +924,7 @@ Host: clayster.com</text>
           </headers>
           <data>
               <sipub xmlns='http://jabber.org/protocol/sipub'
-                     from='httpserver@clayster.com'
+                     from='httpserver@example.org'
                      id='file-0001'
                      mime-type='image/png'
                      profile='http://jabber.org/protocol/si/profile/file-transfer'>
@@ -956,19 +959,19 @@ Host: clayster.com</text>
                 <example caption='ibb'>
                     <![CDATA[
    <iq type='set'
-       from='httpclient@clayster.com/browser'
-       to='httpserver@clayster.com'
+       from='httpclient@example.org/browser'
+       to='httpserver@example.org'
        id='12'>
       <req xmlns='urn:xmpp:http' method='GET' resource='/webcam1.jpg' version='1.1'>
           <headers xmlns='http://jabber.org/protocol/shim'>
-              <header name='Host'>clayster.com</header>
+              <header name='Host'>example.org</header>
           </headers>
       </req>
    </iq>
 
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='12'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -983,8 +986,8 @@ Host: clayster.com</text>
    </iq>
 
    <iq type='set'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='13'>
       <open xmlns='http://jabber.org/protocol/ibb'
             block-size='32768'
@@ -993,27 +996,27 @@ Host: clayster.com</text>
    </iq>
 
    <iq type='result'
-       from='httpclient@clayster.com/browser'
-       to='httpserver@clayster.com'
+       from='httpclient@example.org/browser'
+       to='httpserver@example.org'
        id='13'/>
 
-   <message from='httpserver@clayster.com'
-            to='httpclient@clayster.com/browser'>
+   <message from='httpserver@example.org'
+            to='httpclient@example.org/browser'>
       <data xmlns='http://jabber.org/protocol/ibb' sid='Stream0002' seq='0'>...</chunk>
    </message>
 
    ...
 
    <iq type='set'
-       from='httpclient@clayster.com/browser'
-       to='httpserver@clayster.com'
+       from='httpclient@example.org/browser'
+       to='httpserver@example.org'
        id='14'>
       <close xmlns='http://jabber.org/protocol/ibb' sid='Stream0002'/>
    </iq>
 
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='14'/>]]>
                 </example>
             </section3>
@@ -1027,8 +1030,8 @@ Host: clayster.com</text>
                 <example caption='jingle'>
                     <![CDATA[
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='14'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -1145,9 +1148,9 @@ Host: clayster.com</text>
 					</p>
 					<example caption='Examples of URLs with the httpx scheme'>
 						<![CDATA[
-   httpx://httpServer@clayster.com/index.html
-   httpx://httpServer@clayster.com/images/image1.png
-   httpx://httpServer@clayster.com/api?p1=a&p2=b]]>
+   httpx://httpServer@example.org/index.html
+   httpx://httpServer@example.org/images/image1.png
+   httpx://httpServer@example.org/api?p1=a&p2=b]]>
 					</example>
 					<p>
                         By creating a new scheme for HTTP over XMPP transport, and implementing support for it in web browsers, XML HTTP request objects and web servers,
@@ -1241,7 +1244,7 @@ Host: clayster.com</text>
                     <example caption='SOAP method call'>
                         <![CDATA[
    <iq type='set'
-       from='httpclient@clayster.com/browser'
+       from='httpclient@example.org/browser'
        to='httpserver@example.com'
        id='15'>
       <req xmlns='urn:xmpp:http' method='POST' resource='/Math' version='1.1'>
@@ -1254,7 +1257,7 @@ Host: clayster.com</text>
               <xml>
                   <soap:Envelope xmlns:soap="http://www.w3.org/2001/12/soap-envelope"
                                  soap:encodingStyle="http://www.w3.org/2001/12/soap-encoding">
-                      <soap:Body xmlns:m="http://www.clayster.com/math">
+                      <soap:Body xmlns:m="http://www.example.org/math">
                           <m:AddNumbers>
                               <m:N1>10</m:N1>
                               <m:N2>20</m:N2>
@@ -1268,7 +1271,7 @@ Host: clayster.com</text>
 
    <iq type='result'
        from='httpserver@example.com'
-       to='httpclient@clayster.com/browser'
+       to='httpclient@example.org/browser'
        id='15'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -1279,7 +1282,7 @@ Host: clayster.com</text>
               <xml>
                   <soap:Envelope xmlns:soap="http://www.w3.org/2001/12/soap-envelope"
                                  soap:encodingStyle="http://www.w3.org/2001/12/soap-encoding">
-                      <soap:Body xmlns:m="http://www.clayster.com/math">
+                      <soap:Body xmlns:m="http://www.example.org/math">
                           <m:AddNumbersResponse>
                               <m:Sum>30</m:Sum>
                           </m:AddNumbersResponse>
@@ -1304,19 +1307,19 @@ Host: clayster.com</text>
                     <example caption='REST'>
                         <![CDATA[
    <iq type='set'
-       from='httpclient@clayster.com/browser'
-       to='httpserver@clayster.com'
+       from='httpclient@example.org/browser'
+       to='httpserver@example.org'
        id='16'>
       <req xmlns='urn:xmpp:http' method='GET' resource='/api/multiplicationtable?m=5' version='1.1'>
           <headers xmlns='http://jabber.org/protocol/shim'>
-              <header name='Host'>clayster.com</header>
+              <header name='Host'>example.org</header>
           </headers>
       </req>
    </iq>
 
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='16'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -1373,8 +1376,8 @@ Host: clayster.com</text>
                     <example caption='Turtle'>
                         <![CDATA[
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='2'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -1386,7 +1389,7 @@ Host: clayster.com</text>
           </headers>
           <data>
               <text>@prefix dc: &lt;http://purl.org/dc/elements/1.1/&gt;.
-@base &lt;http://clayster.com/&gt;.
+@base &lt;http://example.org/&gt;.
 
 &lt;xep&gt; dc:title "HTTP over XMPP";
       dc:creator &lt;PeterWaher&gt;;
@@ -1409,8 +1412,8 @@ Host: clayster.com</text>
                     <example caption='RDF'>
                         <![CDATA[
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='17'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -1423,10 +1426,10 @@ Host: clayster.com</text>
               <xml>
                   <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/"
                            xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-                      <rdf:Description rdf:about="http://clayster.com/xep">
+                      <rdf:Description rdf:about="http://example.org/xep">
                           <dc:title>HTTP over XMPP</dc:title>
-                          <dc:creator rdf:resource="http://clayster.com/PeterWaher" />
-                          <dc:publisher rdf:resource="http://clayster.com/XSF" />
+                          <dc:creator rdf:resource="http://example.org/PeterWaher" />
+                          <dc:publisher rdf:resource="http://example.org/XSF" />
                       </rdf:Description>
                   </rdf:RDF>
               </xml>
@@ -1442,20 +1445,20 @@ Host: clayster.com</text>
                     <example caption='SPARQL'>
                         <![CDATA[
    <iq type='set'
-       from='httpclient@clayster.com/browser'
-       to='httpserver@clayster.com'
+       from='httpclient@example.org/browser'
+       to='httpserver@example.org'
        id='4'>
       <req xmlns='urn:xmpp:http' method='POST' version='1.1'
            resource='/sparql/?default-graph-uri=http%3A%2F%2Fanother.example%2Fcalendar.rdf'>
           <headers xmlns='http://jabber.org/protocol/shim'>
-              <header name='Host'>clayster.com</header>
+              <header name='Host'>example.org</header>
               <header name='User-agent'>Clayster HTTP/XMPP Client</header>
               <header name='Content-Type'>application/sparql-query</header>
               <header name='Content-Length'>...</header>
           </headers>
           <data>
               <text>@prefix dc: &lt;http://purl.org/dc/elements/1.1/&gt;.
-@base &lt;http://clayster.com/&gt;.
+@base &lt;http://example.org/&gt;.
 
 &lt;xep&gt; dc:title "HTTP over XMPP";
       dc:creator &lt;PeterWaher&gt;;
@@ -1465,8 +1468,8 @@ Host: clayster.com</text>
    </iq>
 
    <iq type='result'
-       from='httpserver@clayster.com'
-       to='httpclient@clayster.com/browser'
+       from='httpserver@example.org'
+       to='httpclient@example.org/browser'
        id='4'>
       <resp xmlns='urn:xmpp:http' version='1.1' statusCode='200' statusMessage='OK'>
           <headers xmlns='http://jabber.org/protocol/shim'>
@@ -1488,7 +1491,7 @@ Host: clayster.com</text>
                                   <literal>HTTP over XMPP</literal>
                               </binding>
                               <binding name="creator">
-                                  <uri>http://clayster.com/PeterWaher</uri>
+                                  <uri>http://example.org/PeterWaher</uri>
                               </binding>
                           </result>
                       </results>
@@ -1526,8 +1529,8 @@ Host: clayster.com</text>
         <example caption="Service discovery information request">
             <![CDATA[
 <iq type='set'
-    from='httpclient@clayster.com/browser'
-    to='httpserver@clayster.com'
+    from='httpclient@example.org/browser'
+    to='httpserver@example.org'
     id='disco1'>
   <query xmlns='http://jabber.org/protocol/disco#info'/>
 </iq>]]>
@@ -1535,8 +1538,8 @@ Host: clayster.com</text>
         <example caption="Service discovery information response">
             <![CDATA[
 <iq type='result'
-    from='httpserver@clayster.com'
-    to='httpclient@clayster.com/browser'
+    from='httpserver@example.org'
+    to='httpclient@example.org/browser'
     id='disco1'>
   <query xmlns='http://jabber.org/protocol/disco#info'>
     ...
@@ -1732,9 +1735,9 @@ Host: clayster.com</text>
 						</p>
 						<code>
 							<![CDATA[
-   httpx://httpServer@clayster.com/index.html
-   httpx://httpServer@clayster.com/images/image1.png
-   httpx://httpServer@clayster.com/api?p1=a&p2=b]]>
+   httpx://httpServer@example.org/index.html
+   httpx://httpServer@example.org/images/image1.png
+   httpx://httpServer@example.org/api?p1=a&p2=b]]>
 						</code>
 					</dd>
 				</di>
@@ -1791,7 +1794,7 @@ Host: clayster.com</text>
 							For further information, please contact Peter Waher:
 						</p>
 						<p>
-							Email: <link url='mailto:peter.waher@clayster.com'>peter.waher@clayster.com</link><br/>
+							Email: <link url='mailto:peter.waher@example.org'>peter.waher@example.org</link><br/>
 							JabberID: <link url='xmpp:peter.waher@jabber.org'>peter.waher@jabber.org</link><br/>
 							URI: <link url='http://www.linkedin.com/in/peterwaher'>http://www.linkedin.com/in/peterwaher</link>
 						</p>
@@ -1804,7 +1807,7 @@ Host: clayster.com</text>
 							For concerns regarding changes to the provisional registration, please contact Peter Waher:
 						</p>
 						<p>
-							Email: <link url='mailto:peter.waher@clayster.com'>peter.waher@clayster.com</link><br/>
+							Email: <link url='mailto:peter.waher@example.org'>peter.waher@example.org</link><br/>
 							JabberID: <link url='xmpp:peter.waher@jabber.org'>peter.waher@jabber.org</link><br/>
 							URI: <link url='http://www.linkedin.com/in/peterwaher'>http://www.linkedin.com/in/peterwaher</link>
 						</p>
diff --git a/xep-0336.xml b/xep-0336.xml
index 1142e3db..07f0a900 100644
--- a/xep-0336.xml
+++ b/xep-0336.xml
@@ -27,13 +27,16 @@
         <supersedes/>
         <supersededby/>
         <shortname>dynamic-forms</shortname>
-        <author>
-            <firstname>Peter</firstname>
-            <surname>Waher</surname>
-            <email>peter.waher@clayster.com</email>
-            <jid>peter.waher@jabber.org</jid>
-            <uri>http://www.linkedin.com/in/peterwaher</uri>
-        </author>
+        &peterwaher;
+		<revision>
+			<version>0.2</version>
+			<date>2015-11-09</date>
+			<initials>pw</initials>
+			<remark>
+				<p>Updated contact information.</p>
+				<p>Updated example JIDs to example.org</p>
+			</remark>
+		</revision>
   <revision>
     <version>0.1</version>
     <date>2014-01-08</date>
@@ -356,8 +359,8 @@
             <example caption='Performing a server post-back'>
                 <![CDATA[
     <iq type='set'
-        from='formclient@clayster.com/client'
-        to='formserver@clayster.com'
+        from='formclient@example.org/client'
+        to='formserver@example.org'
         id='1'>
         <submit xmlns='urn:xmpp:xdata:dynamic' xml:lang='en'>
             <x xmlns="jabber:x:data" type="submit">
@@ -381,8 +384,8 @@
             <example caption='Post-back response'>
                 <![CDATA[
     <iq type='result'
-        from='formserver@clayster.com'
-        to='formclient@clayster.com/client'
+        from='formserver@example.org'
+        to='formclient@example.org/client'
         id='1'>
         <x xmlns="jabber:x:data" type="form"
            xmlns:xdd="urn:xmpp:xdata:dynamic" 
@@ -601,8 +604,8 @@
             <example caption='Cancelling a dynamic form'>
                 <![CDATA[
     <iq type='set'
-        from='formclient@clayster.com/client'
-        to='formserver@clayster.com'
+        from='formclient@example.org/client'
+        to='formserver@example.org'
         id='4'>
         <cancel xmlns='urn:xmpp:xdata:dynamic'>
             <x xmlns="jabber:x:data" type="submit">
@@ -622,8 +625,8 @@
             <example caption='Dynamic form cancelled'>
                 <![CDATA[
     <iq type='result'
-        from='formserver@clayster.com'
-        to='formclient@clayster.com/client'
+        from='formserver@example.org'
+        to='formclient@example.org/client'
         id='4'/>]]>
             </example>
             <p>
@@ -647,8 +650,8 @@
             <example caption='Dynamic form not found during post-back'>
                 <![CDATA[
     <iq type='error'
-        from='formserver@clayster.com'
-        to='formclient@clayster.com/client'
+        from='formserver@example.org'
+        to='formclient@example.org/client'
         id='2'>
         <error type='cancel'>
             <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -668,8 +671,8 @@
             <example caption='Other error during post-back'>
                 <![CDATA[
     <iq type='error'
-        from='formserver@clayster.com'
-        to='formclient@clayster.com/client'
+        from='formserver@example.org'
+        to='formclient@example.org/client'
         id='3'>
         <error type='cancel'>
             <internal-server-error xmlns='urn:ietf:params:xml:ns:xmpp-streams'/>
@@ -721,8 +724,8 @@
     </x>
 
     ...
-    <message from='server@clayster.com'
-             to='client@clayster.com/client'>
+    <message from='server@example.org'
+             to='client@example.org/client'>
         <updated xmlns='urn:xmpp:xdata:dynamic' sessionVariable='xdd session' xml:lang='en'>
             <x xmlns="jabber:x:data" type="form"
                xmlns:xdd="urn:xmpp:xdata:dynamic" 
@@ -758,8 +761,8 @@
         <example caption="Service discovery information request">
             <![CDATA[
     <iq type='get'
-        from='formclient@clayster.com/client'
-        to='formserver@clayster.com'
+        from='formclient@example.org/client'
+        to='formserver@example.org'
         id='disco1'>
         <query xmlns='http://jabber.org/protocol/disco#info'/>
     </iq>]]>
@@ -767,8 +770,8 @@
         <example caption="Service discovery information response">
             <![CDATA[
     <iq type='result'
-        from='formserver@clayster.com'
-        to='formclient@clayster.com/client'
+        from='formserver@example.org'
+        to='formclient@example.org/client'
         id='disco1'>
         <query xmlns='http://jabber.org/protocol/disco#info'>
             ...
diff --git a/xep-0337.xml b/xep-0337.xml
index 25b8016d..4450e9c9 100644
--- a/xep-0337.xml
+++ b/xep-0337.xml
@@ -21,13 +21,16 @@
         <supersedes/>
         <supersededby/>
         <shortname>eventlogging</shortname>
-        <author>
-            <firstname>Peter</firstname>
-            <surname>Waher</surname>
-            <email>peter.waher@clayster.com</email>
-            <jid>peter.waher@jabber.org</jid>
-            <uri>http://www.linkedin.com/in/peterwaher</uri>
-        </author>
+        &peterwaher;
+		<revision>
+			<version>0.2</version>
+			<date>2015-11-09</date>
+			<initials>pw</initials>
+			<remark>
+				<p>Updated contact information.</p>
+				<p>Updated example JIDs to example.org</p>
+			</remark>
+		</revision>
   <revision>
     <version>0.1</version>
     <date>2014-01-08</date>
@@ -142,7 +145,7 @@
             </p>
             <example caption='Simple event message'>
                 <![CDATA[
-   <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'>
+   <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'>
       <log xmlns='urn:xmpp:eventlog' timestamp='2013-11-10T15:52:23Z'>
          <message>Something happened.</message>
       </log>
@@ -155,7 +158,7 @@
             </p>
             <example caption='Multi-line event message'>
                 <![CDATA[
-   <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'>
+   <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'>
       <log xmlns='urn:xmpp:eventlog' timestamp='2013-11-12T11:47:12Z'>
          <message>10 objects deleted:
 Object 1
@@ -171,7 +174,7 @@ Object 10</message>
             </p>
             <example caption='Specifying type and level'>
                 <![CDATA[
-   <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'>
+   <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'>
       <log xmlns='urn:xmpp:eventlog' timestamp='2013-11-10T15:54:55Z' type='Warning' level='Major'>
          <message>Low on memory.</message>
       </log>
@@ -184,7 +187,7 @@ Object 10</message>
             </p>
             <example caption='Specifying object and subject'>
                 <![CDATA[
-   <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'>
+   <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'>
       <log xmlns='urn:xmpp:eventlog' timestamp='2013-11-10T15:58:12Z' type='Informational' level='Major' object='Towel' subject='Arthur Dent'>
          <message>Object deleted.</message>
       </log>
@@ -197,7 +200,7 @@ Object 10</message>
             </p>
             <example caption='Specifying an event ID'>
                 <![CDATA[
-   <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'>
+   <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'>
       <log xmlns='urn:xmpp:eventlog' id='LoginFailed' timestamp='2013-11-10T16:04:45Z' type='Warning' level='Minor' object='user1' subject='10.0.0.1'>
          <message>User attempted to login but provided incorrect password.</message>
       </log>
@@ -210,7 +213,7 @@ Object 10</message>
             </p>
             <example caption='Tagging events with custom information'>
                 <![CDATA[
-   <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'>
+   <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'>
       <log xmlns='urn:xmpp:eventlog' timestamp='2013-11-10T16:07:01Z' type='Informational' level='Minor'>
          <message>Current resources.</message>
          <tag name='RAM' value='1655709892' type='xs:long'/>
@@ -228,7 +231,7 @@ Object 10</message>
             </p>
             <example caption='Specifying program module'>
                 <![CDATA[
-   <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'>
+   <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'>
       <log xmlns='urn:xmpp:eventlog' timestamp='2013-11-10T16:17:56Z' type='Error' level='Major' object='object1' subject='user1' module='application1'>
          <message>Something horrible happened.</message>
       </log>
@@ -241,7 +244,7 @@ Object 10</message>
             </p>
             <example caption='Sending debug information'>
                 <![CDATA[
-   <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'>
+   <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'>
       <log xmlns='urn:xmpp:eventlog' timestamp='2013-11-10T16:12:25Z' type='Debug' level='Major' module='My new application' stackTrace='file1, line 1, ...'>
          <message>Something is rotten in the state of Denmark.</message>
          <tag name='a' value='1' type='xs:int'/>
@@ -261,7 +264,7 @@ File2, Line2, ...
             </p>
             <example caption='Sending multiple events'>
                 <![CDATA[
-   <message from='device@clayster.com/device' to='eventlog@clayster.com' type='normal' xml:lang='en'>
+   <message from='device@example.org/device' to='eventlog@example.org' type='normal' xml:lang='en'>
       <log  xmlns='urn:xmpp:eventlog' timestamp='2013-11-10T15:52:23Z'>
          <message>Something happened.</message>
       </log>
@@ -277,8 +280,8 @@ File2, Line2, ...
         <example caption="Service discovery information request">
             <![CDATA[
 <iq type='get'
-    from='device@clayster.com/device'
-    to='eventlog@clayster.com'
+    from='device@example.org/device'
+    to='eventlog@example.org'
     id='disco1'>
   <query xmlns='http://jabber.org/protocol/disco#info'/>
 </iq>]]>
@@ -286,8 +289,8 @@ File2, Line2, ...
         <example caption="Service discovery information response">
             <![CDATA[
 <iq type='result'
-    from='eventlog@clayster.com'
-    to='device@clayster.com/device'
+    from='eventlog@example.org'
+    to='device@example.org/device'
     id='disco1'>
   <query xmlns='http://jabber.org/protocol/disco#info'>
     ...
diff --git a/xep-0347.xml b/xep-0347.xml
index c1bde211..047db9a5 100644
--- a/xep-0347.xml
+++ b/xep-0347.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!-- TODO: Sub-namespace for Registration Clients.
         urn:xmpp:iot:discovery:regunit	- Registration Units (can claim ownership)
 -->
@@ -33,13 +33,7 @@
 		<supersedes/>
 		<supersededby/>
 		<shortname>iot-discovery</shortname>
-		<author>
-			<firstname>Peter</firstname>
-			<surname>Waher</surname>
-			<email>peter.waher@clayster.com</email>
-			<jid>peter.waher@jabber.org</jid>
-			<uri>http://www.linkedin.com/in/peterwaher</uri>
-		</author>
+		&peterwaher;
 		<author>
 			<firstname>Ronny</firstname>
 			<surname>Klauck</surname>
@@ -47,6 +41,15 @@
 			<jid>TBD</jid>
 			<uri>http://www-rnks.informatik.tu-cottbus.de/~rklauck</uri>
 		</author>
+		<revision>
+			<version>0.4</version>
+			<date>2015-11-09</date>
+			<initials>pw</initials>
+			<remark>
+				<p>Updated contact information.</p>
+				<p>Updated example JIDs to example.org</p>
+			</remark>
+		</revision>
 		<revision>
 			<version>0.3</version>
 			<date>2014-11-11</date>
@@ -613,8 +616,8 @@
 			<example caption='Register Thing'>
 				<![CDATA[
    <iq type='set'
-       from='thing@clayster.com/imc'
-       to='discovery.clayster.com'
+       from='thing@example.org/imc'
+       to='discovery.example.org'
        id='1'>
       <register xmlns='urn:xmpp:iot:discovery'>
           <str name='SN' value='394872348732948723'/>
@@ -626,8 +629,8 @@
    </iq>
    
    <iq type='result'
-       from='discovery.clayster.com'
-       to='thing@clayster.com/imc'
+       from='discovery.example.org'
+       to='thing@example.org/imc'
        id='1'/>]]>
 			</example>
 			<p>
@@ -652,10 +655,10 @@
 			<example caption='Registration response when alrady claimed'>
 				<![CDATA[
    <iq type='result'
-       from='discovery.clayster.com'
-       to='thing@clayster.com/imc'
+       from='discovery.example.org'
+       to='thing@example.org/imc'
        id='1'>
-      <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@clayster.com'/>
+      <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@example.org'/>
    </iq>]]>
 			</example>
 			<p>
@@ -671,8 +674,8 @@
 			<example caption='Register self-owned Thing'>
 				<![CDATA[
    <iq type='set'
-       from='thing@clayster.com/imc'
-       to='discovery.clayster.com'
+       from='thing@example.org/imc'
+       to='discovery.example.org'
        id='2'>
       <register xmlns='urn:xmpp:iot:discovery' selfOwned='true'>
           <str name='SN' value='394872348732948723'/>
@@ -684,8 +687,8 @@
    </iq>
    
    <iq type='result'
-       from='discovery.clayster.com'
-       to='thing@clayster.com/imc'
+       from='discovery.example.org'
+       to='thing@example.org/imc'
        id='2'/>]]>
 			</example>
 		</section2>
@@ -705,8 +708,8 @@
 			<example caption='Register Thing behind Concentrator'>
 				<![CDATA[
    <iq type='set'
-       from='rack@clayster.com/plcs'
-       to='discovery.clayster.com'
+       from='rack@example.org/plcs'
+       to='discovery.example.org'
        id='3'>
       <register xmlns='urn:xmpp:iot:discovery' nodeId='imc1' sourceId='MeteringTopology'>
           <str name='SN' value='394872348732948723'/>
@@ -718,8 +721,8 @@
    </iq>
    
    <iq type='result'
-       from='discovery.clayster.com'
-       to='rack@clayster.com/plcs'
+       from='discovery.example.org'
+       to='rack@example.org/plcs'
        id='3'/>]]>
 			</example>
 			<p>
@@ -765,8 +768,8 @@
 			<example caption='Claim Ownership of public Thing'>
 				<![CDATA[
    <iq type='set'
-       from='owner@clayster.com/phone'
-       to='discovery.clayster.com'
+       from='owner@example.org/phone'
+       to='discovery.example.org'
        id='4'>
       <mine xmlns='urn:xmpp:iot:discovery'>
           <str name='SN' value='394872348732948723'/>
@@ -784,8 +787,8 @@
 			<example caption='Claim Ownership of private Thing'>
 				<![CDATA[
    <iq type='set'
-       from='owner@clayster.com/phone'
-       to='discovery.clayster.com'
+       from='owner@example.org/phone'
+       to='discovery.example.org'
        id='4'>
       <mine xmlns='urn:xmpp:iot:discovery' public='false'>
           <str name='SN' value='394872348732948723'/>
@@ -808,10 +811,10 @@
 			<example caption='Ownership claim successful'>
 				<![CDATA[
    <iq type='result'
-       from='discovery.clayster.com'
-       to='owner@clayster.com/phone'
+       from='discovery.example.org'
+       to='owner@example.org/phone'
        id='4'>
-      <claimed xmlns='urn:xmpp:iot:discovery' jid='thing@clayster.com'/>
+      <claimed xmlns='urn:xmpp:iot:discovery' jid='thing@example.org'/>
    </iq>]]>
 			</example>
 			<p>
@@ -822,10 +825,10 @@
 			<example caption='Ownership claim of a Thing behind a concentrator successful'>
 				<![CDATA[
    <iq type='result'
-       from='discovery.clayster.com'
-       to='owner@clayster.com/phone'
+       from='discovery.example.org'
+       to='owner@example.org/phone'
        id='4'>
-      <claimed xmlns='urn:xmpp:iot:discovery' jid='rack@clayster.com/plcs' nodeId='imc1' sourceId='MeteringTopology'/>
+      <claimed xmlns='urn:xmpp:iot:discovery' jid='rack@example.org/plcs' nodeId='imc1' sourceId='MeteringTopology'/>
    </iq>]]>
 			</example>
 			<p>
@@ -835,8 +838,8 @@
 			<example caption='Ownership claim failure'>
 				<![CDATA[
    <iq type='error'
-       from='discovery.clayster.com'
-       to='owner@clayster.com/phone'
+       from='discovery.example.org'
+       to='owner@example.org/phone'
        id='4'>
       <error type='cancel'>
          <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -850,10 +853,10 @@
 			<example caption='Ownership claimed'>
 				<![CDATA[
    <iq type='set'
-       from='discovery.clayster.com'
-       to='thing@clayster.com/imc'
+       from='discovery.example.org'
+       to='thing@example.org/imc'
        id='5'>
-      <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@clayster.com'/>
+      <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@example.org'/>
    </iq>]]>
 			</example>
 			<p>
@@ -862,10 +865,10 @@
 			<example caption='Ownership claim of private Thing successful'>
 				<![CDATA[
    <iq type='set'
-       from='discovery.clayster.com'
-       to='thing@clayster.com/imc'
+       from='discovery.example.org'
+       to='thing@example.org/imc'
        id='5'>
-      <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@clayster.com' public='false'/>
+      <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@example.org' public='false'/>
    </iq>]]>
 			</example>
 			<p>
@@ -879,10 +882,10 @@
 			<example caption='Ownership of Thing behind concentrator claimed'>
 				<![CDATA[
    <iq type='set'
-       from='discovery.clayster.com'
-       to='rack@clayster.com/plcs'
+       from='discovery.example.org'
+       to='rack@example.org/plcs'
        id='5'>
-      <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@clayster.com' nodeId='imc1' sourceId='MeteringTopology'/>
+      <claimed xmlns='urn:xmpp:iot:discovery' jid='owner@example.org' nodeId='imc1' sourceId='MeteringTopology'/>
    </iq>]]>
 			</example>
 			<p>
@@ -891,8 +894,8 @@
 			<example caption='Ownership claimed acknowledged'>
 				<![CDATA[
    <iq type='result'
-       from='thing@clayster.com/imc'
-       to='discovery.clayster.com'
+       from='thing@example.org/imc'
+       to='discovery.example.org'
        id='5'/>]]>
 			</example>
 			<p>
@@ -911,10 +914,10 @@
 			<example caption='Remove Thing'>
 				<![CDATA[
    <iq type='set'
-       from='owner@clayster.com/phone'
-       to='discovery.clayster.com'
+       from='owner@example.org/phone'
+       to='discovery.example.org'
        id='6'>
-      <remove xmlns='urn:xmpp:iot:discovery' jid='thing@clayster.com'/>
+      <remove xmlns='urn:xmpp:iot:discovery' jid='thing@example.org'/>
    </iq>]]>
 			</example>
 			<p>
@@ -924,10 +927,10 @@
 			<example caption='Remove Thing behind concentrator'>
 				<![CDATA[
    <iq type='set'
-       from='owner@clayster.com/phone'
-       to='discovery.clayster.com'
+       from='owner@example.org/phone'
+       to='discovery.example.org'
        id='6'>
-      <remove xmlns='urn:xmpp:iot:discovery' jid='rack@clayster.com/plcs' nodeId='imc1' sourceId='MeteringTopology'/>
+      <remove xmlns='urn:xmpp:iot:discovery' jid='rack@example.org/plcs' nodeId='imc1' sourceId='MeteringTopology'/>
    </iq>]]>
 			</example>
 			<p>
@@ -937,8 +940,8 @@
 			<example caption='Thing removed'>
 				<![CDATA[
    <iq type='result'
-       from='discovery.clayster.com'
-       to='owner@clayster.com/phone'
+       from='discovery.example.org'
+       to='owner@example.org/phone'
        id='6'/>]]>
 			</example>
 			<p>
@@ -947,8 +950,8 @@
 			<example caption='Removal failure'>
 				<![CDATA[
    <iq type='error'
-       from='discovery.clayster.com'
-       to='owner@clayster.com/phone'
+       from='discovery.example.org'
+       to='owner@example.org/phone'
        id='6'>
       <error type='cancel'>
          <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -962,15 +965,15 @@
 			<example caption='Thing removed from registry by owner'>
 				<![CDATA[
    <iq type='set'
-       from='discovery.clayster.com'
-       to='thing@clayster.com/imc'
+       from='discovery.example.org'
+       to='thing@example.org/imc'
        id='7'>
       <removed xmlns='urn:xmpp:iot:discovery'/>
    </iq>
    
    <iq type='result'
-       from='thing@clayster.com/imc'
-       to='discovery.clayster.com'
+       from='thing@example.org/imc'
+       to='discovery.example.org'
        id='7'/>]]>
 			</example>
 			<p>
@@ -979,8 +982,8 @@
 			<example caption='Thing behind concentrator removed from registry by owner'>
 				<![CDATA[
    <iq type='set'
-       from='discovery.clayster.com'
-       to='rack@clayster.com/plcs'
+       from='discovery.example.org'
+       to='rack@example.org/plcs'
        id='7'>
       <removed xmlns='urn:xmpp:iot:discovery' nodeId='imc1' sourceId='MeteringTopology'/>
    </iq>]]>
@@ -991,8 +994,8 @@
 			<example caption='Removal acknowledgement'>
 				<![CDATA[
    <iq type='result'
-       from='thing@clayster.com/imc'
-       to='discovery.clayster.com'
+       from='thing@example.org/imc'
+       to='discovery.example.org'
        id='7'/>]]>
 			</example>
 		</section2>
@@ -1051,8 +1054,8 @@
 			<example caption='Update Meta Data request'>
 				<![CDATA[
    <iq type='set'
-       from='thing@clayster.com/imc'
-       to='discovery.clayster.com'
+       from='thing@example.org/imc'
+       to='discovery.example.org'
        id='8'>
       <update xmlns='urn:xmpp:iot:discovery'>
           <str name='KEY' value=''/>
@@ -1069,8 +1072,8 @@
 			<example caption='Update Meta Data of Thing behind concentrator'>
 				<![CDATA[
    <iq type='set'
-       from='rack@clayster.com/plcs'
-       to='discovery.clayster.com'
+       from='rack@example.org/plcs'
+       to='discovery.example.org'
        id='8'>
       <update xmlns='urn:xmpp:iot:discovery' nodeId='imc1' sourceId='MeteringTopology'>
           <str name='KEY' value=''/>
@@ -1086,8 +1089,8 @@
 			<example caption='Update Meta Data request acknowledgement'>
 				<![CDATA[
    <iq type='result'
-       from='discovery.clayster.com'
-       to='thing@clayster.com/imc'
+       from='discovery.example.org'
+       to='thing@example.org/imc'
        id='8'/>]]>
 			</example>
 			<p>
@@ -1098,8 +1101,8 @@
 			<example caption='Update Meta Data request failure'>
 				<![CDATA[
    <iq type='error'
-       from='discovery.clayster.com'
-       to='thing@clayster.com/imc'
+       from='discovery.example.org'
+       to='thing@example.org/imc'
        id='8'>
       <error type='cancel'>
          <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -1114,8 +1117,8 @@
 			<example caption='Update Meta Data response to request from disowned Thing'>
 				<![CDATA[
    <iq type='result'
-       from='discovery.clayster.com'
-       to='thing@clayster.com/imc'
+       from='discovery.example.org'
+       to='thing@example.org/imc'
        id='8'>
       <disowned xmlns='urn:xmpp:iot:discovery'/>
    </iq>]]>
@@ -1132,10 +1135,10 @@
 			<example caption='Owner requests an update of Meta Data of Thing'>
 				<![CDATA[
    <iq type='set'
-       from='owner@clayster.com/1234'
-       to='discovery.clayster.com'
+       from='owner@example.org/1234'
+       to='discovery.example.org'
        id='8'>
-      <update xmlns='urn:xmpp:iot:discovery' jid='thing@clayster.com'>
+      <update xmlns='urn:xmpp:iot:discovery' jid='thing@example.org'>
           <str name='ROOM' value='...'/>
           <str name='APT' value='...'/>
           <str name='BLD' value='...'/>
@@ -1155,10 +1158,10 @@
 			<example caption='Owner requests an update of Meta Data of Thing behind concentrator'>
 				<![CDATA[
    <iq type='set'
-       from='owner@clayster.com/1234'
-       to='discovery.clayster.com'
+       from='owner@example.org/1234'
+       to='discovery.example.org'
        id='8'>
-      <update xmlns='urn:xmpp:iot:discovery' jid='rack@clayster.com' nodeId='imc1' sourceId='MeteringTopology'>
+      <update xmlns='urn:xmpp:iot:discovery' jid='rack@example.org' nodeId='imc1' sourceId='MeteringTopology'>
           <str name='ROOM' value='...'/>
           <str name='APT' value='...'/>
           <str name='BLD' value='...'/>
@@ -1177,8 +1180,8 @@
 			<example caption='Owner updating thing Meta Data request acknowledgement'>
 				<![CDATA[
    <iq type='result'
-       from='discovery.clayster.com'
-       to='owner@clayster.com/1234'
+       from='discovery.example.org'
+       to='owner@example.org/1234'
        id='8'/>]]>
 			</example>
 			<p>
@@ -1188,8 +1191,8 @@
 			<example caption='Owner updating thing Meta Data request failure'>
 				<![CDATA[
    <iq type='error'
-       from='discovery.clayster.com'
-       to='owner@clayster.com/1234'
+       from='discovery.example.org'
+       to='owner@example.org/1234'
        id='8'>
       <error type='cancel'>
          <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -1328,8 +1331,8 @@
 			<example caption='Searching for Things'>
 				<![CDATA[
    <iq type='get'
-       from='curious@clayster.com/client'
-       to='discovery.clayster.com'
+       from='curious@example.org/client'
+       to='discovery.example.org'
        id='9'>
       <search xmlns='urn:xmpp:iot:discovery' offset='0' maxCount='20'>
           <strEq name='MAN' value='www.ktc.se'/>
@@ -1357,11 +1360,11 @@
 			<example caption='Search result'>
 				<![CDATA[
    <iq type='result'
-       from='discovery.clayster.com'
-       to='curious@clayster.com/client'
+       from='discovery.example.org'
+       to='curious@example.org/client'
        id='9'>
       <found xmlns='urn:xmpp:iot:discovery' more='false'>
-          <thing owner='owner@clayster.com' jid='thing@clayster.com'>
+          <thing owner='owner@example.org' jid='thing@example.org'>
              <str name='SN' value='394872348732948723'/>
              <str name='MAN' value='www.ktc.se'/>
              <str name='MODEL' value='IMC'/>
@@ -1381,11 +1384,11 @@
 			<example caption='Search result containing Thing behind a concentrator'>
 				<![CDATA[
    <iq type='result'
-       from='discovery.clayster.com'
-       to='curious@clayster.com/client'
+       from='discovery.example.org'
+       to='curious@example.org/client'
        id='9'>
       <found xmlns='urn:xmpp:iot:discovery' more='false'>
-          <thing owner='owner@clayster.com' jid='rack@clayster.com' nodeId='imc1' sourceId='MeteringTopology'>
+          <thing owner='owner@example.org' jid='rack@example.org' nodeId='imc1' sourceId='MeteringTopology'>
              <str name='SN' value='394872348732948723'/>
              <str name='MAN' value='www.ktc.se'/>
              <str name='MODEL' value='IMC'/>
@@ -1414,8 +1417,8 @@
 			<example caption='Unregister Thing'>
 				<![CDATA[
    <iq type='set'
-       from='thing@clayster.com/imc'
-       to='discovery.clayster.com'
+       from='thing@example.org/imc'
+       to='discovery.example.org'
        id='10'>
       <unregister xmlns='urn:xmpp:iot:discovery'/>
    </iq>]]>
@@ -1427,8 +1430,8 @@
 			<example caption='Unregistring Thing behind concentrator'>
 				<![CDATA[
    <iq type='set'
-       from='rack@clayster.com/plcs'
-       to='discovery.clayster.com'
+       from='rack@example.org/plcs'
+       to='discovery.example.org'
        id='10'>
       <unregister xmlns='urn:xmpp:iot:discovery' nodeId='imc1' sourceId='MeteringTopology'/>
    </iq>]]>
@@ -1439,8 +1442,8 @@
 			<example caption='Unregister Thing acknowledgement'>
 				<![CDATA[
    <iq type='result'
-       from='discovery.clayster.com'
-       to='thing@clayster.com/imc'
+       from='discovery.example.org'
+       to='thing@example.org/imc'
        id='10'/>]]>
 			</example>
 		</section2>
@@ -1451,10 +1454,10 @@
 			<example caption='Disowning Thing'>
 				<![CDATA[
    <iq type='set'
-       from='owner@clayster.com/phone'
-       to='discovery.clayster.com'
+       from='owner@example.org/phone'
+       to='discovery.example.org'
        id='11'>
-      <disown xmlns='urn:xmpp:iot:discovery' jid='thing@clayster.com'/>
+      <disown xmlns='urn:xmpp:iot:discovery' jid='thing@example.org'/>
    </iq>]]>
 			</example>
 			<p>
@@ -1464,10 +1467,10 @@
 			<example caption='Disowning Thing behind concentrator'>
 				<![CDATA[
    <iq type='set'
-       from='owner@clayster.com/phone'
-       to='discovery.clayster.com'
+       from='owner@example.org/phone'
+       to='discovery.example.org'
        id='11'>
-      <disown xmlns='urn:xmpp:iot:discovery' jid='rack@clayster.com/plcs' nodeId='imc1' sourceId='MeteringTopology'/>
+      <disown xmlns='urn:xmpp:iot:discovery' jid='rack@example.org/plcs' nodeId='imc1' sourceId='MeteringTopology'/>
    </iq>]]>
 			</example>
 			<p>
@@ -1476,8 +1479,8 @@
 			<example caption='Failure to disown Thing - Not Found'>
 				<![CDATA[
    <iq type='error'
-       from='discovery.clayster.com'
-       to='owner@clayster.com/phone'
+       from='discovery.example.org'
+       to='owner@example.org/phone'
        id='11'>
       <error type='cancel'>
          <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -1491,8 +1494,8 @@
 			<example caption='Failure to disown Thing - Offline'>
 				<![CDATA[
    <iq type='error'
-       from='discovery.clayster.com'
-       to='owner@clayster.com/phone'
+       from='discovery.example.org'
+       to='owner@example.org/phone'
        id='11'>
       <error type='cancel'>
          <not-allowed xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
@@ -1506,8 +1509,8 @@
 			<example caption='Thing disowned in registry by owner'>
 				<![CDATA[
    <iq type='set'
-       from='discovery.clayster.com'
-       to='thing@clayster.com/imc'
+       from='discovery.example.org'
+       to='thing@example.org/imc'
        id='12'>
       <disowned xmlns='urn:xmpp:iot:discovery'/>
    </iq>]]>
@@ -1518,8 +1521,8 @@
 			<example caption='Thing behind concentrator disowned in registry by owner'>
 				<![CDATA[
    <iq type='set'
-       from='discovery.clayster.com'
-       to='rack@clayster.com/plcs'
+       from='discovery.example.org'
+       to='rack@example.org/plcs'
        id='12'>
       <disowned xmlns='urn:xmpp:iot:discovery' nodeId='imc1' sourceId='MeteringTopology'/>
    </iq>]]>
@@ -1530,8 +1533,8 @@
 			<example caption='Acknowledging disownment'>
 				<![CDATA[
    <iq type='result'
-       from='thing@clayster.com/imc'
-       to='discovery.clayster.com'
+       from='thing@example.org/imc'
+       to='discovery.example.org'
        id='12'/>]]>
 			</example>
 			<p>
@@ -1542,8 +1545,8 @@
 			<example caption='Thing disowned'>
 				<![CDATA[
    <iq type='result'
-       from='discovery.clayster.com'
-       to='owner@clayster.com/phone'
+       from='discovery.example.org'
+       to='owner@example.org/phone'
        id='11'/>]]>
 			</example>
 			<p>
@@ -1559,8 +1562,8 @@
 		<example caption="Service discovery information request">
 			<![CDATA[
    <iq type='get'
-       from='device@clayster.com/device'
-       to='provisioning@clayster.com'
+       from='device@example.org/device'
+       to='provisioning@example.org'
        id='13'>
       <query xmlns='http://jabber.org/protocol/disco#info'/>
    </iq>]]>
@@ -1568,8 +1571,8 @@
 		<example caption="Service discovery information response">
 			<![CDATA[
    <iq type='result'
-       from='provisioning@clayster.com'
-       to='device@clayster.com/device'
+       from='provisioning@example.org'
+       to='device@example.org/device'
        id='13'>
      <query xmlns='http://jabber.org/protocol/disco#info'>
         ...
@@ -1583,13 +1586,13 @@
 		</p>
 		<example caption="Checking if server supports components">
 			<![CDATA[
-   <iq from='device@clayster.com/device' to='clayster.com' type='get' id='14'>
+   <iq from='device@example.org/device' to='example.org' type='get' id='14'>
       <query xmlns="http://jabber.org/protocol/disco#info"/>
    </iq>]]>
 		</example>
 		<example caption="Response confirming support for components">
 			<![CDATA[
-   <iq type="result" id="14" from="clayster.com" to="device@clayster.com/device">
+   <iq type="result" id="14" from="example.org" to="device@example.org/device">
       <query xmlns="http://jabber.org/protocol/disco#info">
          ...
          <feature var="http://jabber.org/protocol/disco#items"/>
@@ -1602,16 +1605,16 @@
 		</p>
 		<example caption="Requesting list of server components">
 			<![CDATA[
-   <iq from='device@clayster.com/device' to='clayster.com' type='get' id='15'>
+   <iq from='device@example.org/device' to='example.org' type='get' id='15'>
       <query xmlns="http://jabber.org/protocol/disco#items"/>
    </iq>]]>
 		</example>
 		<example caption="Response containing list of server components">
 			<![CDATA[
-   <iq type="result" id="15" from="clayster.com" to="995fab3dd759452ca9c370647323af0c@clayster.com/ebe2348e">
+   <iq type="result" id="15" from="example.org" to="995fab3dd759452ca9c370647323af0c@example.org/ebe2348e">
       <query xmlns="http://jabber.org/protocol/disco#items">
        ...
-         <item jid="discovery.clayster.com" name="Registro de cosas"/>
+         <item jid="discovery.example.org" name="Registro de cosas"/>
        ...
       </query>
    </iq>]]>
@@ -1622,8 +1625,8 @@
 		<example caption="Service discovery information request made to each component">
 			<![CDATA[
    <iq type='get'
-       from='device@clayster.com/device'
-       to='discovery.clayster.com'
+       from='device@example.org/device'
+       to='discovery.example.org'
        id='16'>
       <query xmlns='http://jabber.org/protocol/disco#info'/>
    </iq>]]>
@@ -1631,8 +1634,8 @@
 		<example caption="Service discovery information response from each component">
 			<![CDATA[
    <iq type='result'
-       from='discovery.clayster.com'
-       to='device@clayster.com/device'
+       from='discovery.example.org'
+       to='device@example.org/device'
        id='16'>
       <query xmlns='http://jabber.org/protocol/disco#info'>
          ...
diff --git a/xep-0348.xml b/xep-0348.xml
index c6f52789..4d663884 100644
--- a/xep-0348.xml
+++ b/xep-0348.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE xep SYSTEM 'xep.dtd' [
   <!ENTITY % ents SYSTEM 'xep.ent'>
 %ents;
@@ -24,13 +24,16 @@
 		<supersedes/>
 		<supersededby/>
 		<shortname>signing-forms</shortname>
-		<author>
-			<firstname>Peter</firstname>
-			<surname>Waher</surname>
-			<email>peter.waher@clayster.com</email>
-			<jid>peter.waher@jabber.org</jid>
-			<uri>http://www.linkedin.com/in/peterwaher</uri>
-		</author>
+		&peterwaher;
+		<revision>
+			<version>0.2</version>
+			<date>2015-11-09</date>
+			<initials>pw</initials>
+			<remark>
+				<p>Updated contact information.</p>
+				<p>Updated example JIDs to example.org</p>
+			</remark>
+		</revision>
     <revision>
       <version>0.1</version>
       <date>2014-05-28</date>
@@ -445,8 +448,8 @@
 		<example caption="Service discovery information request">
 			<![CDATA[
     <iq type='get'
-        from='clayster.com'
-        to='device@clayster.com'
+        from='example.org'
+        to='device@example.org'
         id='disco1'>
       <query xmlns='http://jabber.org/protocol/disco#info'/>
     </iq>]]>
@@ -454,8 +457,8 @@
 		<example caption="Service discovery information response">
 			<![CDATA[
     <iq type='result'
-        from='device@clayster.com'
-        to='clayster.com'
+        from='device@example.org'
+        to='example.org'
         id='disco1'>
       <query xmlns='http://jabber.org/protocol/disco#info'>
         ...
diff --git a/xep.ent b/xep.ent
index faaab0f5..b19358ac 100644
--- a/xep.ent
+++ b/xep.ent
@@ -995,6 +995,15 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
     <uri>https://blog.samwhited.com/</uri>
   </author>
 " >
+<!ENTITY peterwaher "
+  <author>
+    <firstname>Peter</firstname>
+    <surname>Waher</surname>
+    <email>peterwaher@hotmail.com</email>
+    <jid>peter.waher@jabber.org</jid>
+    <uri>http://www.linkedin.com/in/peterwaher</uri>
+  </author>
+" >
 
 <!-- XMPP Extension Protocols -->