Index: select_act.c
===================================================================
--- select_act.c	(revision 5009)
+++ select_act.c	(revision 5010)
@@ -159,7 +159,7 @@
 				pcb_search_method_t method = SM_REGEX;
 
 				if (pattern || (pattern = gui_get_pat(&method)) != NULL) {
-					if (SelectObjectByName(type, pattern, pcb_true, method))
+					if (pcb_select_object_by_name(type, pattern, pcb_true, method))
 						SetChangedFlag(pcb_true);
 					if (PCB_ACTION_ARG(1) == NULL)
 						free((char*)pattern);
@@ -170,7 +170,7 @@
 			/* select a single object */
 		case F_ToggleObject:
 		case F_Object:
-			if (SelectObject())
+			if (pcb_select_object())
 				SetChangedFlag(pcb_true);
 			break;
 
@@ -185,7 +185,7 @@
 				box.Y2 = MAX(Crosshair.AttachedBox.Point1.Y, Crosshair.AttachedBox.Point2.Y);
 				pcb_notify_crosshair_change(pcb_false);
 				pcb_notify_block();
-				if (Crosshair.AttachedBox.State == STATE_THIRD && SelectBlock(&box, pcb_true)) {
+				if (Crosshair.AttachedBox.State == STATE_THIRD && pcb_select_block(&box, pcb_true)) {
 					SetChangedFlag(pcb_true);
 					Crosshair.AttachedBox.State = STATE_FIRST;
 				}
@@ -202,7 +202,7 @@
 				box.Y1 = -MAX_COORD;
 				box.X2 = MAX_COORD;
 				box.Y2 = MAX_COORD;
-				if (SelectBlock(&box, pcb_true))
+				if (pcb_select_block(&box, pcb_true))
 					SetChangedFlag(pcb_true);
 				break;
 			}
@@ -209,7 +209,7 @@
 
 			/* all found connections */
 		case F_Connection:
-			if (SelectConnection(pcb_true)) {
+			if (pcb_select_connection(pcb_true)) {
 				pcb_draw();
 				IncrementUndoSerialNumber();
 				SetChangedFlag(pcb_true);
@@ -318,7 +318,7 @@
 				pcb_search_method_t method = SM_REGEX;
 
 				if (pattern || (pattern = gui_get_pat(&method)) != NULL) {
-					if (SelectObjectByName(type, pattern, pcb_false, method))
+					if (pcb_select_object_by_name(type, pattern, pcb_false, method))
 						SetChangedFlag(pcb_true);
 					if (PCB_ACTION_ARG(1) == NULL)
 						free((char*)pattern);
@@ -337,7 +337,7 @@
 				box.Y2 = MAX(Crosshair.AttachedBox.Point1.Y, Crosshair.AttachedBox.Point2.Y);
 				pcb_notify_crosshair_change(pcb_false);
 				pcb_notify_block();
-				if (Crosshair.AttachedBox.State == STATE_THIRD && SelectBlock(&box, pcb_false)) {
+				if (Crosshair.AttachedBox.State == STATE_THIRD && pcb_select_block(&box, pcb_false)) {
 					SetChangedFlag(pcb_true);
 					Crosshair.AttachedBox.State = STATE_FIRST;
 				}
@@ -354,7 +354,7 @@
 				box.Y1 = -MAX_COORD;
 				box.X2 = MAX_COORD;
 				box.Y2 = MAX_COORD;
-				if (SelectBlock(&box, pcb_false))
+				if (pcb_select_block(&box, pcb_false))
 					SetChangedFlag(pcb_true);
 				break;
 			}
@@ -361,7 +361,7 @@
 
 			/* all found connections */
 		case F_Connection:
-			if (SelectConnection(pcb_false)) {
+			if (pcb_select_connection(pcb_false)) {
 				pcb_draw();
 				IncrementUndoSerialNumber();
 				SetChangedFlag(pcb_true);