Index: act.c
===================================================================
--- act.c	(revision 31031)
+++ act.c	(revision 31032)
@@ -57,7 +57,7 @@
 	if (argc == 2) {
 		const char *vp;
 
-		RND_PCB_ACT_CONVARG(1, FGW_STR, Zoom, vp = argv[1].val.str);
+		RND_ACT_CONVARG(1, FGW_STR, Zoom, vp = argv[1].val.str);
 
 		if (rnd_strcasecmp(vp, "selected") == 0) {
 			rnd_rnd_box_t sb;
@@ -119,8 +119,8 @@
 		rnd_layer_id_t lid;
 		pcb_layer_type_t lyt;
 
-		RND_PCB_ACT_CONVARG(1, FGW_STR, SwapSides, a = argv[1].val.str);
-		rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, SwapSides, b = argv[2].val.str);
+		RND_ACT_CONVARG(1, FGW_STR, SwapSides, a = argv[1].val.str);
+		RND_ACT_MAY_CONVARG(2, FGW_STR, SwapSides, b = argv[2].val.str);
 		switch (a[0]) {
 			case 'h': case 'H':
 				rnd_conf_toggle_heditor_("view/flip_x", view.flip_x);
@@ -202,8 +202,8 @@
 	if (argc != 2 && argc != 3)
 		RND_ACT_FAIL(Popup);
 
-	RND_PCB_ACT_CONVARG(1, FGW_STR, Popup, a0 = argv[1].val.str);
-	rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, Popup, a1 = argv[2].val.str);
+	RND_ACT_CONVARG(1, FGW_STR, Popup, a0 = argv[1].val.str);
+	RND_ACT_MAY_CONVARG(2, FGW_STR, Popup, a1 = argv[2].val.str);
 
 	*name = '\0';
 	*name2 = '\0';
@@ -274,8 +274,8 @@
 	fgw_error_t er;
 	fgw_arg_t r, args[4];
 
-	RND_PCB_ACT_CONVARG(1, FGW_LAYER, LayerHotkey, ly = fgw_layer(&argv[1]));
-	RND_PCB_ACT_CONVARG(2, FGW_STR, LayerHotkey, op = argv[2].val.str);
+	RND_ACT_CONVARG(1, FGW_LAYER, LayerHotkey, ly = fgw_layer(&argv[1]));
+	RND_ACT_CONVARG(2, FGW_STR, LayerHotkey, op = argv[2].val.str);
 
 	if (rnd_strcasecmp(op, "select") == 0)   { key = "pcb-rnd::key::select"; title = "set layer selection hotkey"; }
 	else if (rnd_strcasecmp(op, "vis") == 0) { key = "pcb-rnd::key::vis"; title = "set layer visibility hotkey"; }
Index: routest_dlg.c
===================================================================
--- routest_dlg.c	(revision 31031)
+++ routest_dlg.c	(revision 31032)
@@ -339,7 +339,7 @@
 	if (argc > 2)
 		RND_ACT_FAIL(AdjustStyle);
 
-	rnd_PCB_ACT_MAY_CONVARG(1, FGW_LONG, AdjustStyle, idx = argv[1].val.nat_long);
+	RND_ACT_MAY_CONVARG(1, FGW_LONG, AdjustStyle, idx = argv[1].val.nat_long);
 
 	if (idx >= (long)vtroutestyle_len(&PCB->RouteStyle)) {
 		rnd_message(RND_MSG_ERROR, "Invalid route style %ld index; max value: %ld\n", idx, vtroutestyle_len(&PCB->RouteStyle)-1);
Index: status.c
===================================================================
--- status.c	(revision 31031)
+++ status.c	(revision 31032)
@@ -348,7 +348,7 @@
 	if (argc > 2)
 		RND_ACT_FAIL(StatusSetText);
 
-	rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, StatusSetText, text = argv[1].val.str);
+	RND_ACT_MAY_CONVARG(1, FGW_STR, StatusSetText, text = argv[1].val.str);
 
 	if (text != NULL) {
 		rnd_hid_attr_val_t hv;
@@ -411,8 +411,8 @@
 	if (argc > 3)
 		RND_ACT_FAIL(StatusSetText);
 
-	rnd_PCB_ACT_MAY_CONVARG(1, FGW_COORD, StatusSetText, x = fgw_coord(&argv[1]));
-	rnd_PCB_ACT_MAY_CONVARG(2, FGW_COORD, StatusSetText, y = fgw_coord(&argv[2]));
+	RND_ACT_MAY_CONVARG(1, FGW_COORD, StatusSetText, x = fgw_coord(&argv[1]));
+	RND_ACT_MAY_CONVARG(2, FGW_COORD, StatusSetText, y = fgw_coord(&argv[2]));
 
 	/* check if there are any pins or pads at that position */
 	rattype = pcb_search_obj_by_location(PCB_OBJ_RAT, &rptr1, &rptr2, &rptr3, x, y, 0);