Index: trunk/src/change.c
===================================================================
--- trunk/src/change.c	(revision 10701)
+++ trunk/src/change.c	(revision 10702)
@@ -40,6 +40,7 @@
 #include "hid_actions.h"
 #include "compat_nls.h"
 #include "obj_all_op.h"
+#include "obj_subc_parent.h"
 
 /* ---------------------------------------------------------------------------
  * some local identifiers
@@ -1226,6 +1227,7 @@
 {
 	char *name = NULL;
 	char msg[513];
+	pcb_any_obj_t *obj = Ptr2;
 
 	/* if passed an element name, make it an element reference instead */
 	if (Type == PCB_TYPE_ELEMENT_NAME) {
@@ -1233,6 +1235,13 @@
 		Ptr2 = Ptr1;
 		Ptr3 = Ptr1;
 	}
+
+	if (pcb_is_obj_in_subc(obj)) {
+		name = pcb_gui->prompt_for(_("Enter terminal ID:"), PCB_EMPTY(obj->term));
+/*		pcb_term_undoable_rename()*/
+		return;
+	}
+
 	switch (Type) {
 	case PCB_TYPE_LINE:
 		name = pcb_gui->prompt_for(_("Linename:"), PCB_EMPTY(((pcb_line_t *) Ptr2)->Number));
Index: trunk/src/change.h
===================================================================
--- trunk/src/change.h	(revision 10701)
+++ trunk/src/change.h	(revision 10702)
@@ -36,7 +36,7 @@
  * some defines
  */
 #define	PCB_CHANGENAME_TYPES        \
-	(PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_LINE)
+	(PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON | PCB_TYPE_SUBC_PART)
 
 #define	PCB_CHANGESIZE_TYPES        \
 	(PCB_TYPE_POLYGON | PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_LINE | \