Index: conf/conftest.c
===================================================================
--- conf/conftest.c	(revision 34732)
+++ 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: propedit/glue.c
===================================================================
--- propedit/glue.c	(revision 34732)
+++ 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 = "./";