Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 5005)
+++ trunk/doc-rnd/hacking/renames	(revision 5006)
@@ -789,3 +789,7 @@
 r_search -> pcb_r_search
 r_region_is_empty -> pcb_r_region_is_empty
 __r_dump_tree -> pcb_r_dump_tree
+LookupRubberbandLines -> pcb_rubber_band_lookup_lines
+LookupRatLines -> pcb_rubber_band_lookup_rat_lines
+GetRubberbandMemory -> pcb_rubber_band_alloc
+CreateNewRubberbandEntry -> pcb_rubber_band_create
Index: trunk/src/action_helper.c
===================================================================
--- trunk/src/action_helper.c	(revision 5005)
+++ trunk/src/action_helper.c	(revision 5006)
@@ -136,13 +136,13 @@
 
 	/* get all attached objects if necessary */
 	if ((conf_core.editor.mode != PCB_MODE_COPY) && conf_core.editor.rubber_band_mode)
-		LookupRubberbandLines(Crosshair.AttachedObject.Type,
+		pcb_rubber_band_lookup_lines(Crosshair.AttachedObject.Type,
 													Crosshair.AttachedObject.Ptr1, Crosshair.AttachedObject.Ptr2, Crosshair.AttachedObject.Ptr3);
 	if (conf_core.editor.mode != PCB_MODE_COPY &&
 			(Crosshair.AttachedObject.Type == PCB_TYPE_ELEMENT ||
 			 Crosshair.AttachedObject.Type == PCB_TYPE_VIA ||
 			 Crosshair.AttachedObject.Type == PCB_TYPE_LINE || Crosshair.AttachedObject.Type == PCB_TYPE_LINE_POINT))
-		LookupRatLines(Crosshair.AttachedObject.Type,
+		pcb_rubber_band_lookup_rat_lines(Crosshair.AttachedObject.Type,
 									 Crosshair.AttachedObject.Ptr1, Crosshair.AttachedObject.Ptr2, Crosshair.AttachedObject.Ptr3);
 }
 
@@ -1112,7 +1112,7 @@
 				int i;
 
 				Crosshair.AttachedObject.RubberbandN = 0;
-				LookupRatLines(type, ptr1, ptr2, ptr3);
+				pcb_rubber_band_lookup_rat_lines(type, ptr1, ptr2, ptr3);
 				ptr = Crosshair.AttachedObject.Rubberband;
 				for (i = 0; i < Crosshair.AttachedObject.RubberbandN; i++) {
 					if (PCB->RatOn)
Index: trunk/src/change_act.c
===================================================================
--- trunk/src/change_act.c	(revision 5005)
+++ trunk/src/change_act.c	(revision 5006)
@@ -673,7 +673,7 @@
 
 							RestoreUndoSerialNumber();
 							Crosshair.AttachedObject.RubberbandN = 0;
-							LookupRatLines(type, ptr1, ptr2, ptr3);
+							pcb_rubber_band_lookup_rat_lines(type, ptr1, ptr2, ptr3);
 							ptr = Crosshair.AttachedObject.Rubberband;
 							for (i = 0; i < Crosshair.AttachedObject.RubberbandN; i++, ptr++) {
 								if (PCB->RatOn)
Index: trunk/src/object_act.c
===================================================================
--- trunk/src/object_act.c	(revision 5005)
+++ trunk/src/object_act.c	(revision 5006)
@@ -389,9 +389,9 @@
 		ny -= y;
 	Crosshair.AttachedObject.RubberbandN = 0;
 	if (conf_core.editor.rubber_band_mode)
-		LookupRubberbandLines(type, ptr1, ptr2, ptr3);
+		pcb_rubber_band_lookup_lines(type, ptr1, ptr2, ptr3);
 	if (type == PCB_TYPE_ELEMENT)
-		LookupRatLines(type, ptr1, ptr2, ptr3);
+		pcb_rubber_band_lookup_rat_lines(type, ptr1, ptr2, ptr3);
 	pcb_move_obj_and_rubberband(type, ptr1, ptr2, ptr3, nx, ny);
 	SetChangedFlag(pcb_true);
 	return 0;
Index: trunk/src/rotate.c
===================================================================
--- trunk/src/rotate.c	(revision 5005)
+++ trunk/src/rotate.c	(revision 5006)
@@ -140,9 +140,9 @@
 		}
 		Crosshair.AttachedObject.RubberbandN = 0;
 		if (conf_core.editor.rubber_band_mode)
-			LookupRubberbandLines(type, ptr1, ptr2, ptr3);
+			pcb_rubber_band_lookup_lines(type, ptr1, ptr2, ptr3);
 		if (type == PCB_TYPE_ELEMENT)
-			LookupRatLines(type, ptr1, ptr2, ptr3);
+			pcb_rubber_band_lookup_rat_lines(type, ptr1, ptr2, ptr3);
 		pcb_obj_rotate90(type, ptr1, ptr2, ptr3, X, Y, Steps);
 		SetChangedFlag(pcb_true);
 	}
Index: trunk/src/rubberband.c
===================================================================
--- trunk/src/rubberband.c	(revision 5005)
+++ trunk/src/rubberband.c	(revision 5006)
@@ -108,7 +108,7 @@
 					touches = 1;
 			}
 			if (touches) {
-				CreateNewRubberbandEntry(i->layer, line, &line->Point1);
+				pcb_rubber_band_create(i->layer, line, &line->Point1);
 				found++;
 			}
 		}
