diff --git a/xep-0116.xml b/xep-0116.xml
index 7e234653..ca5ac416 100644
--- a/xep-0116.xml
+++ b/xep-0116.xml
@@ -250,7 +250,7 @@
   <feature xmlns='http://jabber.org/protocol/feature-neg'>
     <x type='form' xmlns='jabber:x:data'>
       <field type="hidden" var="FORM_TYPE">
-        <value>urn:xmpp:chatneg</value>
+        <value>urn:xmpp:ssn</value>
       </field>
       <field type="boolean" var="accept">
         <value>1</value>
@@ -334,7 +334,7 @@
   <feature xmlns='http://jabber.org/protocol/feature-neg'>
     <x type='form' xmlns='jabber:x:data'>
       <field type="hidden" var="FORM_TYPE">
-        <value>urn:xmpp:chatneg</value>
+        <value>urn:xmpp:ssn</value>
       </field>
       ...
       ...
@@ -401,7 +401,7 @@
   <feature xmlns='http://jabber.org/protocol/feature-neg'>
     <x type='submit' xmlns='jabber:x:data'>
       <field var="FORM_TYPE">
-        <value>urn:xmpp:chatneg</value>
+        <value>urn:xmpp:ssn</value>
       </field>
       <field var="accept"><value>1</value></field>
       <field var="otr"><value>true</value></field>
@@ -442,7 +442,7 @@
   <feature xmlns='http://jabber.org/protocol/feature-neg'>
     <x type='submit' xmlns='jabber:x:data'>
       <field var="FORM_TYPE">
-        <value>urn:xmpp:chatneg</value>
+        <value>urn:xmpp:ssn</value>
       </field>
       <field var="accept"><value>1</value></field>
       <field var="otr"><value>true</value></field>
@@ -523,7 +523,7 @@
   <feature xmlns='http://jabber.org/protocol/feature-neg'>
     <x type='submit' xmlns='jabber:x:data'>
       <field var="FORM_TYPE">
-        <value>urn:xmpp:chatneg</value>
+        <value>urn:xmpp:ssn</value>
       </field>
       ...
       ...
@@ -607,7 +607,7 @@
   <thread>ffd7076498744578d10edabfe7f4a866</thread>
   <feature xmlns='http://jabber.org/protocol/feature-neg'>
     <x type='result' xmlns='jabber:x:data'>
-      <field var="FORM_TYPE"><value>urn:xmpp:chatneg</value></field>
+      <field var="FORM_TYPE"><value>urn:xmpp:ssn</value></field>
       <field var="accept"><value>1</value></field>
       <field var="nonce"><value> ** Bob's Base64 encoded ESession ID ** </value></field>
       <field var="identity"><value> ** Encrypted identity ** </value></field>
@@ -627,7 +627,7 @@
   <thread>ffd7076498744578d10edabfe7f4a866</thread>
   <feature xmlns='http://jabber.org/protocol/feature-neg'>
     <x type='result' xmlns='jabber:x:data'>
-      <field var="FORM_TYPE"><value>urn:xmpp:chatneg</value></field>
+      <field var="FORM_TYPE"><value>urn:xmpp:ssn</value></field>
       <field var="accept"><value>1</value></field>
       <field var="nonce"><value> ** Bob's Base64 encoded ESession ID ** </value></field>
       <field type="hidden" var="dhkeys">
@@ -692,7 +692,7 @@
   <thread>ffd7076498744578d10edabfe7f4a866</thread>
   <init xmlns='urn:xmpp:esession#init'>
     <x type='result' xmlns='jabber:x:data'>
-      <field var="FORM_TYPE"><value>urn:xmpp:chatneg</value></field>
+      <field var="FORM_TYPE"><value>urn:xmpp:ssn</value></field>
       <field var="nonce"><value> ** Alice's Base64 encoded ESession ID ** </value></field>
       <field var="srshash"><value> ** HMAC with shared retained secret ** </value></field>
       <field var="identity"><value> ** Encrypted identity ** </value></field>
@@ -1011,7 +1011,7 @@
 </form_type>
 
 <form_type>
-  <name>urn:xmpp:chatneg</name>
+  <name>urn:xmpp:ssn</name>
   <jep>XEP-0155</jep>
   ...
 </form_type>
diff --git a/xep-0187.xml b/xep-0187.xml
index d73970e5..478a3b44 100644
--- a/xep-0187.xml
+++ b/xep-0187.xml
@@ -183,7 +183,7 @@
       <item>
         <x type='form' xmlns='jabber:x:data'>
           <field type="hidden" var="FORM_TYPE">
-            <value>urn:xmpp:chatneg</value>
+            <value>urn:xmpp:ssn</value>
           </field>
           <field type="list-single" var="otr">
             <option><value>false</value></option>
@@ -305,7 +305,7 @@
   <init xmlns='urn:xmpp:esession#init'>
     <x type='submit' xmlns='jabber:x:data'>
       <field var="FORM_TYPE">
-        <value>urn:xmpp:chatneg</value>
+        <value>urn:xmpp:ssn</value>
       </field>
       <field var="otr"><value>true</value></field>
       <field var="disclosure"><value>never</value></field>