Index: renumber.c
===================================================================
--- renumber.c	(revision 30899)
+++ renumber.c	(revision 30900)
@@ -81,7 +81,7 @@
 	int ok;
 	pcb_bool free_name = pcb_false;
 
-	PCB_ACT_MAY_CONVARG(1, FGW_STR, Renumber, name = argv[1].val.str);
+	rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, Renumber, name = argv[1].val.str);
 
 	if (name == NULL) {
 		/*
@@ -110,7 +110,7 @@
 		if (pcb_hid_message_box(&PCB->hidlib, "warning", "Renumber: overwrite", "File exists!  Ok to overwrite?", "cancel", 0, "overwrite", 1, NULL) != 1) {
 			if (free_name && name)
 				free((char*)name);
-			PCB_ACT_IRES(1);
+			RND_ACT_IRES(1);
 			return 0;
 		}
 	}
@@ -119,7 +119,7 @@
 		pcb_message(PCB_MSG_ERROR, "Could not open %s\n", name);
 		if (free_name && name)
 			free((char*)name);
-		PCB_ACT_IRES(1);
+		RND_ACT_IRES(1);
 		return 0;
 	}
 
@@ -339,7 +339,7 @@
 	free(ox_list);
 	free(oy_list);
 	free(cnt_list);
-	PCB_ACT_IRES(0);
+	RND_ACT_IRES(0);
 	return 0;
 }
 
Index: renumberblock.c
===================================================================
--- renumberblock.c	(revision 30899)
+++ renumberblock.c	(revision 30900)
@@ -33,8 +33,8 @@
 	char num_buf[15];
 	int old_base, new_base;
 
-	PCB_ACT_CONVARG(1, FGW_INT, RenumberBlock, old_base = argv[1].val.nat_int);
-	PCB_ACT_CONVARG(2, FGW_INT, RenumberBlock, new_base = argv[2].val.nat_int);
+	RND_PCB_ACT_CONVARG(1, FGW_INT, RenumberBlock, old_base = argv[1].val.nat_int);
+	RND_PCB_ACT_CONVARG(2, FGW_INT, RenumberBlock, new_base = argv[2].val.nat_int);
 
 	conf_set_editor(name_on_pcb, 1);
 
@@ -65,7 +65,7 @@
 	}
 	PCB_END_LOOP;
 	pcb_undo_inc_serial();
-	PCB_ACT_IRES(0);
+	RND_ACT_IRES(0);
 	return 0;
 }
 
@@ -78,8 +78,8 @@
 	char num_buf[15];
 	int old_base, new_base;
 
-	PCB_ACT_CONVARG(1, FGW_INT, RenumberBuffer, old_base = argv[1].val.nat_int);
-	PCB_ACT_CONVARG(2, FGW_INT, RenumberBuffer, new_base = argv[2].val.nat_int);
+	RND_PCB_ACT_CONVARG(1, FGW_INT, RenumberBuffer, old_base = argv[1].val.nat_int);
+	RND_PCB_ACT_CONVARG(2, FGW_INT, RenumberBuffer, new_base = argv[2].val.nat_int);
 
 	conf_set_editor(name_on_pcb, 1);
 
@@ -108,6 +108,6 @@
 	}
 	PCB_END_LOOP;
 
-	PCB_ACT_IRES(0);
+	RND_ACT_IRES(0);
 	return 0;
 }