diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index c650894b3..459c8c92f 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -1146,7 +1146,7 @@ const LinphoneErrorInfo *linphone_call_get_error_info(const LinphoneCall *call){
  *
  * return user_pointer an opaque user pointer that can be retrieved at any time
 **/
-void *linphone_call_get_user_pointer(LinphoneCall *call)
+void *linphone_call_get_user_data(LinphoneCall *call)
 {
 	return call->user_pointer;
 }
@@ -1158,7 +1158,7 @@ void *linphone_call_get_user_pointer(LinphoneCall *call)
  *
  * the user_pointer is an opaque user pointer that can be retrieved at any time in the LinphoneCall
 **/
-void linphone_call_set_user_pointer(LinphoneCall *call, void *user_pointer)
+void linphone_call_set_user_data(LinphoneCall *call, void *user_pointer)
 {
 	call->user_pointer = user_pointer;
 }
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 6818b1415..93f30606e 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -288,14 +288,14 @@ const char *linphone_call_log_get_call_id(const LinphoneCallLog *cl){
 /**
  * Assign a user pointer to the call log.
 **/
-void linphone_call_log_set_user_pointer(LinphoneCallLog *cl, void *up){
+void linphone_call_log_set_user_data(LinphoneCallLog *cl, void *up){
 	cl->user_pointer=up;
 }
 
 /**
  * Returns the user pointer associated with the call log.
 **/
-void *linphone_call_log_get_user_pointer(const LinphoneCallLog *cl){
+void *linphone_call_log_get_user_data(const LinphoneCallLog *cl){
 	return cl->user_pointer;
 }
 
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 9fdb864df..b08c75395 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -356,8 +356,12 @@ LINPHONE_PUBLIC	bool_t linphone_call_log_video_enabled(LinphoneCallLog *cl);
 LINPHONE_PUBLIC	time_t linphone_call_log_get_start_date(LinphoneCallLog *cl);
 LINPHONE_PUBLIC	int linphone_call_log_get_duration(LinphoneCallLog *cl);
 LINPHONE_PUBLIC	float linphone_call_log_get_quality(LinphoneCallLog *cl);
-LINPHONE_PUBLIC	void linphone_call_log_set_user_pointer(LinphoneCallLog *cl, void *up);
-LINPHONE_PUBLIC	void *linphone_call_log_get_user_pointer(const LinphoneCallLog *cl);
+/** @deprecated Use linphone_call_log_set_user_data() instead. */
+#define linphone_call_log_set_user_pointer(cl, ud) linphone_call_log_set_user_data(cl, ud)
+LINPHONE_PUBLIC	void linphone_call_log_set_user_data(LinphoneCallLog *cl, void *up);
+/** @deprecated Use linphone_call_log_get_user_data() instead. */
+#define linphone_call_log_get_user_pointer(cl) linphone_call_log_get_user_data(cl)
+LINPHONE_PUBLIC	void *linphone_call_log_get_user_data(const LinphoneCallLog *cl);
 void linphone_call_log_set_ref_key(LinphoneCallLog *cl, const char *refkey);
 const char *linphone_call_log_get_ref_key(const LinphoneCallLog *cl);
 LINPHONE_PUBLIC	const rtp_stats_t *linphone_call_log_get_local_stats(const LinphoneCallLog *cl);
@@ -717,8 +721,12 @@ LINPHONE_PUBLIC	const char* linphone_call_get_authentication_token(LinphoneCall
 LINPHONE_PUBLIC	bool_t linphone_call_get_authentication_token_verified(LinphoneCall *call);
 LINPHONE_PUBLIC	void linphone_call_set_authentication_token_verified(LinphoneCall *call, bool_t verified);
 LINPHONE_PUBLIC void linphone_call_send_vfu_request(LinphoneCall *call);
-LINPHONE_PUBLIC void *linphone_call_get_user_pointer(LinphoneCall *call);
-LINPHONE_PUBLIC	void linphone_call_set_user_pointer(LinphoneCall *call, void *user_pointer);
+/** @deprecated Use linphone_call_get_user_data() instead. */
+#define linphone_call_get_user_pointer(call) linphone_call_get_user_data(call)
+LINPHONE_PUBLIC void *linphone_call_get_user_data(LinphoneCall *call);
+/** @deprecated Use linphone_call_set_user_data() instead. */
+#define linphone_call_set_user_pointer(call, ud) linphone_call_set_user_data(call, ud)
+LINPHONE_PUBLIC	void linphone_call_set_user_data(LinphoneCall *call, void *user_data);
 LINPHONE_PUBLIC	void linphone_call_set_next_video_frame_decoded_callback(LinphoneCall *call, LinphoneCallCbFunc cb, void* user_data);
 LINPHONE_PUBLIC LinphoneCallState linphone_call_get_transfer_state(LinphoneCall *call);
 LINPHONE_PUBLIC void linphone_call_zoom_video(LinphoneCall* call, float zoom_factor, float* cx, float* cy);
diff --git a/tools/python/apixml2python.py b/tools/python/apixml2python.py
index f71cbb7eb..34770b328 100755
--- a/tools/python/apixml2python.py
+++ b/tools/python/apixml2python.py
@@ -38,13 +38,9 @@ blacklisted_events = [
 	'LinphoneCoreFileTransferSendCb'	# missing LinphoneContent
 ]
 blacklisted_functions = [
-	'linphone_call_get_user_pointer',	# rename to linphone_call_get_user_data
-	'linphone_call_set_user_pointer',	# rename to linphone_call_set_user_data
 	'linphone_call_log_get_local_stats',	# missing rtp_stats_t
 	'linphone_call_log_get_remote_stats',	# missing rtp_stats_t
 	'linphone_call_log_get_start_date',	# missing time_t
-	'linphone_call_log_get_user_pointer',	# rename to linphone_call_log_get_user_data
-	'linphone_call_log_set_user_pointer',	# rename to linphone_call_log_set_user_data
 	'linphone_call_params_get_privacy',	# missing LinphonePrivacyMask
 	'linphone_call_params_get_used_audio_codec',	# missing PayloadType
 	'linphone_call_params_get_used_video_codec',	# missing PayloadType