Index: trunk/src/data.h
===================================================================
--- trunk/src/data.h	(revision 6281)
+++ trunk/src/data.h	(revision 6282)
@@ -57,8 +57,8 @@
 
 /* OBSOLOTE: do not use these 4 */
 #define pcb_max_group (PCB->LayerGroups.len)
-#define pcb_solder_silk_layer (pcb_max_layer + PCB_SOLDER_SIDE - 2)
-#define pcb_component_silk_layer (pcb_max_layer + PCB_COMPONENT_SIDE - 2)
+#define pcb_layer_get_bottom_silk()   (pcb_max_layer + PCB_SOLDER_SIDE - 2)
+#define pcb_layer_get_top_silk()      (pcb_max_layer + PCB_COMPONENT_SIDE - 2)
 
 extern pcb_buffer_t pcb_buffers[PCB_MAX_BUFFER];
 extern int pcb_added_lines;
Index: trunk/src/layer.h
===================================================================
--- trunk/src/layer.h	(revision 6281)
+++ trunk/src/layer.h	(revision 6282)
@@ -126,15 +126,15 @@
 #define	LAYER_ON_STACK(n)	(&PCB->Data->Layer[pcb_layer_stack[(n)]])
 #define LAYER_PTR(n)            (&PCB->Data->Layer[(n)])
 #define	CURRENT			(PCB->SilkActive ? &PCB->Data->Layer[ \
-				(conf_core.editor.show_solder_side ? pcb_solder_silk_layer : pcb_component_silk_layer)] \
+				(conf_core.editor.show_solder_side ? pcb_layer_get_bottom_silk() : pcb_layer_get_top_silk())] \
 				: LAYER_ON_STACK(0))
 #define	INDEXOFCURRENT		(PCB->SilkActive ? \
-				(conf_core.editor.show_solder_side ? pcb_solder_silk_layer : pcb_component_silk_layer) \
+				(conf_core.editor.show_solder_side ? pcb_layer_get_bottom_silk() : pcb_layer_get_top_silk()) \
 				: pcb_layer_stack[0])
 #define SILKLAYER		Layer[ \
-				(conf_core.editor.show_solder_side ? pcb_solder_silk_layer : pcb_component_silk_layer)]
+				(conf_core.editor.show_solder_side ? pcb_layer_get_bottom_silk() : pcb_layer_get_top_silk())]
 #define BACKSILKLAYER		Layer[ \
-				(conf_core.editor.show_solder_side ? pcb_component_silk_layer : pcb_solder_silk_layer)]
+				(conf_core.editor.show_solder_side ? pcb_layer_get_top_silk() : pcb_layer_get_bottom_silk())]
 
 #define LAYER_LOOP(data, ml) do { \
         pcb_cardinal_t n; \
Index: trunk/src/layer_vis.c
===================================================================
--- trunk/src/layer_vis.c	(revision 6281)
+++ trunk/src/layer_vis.c	(revision 6282)
@@ -236,7 +236,7 @@
 	PCB->RatOn = pcb_true;
 
 	/* Bring the component group to the front and make it active.  */
-	comp_group = pcb_layer_get_group(pcb_component_silk_layer);
+	comp_group = pcb_layer_get_group(pcb_layer_get_top_silk());
 	pcb_layervis_change_group_vis(PCB->LayerGroups.grp[comp_group].lid[0], 1, 1);
 }