diff --git a/coreapi/contact_providers_priv.h b/coreapi/contact_providers_priv.h
index 58527c9d6..d52af6c5f 100644
--- a/coreapi/contact_providers_priv.h
+++ b/coreapi/contact_providers_priv.h
@@ -24,7 +24,7 @@
 
 struct _LinphoneContactSearch{
 	belle_sip_object_t base;
-	ContactSearchID id;
+	LinphoneContactSearchID id;
 	char* predicate;
 	ContactSearchCallback cb;
 	void* data;
diff --git a/coreapi/contactprovider.c b/coreapi/contactprovider.c
index ac5d9fc4d..5c1a36b75 100644
--- a/coreapi/contactprovider.c
+++ b/coreapi/contactprovider.c
@@ -38,7 +38,7 @@ static void linphone_contact_search_destroy( LinphoneContactSearch* req) {
 	if( req->predicate ) ms_free(req->predicate);
 }
 
-ContactSearchID linphone_contact_search_get_id(LinphoneContactSearch* obj)
+LinphoneContactSearchID linphone_contact_search_get_id(LinphoneContactSearch* obj)
 {
 	return obj->id;
 }
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 7d85d2717..3e496caa3 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1231,7 +1231,7 @@ static void certificates_config_read(LinphoneCore *lc) {
 static void sip_config_read(LinphoneCore *lc) {
 	char *contact;
 	const char *tmpstr;
-	LCSipTransports tr;
+	LinphoneSipTransports tr;
 	int i,tmp;
 	int ipv6_default = TRUE;
 
@@ -2557,7 +2557,7 @@ void linphone_core_set_use_rfc2833_for_dtmf(LinphoneCore *lc,bool_t use_rfc2833)
 }
 
 int linphone_core_get_sip_port(LinphoneCore *lc){
-	LCSipTransports tr;
+	LinphoneSipTransports tr;
 	linphone_core_get_sip_transports_used(lc,&tr);
 	return tr.udp_port>0 ? tr.udp_port : (tr.tcp_port > 0 ? tr.tcp_port : tr.tls_port);
 }
@@ -2592,7 +2592,7 @@ static void transport_error(LinphoneCore *lc, const char* transport, int port){
 	ms_free(msg);
 }
 
-static bool_t transports_unchanged(const LCSipTransports * tr1, const LCSipTransports * tr2){
+static bool_t transports_unchanged(const LinphoneSipTransports * tr1, const LinphoneSipTransports * tr2){
 	return
 		tr2->udp_port==tr1->udp_port &&
 		tr2->tcp_port==tr1->tcp_port &&
@@ -2614,7 +2614,7 @@ static void __linphone_core_invalidate_registers(LinphoneCore* lc){
 int _linphone_core_apply_transports(LinphoneCore *lc){
 	Sal *sal=lc->sal;
 	const char *anyaddr;
-	LCSipTransports *tr=&lc->sip_conf.transports;
+	LinphoneSipTransports *tr=&lc->sip_conf.transports;
 	const char* listening_address;
 	/*first of all invalidate all current registrations so that we can register again with new transports*/
 	__linphone_core_invalidate_registers(lc);
@@ -2662,7 +2662,7 @@ bool_t linphone_core_sip_transport_supported(const LinphoneCore *lc, LinphoneTra
 }
 
 int linphone_core_set_sip_transports(LinphoneCore *lc, const LCSipTransports * tr_config /*config to be saved*/){
-	LCSipTransports tr=*tr_config;
+	LinphoneSipTransports tr=*tr_config;
 
 	if (lp_config_get_int(lc->config,"sip","sip_random_port",0)==1) {
 		/*legacy random mode*/
@@ -2707,7 +2707,7 @@ void linphone_core_get_sip_transports_used(LinphoneCore *lc, LinphoneSipTranspor
 }
 
 void linphone_core_set_sip_port(LinphoneCore *lc,int port) {
-	LCSipTransports tr;
+	LinphoneSipTransports tr;
 	memset(&tr,0,sizeof(tr));
 	tr.udp_port=port;
 	linphone_core_set_sip_transports (lc,&tr);
diff --git a/coreapi/misc.c b/coreapi/misc.c
index c57dfe764..6b4d655d2 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -1291,7 +1291,7 @@ void linphone_core_queue_task(LinphoneCore *lc, belle_sip_source_func_t task_fun
 }
 
 static int get_unique_transport(LinphoneCore *lc, LinphoneTransportType *type, int *port){
-	LCSipTransports tp;
+	LinphoneSipTransports tp;
 	linphone_core_get_sip_transports(lc,&tp);
 	if (tp.tcp_port==0 && tp.tls_port==0 && tp.udp_port!=0){
 		*type=LinphoneTransportUdp;
@@ -1341,7 +1341,7 @@ int linphone_core_migrate_to_multi_transport(LinphoneCore *lc){
 		LinphoneTransportType tpt;
 		int port;
 		if (get_unique_transport(lc,&tpt,&port)==0){
-			LCSipTransports newtp={0};
+			LinphoneSipTransports newtp={0};
 			if (lp_config_get_int(lc->config,"sip","sip_random_port",0))
 				port=-1;
 			ms_message("Core is using a single SIP transport, migrating proxy config and enabling multi-transport.");
diff --git a/coreapi/private.h b/coreapi/private.h
index be8e480ea..543b4efcb 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -811,7 +811,7 @@ typedef struct sip_config
 	int in_call_timeout;	/*timeout after a call is hangup */
 	int delayed_timeout; 	/*timeout after a delayed call is resumed */
 	unsigned int keepalive_period; /* interval in ms between keep alive messages sent to the proxy server*/
-	LCSipTransports transports;
+	LinphoneSipTransports transports;
 	bool_t guess_hostname;
 	bool_t loopback_only;
 	bool_t ipv6_enabled;
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 1968d7896..758347676 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -688,7 +688,7 @@ char* linphone_proxy_config_normalize_phone_number(LinphoneProxyConfig *proxy, c
 			ms_free(flatten);
 		}
 	}
-	if (proxy==NULL) linphone_proxy_config_destroy(tmpproxy);
+	if (proxy==NULL) linphone_proxy_config_unref(tmpproxy);
 	return result;
 }
 
diff --git a/include/linphone/chat.h b/include/linphone/chat.h
index 954d55611..7d41e3c59 100644
--- a/include/linphone/chat.h
+++ b/include/linphone/chat.h
@@ -41,7 +41,7 @@ extern "C" {
  * @deprecated Use LinphoneChatMessageCbsMsgStateChangedCb instead.
  * @donotwrap
  */
-LINPHONE_DEPRECATED typedef void (*LinphoneChatMessageStateChangedCb)(LinphoneChatMessage* msg,LinphoneChatMessageState state,void* ud);
+typedef void (*LinphoneChatMessageStateChangedCb)(LinphoneChatMessage* msg,LinphoneChatMessageState state,void* ud);
 
 /**
  * Call back used to notify message delivery status
diff --git a/include/linphone/contactprovider.h b/include/linphone/contactprovider.h
index bb435cd41..7dd83974a 100644
--- a/include/linphone/contactprovider.h
+++ b/include/linphone/contactprovider.h
@@ -28,7 +28,7 @@ extern "C" {
 /* LinphoneContactSearchRequest */
 
 void linphone_contact_search_init(LinphoneContactSearch *obj, const char *predicate, ContactSearchCallback cb, void *cb_data);
-ContactSearchID linphone_contact_search_get_id(LinphoneContactSearch *obj);
+LinphoneContactSearchID linphone_contact_search_get_id(LinphoneContactSearch *obj);
 const char* linphone_contact_search_get_predicate(LinphoneContactSearch *obj);
 void linphone_contact_search_invoke_cb(LinphoneContactSearch *req, MSList *friends);
 LINPHONE_PUBLIC LinphoneContactSearch* linphone_contact_search_ref(void *obj);