diff --git a/xep-0166.xml b/xep-0166.xml
index 092cdbfb..48eab2e2 100644
--- a/xep-0166.xml
+++ b/xep-0166.xml
@@ -411,7 +411,7 @@ Romeo                         Juliet
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
     <reason>
-      <no-error/>
+      <success/>
       <text>Sorry, gotta go!</text>
     </reason>
   </jingle>
@@ -1030,10 +1030,6 @@ PENDING  o----------------------+   |
         <td>&lt;decline/&gt;</td>
         <td>The party wishes to formally decline the session.</td>
       </tr>
-      <tr>
-        <td>&lt;ended/&gt;</td>
-        <td>The session has formally ended.</td>
-      </tr>
       <tr>
         <td>&lt;expired/&gt;</td>
         <td>The session length has exceeded a pre-defined time limit (e.g., a meeting hosted at a conference service).</td>
@@ -1042,17 +1038,17 @@ PENDING  o----------------------+   |
         <td>&lt;general-error/&gt;</td>
         <td>The action is related to a non-specific application error.</td>
       </tr>
+      <tr>
+        <td>&lt;gone/&gt;</td>
+        <td>The entity is going offline or is no longer available.</td>
+      </tr>
       <tr>
         <td>&lt;media-error/&gt;</td>
         <td>The action is related to media processing problems.</td>
       </tr>
-      <tr>
-        <td>&lt;no-error/&gt;</td>
-        <td>The action is generated during the normal course of state management.</td>
-      </tr>
       <tr>
         <td>&lt;success/&gt;</td>
-        <td>The session has been successfully completed.</td>
+        <td>The action is generated during the normal course of state management and does not reflect any error.</td>
       </tr>
       <tr>
         <td>&lt;timeout/&gt;</td>
@@ -1300,13 +1296,15 @@ PENDING  o----------------------+   |
         <xs:element name='alternative-session' 
                     type='alternativeSessionElementType'/>
         <xs:element name='busy' type='empty'/>
+        <xs:element name='cancel' type='empty'/>
         <xs:element name='connectivity-error' type='empty'/>
         <xs:element name='decline' type='empty'/>
+        <xs:element name='expired' type='empty'/>
         <xs:element name='general-error' type='empty'/>
-        <xs:element name='invalid-credentials' type='empty'/>
+        <xs:element name='gone' type='empty'/>
         <xs:element name='media-error' type='empty'/>
-        <xs:element name='no-error' type='empty'/>
         <xs:element name='success' type='empty'/>
+        <xs:element name='timeout' type='empty'/>
         <xs:element name='unsupported-applications' type='empty'/>
         <xs:element name='unsupported-transports' type='empty'/>
       </xs:choice>
diff --git a/xep-0167.xml b/xep-0167.xml
index 9ff6afbc..9f360a07 100644
--- a/xep-0167.xml
+++ b/xep-0167.xml
@@ -855,7 +855,7 @@ Romeo                         Juliet
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
     <reason>
-      <no-error/>
+      <success/>
       <text>Sorry, gotta go!</text>
     </reason>
   </jingle>
@@ -1036,7 +1036,7 @@ Romeo                         Juliet
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
     <reason>
-      <no-error/>
+      <success/>
       <text>Sorry, gotta go!</text>
     </reason>
   </jingle>
@@ -1250,7 +1250,7 @@ Romeo                    Gateway                    Juliet
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
     <reason>
-      <no-error/>
+      <success/>
       <text>Sorry, gotta go!</text>
     </reason>
   </jingle>
@@ -1567,7 +1567,7 @@ Romeo                         Juliet
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
     <reason>
-      <no-error/>
+      <success/>
       <text>I&apos;m outta here!</text>
     </reason>
   </jingle>
diff --git a/xep-0176.xml b/xep-0176.xml
index 0b349fc5..15763ada 100644
--- a/xep-0176.xml
+++ b/xep-0176.xml
@@ -1017,7 +1017,7 @@ Romeo                    Gateway                    Juliet
           initiator='romeo@montague.lit/orchard'
           sid='a73sjjvkla37jfea'>
     <reason>
-      <no-error/>
+      <success/>
       <text>Sorry, gotta go!</text>
     </reason>
   </jingle>