diff --git a/console/commands.c b/console/commands.c
index 99effcfcc..09fc9c324 100644
--- a/console/commands.c
+++ b/console/commands.c
@@ -1616,7 +1616,7 @@ linphonec_proxy_add(LinphoneCore *lc)
 				continue;
 			}
 
-			linphone_proxy_config_expires(cfg, expires);
+			linphone_proxy_config_set_expires(cfg, expires);
 			linphonec_out("Expiration: %d seconds\n", linphone_proxy_config_get_expires (cfg));
 
 			free(input);
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 5b06847cb..f3c2a070d 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -658,7 +658,8 @@ LINPHONE_PUBLIC	LinphoneProxyConfig *linphone_proxy_config_new(void);
 LINPHONE_PUBLIC	int linphone_proxy_config_set_server_addr(LinphoneProxyConfig *obj, const char *server_addr);
 LINPHONE_PUBLIC	int linphone_proxy_config_set_identity(LinphoneProxyConfig *obj, const char *identity);
 LINPHONE_PUBLIC	int linphone_proxy_config_set_route(LinphoneProxyConfig *obj, const char *route);
-LINPHONE_PUBLIC	void linphone_proxy_config_expires(LinphoneProxyConfig *obj, int expires);
+LINPHONE_PUBLIC	void linphone_proxy_config_set_expires(LinphoneProxyConfig *obj, int expires);
+#define linphone_proxy_config_expires linphone_proxy_config_set_expires
 /**
  * Indicates  either or not, REGISTRATION must be issued for this #LinphoneProxyConfig .
  * <br> In case this #LinphoneProxyConfig has been added to #LinphoneCore, follows the linphone_proxy_config_edit() rule.
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 501357aed..7a587ce83 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -2600,7 +2600,7 @@ extern "C" jint Java_org_linphone_core_LinphoneProxyConfigImpl_getState(JNIEnv*
 	return (jint) linphone_proxy_config_get_state((const LinphoneProxyConfig *) ptr);
 }
 extern "C" void Java_org_linphone_core_LinphoneProxyConfigImpl_setExpires(JNIEnv*  env,jobject thiz,jlong ptr,jint delay) {
-	linphone_proxy_config_expires((LinphoneProxyConfig *) ptr, (int) delay);
+	linphone_proxy_config_set_expires((LinphoneProxyConfig *) ptr, (int) delay);
 }
 
 extern "C" jint Java_org_linphone_core_LinphoneCallImpl_getDuration(JNIEnv*  env,jobject thiz,jlong ptr) {
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index cafef59d0..94ea34908 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -227,7 +227,7 @@ void linphone_proxy_config_enableregister(LinphoneProxyConfig *obj, bool_t val){
 /**
  * Sets the registration expiration time in seconds.
 **/
-void linphone_proxy_config_expires(LinphoneProxyConfig *obj, int val){
+void linphone_proxy_config_set_expires(LinphoneProxyConfig *obj, int val){
 	if (val<0) val=600;
 	obj->expires=val;
 }
diff --git a/gtk/propertybox.c b/gtk/propertybox.c
index 9467d109c..22c3813c4 100644
--- a/gtk/propertybox.c
+++ b/gtk/propertybox.c
@@ -738,7 +738,7 @@ void linphone_gtk_proxy_ok(GtkButton *button){
 		gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(w,"route"))));
 	linphone_proxy_config_set_contact_parameters(cfg,
 		gtk_entry_get_text(GTK_ENTRY(linphone_gtk_get_widget(w,"params"))));
-	linphone_proxy_config_expires(cfg,
+	linphone_proxy_config_set_expires(cfg,
 		(int)gtk_spin_button_get_value(
 			GTK_SPIN_BUTTON(linphone_gtk_get_widget(w,"regperiod"))));
 	linphone_proxy_config_enable_publish(cfg,
diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c
index 439f9c89f..47a9074f8 100644
--- a/gtk/setupwizard.c
+++ b/gtk/setupwizard.c
@@ -416,7 +416,7 @@ static void linphone_gtk_assistant_prepare(GtkWidget *assistant, GtkWidget *page
 		linphone_proxy_config_set_identity(cfg, creator->username);
 		linphone_proxy_config_set_server_addr(cfg, creator->domain);
 		linphone_proxy_config_set_route(cfg, creator->route);
-		linphone_proxy_config_expires(cfg, 3600);
+		linphone_proxy_config_set_expires(cfg, 3600);
 		linphone_proxy_config_enable_publish(cfg, FALSE);
 		linphone_proxy_config_enable_register(cfg, TRUE);
 
diff --git a/tester/register_tester.c b/tester/register_tester.c
index c899403be..7ec8881e0 100644
--- a/tester/register_tester.c
+++ b/tester/register_tester.c
@@ -87,7 +87,7 @@ static void register_with_refresh_base_3(LinphoneCore* lc
 	server_addr = linphone_address_get_domain(from);
 
 	linphone_proxy_config_enable_register(proxy_cfg,TRUE);
-	linphone_proxy_config_expires(proxy_cfg,1);
+	linphone_proxy_config_set_expires(proxy_cfg,1);
 	if (route) {
 		linphone_proxy_config_set_route(proxy_cfg,route);
 		linphone_proxy_config_set_server_addr(proxy_cfg,route);