Index: trunk/src/change.c
===================================================================
--- trunk/src/change.c	(revision 21826)
+++ trunk/src/change.c	(revision 21827)
@@ -815,7 +815,7 @@
 	pcb_object_operation(&ChgFlagFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
 }
 
-void *pcb_obj_invalidate_label(int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+void *pcb_obj_invalidate_label(pcb_objtype_t Type, void *Ptr1, void *Ptr2, void *Ptr3)
 {
 	pcb_opctx_t ctx;
 	ctx.noarg.pcb = PCB;
Index: trunk/src/change.h
===================================================================
--- trunk/src/change.h	(revision 21826)
+++ trunk/src/change.h	(revision 21827)
@@ -106,6 +106,6 @@
 void pcb_flag_change(pcb_board_t *pcb, pcb_change_flag_t how, pcb_flag_values_t flg, int Type, void *Ptr1, void *Ptr2, void *Ptr3);
 
 /* Invalidate the term label of an object */
-void *pcb_obj_invalidate_label(int Type, void *Ptr1, void *Ptr2, void *Ptr3);
+void *pcb_obj_invalidate_label(pcb_objtype_t Type, void *Ptr1, void *Ptr2, void *Ptr3);
 
 #endif
Index: trunk/src/obj_term.c
===================================================================
--- trunk/src/obj_term.c	(revision 21826)
+++ trunk/src/obj_term.c	(revision 21827)
@@ -172,9 +172,6 @@
 	char str[1]; /* must be the last item, spans longer than 1 */
 } term_rename_t;
 
-TODO(": get rid of the two parallel type systems")
-extern unsigned long pcb_obj_type2oldtype(pcb_objtype_t type);
-
 static int undo_term_rename_swap(void *udata)
 {
 	char *old_term = NULL;
@@ -193,7 +190,7 @@
 	if (r->obj->term != NULL) {
 		old_term = pcb_strdup(r->obj->term);
 		res |= pcb_term_del(&subc->terminals, r->obj);
-		pcb_obj_invalidate_label(pcb_obj_type2oldtype(r->obj->type), r->obj->parent.any, r->obj, r->obj);
+		pcb_obj_invalidate_label(r->obj->type, r->obj->parent.any, r->obj, r->obj);
 		r->obj->term = NULL;
 	}
 
@@ -200,7 +197,7 @@
 	/* add to new terminal */
 	if (*r->str != '\0') {
 		res |= pcb_term_add(&subc->terminals, r->str, r->obj);
-		pcb_obj_invalidate_label(pcb_obj_type2oldtype(r->obj->type), r->obj->parent.any, r->obj, r->obj);
+		pcb_obj_invalidate_label(r->obj->type, r->obj->parent.any, r->obj, r->obj);
 	}
 
 	/* swap name: redo & undo are symmetric; we made sure to have enough room for either old or new name */