diff --git a/include/freerdp/types.h b/include/freerdp/types.h
index eaa8a64cb..6f5a89b9f 100644
--- a/include/freerdp/types.h
+++ b/include/freerdp/types.h
@@ -113,7 +113,7 @@ FRDP_BRUSH;
 typedef struct _FRDP_PLUGIN_DATA
 {
 	uint16 size;
-	void * data[4];
+	void* data[4];
 }
 FRDP_PLUGIN_DATA;
 
@@ -128,19 +128,19 @@ FRDP_RECT;
 
 typedef struct _FRDP_EVENT FRDP_EVENT;
 
-typedef void (*FRDP_EVENT_CALLBACK) (FRDP_EVENT * event);
+typedef void (*FRDP_EVENT_CALLBACK) (FRDP_EVENT* event);
 
 struct _FRDP_EVENT
 {
 	uint16 event_type;
-	FRDP_EVENT_CALLBACK event_callback;
-	void * user_data;
+	FRDP_EVENT_CALLBACK on_event_free_callback;
+	void* user_data;
 };
 
 struct _FRDP_VIDEO_FRAME_EVENT
 {
 	FRDP_EVENT event;
-	uint8 * frame_data;
+	uint8* frame_data;
 	uint32 frame_size;
 	uint32 frame_pixfmt;
 	sint16 frame_width;
@@ -150,7 +150,7 @@ struct _FRDP_VIDEO_FRAME_EVENT
 	sint16 width;
 	sint16 height;
 	uint16 num_visible_rects;
-	FRDP_RECT * visible_rects;
+	FRDP_RECT* visible_rects;
 };
 typedef struct _FRDP_VIDEO_FRAME_EVENT FRDP_VIDEO_FRAME_EVENT;
 
diff --git a/include/freerdp/utils/event.h b/include/freerdp/utils/event.h
index 21b70e08a..6e47f563c 100644
--- a/include/freerdp/utils/event.h
+++ b/include/freerdp/utils/event.h
@@ -23,7 +23,7 @@
 #include <freerdp/types.h>
 #include <freerdp/constants.h>
 
-FRDP_EVENT* freerdp_event_new(uint32 event_type, FRDP_EVENT_CALLBACK callback, void* user_data);
+FRDP_EVENT* freerdp_event_new(uint32 event_type, FRDP_EVENT_CALLBACK on_event_free_callback, void* user_data);
 void freerdp_event_free(FRDP_EVENT* event);
 
 #endif
diff --git a/libfreerdp-utils/event.c b/libfreerdp-utils/event.c
index 499e9673f..66f858c23 100644
--- a/libfreerdp-utils/event.c
+++ b/libfreerdp-utils/event.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <freerdp/utils/event.h>
 
-FRDP_EVENT* freerdp_event_new(uint32 event_type, FRDP_EVENT_CALLBACK callback, void* user_data)
+FRDP_EVENT* freerdp_event_new(uint32 event_type, FRDP_EVENT_CALLBACK on_event_free_callback, void* user_data)
 {
 	FRDP_EVENT* event = NULL;
 
@@ -44,7 +44,7 @@ FRDP_EVENT* freerdp_event_new(uint32 event_type, FRDP_EVENT_CALLBACK callback, v
 	if (event != NULL)
 	{
 		event->event_type = event_type;
-		event->event_callback = callback;
+		event->on_event_free_callback = on_event_free_callback;
 		event->user_data = user_data;
 	}
 
@@ -55,8 +55,8 @@ void freerdp_event_free(FRDP_EVENT* event)
 {
 	if (event != NULL)
 	{
-		if (event->event_callback != NULL)
-			event->event_callback(event);
+		if (event->on_event_free_callback != NULL)
+			event->on_event_free_callback(event);
 
 		switch (event->event_type)
 		{