Index: bus.c
===================================================================
--- bus.c	(revision 30991)
+++ bus.c	(revision 30992)
@@ -30,7 +30,7 @@
 #define LID_TARGET 1
 
 typedef struct {
-	PCB_DAD_DECL_NOINIT(dlg)
+	RND_DAD_DECL_NOINIT(dlg)
 	int gui_active;
 	int width;
 	rnd_coord_t pitch;
@@ -47,7 +47,7 @@
 	rnd_trace("bus del_pre\n");
 
 	if ((bus != NULL) && (bus->gui_active))
-		PCB_DAD_FREE(bus->dlg);
+		RND_DAD_FREE(bus->dlg);
 
 	free(bus);
 	subc->extobj_data = NULL;
@@ -357,13 +357,13 @@
 	pcb_subc_t *subc = caller_data;
 	bus_t *bus = subc->extobj_data;
 
-	PCB_DAD_FREE(bus->dlg);
+	RND_DAD_FREE(bus->dlg);
 	bus->gui_active = 0;
 }
 
 static void pcb_bus_gui_propedit(pcb_subc_t *subc)
 {
-	pcb_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}};
+	rnd_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}};
 	bus_t *bus;
 
 	rnd_trace("bus: gui propedit\n");
@@ -376,21 +376,21 @@
 	if (bus->gui_active)
 		return; /* do not open another */
 
-	PCB_DAD_BEGIN_VBOX(bus->dlg);
-		PCB_DAD_COMPFLAG(bus->dlg, RND_HATF_EXPFILL);
-		PCB_DAD_BEGIN_TABLE(bus->dlg, 2);
+	RND_DAD_BEGIN_VBOX(bus->dlg);
+		RND_DAD_COMPFLAG(bus->dlg, RND_HATF_EXPFILL);
+		RND_DAD_BEGIN_TABLE(bus->dlg, 2);
 			pcb_exto_dlg_int(bus->dlg, subc, "width", "extobj::width", "number of traces in the bus");
 			pcb_exto_dlg_coord(bus->dlg, subc, "thickness", "extobj::thickness", "thickness of each trace");
 			pcb_exto_dlg_coord(bus->dlg, subc, "clearance", "extobj::clearance", "clearance on each trace");
 			pcb_exto_dlg_coord(bus->dlg, subc, "pitch", "extobj::pitch", "distance between trace centerlines");
-		PCB_DAD_END(bus->dlg);
-		PCB_DAD_BUTTON_CLOSES(bus->dlg, clbtn);
-	PCB_DAD_END(bus->dlg);
+		RND_DAD_END(bus->dlg);
+		RND_DAD_BUTTON_CLOSES(bus->dlg, clbtn);
+	RND_DAD_END(bus->dlg);
 
 	/* set up the context */
 	bus->gui_active = 1;
 
-	PCB_DAD_NEW("bus", bus->dlg, "Bus", subc, pcb_false, pcb_bus_close_cb);
+	RND_DAD_NEW("bus", bus->dlg, "Bus", subc, pcb_false, pcb_bus_close_cb);
 }
 
 static pcb_extobj_t pcb_bus = {
Index: dimension.c
===================================================================
--- dimension.c	(revision 30991)
+++ dimension.c	(revision 30992)
@@ -32,7 +32,7 @@
 #define LID_TARGET 1
 
 typedef struct {
-	PCB_DAD_DECL_NOINIT(dlg)
+	RND_DAD_DECL_NOINIT(dlg)
 	int gui_active;
 
 	int style;
@@ -395,13 +395,13 @@
 	pcb_subc_t *subc = caller_data;
 	dimension *dim = subc->extobj_data;
 
-	PCB_DAD_FREE(dim->dlg);
+	RND_DAD_FREE(dim->dlg);
 	dim->gui_active = 0;
 }
 
 static void pcb_dimension_gui_propedit(pcb_subc_t *subc)
 {
-	pcb_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}};
+	rnd_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}};
 	dimension *dim;
 
 	rnd_trace("dim: gui propedit\n");
@@ -414,19 +414,19 @@
 	if (dim->gui_active)
 		return; /* do not open another */
 
