Index: trunk/src/change.c
===================================================================
--- trunk/src/change.c	(revision 10704)
+++ trunk/src/change.c	(revision 10705)
@@ -1236,7 +1236,7 @@
 		Ptr3 = Ptr1;
 	}
 
-	if (pcb_is_obj_in_subc(obj)) {
+	if (pcb_obj_parent_subc(obj)) {
 		name = pcb_gui->prompt_for(_("Enter terminal ID:"), PCB_EMPTY(obj->term));
 /*		pcb_term_undoable_rename()*/
 		return;
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 10704)
+++ trunk/src/obj_arc.c	(revision 10705)
@@ -782,7 +782,7 @@
 {
 	pcb_arc_t *arc = (pcb_arc_t *)b;
 
-	if (!PCB->SubcPartsOn && pcb_is_lobj_in_subc(arc->parent_type, &arc->parent))
+	if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(arc->parent_type, &arc->parent))
 		return PCB_R_DIR_NOT_FOUND;
 
 	pcb_arc_draw((pcb_layer_t *)cl, arc);
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 10704)
+++ trunk/src/obj_line.c	(revision 10705)
@@ -922,7 +922,7 @@
 {
 	pcb_line_t *line = (pcb_line_t *)b;
 
-	if (!PCB->SubcPartsOn && pcb_is_lobj_in_subc(line->parent_type, &line->parent))
+	if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(line->parent_type, &line->parent))
 		return PCB_R_DIR_NOT_FOUND;
 
 	pcb_line_draw((pcb_layer_t *)cl, line);
Index: trunk/src/obj_pinvia.c
===================================================================
--- trunk/src/obj_pinvia.c	(revision 10704)
+++ trunk/src/obj_pinvia.c	(revision 10705)
@@ -1070,7 +1070,7 @@
 {
 	pcb_pin_t *via = (pcb_pin_t *)b;
 
-	if (PCB->SubcPartsOn || !pcb_is_gobj_in_subc(via->parent_type, &via->parent))
+	if (PCB->SubcPartsOn || !pcb_gobj_parent_subc(via->parent_type, &via->parent))
 		draw_via(via, pcb_false);
 	return PCB_R_DIR_FOUND_CONTINUE;
 }
@@ -1085,7 +1085,7 @@
 	if ((plated == 0 && !PCB_FLAG_TEST(PCB_FLAG_HOLE, pv)) || (plated == 1 && PCB_FLAG_TEST(PCB_FLAG_HOLE, pv)))
 		return PCB_R_DIR_FOUND_CONTINUE;
 
-	if (!PCB->SubcPartsOn && pcb_is_gobj_in_subc(pv->parent_type, &pv->parent))
+	if (!PCB->SubcPartsOn && pcb_gobj_parent_subc(pv->parent_type, &pv->parent))
 		return PCB_R_DIR_FOUND_CONTINUE;
 
 	if (conf_core.editor.thin_draw) {
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 10704)
+++ trunk/src/obj_poly.c	(revision 10705)
@@ -820,7 +820,7 @@
 	if (!polygon->Clipped)
 		return PCB_R_DIR_NOT_FOUND;
 
-	if (!PCB->SubcPartsOn && pcb_is_lobj_in_subc(polygon->parent_type, &polygon->parent))
+	if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(polygon->parent_type, &polygon->parent))
 		return PCB_R_DIR_NOT_FOUND;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_WARN, polygon))
Index: trunk/src/obj_subc_parent.h
===================================================================
--- trunk/src/obj_subc_parent.h	(revision 10704)
+++ trunk/src/obj_subc_parent.h	(revision 10705)
@@ -31,7 +31,7 @@
 #include "layer.h"
 
 /* Returns the subc a global (on-data) object is part of (or NULL if not part of any subc) */
-static inline PCB_FUNC_UNUSED pcb_subc_t *pcb_is_gobj_in_subc(pcb_parenttype_t pt, pcb_parent_t *p)
+static inline PCB_FUNC_UNUSED pcb_subc_t *pcb_gobj_parent_subc(pcb_parenttype_t pt, pcb_parent_t *p)
 {
 	if (pt != PCB_PARENT_DATA)
 		return NULL;
@@ -45,7 +45,7 @@
 }
 
 /* Returns the subc a layer object is part of (or NULL if not part of any subc) */
-static inline PCB_FUNC_UNUSED pcb_subc_t *pcb_is_lobj_in_subc(pcb_parenttype_t pt, pcb_parent_t *p)
+static inline PCB_FUNC_UNUSED pcb_subc_t *pcb_lobj_parent_subc(pcb_parenttype_t pt, pcb_parent_t *p)
 {
 	if (pt != PCB_PARENT_LAYER)
 		return NULL;
@@ -62,18 +62,18 @@
 }
 
 /* Returns the subc an object is part of (or NULL if not part of any subc) */
-static inline PCB_FUNC_UNUSED pcb_subc_t *pcb_is_obj_in_subc(pcb_any_obj_t *obj)
+static inline PCB_FUNC_UNUSED pcb_subc_t *pcb_obj_parent_subc(pcb_any_obj_t *obj)
 {
 	switch(obj->type) {
 		case PCB_OBJ_VIA:
 		case PCB_OBJ_SUBC:
-			return pcb_is_gobj_in_subc(obj->parent_type, &obj->parent);
+			return pcb_gobj_parent_subc(obj->parent_type, &obj->parent);
 
 		case PCB_OBJ_LINE:
 		case PCB_OBJ_POLYGON:
 		case PCB_OBJ_TEXT:
 		case PCB_OBJ_ARC:
-			return pcb_is_lobj_in_subc(obj->parent_type, &obj->parent);
+			return pcb_lobj_parent_subc(obj->parent_type, &obj->parent);
 
 #if 0
 		case PCB_OBJ_RATLINE:
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 10704)
+++ trunk/src/obj_text.c	(revision 10705)
@@ -729,7 +729,7 @@
 	int min_silk_line;
 	unsigned int flg = 0;
 
-	if (!PCB->SubcPartsOn && pcb_is_lobj_in_subc(text->parent_type, &text->parent))
+	if (!PCB->SubcPartsOn && pcb_lobj_parent_subc(text->parent_type, &text->parent))
 		return PCB_R_DIR_FOUND_CONTINUE;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, text))
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 10704)
+++ trunk/src/search.c	(revision 10705)
@@ -74,7 +74,7 @@
    obj is the object to be checked if part of subc; check lock on locked_obj */
 #define TEST_OBJST(objst, locality, obj, locked_obj) \
 do { \
-	if (!(objst & PCB_TYPE_SUBC_PART) && (pcb_is_ ## locality ## obj_in_subc(obj->parent_type, &obj->parent))) \
+	if (!(objst & PCB_TYPE_SUBC_PART) && (pcb_ ## locality ## obj_parent_subc(obj->parent_type, &obj->parent))) \
 		return PCB_R_DIR_NOT_FOUND; \
 	if (!(objst & PCB_TYPE_LOCKED) && (PCB_FLAG_TEST(objst & PCB_FLAG_LOCK, locked_obj))) \
 		return PCB_R_DIR_NOT_FOUND; \