Index: propdlg.c
===================================================================
--- propdlg.c	(revision 31031)
+++ propdlg.c	(revision 31032)
@@ -665,7 +665,7 @@
 	if (argc > 1) {
 		for(a = 1; a < argc; a++) {
 			const char *cmd;
-			RND_PCB_ACT_CONVARG(a, FGW_STR, propedit, cmd = argv[a].val.str);
+			RND_ACT_CONVARG(a, FGW_STR, propedit, cmd = argv[a].val.str);
 			r = prop_scope_add(&ctx->pe, cmd, 0);
 			if (r != 0)
 				return r;
Index: propedit.c
===================================================================
--- propedit.c	(revision 31031)
+++ propedit.c	(revision 31032)
@@ -183,15 +183,15 @@
 
 	pcb_props_init(&ctx, PCB);
 
-	RND_PCB_ACT_CONVARG(1, FGW_STR, propset, first = argv[1].val.str);
+	RND_ACT_CONVARG(1, FGW_STR, propset, first = argv[1].val.str);
 	if (prop_scope_add(&ctx, first, 1) == 0) {
-		RND_PCB_ACT_CONVARG(2, FGW_STR, propset, name = argv[2].val.str);
-		RND_PCB_ACT_CONVARG(3, FGW_STR, propset, val = argv[3].val.str);
+		RND_ACT_CONVARG(2, FGW_STR, propset, name = argv[2].val.str);
+		RND_ACT_CONVARG(3, FGW_STR, propset, val = argv[3].val.str);
 	}
 	else {
 		name = first;
 		ctx.selection = 1;
-		RND_PCB_ACT_CONVARG(2, FGW_STR, propset, val = argv[2].val.str);
+		RND_ACT_CONVARG(2, FGW_STR, propset, val = argv[2].val.str);
 	}
 
 	RND_ACT_IRES(pcb_propsel_set_str(&ctx, name, val));
@@ -214,15 +214,15 @@
 
 	pcb_props_init(&ctx, PCB);
 
-	RND_PCB_ACT_CONVARG(1, FGW_STR, propget, first = argv[1].val.str);
+	RND_ACT_CONVARG(1, FGW_STR, propget, first = argv[1].val.str);
 	if (prop_scope_add(&ctx, first, 1) == 0) {
-		RND_PCB_ACT_CONVARG(2, FGW_STR, propget, name = argv[2].val.str);
-		rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, propget, stty = argv[3].val.str);
+		RND_ACT_CONVARG(2, FGW_STR, propget, name = argv[2].val.str);
+		RND_ACT_MAY_CONVARG(3, FGW_STR, propget, stty = argv[3].val.str);
 	}
 	else {
 		name = first;
 		ctx.selection = 1;
-		RND_PCB_ACT_CONVARG(2, FGW_STR, propget, stty = argv[2].val.str);
+		RND_ACT_CONVARG(2, FGW_STR, propget, stty = argv[2].val.str);
 	}
 
 	ctx.geo = 1;
@@ -285,7 +285,7 @@
 
 	pcb_props_init(&ctx, PCB);
 
-	rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, propset, scope = argv[1].val.str);
+	RND_ACT_MAY_CONVARG(1, FGW_STR, propset, scope = argv[1].val.str);
 	if (scope != NULL) {
 		if (prop_scope_add(&ctx, scope, 0) != 0)
 			return FGW_ERR_ARG_CONV;