Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 16367)
+++ trunk/src/hid.h	(revision 16368)
@@ -574,7 +574,7 @@
    * allocate any colors needed, via get_color.
 
    * cycle through the layers, calling set_layer for each layer to be
-     drawn, and only drawing elements (all or specified) of desired
+     drawn, and only drawing objects (all or specified) of desired
      layers.
 
    Do *not* assume that the hid that is passed is the GUI hid.  This
@@ -601,7 +601,7 @@
 /* Normal expose: draw all layers with all flags (no .content is used) */
 void pcb_hid_expose_all(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *region);
 
-/* Pinout preview expose: draws an element; content.elem is used */
+/* Pinout preview expose: draws a subc; content.elem is used */
 void pcb_hid_expose_pinout(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *element);
 
 
Index: trunk/src/obj_line.h
===================================================================
--- trunk/src/obj_line.h	(revision 16367)
+++ trunk/src/obj_line.h	(revision 16368)
@@ -36,7 +36,7 @@
 
 struct pcb_line_s {            /* holds information about one line */
 	PCB_ANYLINEFIELDS;
-	gdl_elem_t link;             /* a line is in a list: either on a layer or in an element */
+	gdl_elem_t link;             /* a line is in a list: either on a layer */
 };
 
 /* crosshair: */
Index: trunk/src/obj_subc.h
===================================================================
--- trunk/src/obj_subc.h	(revision 16367)
+++ trunk/src/obj_subc.h	(revision 16368)
@@ -68,7 +68,7 @@
 
 void pcb_subc_mirror(pcb_data_t *data, pcb_subc_t *subc, pcb_coord_t y_offs, pcb_bool smirror);
 
-/* changes the side of the board an element is on; returns pcb_true if done */
+/* changes the side of the board a subc is on; returns pcb_true if done */
 pcb_bool pcb_subc_change_side(pcb_subc_t **subc, pcb_coord_t yoff);
 
 void pcb_subc_rotate(pcb_subc_t *subc, pcb_coord_t cx, pcb_coord_t cy, double cosa, double sina, double angle);
Index: trunk/src/obj_text.h
===================================================================
--- trunk/src/obj_text.h	(revision 16367)
+++ trunk/src/obj_text.h	(revision 16368)
@@ -42,7 +42,7 @@
 	pcb_uint8_t Direction;
 	pcb_font_id_t fid;
 	char *TextString;             /* string */
-	gdl_elem_t link;              /* a text is in a list of a layer or an element */
+	gdl_elem_t link;              /* a text is in a list of a layer */
 };
 
 /* These need to be carefully written to avoid overflows, and return
Index: trunk/src/plug_footprint.h
===================================================================
--- trunk/src/plug_footprint.h	(revision 16367)
+++ trunk/src/plug_footprint.h	(revision 16368)
@@ -20,7 +20,7 @@
 
 /* duplicates the name and splits it into a basename and params;
    params is NULL if the name is not parametric (and "" if parameter list is empty)
-   returns 1 if name is parametric, 0 if file element.
+   returns 1 if name is parametric footprint, 0 if static file footprint.
    The caller shall free only *basename at the end.
    */
 int pcb_fp_dupname(const char *name, char **basename, char **params);
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 16367)
+++ trunk/src/search.c	(revision 16368)
@@ -496,7 +496,7 @@
 	TEST_OBJST(i->objst, i->req_flag, g, subc, subc);
 
 	if ((PCB_FRONT(subc) || i->BackToo) && PCB_POINT_IN_BOX(PosX, PosY, &subc->BoundingBox)) {
-		/* use the element with the smallest bounding box */
+		/* use the subcircuit with the smallest bounding box */
 		newarea = (subc->BoundingBox.X2 - subc->BoundingBox.X1) * (double) (subc->BoundingBox.Y2 - subc->BoundingBox.Y1);
 		if (newarea < i->area) {
 			i->area = newarea;