diff --git a/xep-0155.xml b/xep-0155.xml
index 995fa912..62da6f45 100644
--- a/xep-0155.xml
+++ b/xep-0155.xml
@@ -195,12 +195,12 @@ PENDING  o---------------+
         <required/>
       </field>
       <field label='Off-The-Record?' type='list-single' var='otr'>
-        <value>0</value>
+        <value>no</value>
         <option label='Allow message logging'>
-          <value>0</value>
+          <value>no</value>
         </option>
         <option label='Disable all message logging'>
-          <value>1</value>
+          <value>yes</value>
         </option>
         <required/>
       </field>
@@ -220,23 +220,23 @@ PENDING  o---------------+
       <field label='XHTML formatting?'
              type='list-single'
              var='http://jabber.org/protocol/xhtml-im'>
-        <value>1</value>
-        <option label='Disable'><value>0</value></option>
-        <option label='Enable'><value>1</value></option>
+        <value>yes</value>
+        <option label='Disable'><value>no</value></option>
+        <option label='Enable'><value>yes</value></option>
       </field>
       <field label='Temporarily share presence?'
              type='list-single'
              var='presence'
-        <value>1</value>
-        <option label='Disable'><value>0</value></option>
-        <option label='Enable'><value>1</value></option>
+        <value>yes</value>
+        <option label='Disable'><value>no</value></option>
+        <option label='Enable'><value>yes</value></option>
       </field>
       <field label='Chat State Notifications?'
              type='list-single'
              var='http://jabber.org/protocol/chatstates'>
-        <value>1</value>
-        <option label='Disable'><value>0</value></option>
-        <option label='Enable'><value>1</value></option>
+        <value>yes</value>
+        <option label='Disable'><value>no</value></option>
+        <option label='Enable'><value>yes</value></option>
       </field>
       <field label='Minimum security level'
              type='list-single'
@@ -467,9 +467,9 @@ PENDING  o---------------+
         <required/>
       </field>
       <field label='Off-The-Record?' type='list-single' var='otr'>
-        <value>1</value>
+        <value>yes</value>
         <option label='Disable all message logging'>
-          <value>1</value>
+          <value>yes</value>
         </option>
         <required/>
       </field>
@@ -646,7 +646,7 @@ PENDING  o---------------+
       type='list-single'
       label='Whether may send Chat State Notifications per XEP-0085'>
     <option label='Must Not Send'>
-      <value>0</value>
+      <value>no</value>
     </option>
     <option label='May Send'>
       <value>1</value>
@@ -657,7 +657,7 @@ PENDING  o---------------+
       type='list-single'
       label='Whether allowed to use XHTML-IM formatting per XEP-0071'>
     <option label='Must Not Send'>
-      <value>0</value>
+      <value>no</value>
     </option>
     <option label='May Send'>
       <value>1</value>
@@ -674,7 +674,7 @@ PENDING  o---------------+
       type='list-single'
       label='Off-The-Record'>
     <option label='May log messages'>
-      <value>0</value>
+      <value>no</value>
     </option>
     <option label='Must disable absolutely all message
                    logging including automatic archiving