Index: propdlg.c
===================================================================
--- propdlg.c	(revision 30954)
+++ propdlg.c	(revision 30955)
@@ -421,15 +421,15 @@
 	propdlg_t *ctx = caller_data;
 	pcb_hid_row_t *r = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wtree]);
 	if (r == NULL) {
-		rnd_message(PCB_MSG_ERROR, "can not delete: no attribute selected\n");
+		rnd_message(RND_MSG_ERROR, "can not delete: no attribute selected\n");
 		return;
 	}
 	if (r->path[0] != 'a') {
-		rnd_message(PCB_MSG_ERROR, "Only atributes (a/ subtree) can be deleted.\n");
+		rnd_message(RND_MSG_ERROR, "Only atributes (a/ subtree) can be deleted.\n");
 		return;
 	}
 	if (pcb_propsel_del(&ctx->pe, r->path) < 1) {
-		rnd_message(PCB_MSG_ERROR, "Failed to remove the attribute from any object.\n");
+		rnd_message(RND_MSG_ERROR, "Failed to remove the attribute from any object.\n");
 		return;
 	}
 	prop_refresh(ctx);
Index: propedit.c
===================================================================
--- propedit.c	(revision 30954)
+++ propedit.c	(revision 30955)
@@ -56,7 +56,7 @@
 		pcb_objtype_t type = pcb_search_obj_by_location(PCB_OBJ_SUBC, &o1, &o2, &o3, pcb_crosshair.X, pcb_crosshair.Y, PCB_SLOP);
 		if (type == 0) {
 			if (!quiet)
-				rnd_message(PCB_MSG_ERROR, "No object under the cursor\n");
+				rnd_message(RND_MSG_ERROR, "No object under the cursor\n");
 			return FGW_ERR_ARG_CONV;
 		}
 		goto object_scope;
@@ -66,7 +66,7 @@
 			idp = pcb_str2idpath(pe->pcb, cmd+7);
 			if (idp == NULL) {
 				if (!quiet)
-					rnd_message(PCB_MSG_ERROR, "Failed to convert object ID: '%s'\n", cmd+7);
+					rnd_message(RND_MSG_ERROR, "Failed to convert object ID: '%s'\n", cmd+7);
 				return FGW_ERR_ARG_CONV;
 			}
 			pcb_idpath_list_append(&pe->objs, idp);
@@ -80,7 +80,7 @@
 				type = pcb_search_obj_by_location(PCB_OBJ_CLASS_REAL, &o1, &o2, &o3, pcb_crosshair.X, pcb_crosshair.Y, PCB_SLOP);
 			if (type == 0) {
 				if (!quiet)
-					rnd_message(PCB_MSG_ERROR, "No object under the cursor\n");
+					rnd_message(RND_MSG_ERROR, "No object under the cursor\n");
 				return FGW_ERR_ARG_CONV;
 			}
 			object_scope:;
@@ -87,7 +87,7 @@
 			idp = pcb_obj2idpath(o2);
 			if (idp == NULL) {
 				if (!quiet)
-					rnd_message(PCB_MSG_ERROR, "Object under the cursor has no idpath\n");
+					rnd_message(RND_MSG_ERROR, "Object under the cursor has no idpath\n");
 				return FGW_ERR_ARG_CONV;
 			}
 			pcb_idpath_list_append(&pe->objs, idp);
@@ -99,7 +99,7 @@
 				id = pcb_layergrp_str2id(pe->pcb, cmd+9);
 				if (id < 0) {
 					if (!quiet)
-						rnd_message(PCB_MSG_ERROR, "Invalid layergrp ID '%s'\n", cmd+9);
+						rnd_message(RND_MSG_ERROR, "Invalid layergrp ID '%s'\n", cmd+9);
 					return FGW_ERR_ARG_CONV;
 				}
 			}
@@ -116,7 +116,7 @@
 			id = pcb_layer_str2id(pe->data, cmd+6);
 			if (id < 0) {
 				if (!quiet)
-					rnd_message(PCB_MSG_ERROR, "Invalid layer ID '%s'\n", cmd+6);
+					rnd_message(RND_MSG_ERROR, "Invalid layer ID '%s'\n", cmd+6);
 				return FGW_ERR_ARG_CONV;
 			}
 			vtl0_append(&pe->layers, id);
@@ -147,7 +147,7 @@
 			return 0;
 		}
 		if (!quiet)
-			rnd_message(PCB_MSG_ERROR, "Invalid scope: %s\n", cmd);
+			rnd_message(RND_MSG_ERROR, "Invalid scope: %s\n", cmd);
 		return FGW_ERR_ARG_CONV;
 	}
 	return 0;
@@ -355,12 +355,12 @@
 	PCB_API_CHK_VER;
 
 	if (sizeof(long) < sizeof(pcb_layer_id_t)) {
-		rnd_message(PCB_MSG_ERROR, "can't load propedig: layer id type wider than long\n");
+		rnd_message(RND_MSG_ERROR, "can't load propedig: layer id type wider than long\n");
 		return -1;
 	}
 
 	if (sizeof(long) < sizeof(pcb_layergrp_id_t)) {
-		rnd_message(PCB_MSG_ERROR, "can't load propedig: layergrp id type wider than long\n");
+		rnd_message(RND_MSG_ERROR, "can't load propedig: layergrp id type wider than long\n");
 		return -1;
 	}