diff --git a/sflphone-client-gnome/src/config/Makefile.am b/sflphone-client-gnome/src/config/Makefile.am
index 2c7f3e7b613c99e0470382f03e1ee45ffd6b51be..f1bc2f9d929a0afdd0df513e49b4e10ed1588014 100644
--- a/sflphone-client-gnome/src/config/Makefile.am
+++ b/sflphone-client-gnome/src/config/Makefile.am
@@ -8,7 +8,7 @@ libconfig_la_SOURCES = \
   accountlistconfigdialog.c \
   zrtpadvanceddialog.c \
   tlsadvanceddialog.c \
-  accountwindow.c \
+  accountconfigdialog.c \
   hooks-config.c \
   audioconf.c \
   utils.c 
diff --git a/sflphone-client-gnome/src/config/accountwindow.c b/sflphone-client-gnome/src/config/accountconfigdialog.c
similarity index 99%
rename from sflphone-client-gnome/src/config/accountwindow.c
rename to sflphone-client-gnome/src/config/accountconfigdialog.c
index e54593ce4b1ea7653d383adc65fe4154007be83d..6f82997a9a217f146cc0a9861d25540e7d3e1753 100644
--- a/sflphone-client-gnome/src/config/accountwindow.c
+++ b/sflphone-client-gnome/src/config/accountconfigdialog.c
@@ -22,7 +22,7 @@
 #include <actions.h>
 #include <mainwindow.h>
 #include <accountlist.h>
-#include <accountwindow.h>
+#include <accountconfigdialog.h>
 #include <zrtpadvanceddialog.h>
 #include <tlsadvanceddialog.h>
 
@@ -698,7 +698,7 @@ GtkWidget * create_advanced_tab(account_t **a)
 	gtk_container_set_border_width (GTK_CONTAINER(table), 10);
 	gtk_table_set_row_spacings( GTK_TABLE(table), 5);	
 
-	label = gtk_label_new_with_mnemonic (_("Local port"));
+	label = gtk_label_new_with_mnemonic (_("Registration expire"));
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
     expireSpinBox = gtk_spin_button_new_with_range(1, 65535, 1);
diff --git a/sflphone-client-gnome/src/config/accountwindow.h b/sflphone-client-gnome/src/config/accountconfigdialog.h
similarity index 97%
rename from sflphone-client-gnome/src/config/accountwindow.h
rename to sflphone-client-gnome/src/config/accountconfigdialog.h
index 50e6f760f65213b69f56b26f2d5507dc580c29fe..5e6d9132c50ee240aa51122114ace4ea76bda300 100644
--- a/sflphone-client-gnome/src/config/accountwindow.h
+++ b/sflphone-client-gnome/src/config/accountconfigdialog.h
@@ -20,7 +20,7 @@
  
 #ifndef __ACCOUNTWINDOW_H__
 #define __ACCOUNTWINDOW_H__
-/** @file accountwindow.h
+/** @file accountconfigdialog.h
   * @brief The window to edit account details.
   */
 
diff --git a/sflphone-client-gnome/src/config/preferencesdialog.c b/sflphone-client-gnome/src/config/preferencesdialog.c
index 400a7c499f5815feef83112f7445c18cb7353e87..49f575274b3ad6189a18600bb69efb31c9025948 100644
--- a/sflphone-client-gnome/src/config/preferencesdialog.c
+++ b/sflphone-client-gnome/src/config/preferencesdialog.c
@@ -23,7 +23,7 @@
 #include <gtk/gtk.h>
 
 #include <accountlist.h>
-#include <accountwindow.h>
+#include <accountconfigdialog.h>
 #include <actions.h>
 #include <config.h>
 #include <toolbar.h>