diff --git a/src/libeis-private.h b/src/libeis-private.h
index 5baaa21..3cf4cfb 100644
--- a/src/libeis-private.h
+++ b/src/libeis-private.h
@@ -36,7 +36,7 @@ struct eis_backend_interface {
 
 struct eis {
 	struct object object;
-	void *userdata;
+	void *user_data;
 	struct logger *logger;
 	struct sink *sink;
 	struct list clients;
diff --git a/src/libeis.c b/src/libeis.c
index 7542ea8..268143c 100644
--- a/src/libeis.c
+++ b/src/libeis.c
@@ -63,8 +63,8 @@ _public_
 OBJECT_IMPLEMENT_UNREF(eis);
 #define _cleanup_eis_ _cleanup_(eis_cleanup)
 _public_
-OBJECT_IMPLEMENT_SETTER(eis, userdata, void *);
-OBJECT_IMPLEMENT_GETTER(eis, userdata, void *);
+OBJECT_IMPLEMENT_SETTER(eis, user_data, void *);
+OBJECT_IMPLEMENT_GETTER(eis, user_data, void *);
 
 _public_ struct eis *
 eis_new(void *user_data)
diff --git a/src/libeis.h b/src/libeis.h
index fadfb00..09f2247 100644
--- a/src/libeis.h
+++ b/src/libeis.h
@@ -109,10 +109,10 @@ struct eis *
 eis_unref(struct eis *eis);
 
 void *
-eis_get_userdata(struct eis *eis);
+eis_get_user_data(struct eis *eis);
 
 void
-eis_set_userdata(struct eis *eis, void *userdata);
+eis_set_user_data(struct eis *eis, void *user_data);
 
 /**
  * Initialize the context with a UNIX socket name.