Index: conf/conftest.c
===================================================================
--- conf/conftest.c	(revision 30942)
+++ conf/conftest.c	(revision 30943)
@@ -158,13 +158,13 @@
 	pcb_conf_update(NULL, -1);
 }
 
-conf_policy_t current_policy = POL_OVERWRITE;
+rnd_conf_policy_t current_policy = RND_POL_OVERWRITE;
 conf_role_t current_role = CFR_DESIGN;
 
 void cmd_policy(char *arg)
 {
-	conf_policy_t np = pcb_conf_policy_parse(arg);
-	if (np == POL_invalid)
+	rnd_conf_policy_t np = pcb_conf_policy_parse(arg);
+	if (np == RND_POL_invalid)
 		rnd_message(PCB_MSG_ERROR, "Invalid/unknown policy: '%s'", arg);
 	else
 		current_policy = np;
@@ -205,7 +205,7 @@
 
 void cmd_chpolicy(char *arg)
 {
-	conf_policy_t np;
+	rnd_conf_policy_t np;
 	lht_node_t *first;
 
 	if (arg == NULL) {
@@ -213,7 +213,7 @@
 		return;
 	}
 	np = pcb_conf_policy_parse(arg);
-	if (np == POL_invalid) {
+	if (np == RND_POL_invalid) {
 		rnd_message(PCB_MSG_ERROR, "Invalid integer policy: '%s'", arg);
 		return;
 	}
Index: librnd/librnd_test.c
===================================================================
--- librnd/librnd_test.c	(revision 30942)
+++ librnd/librnd_test.c	(revision 30943)
@@ -33,7 +33,7 @@
 		n += pcbhl_main_args_add(&ga, argv[n], argv[n+1]);
 	pcb_hidlib_init2(pup_buildins, local_buildins);
 
-	pcb_conf_set(CFR_CLI, "editor/view/flip_y", 0, "1", POL_OVERWRITE);
+	pcb_conf_set(CFR_CLI, "editor/view/flip_y", 0, "1", RND_POL_OVERWRITE);
 
 	if (pcbhl_main_args_setup1(&ga) != 0) {
 		fprintf(stderr, "setup1 fail\n");