@@ -129,7 +129,7 @@
 					touches = 1;
 			}
 			if (touches) {
-				CreateNewRubberbandEntry(i->layer, line, &line->Point2);
+				pcb_rubber_band_create(i->layer, line, &line->Point2);
 				found++;
 			}
 		}
@@ -158,14 +158,14 @@
 
 #ifdef CLOSEST_ONLY							/* keep this to remind me */
 	if (dist1 < dist2)
-		CreateNewRubberbandEntry(i->layer, line, &line->Point1);
+		pcb_rubber_band_create(i->layer, line, &line->Point1);
 	else
-		CreateNewRubberbandEntry(i->layer, line, &line->Point2);
+		pcb_rubber_band_create(i->layer, line, &line->Point2);
 #else
 	if (dist1 <= 0)
-		CreateNewRubberbandEntry(i->layer, line, &line->Point1);
+		pcb_rubber_band_create(i->layer, line, &line->Point1);
 	if (dist2 <= 0)
-		CreateNewRubberbandEntry(i->layer, line, &line->Point2);
+		pcb_rubber_band_create(i->layer, line, &line->Point2);
 #endif
 	return R_DIR_FOUND_CONTINUE;
 }
@@ -218,33 +218,33 @@
 	switch (i->type) {
 	case PCB_TYPE_PIN:
 		if (rat->Point1.X == i->pin->X && rat->Point1.Y == i->pin->Y)
-			CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point1);
+			pcb_rubber_band_create(NULL, (pcb_line_t *) rat, &rat->Point1);
 		else if (rat->Point2.X == i->pin->X && rat->Point2.Y == i->pin->Y)
-			CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point2);
+			pcb_rubber_band_create(NULL, (pcb_line_t *) rat, &rat->Point2);
 		break;
 	case PCB_TYPE_PAD:
 		if (rat->Point1.X == i->pad->Point1.X && rat->Point1.Y == i->pad->Point1.Y && rat->group1 == i->group)
-			CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point1);
+			pcb_rubber_band_create(NULL, (pcb_line_t *) rat, &rat->Point1);
 		else if (rat->Point2.X == i->pad->Point1.X && rat->Point2.Y == i->pad->Point1.Y && rat->group2 == i->group)
-			CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point2);
+			pcb_rubber_band_create(NULL, (pcb_line_t *) rat, &rat->Point2);
 		else if (rat->Point1.X == i->pad->Point2.X && rat->Point1.Y == i->pad->Point2.Y && rat->group1 == i->group)
-			CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point1);
+			pcb_rubber_band_create(NULL, (pcb_line_t *) rat, &rat->Point1);
 		else if (rat->Point2.X == i->pad->Point2.X && rat->Point2.Y == i->pad->Point2.Y && rat->group2 == i->group)
-			CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point2);
+			pcb_rubber_band_create(NULL, (pcb_line_t *) rat, &rat->Point2);
 		else
 			if (rat->Point1.X == (i->pad->Point1.X + i->pad->Point2.X) / 2 &&
 					rat->Point1.Y == (i->pad->Point1.Y + i->pad->Point2.Y) / 2 && rat->group1 == i->group)
