Index: layer_menu.c
===================================================================
--- layer_menu.c	(revision 30983)
+++ layer_menu.c	(revision 30984)
@@ -65,7 +65,7 @@
 	props.update_on = "";
 	props.cookie = ctx->anch;
 
-	pcb_hid_cfg_del_anchor_menus(node, ctx->anch);
+	rnd_hid_cfg_del_anchor_menus(node, ctx->anch);
 
 	/* prepare for appending the strings at the end of the path, "under" the anchor */
 	*end = '/';
@@ -192,7 +192,7 @@
 	pcb_layer_t *l;
 	rnd_menu_prop_t keyprops;
 
-	pcb_hid_cfg_del_anchor_menus(node, ctx->anch);
+	rnd_hid_cfg_del_anchor_menus(node, ctx->anch);
 
 	/* prepare for appending the strings at the end of the path, "under" the anchor */
 	*end = '/';
@@ -217,7 +217,7 @@
 
 	ctx.view = 0;
 	ctx.anch = "@layerkeys";
-	pcb_hid_cfg_map_anchor_menus(ctx.anch, layer_install_menu_key, &ctx);
+	rnd_hid_cfg_map_anchor_menus(ctx.anch, layer_install_menu_key, &ctx);
 }
 
 static int layer_menu_install_timer_active = 0;
@@ -229,11 +229,11 @@
 
 	ctx.view = 1;
 	ctx.anch = "@layerview";
-	pcb_hid_cfg_map_anchor_menus(ctx.anch, layer_install_menu1, &ctx);
+	rnd_hid_cfg_map_anchor_menus(ctx.anch, layer_install_menu1, &ctx);
 
 	ctx.view = 0;
 	ctx.anch = "@layerpick";
-	pcb_hid_cfg_map_anchor_menus(ctx.anch, layer_install_menu1, &ctx);
+	rnd_hid_cfg_map_anchor_menus(ctx.anch, layer_install_menu1, &ctx);
 
 	layer_install_menu_keys();
 	layer_menu_install_timer_active = 0;
Index: routest.c
===================================================================
--- routest.c	(revision 30983)
+++ routest.c	(revision 30984)
@@ -64,7 +64,7 @@
 	props.update_on = "";
 	props.cookie = ANCH;
 
-	pcb_hid_cfg_del_anchor_menus(node, ANCH);
+	rnd_hid_cfg_del_anchor_menus(node, ANCH);
 
 	/* prepare for appending the strings at the end of the path, "under" the anchor */
 	*end = '/';
@@ -97,7 +97,7 @@
 {
 	if (rst_lock) return;
 	rst_lock++;
-	pcb_hid_cfg_map_anchor_menus(ANCH, rst_install_menu, NULL);
+	rnd_hid_cfg_map_anchor_menus(ANCH, rst_install_menu, NULL);
 
 	if (rst.sub_inited) {
 		int n, target;