Index: media.c
===================================================================
--- media.c	(revision 24430)
+++ media.c	(revision 24431)
@@ -71,7 +71,7 @@
 #define MARGINX PCB_MIL_TO_COORD(500)
 #define MARGINY PCB_MIL_TO_COORD(500)
 
-MediaType media_data[] = {
+pcb_media_t pcb_media_data[] = {
 	{"A0", PCB_MM_TO_COORD(841), PCB_MM_TO_COORD(1189), MARGINX, MARGINY},
 	{"A1", PCB_MM_TO_COORD(594), PCB_MM_TO_COORD(841), MARGINX, MARGINY},
 	{"A2", PCB_MM_TO_COORD(420), PCB_MM_TO_COORD(594), MARGINX, MARGINY},
Index: media.h
===================================================================
--- media.h	(revision 24430)
+++ media.h	(revision 24431)
@@ -1,7 +1,7 @@
 typedef struct {
 	const char *name;
-	pcb_coord_t Width, Height;
-	pcb_coord_t MarginX, MarginY;
-} MediaType, *MediaTypePtr;
+	pcb_coord_t width, height;
+	pcb_coord_t margin_x, margin_y;
+} pcb_media_t;
 
-extern MediaType media_data[];
+extern pcb_media_t pcb_media_data[];