diff --git a/proto/protocol.xml b/proto/protocol.xml
index bcedebd..d39c3ca 100644
--- a/proto/protocol.xml
+++ b/proto/protocol.xml
@@ -127,7 +127,7 @@
       <arg name="name" type="string" summary="the client name"/>
     </request>
 
-    <request name="interface" since="1">
+    <request name="interface_version" since="1">
       <description summary="interface support notification">
         Notify the EIS implementation that the client supports the
         given named interface with the given maximum version number.
diff --git a/src/libei-connection-setup.c b/src/libei-connection-setup.c
index eeb50ce..a911375 100644
--- a/src/libei-connection-setup.c
+++ b/src/libei-connection-setup.c
@@ -82,15 +82,15 @@ ei_connection_setup_initialize(struct ei_connection_setup *setup, uint32_t versi
 	if (version >= EI_CONNECTION_SETUP_REQUEST_NAME_SINCE_VERSION)
 		ei_connection_setup_request_name(setup, ei->name);
 
-	if (version >= EI_CONNECTION_SETUP_REQUEST_INTERFACE_SINCE_VERSION) {
-		ei_connection_setup_request_interface(setup, "ei_connection_setup", VERSION_V(1));
-		ei_connection_setup_request_interface(setup, "ei_connection", VERSION_V(1));
-		ei_connection_setup_request_interface(setup, "ei_callback", VERSION_V(1));
-		ei_connection_setup_request_interface(setup, "ei_seat", VERSION_V(1));
-		ei_connection_setup_request_interface(setup, "ei_device", VERSION_V(1));
-		ei_connection_setup_request_interface(setup, "ei_pointer", VERSION_V(1));
-		ei_connection_setup_request_interface(setup, "ei_keyboard", VERSION_V(1));
-		ei_connection_setup_request_interface(setup, "ei_touchscreen", VERSION_V(1));
+	if (version >= EI_CONNECTION_SETUP_REQUEST_INTERFACE_VERSION_SINCE_VERSION) {
+		ei_connection_setup_request_interface_version(setup, "ei_connection_setup", VERSION_V(1));
+		ei_connection_setup_request_interface_version(setup, "ei_connection", VERSION_V(1));
+		ei_connection_setup_request_interface_version(setup, "ei_callback", VERSION_V(1));
+		ei_connection_setup_request_interface_version(setup, "ei_seat", VERSION_V(1));
+		ei_connection_setup_request_interface_version(setup, "ei_device", VERSION_V(1));
+		ei_connection_setup_request_interface_version(setup, "ei_pointer", VERSION_V(1));
+		ei_connection_setup_request_interface_version(setup, "ei_keyboard", VERSION_V(1));
+		ei_connection_setup_request_interface_version(setup, "ei_touchscreen", VERSION_V(1));
 	}
 
 	ei_connection_setup_request_done(setup);
diff --git a/src/libeis-connection-setup.c b/src/libeis-connection-setup.c
index 7ceab2f..ffd0626 100644
--- a/src/libeis-connection-setup.c
+++ b/src/libeis-connection-setup.c
@@ -120,7 +120,7 @@ client_msg_type(struct eis_connection_setup *setup, uint32_t type)
 }
 
 static int
-client_msg_interface(struct eis_connection_setup *setup, const char *name, uint32_t version)
+client_msg_interface_version(struct eis_connection_setup *setup, const char *name, uint32_t version)
 {
 	struct eis_client *client = eis_connection_setup_get_client(setup);
 	struct eis *eis = eis_client_get_context(client);
@@ -170,7 +170,7 @@ static const struct eis_connection_setup_interface interface = {
 	.done = client_msg_done,
 	.type = client_msg_type,
 	.name = client_msg_name,
-	.interface = client_msg_interface,
+	.interface_version = client_msg_interface_version,
 };
 
 const struct eis_connection_setup_interface *