diff --git a/swad_centre.c b/swad_centre.c
index b457abfea..5728b44d6 100644
--- a/swad_centre.c
+++ b/swad_centre.c
@@ -722,7 +722,7 @@ void Ctr_ShowCtrsOfCurrentIns (void)
       Ctr_GetListCentres (Gbl.CurrentIns.Ins.InsCod);
 
       /***** Write menu to select country and institution *****/
-      Hie_WriteMenuAllCourses ();
+      Hie_WriteMenuHierarchy ();
 
       /***** List centres *****/
       Ctr_ListCentres ();
@@ -1765,7 +1765,7 @@ void Ctr_ChangeCtrInsInConfig (void)
 	 Gbl.CurrentIns.Ins.InsCod = NewIns.InsCod;
 
 	 /***** Initialize again current course, degree, centre... *****/
-	 Hie_InitCurrentCourse ();
+	 Hie_InitHierarchy ();
 
 	 /***** Write message to show the change made *****/
 	 sprintf (Gbl.Message,Txt_The_centre_X_has_been_moved_to_the_institution_Y,
diff --git a/swad_changelog.h b/swad_changelog.h
index e54d2af02..428c2e1cf 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -157,13 +157,14 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 16.61 (2016-11-14)"
+#define Log_PLATFORM_VERSION	"SWAD 16.61.1 (2016-11-14)"
 #define CSS_FILE		"swad16.60.1.css"
 #define JS_FILE			"swad16.46.1.js"
 
 // Number of lines (includes comments but not blank lines) has been got with the following command:
 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
 /*
+        Version 16.61.1:  Nov 14, 2016	Code refactoring in hierarchy. (207150 lines)
         Version 16.61:    Nov 14, 2016	New module swad_hierarchy. (207159 lines)
         Version 16.60.1:  Nov 14, 2016	Changes in layout of file browser. (207096 lines)
         Version 16.60:    Nov 14, 2016	Code refactoring in file browser.
diff --git a/swad_course.c b/swad_course.c
index 01f98720a..aabc281a3 100644
--- a/swad_course.c
+++ b/swad_course.c
@@ -971,7 +971,7 @@ void Crs_ShowCrssOfCurrentDeg (void)
       Crs_GetListCoursesInDegree (Crs_ALL_COURSES_EXCEPT_REMOVED);
 
       /***** Write menu to select country, institution, centre and degree *****/
-      Hie_WriteMenuAllCourses ();
+      Hie_WriteMenuHierarchy ();
 
       /***** Show list of courses *****/
       Crs_ListCourses ();
@@ -2445,7 +2445,7 @@ void Crs_ChangeCrsDegInConfig (void)
 	 Gbl.CurrentDeg.Deg.DegCod = NewDeg.DegCod;
 
 	 /***** Initialize again current course, degree, centre... *****/
-      	 Hie_InitCurrentCourse ();
+      	 Hie_InitHierarchy ();
 
 	 /***** Create message to show the change made *****/
 	 sprintf (Gbl.Message,Txt_The_course_X_has_been_moved_to_the_degree_Y,
diff --git a/swad_degree.c b/swad_degree.c
index c57aa1fe9..65809d2aa 100644
--- a/swad_degree.c
+++ b/swad_degree.c
@@ -659,7 +659,7 @@ void Deg_ShowDegsOfCurrentCtr (void)
       Deg_GetListDegsOfCurrentCtr ();
 
       /***** Write menu to select country, institution and centre *****/
-      Hie_WriteMenuAllCourses ();
+      Hie_WriteMenuHierarchy ();
 
       /***** Show list of degrees *****/
       Deg_ListDegrees ();
@@ -2080,7 +2080,7 @@ void Deg_ChangeDegCtrInConfig (void)
 	 Gbl.CurrentCtr.Ctr.CtrCod = NewCtr.CtrCod;
 
 	 /***** Initialize again current course, degree, centre... *****/
-	 Hie_InitCurrentCourse ();
+	 Hie_InitHierarchy ();
 
 	 /***** Create message to show the change made *****/
 	 sprintf (Gbl.Message,Txt_The_degree_X_has_been_moved_to_the_centre_Y,
diff --git a/swad_institution.c b/swad_institution.c
index e1558984d..a6f9d5926 100644
--- a/swad_institution.c
+++ b/swad_institution.c
@@ -646,7 +646,7 @@ void Ins_ShowInssOfCurrentCty (void)
       Ins_GetListInstitutions (Gbl.CurrentCty.Cty.CtyCod,Ins_GET_EXTRA_DATA);
 
       /***** Write menu to select country *****/
-      Hie_WriteMenuAllCourses ();
+      Hie_WriteMenuHierarchy ();
 
       /***** List institutions *****/
       Ins_ListInstitutions ();
@@ -1792,7 +1792,7 @@ void Ins_ChangeInsCtyInConfig (void)
          Gbl.CurrentCty.Cty.CtyCod = NewCty.CtyCod;
 
 	 /***** Initialize again current course, degree, centre... *****/
-	 Hie_InitCurrentCourse ();
+	 Hie_InitHierarchy ();
 
 	 /***** Write message to show the change made *****/
 	 sprintf (Gbl.Message,Txt_The_country_of_the_institution_X_has_changed_to_Y,
diff --git a/swad_main.c b/swad_main.c
index 4a8e2a7bf..f5048cd95 100644
--- a/swad_main.c
+++ b/swad_main.c
@@ -114,7 +114,7 @@ int main (int argc, char *argv[])
      {
       Par_CreateListOfParams ();
       Par_GetMainParameters ();
-      Hie_InitCurrentCourse ();
+      Hie_InitHierarchy ();
 
       if (!Gbl.WebService.IsWebService)
 	{
diff --git a/swad_user.c b/swad_user.c
index e63bd1f2e..e48ce01a2 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -2573,7 +2573,7 @@ static void Usr_SetUsrRoleAndPrefs (void)
       	 Gbl.CurrentCrs.Crs.CrsCod = Gbl.Usrs.Me.UsrLast.LastCrs;
 
 	 /* Initialize again current course, degree, centre... */
-      	 Hie_InitCurrentCourse ();
+      	 Hie_InitHierarchy ();
 
 	 /* Get again my role in this course */
       	 Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB = Rol_GetRoleInCrs (Gbl.CurrentCrs.Crs.CrsCod,Gbl.Usrs.Me.UsrDat.UsrCod);
diff --git a/swad_web_service.c b/swad_web_service.c
index 2c0a57886..2a73996a8 100644
--- a/swad_web_service.c
+++ b/swad_web_service.c
@@ -1357,7 +1357,7 @@ int swad__getCourseInfo (struct soap *soap,
    strcpy (getCourseInfo->infoSrc,NamesInWSForInfoSrc[InfoSrc]);
 
    /***** Set paths *****/
-   Hie_InitCurrentCourse ();
+   Hie_InitHierarchy ();
 
    /***** Get info text *****/
    getCourseInfo->infoTxt = NULL;
@@ -4606,7 +4606,7 @@ int swad__getFile (struct soap *soap,
      }
 
    /***** Set paths *****/
-   Hie_InitCurrentCourse ();
+   Hie_InitHierarchy ();
    Brw_SetFullPathInTree (FileMetadata.PathInTreeUntilFilFolLnk,
                           FileMetadata.FilFolLnkName);
    Brw_InitializeFileBrowser ();