Index: trunk/doc/developer/renames
===================================================================
--- trunk/doc/developer/renames	(revision 10645)
+++ trunk/doc/developer/renames	(revision 10646)
@@ -1700,3 +1700,6 @@
 draw_poly_callback -> pcb_poly_draw_callback
 ErasePolygon -> pcb_poly_invalidate_erase
 DrawPolygon -> pcb_poly_invalidate_draw
+draw_rat_callback -> pcb_rat_draw_callback
+EraseRat -> pcb_rat_invalidate_erase
+DrawRat -> pcb_rat_invalidate_draw
Index: trunk/src/action_helper.c
===================================================================
--- trunk/src/action_helper.c	(revision 10645)
+++ trunk/src/action_helper.c	(revision 10646)
@@ -745,7 +745,7 @@
 				pcb_added_lines++;
 				pcb_undo_add_obj_to_create(PCB_TYPE_RATLINE, line, line, line);
 				pcb_undo_inc_serial();
-				DrawRat(line);
+				pcb_rat_invalidate_draw(line);
 				pcb_crosshair.AttachedLine.Point1.X = pcb_crosshair.AttachedLine.Point2.X;
 				pcb_crosshair.AttachedLine.Point1.Y = pcb_crosshair.AttachedLine.Point2.Y;
 				pcb_draw();
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 10645)
+++ trunk/src/draw.c	(revision 10646)
@@ -558,7 +558,7 @@
 		break;
 	case PCB_TYPE_RATLINE:
 		if (PCB->RatOn)
-			DrawRat((pcb_rat_t *) ptr2);
+			pcb_rat_invalidate_draw((pcb_rat_t *) ptr2);
 		break;
 	case PCB_TYPE_PIN:
 		if (PCB->PinOn)
Index: trunk/src/draw_ly_spec.c
===================================================================
--- trunk/src/draw_ly_spec.c	(revision 10645)
+++ trunk/src/draw_ly_spec.c	(revision 10646)
@@ -154,7 +154,7 @@
 	 */
 	if (pcb_gui->can_mask_clear_rats)
 		pcb_gui->use_mask(HID_MASK_CLEAR);
-	pcb_r_search(PCB->Data->rat_tree, drawn_area, NULL, draw_rat_callback, NULL, NULL);
+	pcb_r_search(PCB->Data->rat_tree, drawn_area, NULL, pcb_rat_draw_callback, NULL, NULL);
 	if (pcb_gui->can_mask_clear_rats)
 		pcb_gui->use_mask(HID_MASK_OFF);
 }
Index: trunk/src/find_clear.c
===================================================================
--- trunk/src/find_clear.c	(revision 10645)
+++ trunk/src/find_clear.c	(revision 10646)
@@ -90,7 +90,7 @@
 				pcb_undo_add_obj_to_flag(PCB_TYPE_RATLINE, line, line, line);
 			PCB_FLAG_CLEAR(flag, line);
 			if (AndDraw)
-				DrawRat(line);
+				pcb_rat_invalidate_draw(line);
 			change = pcb_true;
 		}
 	}
Index: trunk/src/find_misc.c
===================================================================
--- trunk/src/find_misc.c	(revision 10645)
+++ trunk/src/find_misc.c	(revision 10646)
@@ -139,7 +139,7 @@
 	if (PCB->RatOn) {
 		position = RatList.DrawLocation;
 		for (; position < RatList.Number; position++)
-			DrawRat(RATLIST_ENTRY(position));
+			pcb_rat_invalidate_draw(RATLIST_ENTRY(position));
 		RatList.DrawLocation = RatList.Number;
 	}
 }
@@ -402,7 +402,7 @@
 				pcb_undo_add_obj_to_flag(PCB_TYPE_RATLINE, line, line, line);
 			PCB_FLAG_CLEAR(TheFlag, line);
 			if (AndDraw)
-				DrawRat(line);
+				pcb_rat_invalidate_draw(line);
 			change = pcb_true;
 		}
 	}
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 10645)
+++ trunk/src/obj_line.c	(revision 10646)
@@ -487,13 +487,13 @@
 	else {												/* must be a rat */
 
 		if (PCB->RatOn)
-			EraseRat((pcb_rat_t *) Line);
+			pcb_rat_invalidate_erase((pcb_rat_t *) Line);
 		pcb_r_delete_entry(PCB->Data->rat_tree, &Line->BoundingBox);
 		PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy);
 		pcb_line_bbox(Line);
 		pcb_r_insert_entry(PCB->Data->rat_tree, &Line->BoundingBox, 0);
 		if (PCB->RatOn) {
-			DrawRat((pcb_rat_t *) Line);
+			pcb_rat_invalidate_draw((pcb_rat_t *) Line);
 			pcb_draw();
 		}
 		return (Line);
