diff --git a/ovni.c b/ovni.c
index 72536a8..afb7c04 100644
--- a/ovni.c
+++ b/ovni.c
@@ -543,14 +543,14 @@ ovni_ev_add(struct ovni_ev *ev)
 }
 
 void
-ovni_ev_jumbo(struct ovni_ev *ev, uint8_t *buf, uint32_t bufsize)
+ovni_ev_jumbo_emit(struct ovni_ev *ev, uint8_t *buf, uint32_t bufsize)
 {
 	ovni_ev_set_clock(ev);
 	ovni_ev_add_jumbo(ev, buf, bufsize);
 }
 
 void
-ovni_ev(struct ovni_ev *ev)
+ovni_ev_emit(struct ovni_ev *ev)
 {
 	ovni_ev_set_clock(ev);
 	ovni_ev_add(ev);
diff --git a/ovni.h b/ovni.h
index b0da529..49d6ee6 100644
--- a/ovni.h
+++ b/ovni.h
@@ -163,8 +163,8 @@ int ovni_payload_size(struct ovni_ev *ev);
 void ovni_add_cpu(int index, int phyid);
 
 /* Set the current clock in the event and queue it */
-void ovni_ev(struct ovni_ev *ev);
-void ovni_ev_jumbo(struct ovni_ev *ev, uint8_t *buf, uint32_t bufsize);
+void ovni_ev_emit(struct ovni_ev *ev);
+void ovni_ev_jumbo_emit(struct ovni_ev *ev, uint8_t *buf, uint32_t bufsize);
 
 int ovni_flush(void);
 
diff --git a/test_speed.c b/test_speed.c
index 42a5571..461e3a2 100644
--- a/test_speed.c
+++ b/test_speed.c
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
 	for(i=0; i<n; i++)
 	{
 		ovni_clock_update();
-		ovni_ev(&ev);
+		ovni_ev_emit(&ev);
 	}
 
 	ovni_flush();