Index: conf/conftest.c
===================================================================
--- conf/conftest.c	(revision 30948)
+++ conf/conftest.c	(revision 30949)
@@ -92,7 +92,7 @@
 		rnd_conf_role_t role;
 		arg+=7;
 		while(isspace(*arg)) arg++;
-		role = pcb_conf_role_parse(arg);
+		role = rnd_conf_role_parse(arg);
 		if (role == RND_CFR_invalid) {
 			rnd_message(PCB_MSG_ERROR, "Invalid role: '%s'", arg);
 			return;
@@ -115,13 +115,13 @@
 		rnd_message(PCB_MSG_ERROR, "Need an arg: a native path");
 		return;
 	}
-	node = pcb_conf_get_field(arg);
+	node = rnd_conf_get_field(arg);
 	if (node == NULL) {
 		rnd_message(PCB_MSG_ERROR, "No such path: '%s'", arg);
 		return;
 	}
 	gds_init(&s);
-	pcb_conf_print_native((conf_pfn)pcb_append_printf, &s, NULL, 0, node);
+	rnd_conf_print_native((conf_pfn)pcb_append_printf, &s, NULL, 0, node);
 	printf("%s='%s'\n", node->hash_path, s.array);
 	gds_uninit(&s);
 }
@@ -138,7 +138,7 @@
 	}
 
 	if (*arg == '*') {
-		pcb_conf_load_all(NULL, NULL);
+		rnd_conf_load_all(NULL, NULL);
 		return;
 	}
 
@@ -149,12 +149,12 @@
 	fn++;
 	while(isspace(*fn)) fn++;
 
-	role = pcb_conf_role_parse(arg);
+	role = rnd_conf_role_parse(arg);
 	if (role == RND_CFR_invalid) {
 		rnd_message(PCB_MSG_ERROR, "Invalid role: '%s'", arg);
 		return;
 	}
-	printf("Result: %d\n", pcb_conf_load_as(role, fn, is_text));
+	printf("Result: %d\n", rnd_conf_load_as(role, fn, is_text));
 	pcb_conf_update(NULL, -1);
 }
 
