diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/member.php
similarity index 100%
rename from htdocs/adherents/admin/adherent.php
rename to htdocs/adherents/admin/member.php
diff --git a/htdocs/adherents/admin/adherent_emails.php b/htdocs/adherents/admin/member_emails.php
similarity index 98%
rename from htdocs/adherents/admin/adherent_emails.php
rename to htdocs/adherents/admin/member_emails.php
index e1867285930..207a913d841 100644
--- a/htdocs/adherents/admin/adherent_emails.php
+++ b/htdocs/adherents/admin/member_emails.php
@@ -24,7 +24,7 @@
  */
 
 /**
- *   	\file       htdocs/adherents/admin/adherent.php
+ *   	\file       htdocs/adherents/admin/member_emails.php
  *		\ingroup    member
  *		\brief      Page to setup the module Foundation
  */
diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/member_extrafields.php
similarity index 97%
rename from htdocs/adherents/admin/adherent_extrafields.php
rename to htdocs/adherents/admin/member_extrafields.php
index ec3b3824db7..7f5262bc7c6 100644
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/member_extrafields.php
@@ -19,7 +19,7 @@
  */
 
 /**
- *      \file       htdocs/adherents/admin/adherent_extrafields.php
+ *      \file       htdocs/adherents/admin/member_extrafields.php
  *		\ingroup    member
  *		\brief      Page to setup extra fields of members
  */
diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/member_type_extrafields.php
similarity index 97%
rename from htdocs/adherents/admin/adherent_type_extrafields.php
rename to htdocs/adherents/admin/member_type_extrafields.php
index 34175da465f..91a9233e5d0 100644
--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/member_type_extrafields.php
@@ -22,7 +22,7 @@
  */
 
 /**
- *      \file       htdocs/adherents/admin/adherent_type_extrafields.php
+ *      \file       htdocs/adherents/admin/member_type_extrafields.php
  *		\ingroup    member
  *		\brief      Page to setup extra fields of members
  */
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 0eab527bc6b..56873fe5470 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -851,6 +851,10 @@ class Conf
 		if (isset($this->projet) && !isset($this->project)) {
 			$this->project = $this->projet;
 		}
+		// member is new use, adherent is old use still initialised
+		if (isset($this->adherent) && !isset($this->member)) {
+			$this->member = $this->adherent;
+		}
 
 		// Object $mc
 		if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) {
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index 93378d77390..484f34c265c 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -177,12 +177,12 @@ function member_admin_prepare_head()
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent.php';
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member.php';
 	$head[$h][1] = $langs->trans("Miscellaneous");
 	$head[$h][2] = 'general';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_emails.php';
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member_emails.php';
 	$head[$h][1] = $langs->trans("EMails");
 	$head[$h][2] = 'emails';
 	$h++;
@@ -193,12 +193,12 @@ function member_admin_prepare_head()
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsMember");
 	$head[$h][2] = 'attributes';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_type_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member_type_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsMemberType");
 	$head[$h][2] = 'attributes_type';
 	$h++;
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 2fce081c7b9..16ecbee8526 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -66,7 +66,7 @@ class modAdherent extends DolibarrModules
 		);
 
 		// Config pages
-		$this->config_page_url = array("adherent.php@adherents");
+		$this->config_page_url = array("member.php@adherents");
 
 		// Dependencies
 		$this->hidden = false; // A condition to hide module