Index: trunk/src/librnd/core/conf.c
===================================================================
--- trunk/src/librnd/core/conf.c	(revision 32649)
+++ trunk/src/librnd/core/conf.c	(revision 32650)
@@ -467,7 +467,7 @@
 
 const char *rnd_conf_get_user_conf_name()
 {
-	return rnd_pcphl_conf_user_path;
+	return rnd_conf_user_path;
 }
 
 const char *rnd_conf_get_project_conf_name(const char *project_fn, const char *pcb_fn, const char **try)
@@ -1279,7 +1279,7 @@
 
 	/* load config files */
 	rnd_conf_load_as(RND_CFR_SYSTEM, rnd_conf_sys_path, 0);
-	rnd_conf_load_as(RND_CFR_USER, rnd_pcphl_conf_user_path, 0);
+	rnd_conf_load_as(RND_CFR_USER, rnd_conf_user_path, 0);
 	pc = rnd_conf_get_project_conf_name(project_fn, pcb_fn, &try);
 	if (pc != NULL)
 		rnd_conf_load_as(RND_CFR_PROJECT, pc, 0);
@@ -1289,7 +1289,7 @@
 	   this is needed so if the user makes config changes from the GUI things
 	   get saved. */
 	if (pcb_conf_main_root[RND_CFR_USER] == NULL)
-		rnd_conf_reset(RND_CFR_USER, rnd_pcphl_conf_user_path);
+		rnd_conf_reset(RND_CFR_USER, rnd_conf_user_path);
 
 	rnd_conf_in_production = 1;
 }
@@ -1920,7 +1920,7 @@
 	if (fn == NULL) {
 		switch(role) {
 			case RND_CFR_USER:
-				fn = rnd_pcphl_conf_user_path;
+				fn = rnd_conf_user_path;
 				break;
 			case RND_CFR_PROJECT:
 				fn = rnd_conf_get_project_conf_name(project_fn, pcb_fn, &try);
Index: trunk/src/librnd/core/hidlib.h
===================================================================
--- trunk/src/librnd/core/hidlib.h	(revision 32649)
+++ trunk/src/librnd/core/hidlib.h	(revision 32650)
@@ -119,7 +119,7 @@
 
 /* path to the user's config directory and main config file (RND_CFR_USER) */
 extern const char *rnd_conf_userdir_path;
-extern const char *rnd_pcphl_conf_user_path;
+extern const char *rnd_conf_user_path;
 
 /* path to the system (installed) config directory and main config file (RND_CFR_SYSTEM) */
 extern const char *rnd_conf_sysdir_path;
Index: trunk/src/test-rnd.c
===================================================================
--- trunk/src/test-rnd.c	(revision 32649)
+++ trunk/src/test-rnd.c	(revision 32650)
@@ -57,7 +57,7 @@
 #define FOOBARSHAREDIR "/usr/share/foobar"
 #define CONF_USER_DIR "~/.foobar"
 const char *rnd_conf_userdir_path = CONF_USER_DIR;
-const char *rnd_pcphl_conf_user_path = CONF_USER_DIR "/foobar-conf.lht";
+const char *rnd_conf_user_path = CONF_USER_DIR "/foobar-conf.lht";
 const char *rnd_conf_sysdir_path = FOOBARSHAREDIR;
 const char *rnd_conf_sys_path = FOOBARSHAREDIR "/foobar-conf.lht";
 const char *rnd_app_package = "foobar";
Index: trunk/tests/librnd/glue.c
===================================================================
--- trunk/tests/librnd/glue.c	(revision 32649)
+++ trunk/tests/librnd/glue.c	(revision 32650)
@@ -6,7 +6,7 @@
 const char *rnd_menu_name_fmt = "menu.lht";
 
 const char *rnd_conf_userdir_path = "./";
-const char *rnd_pcphl_conf_user_path = "./conf.lht";
+const char *rnd_conf_user_path = "./conf.lht";
 
 /* hack for running from ./ without internal version of the conf */
 const char *rnd_conf_sysdir_path = "./";
Index: trunk/tests/rnd_printf/glue.c
===================================================================
--- trunk/tests/rnd_printf/glue.c	(revision 32649)
+++ trunk/tests/rnd_printf/glue.c	(revision 32650)
@@ -10,7 +10,7 @@
 const char *rnd_menu_name_fmt = "menu.lht";
 
 const char *rnd_conf_userdir_path = "./";
-const char *rnd_pcphl_conf_user_path = "./conf.lht";
+const char *rnd_conf_user_path = "./conf.lht";
 
 /* hack for running from ./ without internal version of the conf */
 const char *rnd_conf_sysdir_path = "./";