6 files changed, 22 insertions, 23 deletions
diff --git a/lib/tevent/tevent.c b/lib/tevent/tevent.c
index 0b4a3cd5b7..676a3dc398 100644
--- a/lib/tevent/tevent.c
+++ b/lib/tevent/tevent.c
@@ -70,7 +70,7 @@ static char *tevent_default_backend = NULL;
 /*
   register an events backend
 */
-bool event_register_backend(const char *name, const struct tevent_ops *ops)
+bool tevent_register_backend(const char *name, const struct tevent_ops *ops)
 {
 	struct tevent_ops_list *e;
 
@@ -106,13 +106,13 @@ void tevent_set_default_backend(const char *backend)
 */
 static void tevent_backend_init(void)
 {
-	events_select_init();
-	events_standard_init();
+	tevent_select_init();
+	tevent_standard_init();
 #if HAVE_EVENTS_EPOLL
-	events_epoll_init();
+	tevent_epoll_init();
 #endif
 #if HAVE_LINUX_AIO
-	events_aio_init();
+	tevent_aio_init();
 #endif
 }
 
diff --git a/lib/tevent/tevent_aio.c b/lib/tevent/tevent_aio.c
index 46a5d3d6fc..8d25791bea 100644
--- a/lib/tevent/tevent_aio.c
+++ b/lib/tevent/tevent_aio.c
@@ -549,7 +549,7 @@ static struct aio_event *aio_event_add_aio(struct tevent_context *ev,
 	return ae;
 }
 
-static const struct event_ops aio_event_ops = {
+static const struct tevent_ops aio_event_ops = {
 	.context_init	= aio_event_context_init,
 	.add_fd		= aio_event_add_fd,
 	.add_aio        = aio_event_add_aio,
@@ -561,8 +561,8 @@ static const struct event_ops aio_event_ops = {
 	.loop_wait	= aio_event_loop_wait,
 };
 
-bool events_aio_init(void)
+bool tevent_aio_init(void)
 {
-	return event_register_backend("aio", &aio_event_ops);
+	return tevent_register_backend("aio", &aio_event_ops);
 }
 
diff --git a/lib/tevent/tevent_epoll.c b/lib/tevent/tevent_epoll.c
index ab07515f10..1f853e60f1 100644
--- a/lib/tevent/tevent_epoll.c
+++ b/lib/tevent/tevent_epoll.c
@@ -465,7 +465,7 @@ static int epoll_event_loop_wait(struct tevent_context *ev)
 	return 0;
 }
 
-static const struct event_ops epoll_event_ops = {
+static const struct tevent_ops epoll_event_ops = {
 	.context_init	= epoll_event_context_init,
 	.add_fd		= epoll_event_add_fd,
 	.get_fd_flags	= epoll_event_get_fd_flags,
@@ -476,7 +476,7 @@ static const struct event_ops epoll_event_ops = {
 	.loop_wait	= epoll_event_loop_wait,
 };
 
-bool events_epoll_init(void)
+bool tevent_epoll_init(void)
 {
-	return event_register_backend("epoll", &epoll_event_ops);
+	return tevent_register_backend("epoll", &epoll_event_ops);
 }
diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
index 2d6909da36..a439c62743 100644
--- a/lib/tevent/tevent_internal.h
+++ b/lib/tevent/tevent_internal.h
@@ -132,7 +132,7 @@ struct tevent_context {
 };
 
 
-bool event_register_backend(const char *name, const struct tevent_ops *ops);
+bool tevent_register_backend(const char *name, const struct tevent_ops *ops);
 
 bool ev_timeval_is_zero(const struct timeval *tv);
 struct tevent_timer *common_event_add_timed(struct tevent_context *,
@@ -151,11 +151,11 @@ struct tevent_signal *common_event_add_signal(struct tevent_context *ev,
 int common_event_check_signal(struct tevent_context *ev);
 
 
-bool events_standard_init(void);
-bool events_select_init(void);
+bool tevent_standard_init(void);
+bool tevent_select_init(void);
 #if HAVE_EVENTS_EPOLL
-bool events_epoll_init(void);
+bool tevent_epoll_init(void);
 #endif
 #if HAVE_LINUX_AIO
-bool events_aio_init(void);
+bool tevent_aio_init(void);
 #endif
diff --git a/lib/tevent/tevent_select.c b/lib/tevent/tevent_select.c
index 3e72ce4943..103e5ac1fa 100644
--- a/lib/tevent/tevent_select.c
+++ b/lib/tevent/tevent_select.c
@@ -284,7 +284,7 @@ static int select_event_loop_wait(struct tevent_context *ev)
 	return select_ev->exit_code;
 }
 
-static const struct event_ops select_event_ops = {
+static const struct tevent_ops select_event_ops = {
 	.context_init	= select_event_context_init,
 	.add_fd		= select_event_add_fd,
 	.get_fd_flags	= select_event_get_fd_flags,
@@ -295,8 +295,7 @@ static const struct event_ops select_event_ops = {
 	.loop_wait	= select_event_loop_wait,
 };
 
-bool events_select_init(void)
+bool tevent_select_init(void)
 {
-	return event_register_backend("select", &select_event_ops);
+	return tevent_register_backend("select", &select_event_ops);
 }
-
diff --git a/lib/tevent/tevent_standard.c b/lib/tevent/tevent_standard.c
index 1c99408b8d..1c60fc0167 100644
--- a/lib/tevent/tevent_standard.c
+++ b/lib/tevent/tevent_standard.c
@@ -588,7 +588,7 @@ static int std_event_loop_wait(struct tevent_context *ev)
 	return std_ev->exit_code;
 }
 
-static const struct event_ops std_event_ops = {
+static const struct tevent_ops std_event_ops = {
 	.context_init	= std_event_context_init,
 	.add_fd		= std_event_add_fd,
 	.get_fd_flags	= std_event_get_fd_flags,
@@ -600,8 +600,8 @@ static const struct event_ops std_event_ops = {
 };
 
 
-bool events_standard_init(void)
+bool tevent_standard_init(void)
 {
-	return event_register_backend("standard", &std_event_ops);
+	return tevent_register_backend("standard", &std_event_ops);
 }