Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4942)
+++ trunk/doc-rnd/hacking/renames	(revision 4943)
@@ -533,3 +533,5 @@
 pcb_pin_new -> pcb_pin_alloc
 pcb_via_new_on_board -> pcb_via_new
 pcb_pin_new_in_element -> pcb_element_pin_new
+pcb_rats_delete -> pcb_rats_destroy
+RemoveText -> pcb_text_destroy
Index: trunk/src/obj_rat.c
===================================================================
--- trunk/src/obj_rat.c	(revision 4942)
+++ trunk/src/obj_rat.c	(revision 4943)
@@ -97,7 +97,7 @@
 
 /* DeleteRats - deletes rat lines only
  * can delete all rat lines, or only selected one */
-pcb_bool pcb_rats_delete(pcb_bool selected)
+pcb_bool pcb_rats_destroy(pcb_bool selected)
 {
 	pcb_opctx_t ctx;
 	pcb_bool changed = pcb_false;
Index: trunk/src/obj_rat.h
===================================================================
--- trunk/src/obj_rat.h	(revision 4942)
+++ trunk/src/obj_rat.h	(revision 4943)
@@ -42,6 +42,6 @@
 void pcb_rat_free(pcb_rat_t *data);
 
 pcb_rat_t *pcb_rat_new(pcb_data_t *Data, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_cardinal_t group1, pcb_cardinal_t group2, pcb_coord_t Thickness, pcb_flag_t Flags);
-pcb_bool pcb_rats_delete(pcb_bool selected);
+pcb_bool pcb_rats_destroy(pcb_bool selected);
 
 #endif
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 4942)
+++ trunk/src/obj_text.c	(revision 4943)
@@ -421,7 +421,7 @@
 	return NULL;
 }
 
-void *RemoveText(pcb_layer_t *Layer, pcb_text_t *Text)
+void *pcb_text_destroy(pcb_layer_t *Layer, pcb_text_t *Text)
 {
 	pcb_opctx_t ctx;
 
Index: trunk/src/obj_text.h
===================================================================
--- trunk/src/obj_text.h	(revision 4942)
+++ trunk/src/obj_text.h	(revision 4943)
@@ -45,12 +45,13 @@
 pcb_text_t *pcb_text_alloc(pcb_layer_t * layer);
 void pcb_text_free(pcb_text_t * data);
 pcb_text_t *pcb_text_new(pcb_layer_t *Layer, pcb_font_t *PCBFont, pcb_coord_t X, pcb_coord_t Y, unsigned Direction, int Scale, char *TextString, pcb_flag_t Flags);
+void *pcb_text_destroy(pcb_layer_t *Layer, pcb_text_t *Text);
 
+
 /* Add objects without creating them or making any "sanity modifications" to them */
 void pcb_add_text_on_layer(pcb_layer_t *Layer, pcb_text_t *text, pcb_font_t *PCBFont);
 
 void SetTextBoundingBox(pcb_font_t *FontPtr, pcb_text_t *Text);
-void *RemoveText(pcb_layer_t *Layer, pcb_text_t *Text);
 void RotateTextLowLevel(pcb_text_t *Text, pcb_coord_t X, pcb_coord_t Y, unsigned Number);
 
 #define	MOVE_TEXT_LOWLEVEL(t,dx,dy)                    \
Index: trunk/src/rats_act.c
===================================================================
--- trunk/src/rats_act.c	(revision 4942)
+++ trunk/src/rats_act.c	(revision 4943)
@@ -201,12 +201,12 @@
 			pcb_clear_warnings();
 		switch (pcb_funchash_get(function, NULL)) {
 		case F_AllRats:
-			if (pcb_rats_delete(pcb_false))
+			if (pcb_rats_destroy(pcb_false))
 				SetChangedFlag(pcb_true);
 			break;
 		case F_SelectedRats:
 		case F_Selected:
-			if (pcb_rats_delete(pcb_true))
+			if (pcb_rats_destroy(pcb_true))
 				SetChangedFlag(pcb_true);
 			break;
 		}
Index: trunk/src/remove_act.c
===================================================================
--- trunk/src/remove_act.c	(revision 4942)
+++ trunk/src/remove_act.c	(revision 4943)
@@ -66,11 +66,11 @@
 		RemoveSelected();
 		break;
 	case F_AllRats:
-		if (pcb_rats_delete(pcb_false))
+		if (pcb_rats_destroy(pcb_false))
 			SetChangedFlag(pcb_true);
 		break;
 	case F_SelectedRats:
-		if (pcb_rats_delete(pcb_true))
+		if (pcb_rats_destroy(pcb_true))
 			SetChangedFlag(pcb_true);
 		break;
 	}
Index: trunk/src_plugins/autoplace/autoplace.c
===================================================================
--- trunk/src_plugins/autoplace/autoplace.c	(revision 4942)
+++ trunk/src_plugins/autoplace/autoplace.c	(revision 4943)
@@ -756,7 +756,7 @@
 	}
 done:
 	if (changed) {
-		pcb_rats_delete(pcb_false);
+		pcb_rats_destroy(pcb_false);
 		AddAllRats(pcb_false, NULL);
 		pcb_redraw();
 	}
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 4942)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 4943)
@@ -4706,7 +4706,7 @@
 		SaveUndoSerialNumber();
 
 		/* optimize rats, we've changed connectivity a lot. */
-		pcb_rats_delete(pcb_false /*all rats */ );
+		pcb_rats_destroy(pcb_false /*all rats */ );
 		RestoreUndoSerialNumber();
 		AddAllRats(pcb_false /*all rats */ , NULL);
 		RestoreUndoSerialNumber();
Index: trunk/src_plugins/import_sch/import_sch.c
===================================================================
--- trunk/src_plugins/import_sch/import_sch.c	(revision 4942)
+++ trunk/src_plugins/import_sch/import_sch.c	(revision 4943)
@@ -434,7 +434,7 @@
 		return 1;
 	}
 
-	pcb_rats_delete(pcb_false);
+	pcb_rats_destroy(pcb_false);
 	AddAllRats(pcb_false, NULL);
 
 #ifdef DEBUG
Index: trunk/src_plugins/toporouter/toporouter.c
===================================================================
--- trunk/src_plugins/toporouter/toporouter.c	(revision 4942)
+++ trunk/src_plugins/toporouter/toporouter.c	(revision 4943)
@@ -8124,7 +8124,7 @@
 	toporouter_free(r);
 
 	SaveUndoSerialNumber();
-	pcb_rats_delete(pcb_false);
+	pcb_rats_destroy(pcb_false);
 	RestoreUndoSerialNumber();
 	AddAllRats(pcb_false, NULL);
 	RestoreUndoSerialNumber();