Index: dlg.c
===================================================================
--- dlg.c	(revision 30897)
+++ dlg.c	(revision 30898)
@@ -106,8 +106,8 @@
 	fgw_arg_t args[4], ares;
 	args[1].type = FGW_STR; args[1].val.str = "drc_query: manual run";
 	args[2].type = FGW_STR; args[2].val.str = "drc_query_run";
-	fgw_ptr_reg(&pcb_fgw, &args[3], PCB_PTR_DOMAIN_VIEWLIST, FGW_PTR | FGW_STRUCT, view);
-	pcb_actionv_bin(hidlib, "viewlist", &ares, 4, args);
+	fgw_ptr_reg(&rnd_fgw, &args[3], PCB_PTR_DOMAIN_VIEWLIST, FGW_PTR | FGW_STRUCT, view);
+	rnd_actionv_bin(hidlib, "viewlist", &ares, 4, args);
 
 }
 
Index: drc_query.c
===================================================================
--- drc_query.c	(revision 30897)
+++ drc_query.c	(revision 30898)
@@ -349,7 +349,7 @@
 
 static pcb_drc_impl_t drc_query_impl = {"drc_query", "query() based DRC", "drcquerylistrules"};
 
-static pcb_action_t drc_query_action_list[] = {
+static rnd_action_t drc_query_action_list[] = {
 	{"DrcQueryListRules", pcb_act_DrcQueryListRules, pcb_acth_DrcQueryListRules, pcb_acts_DrcQueryListRules},
 	{"DrcQueryEditRule", pcb_act_DrcQueryEditRule, pcb_acth_DrcQueryEditRule, pcb_acts_DrcQueryEditRule}
 };
@@ -370,7 +370,7 @@
 		pcb_conf_unreg_field(free_drc_conf_nodes.array[n]);
 	vtp0_uninit(&free_drc_conf_nodes);
 
-	pcb_remove_actions_by_cookie(drc_query_cookie);
+	rnd_remove_actions_by_cookie(drc_query_cookie);
 	pcb_drcq_stat_uninit();
 }