Index: trunk/scconfig/hooks.c
===================================================================
--- trunk/scconfig/hooks.c	(revision 30879)
+++ trunk/scconfig/hooks.c	(revision 30880)
@@ -49,7 +49,7 @@
 
 static void help1(void)
 {
-	help1_common("pcb-rnd");
+	rnd_help1("pcb-rnd");
 
 	printf(" --coord=32|64              set coordinate integer type's width in bits\n");
 	printf(" --dot_pcb_rnd=path         .pcb-rnd config path under $HOME/\n");
@@ -60,7 +60,7 @@
  returns true if no further argument processing should be done */
 int hook_custom_arg(const char *key, const char *value)
 {
-	hook_custom_arg_common(key, value);
+	rnd_hook_custom_arg(key, value);
 	if (strncmp(key, "workaround-", 11) == 0) {
 		const char *what = key+11;
 		if (strcmp(what, "gtk-ctrl") == 0) append("/local/pcb/workaround_defs", "\n#define PCB_WORKAROUND_GTK_CTRL 1");
@@ -111,7 +111,7 @@
 	pup_hook_postinit();
 	fungw_hook_postinit();
 
-	hook_postinit_common();
+	rnd_hook_postinit();
 
 	put("/local/pcb/want_bison", sfalse);
 	put("/local/pcb/want_byaccic", sfalse);
@@ -125,7 +125,7 @@
 /* Runs after all arguments are read and parsed */
 int hook_postarg()
 {
-	return hook_postarg_common();
+	return rnd_hook_postarg();
 }
 
 
Index: trunk/scconfig/librnd/scconfig/hooks_common.h
===================================================================
--- trunk/scconfig/librnd/scconfig/hooks_common.h	(revision 30879)
+++ trunk/scconfig/librnd/scconfig/hooks_common.h	(revision 30880)
@@ -8,7 +8,7 @@
 /*** implementation ***/
 static void all_plugin_select(const char *state, int force);
 
-static void help1_common(const char *progname)
+static void rnd_help1(const char *progname)
 {
 	printf("./configure: configure %s.\n", progname);
 	printf("\n");
@@ -49,7 +49,7 @@
 		repeat = strclone(msg); \
 } while(0)
 
-static int hook_custom_arg_common_(const char *key, const char *value)
+static int rnd_hook_custom_arg_(const char *key, const char *value)
 {
 	if (strcmp(key, "prefix") == 0) {
 		report("Setting prefix to '%s'\n", value);
@@ -101,9 +101,9 @@
 	return 0;
 }
 
-#define hook_custom_arg_common(key, value) \
+#define rnd_hook_custom_arg(key, value) \
 do { \
-	if (hook_custom_arg_common_(key, value)) \
+	if (rnd_hook_custom_arg_(key, value)) \
 		return 1; \
 } while(0)
 
@@ -215,7 +215,7 @@
 }
 
 
-void hook_postinit_common()
+void rnd_hook_postinit()
 {
 	/* DEFAULTS */
 	put("/local/prefix", "/usr/local");
@@ -265,7 +265,7 @@
 
 
 /* Runs after all arguments are read and parsed */
-int hook_postarg_common()
+int rnd_hook_postarg()
 {
 	int limit = 128;