Index: order.h
===================================================================
--- order.h	(revision 30991)
+++ order.h	(revision 30992)
@@ -34,7 +34,7 @@
 extern conf_order_t conf_order;
 
 typedef struct{
-	PCB_DAD_DECL_NOINIT(dlg)
+	RND_DAD_DECL_NOINIT(dlg)
 	int active; /* already open - allow only one instance */
 	vtp0_t names;
 	void *odata;                                   /* implementation-specific data of the current order */
Index: order_dlg.c
===================================================================
--- order_dlg.c	(revision 30991)
+++ order_dlg.c	(revision 30992)
@@ -3,13 +3,13 @@
 static void order_close_cb(void *caller_data, rnd_hid_attr_ev_t ev)
 {
 	order_ctx_t *ctx = caller_data;
-	PCB_DAD_FREE(ctx->dlg);
+	RND_DAD_FREE(ctx->dlg);
 	memset(ctx, 0, sizeof(order_ctx_t));
 }
 
 static int order_dialog(void)
 {
-	pcb_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}};
+	rnd_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}};
 	pcb_order_imp_t *imp;
 	int n;
 
@@ -29,62 +29,62 @@
 	}
 	vtp0_set(&order_ctx.names, n, NULL);
 
-	PCB_DAD_BEGIN_VBOX(order_ctx.dlg);
-		PCB_DAD_COMPFLAG(order_ctx.dlg, RND_HATF_EXPFILL);
-		PCB_DAD_BEGIN_TABBED(order_ctx.dlg, order_ctx.names.array);
-			PCB_DAD_COMPFLAG(order_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_LEFT_TAB);
+	RND_DAD_BEGIN_VBOX(order_ctx.dlg);
+		RND_DAD_COMPFLAG(order_ctx.dlg, RND_HATF_EXPFILL);
+		RND_DAD_BEGIN_TABBED(order_ctx.dlg, order_ctx.names.array);
+			RND_DAD_COMPFLAG(order_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_LEFT_TAB);
 			for(n = 0; n < pcb_order_imps.used; n++) {
 				imp = pcb_order_imps.array[n];
 				if (imp->load_fields(pcb_order_imps.array[n], &order_ctx) == 0) {
-					PCB_DAD_BEGIN_VBOX(order_ctx.dlg);
-						PCB_DAD_COMPFLAG(order_ctx.dlg, RND_HATF_EXPFILL);
+					RND_DAD_BEGIN_VBOX(order_ctx.dlg);
+						RND_DAD_COMPFLAG(order_ctx.dlg, RND_HATF_EXPFILL);
 
 						imp->populate_dad(pcb_order_imps.array[n], &order_ctx);
-					PCB_DAD_END(order_ctx.dlg);
+					RND_DAD_END(order_ctx.dlg);
 				}
 				else
-					PCB_DAD_LABEL(order_ctx.dlg, "Failed to determine form fields");
+					RND_DAD_LABEL(order_ctx.dlg, "Failed to determine form fields");
 			}
 
-		PCB_DAD_END(order_ctx.dlg);
-		PCB_DAD_BUTTON_CLOSES(order_ctx.dlg, clbtn);
-	PCB_DAD_END(order_ctx.dlg);
+		RND_DAD_END(order_ctx.dlg);
+		RND_DAD_BUTTON_CLOSES(order_ctx.dlg, clbtn);
+	RND_DAD_END(order_ctx.dlg);
 
 	/* set up the context */
 	order_ctx.active = 1;
 
-	PCB_DAD_NEW("order", order_ctx.dlg, "Order PCB", &order_ctx, pcb_false, order_close_cb);
+	RND_DAD_NEW("order", order_ctx.dlg, "Order PCB", &order_ctx, pcb_false, order_close_cb);
 	return 0;
 }
 
 void pcb_order_dad_field(order_ctx_t *octx, pcb_order_field_t *f)
 {
-	PCB_DAD_BEGIN_HBOX(octx->dlg);
-		PCB_DAD_LABEL(octx->dlg, f->name);
-		PCB_DAD_BEGIN_VBOX(octx->dlg);
-			PCB_DAD_COMPFLAG(octx->dlg, RND_HATF_EXPFILL);
-		PCB_DAD_END(octx->dlg);
+	RND_DAD_BEGIN_HBOX(octx->dlg);
+		RND_DAD_LABEL(octx->dlg, f->name);
+		RND_DAD_BEGIN_VBOX(octx->dlg);
+			RND_DAD_COMPFLAG(octx->dlg, RND_HATF_EXPFILL);
+		RND_DAD_END(octx->dlg);
 		switch(f->type) {
 			case RND_HATT_ENUM:
-				PCB_DAD_ENUM(octx->dlg, f->enum_vals);
-				PCB_DAD_DEFAULT_NUM(octx->dlg, f->val.lng);
+				RND_DAD_ENUM(octx->dlg, f->enum_vals);
+				RND_DAD_DEFAULT_NUM(octx->dlg, f->val.lng);
 				break;
 			case RND_HATT_INTEGER:
-				PCB_DAD_INTEGER(octx->dlg, "");
-				PCB_DAD_DEFAULT_NUM(octx->dlg, f->val.lng);
+				RND_DAD_INTEGER(octx->dlg, "");
+				RND_DAD_DEFAULT_NUM(octx->dlg, f->val.lng);
 				break;
 			case RND_HATT_COORD:
-				PCB_DAD_COORD(octx->dlg, "");
-				PCB_DAD_DEFAULT_NUM(octx->dlg, f->val.crd);
+				RND_DAD_COORD(octx->dlg, "");
+				RND_DAD_DEFAULT_NUM(octx->dlg, f->val.crd);
 				break;
 			case RND_HATT_STRING:
-				PCB_DAD_STRING(octx->dlg);
-				PCB_DAD_DEFAULT_PTR(octx->dlg, f->val.str);
+				RND_DAD_STRING(octx->dlg);
+				RND_DAD_DEFAULT_PTR(octx->dlg, f->val.str);
 				break;
 			case RND_HATT_LABEL: break;
 			default:
-				PCB_DAD_LABEL(octx->dlg, "<invalid type>");
+				RND_DAD_LABEL(octx->dlg, "<invalid type>");
 		}
-		f->wid = PCB_DAD_CURRENT(octx->dlg);
-	PCB_DAD_END(octx->dlg);
+		f->wid = RND_DAD_CURRENT(octx->dlg);
+	RND_DAD_END(octx->dlg);
 }