@@ -800,7 +800,7 @@
 	}
 	else {
 		pcb_r_insert_entry(PCB->Data->rat_tree, (pcb_box_t *) Line, 0);
-		DrawRat((pcb_rat_t *) Line);
+		pcb_rat_invalidate_draw((pcb_rat_t *) Line);
 	}
 	pcb_draw();
 }
Index: trunk/src/obj_rat.c
===================================================================
--- trunk/src/obj_rat.c	(revision 10645)
+++ trunk/src/obj_rat.c	(revision 10646)
@@ -163,7 +163,7 @@
 	if (!newone)
 		return newone;
 	pcb_undo_add_obj_to_create(PCB_TYPE_LINE, CURRENT, newone, newone);
-	EraseRat(Rat);
+	pcb_rat_invalidate_erase(Rat);
 	pcb_line_invalidate_draw(CURRENT, newone);
 	newone = pcb_line_new_merge(CURRENT, Rat->Point2.X, Rat->Point2.Y,
 																	ctx->insert.x, ctx->insert.y, conf_core.design.line_thickness, 2 * conf_core.design.clearance, Rat->Flags);
@@ -195,7 +195,7 @@
 		return (NULL);
 	pcb_undo_add_obj_to_create(PCB_TYPE_LINE, ctx->move.dst_layer, newone, newone);
 	if (PCB->RatOn)
-		EraseRat(Rat);
+		pcb_rat_invalidate_erase(Rat);
 	pcb_undo_move_obj_to_remove(PCB_TYPE_RATLINE, Rat, Rat, Rat);
 	pcb_line_invalidate_draw(ctx->move.dst_layer, newone);
 	pcb_draw();
@@ -217,7 +217,7 @@
 {
 	/* erase from screen and memory */
 	if (PCB->RatOn) {
-		EraseRat(Rat);
+		pcb_rat_invalidate_erase(Rat);
 		if (!ctx->remove.bulk)
 			pcb_draw();
 	}
@@ -227,7 +227,7 @@
 }
 
 /*** draw ***/
-pcb_r_dir_t draw_rat_callback(const pcb_box_t * b, void *cl)
+pcb_r_dir_t pcb_rat_draw_callback(const pcb_box_t * b, void *cl)
 {
 	pcb_rat_t *rat = (pcb_rat_t *) b;
 
@@ -257,7 +257,7 @@
 	return PCB_R_DIR_FOUND_CONTINUE;
 }
 
-void EraseRat(pcb_rat_t *Rat)
+void pcb_rat_invalidate_erase(pcb_rat_t *Rat)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_VIA, Rat)) {
 		pcb_coord_t w = Rat->Thickness;
@@ -275,7 +275,7 @@
 	pcb_flag_erase(&Rat->Flags);
 }
 
-void DrawRat(pcb_rat_t *Rat)
+void pcb_rat_invalidate_draw(pcb_rat_t *Rat)
 {
 	if (conf_core.appearance.rat_thickness < 20)
 		Rat->Thickness = pcb_pixel_slop * conf_core.appearance.rat_thickness;
Index: trunk/src/obj_rat_draw.h
===================================================================
--- trunk/src/obj_rat_draw.h	(revision 10645)
+++ trunk/src/obj_rat_draw.h	(revision 10646)
@@ -28,8 +28,8 @@
 
 /* Include rtree.h for these */
 #ifdef PCB_RTREE_H
-pcb_r_dir_t draw_rat_callback(const pcb_box_t * b, void *cl);
+pcb_r_dir_t pcb_rat_draw_callback(const pcb_box_t * b, void *cl);
 #endif
 
-void EraseRat(pcb_rat_t *Rat);
-void DrawRat(pcb_rat_t *Rat);
+void pcb_rat_invalidate_erase(pcb_rat_t *Rat);
+void pcb_rat_invalidate_draw(pcb_rat_t *Rat);
Index: trunk/src/rats.c
===================================================================
--- trunk/src/rats.c	(revision 10645)
+++ trunk/src/rats.c	(revision 10646)
@@ -614,7 +614,7 @@
 					if (distance == 0)
 						PCB_FLAG_SET(PCB_FLAG_VIA, line);
 					pcb_undo_add_obj_to_create(PCB_TYPE_RATLINE, line, line, line);
-					DrawRat(line);
+					pcb_rat_invalidate_draw(line);
 					changed = pcb_true;
 				}
 			}
