Index: polyhelp.c
===================================================================
--- polyhelp.c	(revision 30899)
+++ polyhelp.c	(revision 30900)
@@ -441,12 +441,12 @@
 	pcb_flag_t flg;
 	int want_contour = 0, want_poly = 0, cont_specd = 0;
 
-	PCB_ACT_CONVARG(1, FGW_STR, PolyHatch, op = argv[1].val.str);
-	PCB_ACT_MAY_CONVARG(2, FGW_STR, PolyHatch, arg = argv[2].val.str);
+	RND_PCB_ACT_CONVARG(1, FGW_STR, PolyHatch, op = argv[1].val.str);
+	rnd_PCB_ACT_MAY_CONVARG(2, FGW_STR, PolyHatch, arg = argv[2].val.str);
 
 	if (pcb_strcasecmp(op, "interactive") == 0) {
 		if (polyhatch_gui(&period, &dir, &flg, &want_contour) != 0) {
-			PCB_ACT_IRES(1);
+			RND_ACT_IRES(1);
 			return 0;
 		}
 	}
@@ -500,7 +500,7 @@
 		pcb_cpoly_hatch_lines(PCB_CURRLAYER(PCB), polygon, dir, period, conf_core.design.line_thickness, conf_core.design.line_thickness * 2, flg);
 	} PCB_ENDALL_LOOP;
 
-	PCB_ACT_IRES(0);
+	RND_ACT_IRES(0);
 	return 0;
 }
 
@@ -510,7 +510,7 @@
 {
 	pcb_coord_t offs;
 
-	PCB_ACT_CONVARG(1, FGW_COORD, PolyOffs, offs = fgw_coord(&argv[1]));
+	RND_PCB_ACT_CONVARG(1, FGW_COORD, PolyOffs, offs = fgw_coord(&argv[1]));
 
 	PCB_POLY_ALL_LOOP(PCB->Data); {
 		pcb_poly_t *p;
@@ -521,7 +521,7 @@
 		PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, p);
 	} PCB_ENDALL_LOOP;
 
-	PCB_ACT_IRES(0);
+	RND_ACT_IRES(0);
 	return 0;
 }
 
Index: topoly.c
===================================================================
--- topoly.c	(revision 30899)
+++ topoly.c	(revision 30900)
@@ -342,7 +342,7 @@
 	const char *op = NULL;
 	void *r1, *r2, *r3;
 
-	PCB_ACT_MAY_CONVARG(1, FGW_STR, topoly, op = argv[1].val.str);
+	rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, topoly, op = argv[1].val.str);
 
 	if (op == NULL) {
 		pcb_coord_t x, y;
@@ -349,7 +349,7 @@
 		rnd_hid_get_coords("Click on a line or arc of the contour loop", &x, &y, 0);
 		if (pcb_search_screen(x, y, CONT_TYPE, &r1, &r2, &r3) == 0) {
 			pcb_message(PCB_MSG_ERROR, "ToPoly(): failed to find a line or arc there\n");
-			PCB_ACT_IRES(1);
+			RND_ACT_IRES(1);
 			return 0;
 		}
 	}
@@ -356,17 +356,17 @@
 	else {
 		if (strcmp(op, "outline") == 0) {
 			pcb_topoly_1st_outline(PCB, 0);
-			PCB_ACT_IRES(0);
+			RND_ACT_IRES(0);
 			return 0;
 		}
 		else {
 			pcb_message(PCB_MSG_ERROR, "Invalid first argument\n");
-			PCB_ACT_IRES(1);
+			RND_ACT_IRES(1);
 			return 0;
 		}
 	}
 
 	pcb_topoly_conn(PCB, r2, 0);
-	PCB_ACT_IRES(0);
+	RND_ACT_IRES(0);
 	return 0;
 }