Index: trunk/src/main.c
===================================================================
--- trunk/src/main.c	(revision 34732)
+++ trunk/src/main.c	(revision 34733)
@@ -90,7 +90,7 @@
 const char *rnd_menu_name_fmt = "pcb-menu-%s.lht";
 
 #define CONF_USER_DIR "~/" DOT_PCB_RND
-const char *rnd_conf_userdir_path, *rnd_pcphl_conf_user_path;
+const char *rnd_conf_userdir_path, *rnd_conf_user_path;
 const char *rnd_conf_sysdir_path, *rnd_conf_sys_path;
 const char *rnd_app_package = PCB_PACKAGE;
 const char *rnd_app_version = PCB_VERSION;
@@ -207,7 +207,7 @@
 	rnd_menu_file_paths[3] = NULL;
 
 	rnd_conf_userdir_path = CONF_USER_DIR;
-	rnd_pcphl_conf_user_path = rnd_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL);
+	rnd_conf_user_path = rnd_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL);
 	rnd_conf_sysdir_path = PCBCONFDIR;
 	rnd_conf_sys_path = rnd_concat(PCBCONFDIR, "/pcb-conf.lht", NULL);
 
@@ -219,7 +219,7 @@
 {
 	/* const for all other parts of the code, but we had to concat (alloc) it above */
 	free((char *)rnd_menu_file_paths[2]);
-	free((char *)rnd_pcphl_conf_user_path);
+	free((char *)rnd_conf_user_path);
 	free((char *)rnd_conf_sys_path);
 }
 
Index: trunk/tests/conf/conftest.c
===================================================================
--- trunk/tests/conf/conftest.c	(revision 34732)
+++ trunk/tests/conf/conftest.c	(revision 34733)
@@ -21,7 +21,7 @@
 
 #define CONF_USER_DIR "~/" DOT_PCB_RND
 const char *rnd_conf_userdir_path = CONF_USER_DIR;
-const char *rnd_pcphl_conf_user_path = CONF_USER_DIR "/pcb-conf.lht";
+const char *rnd_conf_user_path = CONF_USER_DIR "/pcb-conf.lht";
 const char *rnd_conf_sysdir_path = PCBSHAREDIR;
 const char *rnd_conf_sys_path = PCBSHAREDIR "/pcb-conf.lht";
 
Index: trunk/tests/propedit/glue.c
===================================================================
--- trunk/tests/propedit/glue.c	(revision 34732)
+++ trunk/tests/propedit/glue.c	(revision 34733)
@@ -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 = "./";
Index: trunk/util/gsch2pcb-rnd/gsch2pcb.c
===================================================================
--- trunk/util/gsch2pcb-rnd/gsch2pcb.c	(revision 34732)
+++ trunk/util/gsch2pcb-rnd/gsch2pcb.c	(revision 34733)
@@ -57,7 +57,7 @@
 
 #define CONF_USER_DIR "~/" DOT_PCB_RND
 const char *rnd_conf_userdir_path;
-const char *rnd_pcphl_conf_user_path;
+const char *rnd_conf_user_path;
 const char *rnd_conf_sysdir_path;
 const char *rnd_conf_sys_path;
 
@@ -394,7 +394,7 @@
 	method_import_register();
 
 	rnd_conf_userdir_path = CONF_USER_DIR;
-	rnd_pcphl_conf_user_path = rnd_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL);
+	rnd_conf_user_path = rnd_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL);
 	rnd_conf_sysdir_path = PCBCONFDIR;
 	rnd_conf_sys_path = rnd_concat(PCBCONFDIR, "/pcb-conf.lht", NULL);
 	rnd_menu_file_paths[0] = "./";