Index: trunk/src/rats_act.c
===================================================================
--- trunk/src/rats_act.c	(revision 10645)
+++ trunk/src/rats_act.c	(revision 10646)
@@ -104,7 +104,7 @@
 			if (shorty) {
 				pcb_undo_add_obj_to_flag(PCB_TYPE_RATLINE, shorty, shorty, shorty);
 				PCB_FLAG_SET(PCB_FLAG_SELECTED, shorty);
-				DrawRat(shorty);
+				pcb_rat_invalidate_draw(shorty);
 				pcb_draw();
 				pcb_center_display((shorty->Point2.X + shorty->Point1.X) / 2, (shorty->Point2.Y + shorty->Point1.Y) / 2);
 			}
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 10645)
+++ trunk/src/select.c	(revision 10646)
@@ -142,7 +142,7 @@
 
 			pcb_undo_add_obj_to_flag(PCB_TYPE_RATLINE, ptr1, ptr1, ptr1);
 			PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, rat);
-			DrawRat(rat);
+			pcb_rat_invalidate_draw(rat);
 			break;
 		}
 
@@ -295,7 +295,7 @@
 		if (PCB_LINE_NEAR_BOX((pcb_line_t *) line, Box) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, line) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, line) != Flag) {
 			append(PCB_TYPE_RATLINE, line, line);
 			if (pcb->RatOn)
-				DrawRat(line);
+				pcb_rat_invalidate_draw(line);
 		}
 	}
 	PCB_END_LOOP;
@@ -529,7 +529,7 @@
 		if (PCB_FLAG_TEST(PCB_FLAG_FOUND, line)) {
 			pcb_undo_add_obj_to_flag(PCB_TYPE_RATLINE, line, line, line);
 			PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, line);
-			DrawRat(line);
+			pcb_rat_invalidate_draw(line);
 			changed = pcb_true;
 		}
 	}
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 10645)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 10646)
@@ -4668,7 +4668,7 @@
 #ifdef DEBUG_STALE_RATS
 				pcb_undo_add_obj_to_flag(PCB_TYPE_RATLINE, line, line, line);
 				PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, pcb_true, line);
-				DrawRat(line, 0);
+				pcb_rat_invalidate_draw(line, 0);
 #endif /* DEBUG_STALE_RATS */
 				pcb_message(PCB_MSG_ERROR, "The rats nest is stale! Aborting autoroute...\n");
 				goto donerouting;
Index: trunk/src_plugins/lib_gtk_common/dlg_drc.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_drc.c	(revision 10645)
+++ trunk/src_plugins/lib_gtk_common/dlg_drc.c	(revision 10646)
@@ -143,7 +143,7 @@
 		if (PCB_FLAG_TEST(flag, line)) {
 			pcb_undo_add_obj_to_flag(PCB_TYPE_RATLINE, line, line, line);
 			PCB_FLAG_CLEAR(flag, line);
-			DrawRat(line);
+			pcb_rat_invalidate_draw(line);
 			change = pcb_true;
 		}
 	}
Index: trunk/src_plugins/rubberband_orig/rubberband.c
===================================================================
--- trunk/src_plugins/rubberband_orig/rubberband.c	(revision 10645)
+++ trunk/src_plugins/rubberband_orig/rubberband.c	(revision 10646)
@@ -868,7 +868,7 @@
 	ptr = rbnd->Rubberband;
 	for (i = 0; i < rbnd->RubberbandN; i++) {
 		if (PCB->RatOn)
-			EraseRat((pcb_rat_t *) ptr->Line);
+			pcb_rat_invalidate_erase((pcb_rat_t *) ptr->Line);
 		if (PCB_FLAG_TEST(PCB_FLAG_RUBBEREND, ptr->Line))
 			pcb_undo_move_obj_to_remove(PCB_TYPE_RATLINE, ptr->Line, ptr->Line, ptr->Line);
 		else
@@ -1097,7 +1097,7 @@
 		}
 		else {
 			pcb_r_insert_entry(PCB->Data->rat_tree, (pcb_box_t *) ptr->Line, 0);
-			DrawRat((pcb_rat_t *) ptr->Line);
+			pcb_rat_invalidate_draw((pcb_rat_t *) ptr->Line);
 		}
 		rbnd->RubberbandN--;
 		ptr++;
@@ -1121,7 +1121,7 @@
 		ptr = rbnd->Rubberband;
 		for (i = 0; i < rbnd->RubberbandN; i++, ptr++) {
 			if (PCB->RatOn)
-				EraseRat((pcb_rat_t *) ptr->Line);
+				pcb_rat_invalidate_erase((pcb_rat_t *) ptr->Line);
 			pcb_undo_move_obj_to_remove(PCB_TYPE_RATLINE, ptr->Line, ptr->Line, ptr->Line);
 		}
 		pcb_undo_inc_serial();