-			CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point1);
+			pcb_rubber_band_create(NULL, (pcb_line_t *) rat, &rat->Point1);
 		else
 			if (rat->Point2.X == (i->pad->Point1.X + i->pad->Point2.X) / 2 &&
 					rat->Point2.Y == (i->pad->Point1.Y + i->pad->Point2.Y) / 2 && rat->group2 == i->group)
-			CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point2);
+			pcb_rubber_band_create(NULL, (pcb_line_t *) rat, &rat->Point2);
 		break;
 	case PCB_TYPE_LINE_POINT:
 		if (rat->group1 == i->group && rat->Point1.X == i->point->X && rat->Point1.Y == i->point->Y)
-			CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point1);
+			pcb_rubber_band_create(NULL, (pcb_line_t *) rat, &rat->Point1);
 		else if (rat->group2 == i->group && rat->Point2.X == i->point->X && rat->Point2.Y == i->point->Y)
-			CreateNewRubberbandEntry(NULL, (pcb_line_t *) rat, &rat->Point2);
+			pcb_rubber_band_create(NULL, (pcb_line_t *) rat, &rat->Point2);
 		break;
 	default:
 		pcb_message(PCB_MSG_DEFAULT, "hace: bad rubber-rat lookup callback\n");
@@ -376,9 +376,9 @@
 					continue;
 				thick = (line->Thickness + 1) / 2;
 				if (pcb_poly_is_point_in_p(line->Point1.X, line->Point1.Y, thick, Polygon))
-					CreateNewRubberbandEntry(layer, line, &line->Point1);
+					pcb_rubber_band_create(layer, line, &line->Point1);
 				if (pcb_poly_is_point_in_p(line->Point2.X, line->Point2.Y, thick, Polygon))
-					CreateNewRubberbandEntry(layer, line, &line->Point2);
+					pcb_rubber_band_create(layer, line, &line->Point2);
 			}
 			END_LOOP;
 		}
@@ -391,7 +391,7 @@
  * data to 'Crosshair.AttachedObject.Rubberband'
  * lookup is only done for visible layers
  */
-void LookupRubberbandLines(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+void pcb_rubber_band_lookup_lines(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
 {
 
 	/* the function is only supported for some types
@@ -448,7 +448,7 @@
 	}
 }
 
-void LookupRatLines(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+void pcb_rubber_band_lookup_rat_lines(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
 {
 	switch (Type) {
 	case PCB_TYPE_ELEMENT:
@@ -491,7 +491,7 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a rubberband connection, allocates memory if necessary
  */
-pcb_rubberband_t *GetRubberbandMemory(void)
+pcb_rubberband_t *pcb_rubber_band_alloc(void)
 {
 	pcb_rubberband_t *ptr = Crosshair.AttachedObject.Rubberband;
 
@@ -509,9 +509,9 @@
  * adds a new line to the rubberband list of 'Crosshair.AttachedObject'
  * if Layer == 0  it is a rat line
  */
-pcb_rubberband_t *CreateNewRubberbandEntry(pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *MovedPoint)
+pcb_rubberband_t *pcb_rubber_band_create(pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *MovedPoint)
 {
-	pcb_rubberband_t *ptr = GetRubberbandMemory();
+	pcb_rubberband_t *ptr = pcb_rubber_band_alloc();
 
 	/* we toggle the PCB_FLAG_RUBBEREND of the line to determine if */
 	/* both points are being moved. */
Index: trunk/src/rubberband.h
===================================================================
--- trunk/src/rubberband.h	(revision 5005)
+++ trunk/src/rubberband.h	(revision 5006)
@@ -41,9 +41,9 @@
 } pcb_rubberband_t;
 
 
-void LookupRubberbandLines(int, void *, void *, void *);
-void LookupRatLines(int, void *, void *, void *);
-pcb_rubberband_t *GetRubberbandMemory(void);
-pcb_rubberband_t *CreateNewRubberbandEntry(pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *MovedPoint);
+void pcb_rubber_band_lookup_lines(int, void *, void *, void *);
+void pcb_rubber_band_lookup_rat_lines(int, void *, void *, void *);
+pcb_rubberband_t *pcb_rubber_band_alloc(void);
+pcb_rubberband_t *pcb_rubber_band_create(pcb_layer_t *Layer, pcb_line_t *Line, pcb_point_t *MovedPoint);
 
 #endif