diff --git a/proto/protocol.xml b/proto/protocol.xml
index 2b77bd6..345782d 100644
--- a/proto/protocol.xml
+++ b/proto/protocol.xml
@@ -398,7 +398,7 @@
         The callback_data passed in the callback is always zero.
 
         Note that for a client to use this request it must announce
-        support for the "ei_callback" interface in ei_handshake.interface.
+        support for the "ei_callback" interface in ei_handshake.interface_version.
         It is a protocol violation to request sync without having announced the
         "ei_callback" interface and the EIS implementation must disconnect
         the client.
@@ -479,9 +479,9 @@
         A seat is a set of input devices that logically belong together.
 
         This event is only sent if the client announced support for the
-        "ei_seat" interface in ei_handshake.interface.
+        "ei_seat" interface in ei_handshake.interface_version.
         The interface version is equal or less to the client-supported
-        version in ei_handshake.interface for the "ei_seat"
+        version in ei_handshake.interface_version for the "ei_seat"
         interface.
       </description>
       <arg name="seat" type="new_id" interface="ei_seat"/>
@@ -522,7 +522,7 @@
         such the client must not attempt to use it after that point.
 
         Note that for a EIS implementation to use this request the client must
-        announce support for this interface in ei_handshake.interface. It is
+        announce support for this interface in ei_handshake.interface_version. It is
         a protocol violation to send this event to a client without the
         "ei_pingpong" interface.
       </description>
@@ -539,7 +539,7 @@
       the related request that created the ei_callback object is done.
 
       Note that for a client to receive objects of this type, it must announce
-      support for this interface in ei_handshake.interface.
+      support for this interface in ei_handshake.interface_version.
     </description>
 
     <!-- ei_callback events version 1 -->
@@ -561,7 +561,7 @@
       the EIS implementation to enforce a roundtrip to the client.
 
       Note that for a client to receive objects of this type, it must announce
-      support for this interface in ei_handshake.interface.
+      support for this interface in ei_handshake.interface_version.
     </description>
 
     <!-- ei_pingpong client requests version 1 -->
@@ -593,7 +593,7 @@
       ei_seat.done event.
 
       Note that for a client to receive objects of this type, it must announce
-      support for this interface in ei_handshake.interface.
+      support for this interface in ei_handshake.interface_version.
     </description>
 
     <!-- ei_seat client requests version 1 -->
@@ -698,7 +698,7 @@
         This event is only sent if the client announced support for the
         "ei_device" interface in ei_handshake.interface_version.
         The interface version is equal or less to the client-supported
-        version in ei_handshake.interface for the "ei_device"
+        version in ei_handshake.interface_version for the "ei_device"
         interface.
       </description>
       <arg name="device" type="new_id" interface="ei_device" summary="the new device"/>
@@ -719,7 +719,7 @@
       for details.
 
       Note that for a client to receive objects of this type, it must announce
-      support for this interface in ei_handshake.interface.
+      support for this interface in ei_handshake.interface_version.
     </description>
 
     <!-- ei_device client requests version 1 -->
@@ -948,9 +948,9 @@
         ei_device.capabilities.pointer_absolute capability.
 
         This event is only sent if the client announced support for the
-        "ei_pointer" interface in ei_handshake.interface.
+        "ei_pointer" interface in ei_handshake.interface_version.
         The interface version is equal or less to the client-supported
-        version in ei_handshake.interface for the "ei_pointer"
+        version in ei_handshake.interface_version for the "ei_pointer"
         interface.
 
         This event is optional and sent immediately after object creation.
@@ -968,9 +968,9 @@
         ei_device.capabilities.keyboard.
 
         This event is only sent if the client announced support for the
-        "ei_keyboard" interface in ei_handshake.interface.
+        "ei_keyboard" interface in ei_handshake.interface_version.
         The interface version is equal or less to the client-supported
-        version in ei_handshake.interface for the "ei_keyboard"
+        version in ei_handshake.interface_version for the "ei_keyboard"
         interface.
 
         This event is optional and sent immediately after object creation.
@@ -988,9 +988,9 @@
         ei_device.capabilities.touchscreen.
 
         This event is only sent if the client announced support for the
-        "ei_touchscreen" interface in ei_handshake.interface.
+        "ei_touchscreen" interface in ei_handshake.interface_version.
         The interface version is equal or less to the client-supported
-        version in ei_handshake.interface for the "ei_touchscreen"
+        version in ei_handshake.interface_version for the "ei_touchscreen"
         interface.
 
         This event is optional and sent immediately after object creation.
@@ -1097,7 +1097,7 @@
       the device) if the interface is releasd.
 
       Note that for a client to receive objects of this type, it must announce
-      support for this interface in ei_handshake.interface.
+      support for this interface in ei_handshake.interface_version.
     </description>
 
     <!-- ei_pointer client requests version 1 -->
@@ -1335,7 +1335,7 @@
       the device) if the interface is releasd.
 
       Note that for a client to receive objects of this type, it must announce
-      support for this interface in ei_handshake.interface.
+      support for this interface in ei_handshake.interface_version.
     </description>
 
     <!-- ei_keyboard client requests version 1 -->
@@ -1468,7 +1468,7 @@
       the device) if the interface is releasd.
 
       Note that for a client to receive objects of this type, it must announce
-      support for this interface in ei_handshake.interface.
+      support for this interface in ei_handshake.interface_version.
     </description>
 
     <!-- ei_touchscreen client requests version 1 -->