Index: gsch2pcb-rnd/glue.c
===================================================================
--- gsch2pcb-rnd/glue.c	(revision 31000)
+++ gsch2pcb-rnd/glue.c	(revision 31001)
@@ -30,11 +30,11 @@
 
 /* glue for pcb-rnd core */
 
-const char *pcbhl_menu_file_paths[4];
-const char *pcbhl_menu_name_fmt = "pcb-menu-%s.lht";
+const char *rnd_menu_file_paths[4];
+const char *rnd_menu_name_fmt = "pcb-menu-%s.lht";
 
-const char *pcb_hidlib_default_embedded_menu = "";
+const char *rnd_hidlib_default_embedded_menu = "";
 
-void pcb_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot) { }
+void rnd_hidlib_crosshair_move_to(rnd_hidlib_t *hl, rnd_coord_t abs_x, rnd_coord_t abs_y, int mouse_mot) { }
 
 
Index: gsch2pcb-rnd/gsch2pcb.c
===================================================================
--- gsch2pcb-rnd/gsch2pcb.c	(revision 31000)
+++ gsch2pcb-rnd/gsch2pcb.c	(revision 31001)
@@ -56,10 +56,10 @@
 static const char *want_method_default = "import";
 
 #define CONF_USER_DIR "~/" DOT_PCB_RND
-const char *pcbhl_conf_userdir_path;
-const char *pcphl_conf_user_path;
-const char *pcbhl_conf_sysdir_path;
-const char *pcbhl_conf_sys_path;
+const char *rnd_conf_userdir_path;
+const char *rnd_pcphl_conf_user_path;
+const char *rnd_conf_sysdir_path;
+const char *rnd_conf_sys_path;
 
 gdl_list_t pcb_element_list; /* initialized to 0 */
 gadl_list_t schematics, extra_gnetlist_arg_list, extra_gnetlist_list;
@@ -389,14 +389,14 @@
 
 	method_import_register();
 
-	pcbhl_conf_userdir_path = CONF_USER_DIR;
-	pcphl_conf_user_path = pcb_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL);
-	pcbhl_conf_sysdir_path = PCBCONFDIR;
-	pcbhl_conf_sys_path = pcb_concat(PCBCONFDIR, "/pcb-conf.lht", NULL);
-	pcbhl_menu_file_paths[0] = "./";
-	pcbhl_menu_file_paths[1] = "~/.pcb-rnd/";
-	pcbhl_menu_file_paths[2] = pcb_concat(PCBCONFDIR, "/", NULL);
-	pcbhl_menu_file_paths[3] = NULL;
+	rnd_conf_userdir_path = CONF_USER_DIR;
+	rnd_pcphl_conf_user_path = pcb_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL);
+	rnd_conf_sysdir_path = PCBCONFDIR;
+	rnd_conf_sys_path = pcb_concat(PCBCONFDIR, "/pcb-conf.lht", NULL);
+	rnd_menu_file_paths[0] = "./";
+	rnd_menu_file_paths[1] = "~/.pcb-rnd/";
+	rnd_menu_file_paths[2] = pcb_concat(PCBCONFDIR, "/", NULL);
+	rnd_menu_file_paths[3] = NULL;
 
 	rnd_file_loaded_init();
 	rnd_conf_init();