diff --git a/proto/protocol.xml b/proto/protocol.xml
index 57d3b45..a53cc88 100644
--- a/proto/protocol.xml
+++ b/proto/protocol.xml
@@ -173,7 +173,7 @@
     </request>
 
     <request name="name" since="1">
-      <description summary="type request">
+      <description summary="context name request">
         Notify the EIS implementation of the client name. The name is a
         human-presentable UTF-8 string. There is no requirement
         for the EIS implementation to use this name.
@@ -449,7 +449,7 @@
       support for this interface in ei_connection_setup.interface.
     </description>
 
-    <!-- ei_callback client requests version 1 -->
+    <!-- ei_pingpong client requests version 1 -->
 
     <request name="done" type="destructor" since="1">
       <description summary="done event">
@@ -463,7 +463,7 @@
       <arg name="callback_data" type="uint" summary="request-specific data for the callback"/>
     </request>
 
-    <!-- ei_callback events version 1 -->
+    <!-- ei_pingpong events version 1 -->
   </interface>
 
   <interface name="ei_seat" version="1">
@@ -997,7 +997,7 @@
     <!-- ei_pointer events version 1 -->
 
     <event name="destroyed" type="destructor" since="1">
-      <description summary="Seat removal notification">
+      <description summary="Pointer removal notification">
         This pointer has been removed and a client should release all
         associated resources.
 
@@ -1136,7 +1136,7 @@
     <!-- ei_keyboard events version 1 -->
 
     <event name="destroyed" type="destructor" since="1">
-      <description summary="Seat removal notification">
+      <description summary="Keyboard removal notification">
         This keyboard has been removed and a client should release all
         associated resources.
 
@@ -1231,7 +1231,7 @@
     <!-- ei_touchscreen events version 1 -->
 
     <event name="destroyed" type="destructor" since="1">
-      <description summary="Seat removal notification">
+      <description summary="Touchscreen removal notification">
         This touch has been removed and a client should release all
         associated resources.