Index: diag.c
===================================================================
--- diag.c	(revision 30944)
+++ diag.c	(revision 30945)
@@ -77,7 +77,7 @@
 		break;
 		case F_Lihata:
 		{
-		conf_role_t role;
+		rnd_conf_role_t role;
 		const char *srole, *prefix = "";
 		RND_PCB_ACT_CONVARG(2, FGW_STR, DumpConf, srole = argv[2].val.str);
 		rnd_PCB_ACT_MAY_CONVARG(3, FGW_STR, DumpConf, prefix = argv[3].val.str);
@@ -116,7 +116,7 @@
 static fgw_error_t pcb_act_EvalConf(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
 	const char *path;
-	conf_native_t *nat;
+	rnd_conf_native_t *nat;
 	int role;
 
 	RND_PCB_ACT_CONVARG(1, FGW_STR, EvalConf, path = argv[1].val.str);
Index: diag_conf.c
===================================================================
--- diag_conf.c	(revision 30944)
+++ diag_conf.c	(revision 30945)
@@ -36,7 +36,7 @@
 		pl = strlen(match_prefix);
 
 	for (e = htsp_first(pcb_conf_fields); e; e = htsp_next(pcb_conf_fields, e)) {
-		conf_native_t *node = (conf_native_t *)e->value;
+		rnd_conf_native_t *node = (rnd_conf_native_t *)e->value;
 		if (match_prefix != NULL) {
 			if (strncmp(node->hash_path, match_prefix, pl) != 0)
 				continue;
Index: diag_conf.h
===================================================================
--- diag_conf.h	(revision 30944)
+++ diag_conf.h	(revision 30945)
@@ -6,7 +6,7 @@
 typedef struct {
 	const struct {
 		const struct {
-			CFT_BOOLEAN auto_integrity;         /* Enable (expensive) automatic integrity check after each user action */
+			RND_CFT_BOOLEAN auto_integrity;         /* Enable (expensive) automatic integrity check after each user action */
 		} diag;
 	} plugins;
 } conf_diag_t;