Index: file.c
===================================================================
--- file.c	(revision 31039)
+++ file.c	(revision 31040)
@@ -1028,7 +1028,7 @@
 	pcb_text_t *txt;
 	pcb_subc_reg(Data, sc);
 	if (Data->padstack_tree == NULL)
-		Data->padstack_tree = pcb_r_create_tree();
+		Data->padstack_tree = rnd_r_create_tree();
 	sc->data->padstack_tree = Data->padstack_tree;
 
 	yysubc_ox = 0;
@@ -1072,8 +1072,8 @@
 
 	pcb_subc_bbox(yysubc);
 	if (Data->subc_tree == NULL)
-		Data->subc_tree = pcb_r_create_tree();
-	pcb_r_insert_entry(Data->subc_tree, (rnd_rnd_box_t *)yysubc);
+		Data->subc_tree = rnd_r_create_tree();
+	rnd_r_insert_entry(Data->subc_tree, (rnd_rnd_box_t *)yysubc);
 }
 
 static pcb_layer_t *subc_silk_layer(pcb_subc_t *subc)
Index: parse_y.c
===================================================================
--- parse_y.c	(revision 31039)
+++ parse_y.c	(revision 31040)
@@ -2454,8 +2454,8 @@
 				  {
 				    pcb_poly_bbox(Polygon);
 				    if (!Layer->polygon_tree)
-				      Layer->polygon_tree = pcb_r_create_tree();
-				    pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon);
+				      Layer->polygon_tree = rnd_r_create_tree();
+				    rnd_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon);
 				  }
 			}
 #line 2462 "parse_y.c" /* yacc.c:1652  */
Index: parse_y.y
===================================================================
--- parse_y.y	(revision 31039)
+++ parse_y.y	(revision 31040)
@@ -795,8 +795,8 @@
 				  {
 				    pcb_poly_bbox(Polygon);
 				    if (!Layer->polygon_tree)
-				      Layer->polygon_tree = pcb_r_create_tree();
-				    pcb_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon);
+				      Layer->polygon_tree = rnd_r_create_tree();
+				    rnd_r_insert_entry(Layer->polygon_tree, (rnd_rnd_box_t *) Polygon);
 				  }
 			}
 		;