-	PCB_DAD_BEGIN_VBOX(dim->dlg);
-		PCB_DAD_COMPFLAG(dim->dlg, RND_HATF_EXPFILL);
-		PCB_DAD_BEGIN_TABLE(dim->dlg, 2);
+	RND_DAD_BEGIN_VBOX(dim->dlg);
+		RND_DAD_COMPFLAG(dim->dlg, RND_HATF_EXPFILL);
+		RND_DAD_BEGIN_TABLE(dim->dlg, 2);
 			pcb_exto_dlg_coord(dim->dlg, subc, "displacement", "extobj::displace", "distance between base line and dimension line");
 			pcb_exto_dlg_str(dim->dlg, subc, "format", "extobj::format", "printf coord format string of the dimension value");
-		PCB_DAD_END(dim->dlg);
-		PCB_DAD_BUTTON_CLOSES(dim->dlg, clbtn);
-	PCB_DAD_END(dim->dlg);
+		RND_DAD_END(dim->dlg);
+		RND_DAD_BUTTON_CLOSES(dim->dlg, clbtn);
+	RND_DAD_END(dim->dlg);
 
 	/* set up the context */
 	dim->gui_active = 1;
 
-	PCB_DAD_NEW("dimension", dim->dlg, "Dimension line", subc, pcb_false, pcb_dimension_close_cb);
+	RND_DAD_NEW("dimension", dim->dlg, "Dimension line", subc, pcb_false, pcb_dimension_close_cb);
 }
 
 static pcb_extobj_t pcb_dimension = {
Index: line_of_vias.c
===================================================================
--- line_of_vias.c	(revision 30991)
+++ line_of_vias.c	(revision 30992)
@@ -31,7 +31,7 @@
 #include "../src_plugins/lib_compat_help/pstk_compat.h"
 
 typedef struct {
-	PCB_DAD_DECL_NOINIT(dlg)
+	RND_DAD_DECL_NOINIT(dlg)
 	int gui_active;
 	rnd_coord_t pitch;
 	rnd_coord_t clearance;
@@ -43,7 +43,7 @@
 	rnd_trace("LoV del_pre\n");
 
 	if ((lov != NULL) && (lov->gui_active))
-		PCB_DAD_FREE(lov->dlg);
+		RND_DAD_FREE(lov->dlg);
 
 	free(lov);
 	subc->extobj_data = NULL;
@@ -295,13 +295,13 @@
 	pcb_subc_t *subc = caller_data;
 	line_of_vias *lov = subc->extobj_data;
 
-	PCB_DAD_FREE(lov->dlg);
+	RND_DAD_FREE(lov->dlg);
 	lov->gui_active = 0;
 }
 
 static void pcb_line_of_vias_gui_propedit(pcb_subc_t *subc)
 {
-	pcb_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}};
+	rnd_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}};
 	line_of_vias *lov;
 
 	rnd_trace("LoV: gui propedit\n");
@@ -314,19 +314,19 @@
 	if (lov->gui_active)
 		return; /* do not open another */
 
-	PCB_DAD_BEGIN_VBOX(lov->dlg);
-		PCB_DAD_COMPFLAG(lov->dlg, RND_HATF_EXPFILL);
-		PCB_DAD_BEGIN_TABLE(lov->dlg, 2);
+	RND_DAD_BEGIN_VBOX(lov->dlg);
+		RND_DAD_COMPFLAG(lov->dlg, RND_HATF_EXPFILL);
+		RND_DAD_BEGIN_TABLE(lov->dlg, 2);
 			pcb_exto_dlg_coord(lov->dlg, subc, "pitch", "extobj::pitch", "target distance between center of vias");
 			pcb_exto_dlg_coord(lov->dlg, subc, "clearance", "extobj::clearance", "global clarance value on vias");
-		PCB_DAD_END(lov->dlg);
-		PCB_DAD_BUTTON_CLOSES(lov->dlg, clbtn);
-	PCB_DAD_END(lov->dlg);
+		RND_DAD_END(lov->dlg);
+		RND_DAD_BUTTON_CLOSES(lov->dlg, clbtn);
+	RND_DAD_END(lov->dlg);
 
 	/* set up the context */
 	lov->gui_active = 1;
 
-	PCB_DAD_NEW("line_of_vias", lov->dlg, "Line of vias", subc, pcb_false, pcb_line_of_vias_close_cb);
+	RND_DAD_NEW("line_of_vias", lov->dlg, "Line of vias", subc, pcb_false, pcb_line_of_vias_close_cb);
 }
 
 static pcb_extobj_t pcb_line_of_vias = {