@@ -163,7 +163,7 @@
 
 void cmd_policy(char *arg)
 {
-	rnd_conf_policy_t np = pcb_conf_policy_parse(arg);
+	rnd_conf_policy_t np = rnd_conf_policy_parse(arg);
 	if (np == RND_POL_invalid)
 		rnd_message(PCB_MSG_ERROR, "Invalid/unknown policy: '%s'", arg);
 	else
@@ -172,7 +172,7 @@
 
 void cmd_role(char *arg)
 {
-	rnd_conf_role_t nr = pcb_conf_role_parse(arg);
+	rnd_conf_role_t nr = rnd_conf_role_parse(arg);
 	if (nr == RND_CFR_invalid)
 		rnd_message(PCB_MSG_ERROR, "Invalid/unknown role: '%s'", arg);
 	else
@@ -212,7 +212,7 @@
 		rnd_message(PCB_MSG_ERROR, "need a policy", arg);
 		return;
 	}
-	np = pcb_conf_policy_parse(arg);
+	np = rnd_conf_policy_parse(arg);
 	if (np == RND_POL_invalid) {
 		rnd_message(PCB_MSG_ERROR, "Invalid integer policy: '%s'", arg);
 		return;
@@ -251,7 +251,7 @@
 	val++;
 	while(isspace(*val) || (*val == '=')) val++;
 
-	res = pcb_conf_set(current_role, path, -1, val, current_policy);
+	res = rnd_conf_set(current_role, path, -1, val, current_policy);
 	if (res != 0)
 		printf("set error: %d\n", res);
 }
@@ -258,7 +258,7 @@
 
 void cmd_watch(char *arg, int add)
 {
-	rnd_conf_native_t *n = pcb_conf_get_field(arg);
+	rnd_conf_native_t *n = rnd_conf_get_field(arg);
 	if (n == NULL) {
 		rnd_message(PCB_MSG_ERROR, "unknown path");
 		return;
@@ -286,20 +286,20 @@
 void cmd_reset(char *arg)
 {
 	if (arg == NULL) {
-		pcb_conf_reset(current_role, "<cmd_reset current>");
+		rnd_conf_reset(current_role, "<cmd_reset current>");
 	}
 	else if (*arg == '*') {
 		int n;
 		for(n = 0; n < RND_CFR_max_real; n++)
-			pcb_conf_reset(n, "<cmd_reset *>");
+			rnd_conf_reset(n, "<cmd_reset *>");
 	}
 	else {
-		rnd_conf_role_t role = pcb_conf_role_parse(arg);
+		rnd_conf_role_t role = rnd_conf_role_parse(arg);
 		if (role == RND_CFR_invalid) {
 			rnd_message(PCB_MSG_ERROR, "Invalid role: '%s'", arg);
 			return;
 		}
-		pcb_conf_reset(role, "<cmd_reset role>");
+		rnd_conf_reset(role, "<cmd_reset role>");
 	}
 	pcb_conf_update(NULL, -1);
 }
@@ -350,11 +350,11 @@
 
 	hid_id = pcb_conf_hid_reg(hid_cookie, &global_cbs);
 
-	pcb_conf_init();
+	rnd_conf_init();
 	conf_core_init();
 	pcb_hidlib_conf_init();
-	pcb_conf_reset(RND_CFR_SYSTEM, "<main>");
-	pcb_conf_reset(RND_CFR_USER, "<main>");
+	rnd_conf_reset(RND_CFR_SYSTEM, "<main>");
+	rnd_conf_reset(RND_CFR_USER, "<main>");
 
 	while(getline_cont(stdin)) {
 		char *arg, *cmd = line;
@@ -404,6 +404,6 @@
 
 	conf_core_uninit_pre();
 	pcb_conf_hid_unreg(hid_cookie);
-	pcb_conf_uninit();
+	rnd_conf_uninit();
 	return 0;
 }
Index: conf/help.c
===================================================================
--- conf/help.c	(revision 30948)
+++ conf/help.c	(revision 30949)
@@ -31,7 +31,7 @@
 	"Change the policy of the first confroot of the current role's in-memory lihata document to pol and merge. Pol is a policy, see: help policies",
 
 	"set", "path value",
-	"Call pcb_conf_set() on a given path with the given value, using the current set-role and the current set-policy. See also: help role; help policy.",
+	"Call rnd_conf_set() on a given path with the given value, using the current set-role and the current set-policy. See also: help role; help policy.",
 
 	"watch", "path",
 	"Announce changes of a given path. See also: help unwatch",
Index: librnd/glue.c
===================================================================
--- librnd/glue.c	(revision 30948)
+++ librnd/glue.c	(revision 30949)
@@ -33,7 +33,7 @@
 
 void conf_core_init()
 {
-	pcb_conf_reg_field_(NULL, 1, RND_CFN_COORD, "should_never_match", "dummy", 0);
+	rnd_conf_reg_field_(NULL, 1, RND_CFN_COORD, "should_never_match", "dummy", 0);
 }
 
 void pcb_hidlib_adjust_attached_objects(rnd_hidlib_t *hl)
Index: librnd/librnd_test.c
===================================================================
--- librnd/librnd_test.c	(revision 30948)
+++ librnd/librnd_test.c	(revision 30949)
@@ -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(RND_CFR_CLI, "editor/view/flip_y", 0, "1", RND_POL_OVERWRITE);
+	rnd_conf_set(RND_CFR_CLI, "editor/view/flip_y", 0, "1", RND_POL_OVERWRITE);
 
 	if (pcbhl_main_args_setup1(&ga) != 0) {
 		fprintf(stderr, "setup1 fail\n");