Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 5003)
+++ trunk/doc-rnd/hacking/renames	(revision 5004)
@@ -779,3 +779,6 @@
 RotatePointLowLevel -> pcb_point_rotate90
 free_rotate -> pcb_rotate
 PCB_ROTATE90 -> PCB_COORD_ROTATE90
+ParseRoutingString1 -> pcb_route_string_parse1
+ParseRouteString -> pcb_route_string_parse
+make_route_string -> pcb_route_string_make
Index: trunk/src/route_style.c
===================================================================
--- trunk/src/route_style.c	(revision 5003)
+++ trunk/src/route_style.c	(revision 5004)
@@ -38,10 +38,10 @@
 /*! \brief Serializes the route style list 
  *  \par Function Description
  *  Right now n_styles should always be set to NUM_STYLES,
- *  since that is the number of route styles ParseRouteString()
+ *  since that is the number of route styles pcb_route_string_parse()
  *  expects to parse.
  */
-char *make_route_string(vtroutestyle_t *styles)
+char *pcb_route_string_make(vtroutestyle_t *styles)
 {
 	gds_t str;
 	int i;
@@ -62,7 +62,7 @@
  * comma separated Name, Dimension, Dimension, Dimension, Dimension
  * e.g. Signal,20,40,20,10:Power,40,60,28,10:...
  */
-int ParseRoutingString1(char **str, pcb_route_style_t *routeStyle, const char *default_unit)
+int pcb_route_string_parse1(char **str, pcb_route_style_t *routeStyle, const char *default_unit)
 {
 	char *s = *str;
 	char Name[256];
@@ -124,7 +124,7 @@
 		return -1;
 }
 
-int ParseRouteString(char *s, vtroutestyle_t *styles, const char *default_unit)
+int pcb_route_string_parse(char *s, vtroutestyle_t *styles, const char *default_unit)
 {
 	int n;
 
@@ -131,7 +131,7 @@
 	vtroutestyle_truncate(styles, 0);
 	for(n = 0;;n++) {
 		vtroutestyle_enlarge(styles, n+1);
-		if (ParseRoutingString1(&s, &styles->array[n], default_unit) != 0) {
+		if (pcb_route_string_parse1(&s, &styles->array[n], default_unit) != 0) {
 			n--;
 			break;
 		}
Index: trunk/src/route_style.h
===================================================================
--- trunk/src/route_style.h	(revision 5003)
+++ trunk/src/route_style.h	(revision 5004)
@@ -28,14 +28,14 @@
 #include "vtroutestyle.h"
 
 /* Parse a single route string into one pcb_route_style_t *slot. Returns 0 on success.  */
-int ParseRoutingString1(char **str, pcb_route_style_t *routeStyle, const char *default_unit);
+int pcb_route_string_parse1(char **str, pcb_route_style_t *routeStyle, const char *default_unit);
 
 /* Parse a ':' separated list of route strings into a styles vector
    The vector is initialized before the call. On error the vector is left empty
    (but still initialized). Returns 0 on success. */
-int ParseRouteString(char *s, vtroutestyle_t *styles, const char *default_unit);
+int pcb_route_string_parse(char *s, vtroutestyle_t *styles, const char *default_unit);
 
-char *make_route_string(vtroutestyle_t *styles);
+char *pcb_route_string_make(vtroutestyle_t *styles);
 
 /* Set design configuration (the pen we draw with) to a given route style */
 void pcb_use_route_style(pcb_route_style_t *rst);
Index: trunk/src_plugins/hid_gtk/gui-top-window.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-top-window.c	(revision 5003)
+++ trunk/src_plugins/hid_gtk/gui-top-window.c	(revision 5004)
@@ -712,9 +712,9 @@
 /*! \brief Called when user clicks OK on route style dialog */
 static void route_styles_edited_cb(GHidRouteStyleSelector * rss, gboolean save, gpointer data)
 {
-	conf_setf(CFR_DESIGN, "design/routes", -1, "%s", make_route_string(&PCB->RouteStyle));
+	conf_setf(CFR_DESIGN, "design/routes", -1, "%s", pcb_route_string_make(&PCB->RouteStyle));
 	if (save)
-		conf_setf(CFR_USER, "design/routes", -1, "%s", make_route_string(&PCB->RouteStyle));
+		conf_setf(CFR_USER, "design/routes", -1, "%s", pcb_route_string_make(&PCB->RouteStyle));
 	ghid_main_menu_install_route_style_selector
 		(GHID_MAIN_MENU(ghidgui->menu_bar), GHID_ROUTE_STYLE_SELECTOR(ghidgui->route_style_selector));
 }
Index: trunk/src_plugins/io_pcb/parse_y.c
===================================================================
--- trunk/src_plugins/io_pcb/parse_y.c	(revision 5003)
+++ trunk/src_plugins/io_pcb/parse_y.c	(revision 5004)
@@ -2086,7 +2086,7 @@
   case 46:
 #line 662 "parse_y.y" /* yacc.c:1646  */
     {
-				if (ParseRouteString((yyvsp[-1].string), &yyPCB->RouteStyle, "mil"))
+				if (pcb_route_string_parse((yyvsp[-1].string), &yyPCB->RouteStyle, "mil"))
 				{
 					pcb_message(PCB_MSG_ERROR, "illegal route-style string\n");
 					YYABORT;
@@ -2099,7 +2099,7 @@
   case 47:
 #line 671 "parse_y.y" /* yacc.c:1646  */
     {
-				if (ParseRouteString(((yyvsp[-1].string) == NULL ? "" : (yyvsp[-1].string)), &yyPCB->RouteStyle, "cmil"))
+				if (pcb_route_string_parse(((yyvsp[-1].string) == NULL ? "" : (yyvsp[-1].string)), &yyPCB->RouteStyle, "cmil"))
 				{
 					pcb_message(PCB_MSG_ERROR, "illegal route-style string\n");
 					YYABORT;
Index: trunk/src_plugins/io_pcb/parse_y.y
===================================================================
--- trunk/src_plugins/io_pcb/parse_y.y	(revision 5003)
+++ trunk/src_plugins/io_pcb/parse_y.y	(revision 5004)
@@ -660,7 +660,7 @@
 pcbstyles
 		: T_STYLES '(' STRING ')'
 			{
-				if (ParseRouteString($3, &yyPCB->RouteStyle, "mil"))
+				if (pcb_route_string_parse($3, &yyPCB->RouteStyle, "mil"))
 				{
 					pcb_message(PCB_MSG_ERROR, "illegal route-style string\n");
 					YYABORT;
@@ -669,7 +669,7 @@
 			}
 		| T_STYLES '[' STRING ']'
 			{
-				if (ParseRouteString(($3 == NULL ? "" : $3), &yyPCB->RouteStyle, "cmil"))
+				if (pcb_route_string_parse(($3 == NULL ? "" : $3), &yyPCB->RouteStyle, "cmil"))
 				{
 					pcb_message(PCB_MSG_ERROR, "illegal route-style string\n");
 					YYABORT;