Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 5032)
+++ trunk/doc-rnd/hacking/renames	(revision 5033)
@@ -951,3 +951,7 @@
 STATE_FIRST -> PCB_CH_STATE_FIRST
 STATE_SECOND -> PCB_CH_STATE_SECOND
 STATE_THIRD -> PCB_CH_STATE_THIRD
+Basic_Crosshair_Shape -> pcb_ch_shape_basic
+Union_Jack_Crosshair_Shape -> pcb_ch_shape_union_jack
+Dozen_Crosshair_Shape -> pcb_ch_shape_dozen
+Crosshair_Shapes_Number -> pcb_ch_shape_NUM
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 5032)
+++ trunk/src/crosshair.c	(revision 5033)
@@ -1229,7 +1229,7 @@
 	gui->set_line_width(Crosshair.GC, 1);
 
 	/* set initial shape */
-	Crosshair.shape = Basic_Crosshair_Shape;
+	Crosshair.shape = pcb_ch_shape_basic;
 
 	/* set default limits */
 	Crosshair.MinX = Crosshair.MinY = 0;
Index: trunk/src/crosshair.h
===================================================================
--- trunk/src/crosshair.h	(revision 5032)
+++ trunk/src/crosshair.h	(revision 5033)
@@ -62,10 +62,10 @@
 } pcb_mark_t;
 
 enum pcb_crosshair_shape_e {
-	Basic_Crosshair_Shape = 0,		/*  4-ray */
-	Union_Jack_Crosshair_Shape,		/*  8-ray */
-	Dozen_Crosshair_Shape,				/* 12-ray */
-	Crosshair_Shapes_Number
+	pcb_ch_shape_basic = 0,		/*  4-ray */
+	pcb_ch_shape_union_jack,		/*  8-ray */
+	pcb_ch_shape_dozen,				/* 12-ray */
+	pcb_ch_shape_NUM
 };
 
 typedef struct {								/* holds cursor information */
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 5032)
+++ trunk/src/gui_act.c	(revision 5033)
@@ -195,17 +195,17 @@
 static enum pcb_crosshair_shape_e CrosshairShapeIncrement(enum pcb_crosshair_shape_e shape)
 {
 	switch (shape) {
-	case Basic_Crosshair_Shape:
-		shape = Union_Jack_Crosshair_Shape;
+	case pcb_ch_shape_basic:
+		shape = pcb_ch_shape_union_jack;
 		break;
-	case Union_Jack_Crosshair_Shape:
-		shape = Dozen_Crosshair_Shape;
+	case pcb_ch_shape_union_jack:
+		shape = pcb_ch_shape_dozen;
 		break;
-	case Dozen_Crosshair_Shape:
-		shape = Crosshair_Shapes_Number;
+	case pcb_ch_shape_dozen:
+		shape = pcb_ch_shape_NUM;
 		break;
-	case Crosshair_Shapes_Number:
-		shape = Basic_Crosshair_Shape;
+	case pcb_ch_shape_NUM:
+		shape = pcb_ch_shape_basic;
 		break;
 	}
 	return shape;
@@ -294,8 +294,8 @@
 		case F_CycleCrosshair:
 			pcb_notify_crosshair_change(pcb_false);
 			Crosshair.shape = CrosshairShapeIncrement(Crosshair.shape);
-			if (Crosshair_Shapes_Number == Crosshair.shape)
-				Crosshair.shape = Basic_Crosshair_Shape;
+			if (pcb_ch_shape_NUM == Crosshair.shape)
+				Crosshair.shape = pcb_ch_shape_basic;
 			pcb_notify_crosshair_change(pcb_true);
 			break;
 
Index: trunk/src_plugins/hid_gtk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-gdk.c	(revision 5032)
+++ trunk/src_plugins/hid_gtk/gtkhid-gdk.c	(revision 5033)
@@ -1016,12 +1016,12 @@
 
 static void draw_crosshair(GdkGC * xor_gc, gint x, gint y)
 {
-	static enum pcb_crosshair_shape_e prev = Basic_Crosshair_Shape;
+	static enum pcb_crosshair_shape_e prev = pcb_ch_shape_basic;
 
 	draw_right_cross(xor_gc, x, y);
-	if (prev == Union_Jack_Crosshair_Shape)
+	if (prev == pcb_ch_shape_union_jack)
 		draw_slanted_cross(xor_gc, x, y);
-	if (prev == Dozen_Crosshair_Shape)
+	if (prev == pcb_ch_shape_dozen)
 		draw_dozen_cross(xor_gc, x, y);
 	prev = Crosshair.shape;
 }
Index: trunk/src_plugins/hid_gtk/gtkhid-gl.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-gl.c	(revision 5032)
+++ trunk/src_plugins/hid_gtk/gtkhid-gl.c	(revision 5033)
@@ -659,12 +659,12 @@
 
 static void draw_crosshair(gint x, gint y, gint z)
 {
-	static enum pcb_crosshair_shape_e prev = Basic_Crosshair_Shape;
+	static enum pcb_crosshair_shape_e prev = pcb_ch_shape_basic;
 
 	draw_right_cross(x, y, z);
-	if (prev == Union_Jack_Crosshair_Shape)
+	if (prev == pcb_ch_shape_union_jack)
 		draw_slanted_cross(x, y, z);
-	if (prev == Dozen_Crosshair_Shape)
+	if (prev == pcb_ch_shape_dozen)
 		draw_dozen_cross(x, y, z);
 	prev = Crosshair.shape;
 }
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 5032)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 5033)
@@ -1460,9 +1460,9 @@
 static void draw_crosshair(GC xor_gc, int x, int y, int view_width, int view_height)
 {
 	draw_right_cross(xor_gc, x, y, view_width, view_height);
-	if (Crosshair.shape == Union_Jack_Crosshair_Shape)
+	if (Crosshair.shape == pcb_ch_shape_union_jack)
 		draw_slanted_cross(xor_gc, x, y, view_width, view_height);
-	if (Crosshair.shape == Dozen_Crosshair_Shape)
+	if (Crosshair.shape == pcb_ch_shape_dozen)
 		draw_dozen_cross(xor_gc, x, y, view_width, view_height);
 }