Index: trunk/src_plugins/draw_fab/draw_fab.c
===================================================================
--- trunk/src_plugins/draw_fab/draw_fab.c	(revision 15734)
+++ trunk/src_plugins/draw_fab/draw_fab.c	(revision 15735)
@@ -167,7 +167,7 @@
 
 static int DrawFab_overhang(void)
 {
-	DrillInfoTypePtr AllDrills = GetDrillInfo(PCB->Data);
+	DrillInfoTypePtr AllDrills = drill_get_info(PCB->Data);
 	int ds = count_drill_lines(AllDrills);
 	if (ds < 4)
 		ds = 4;
@@ -179,11 +179,11 @@
 	DrillInfoTypePtr AllDrills;
 	int i, n, yoff, total_drills = 0, ds = 0, found;
 	char utcTime[64];
-	AllDrills = GetDrillInfo(PCB->Data);
+	AllDrills = drill_get_info(PCB->Data);
 	if (conf_core.editor.grid_unit->family == PCB_UNIT_IMPERIAL)
-		RoundDrillInfo(AllDrills, PCB_MIL_TO_COORD(1));
+		drill_round_info(AllDrills, PCB_MIL_TO_COORD(1));
 	else
-		RoundDrillInfo(AllDrills, PCB_MM_TO_COORD(0.01));
+		drill_round_info(AllDrills, PCB_MM_TO_COORD(0.01));
 	yoff = -TEXT_LINE;
 
 	/* count how many drill description lines will be needed */
Index: trunk/src_plugins/report/drill.c
===================================================================
--- trunk/src_plugins/report/drill.c	(revision 15734)
+++ trunk/src_plugins/report/drill.c	(revision 15735)
@@ -42,15 +42,15 @@
 #define STEP_DRILL   30
 #define STEP_POINT   100
 
-static void InitializeDrill(DrillTypePtr, pcb_pin_t *, pcb_element_t *);
+static void drill_init(DrillTypePtr, pcb_pin_t *, pcb_element_t *);
 
-static void FillDrill(DrillTypePtr Drill, pcb_any_obj_t *hole, int unplated)
+static void drill_fill(DrillTypePtr Drill, pcb_any_obj_t *hole, int unplated)
 {
 	pcb_cardinal_t n;
 	pcb_any_obj_t **pnew;
 	pcb_any_obj_t **hnew;
 
-	hnew = GetDrillPinMemory(Drill);
+	hnew = drill_pin_alloc(Drill);
 	*hnew = hole;
 	if ((hole->parent_type == PCB_PARENT_ELEMENT) || (hole->parent_type == PCB_PARENT_SUBC)) {
 		Drill->PinCount++;
@@ -58,7 +58,7 @@
 			if (Drill->parent[n] == hole->parent.any)
 				break;
 		if (n == -1) {
-			pnew = GetDrillElementMemory(Drill);
+			pnew = drill_element_alloc(Drill);
 			*pnew = hole->parent.any;
 		}
 	}
@@ -68,7 +68,7 @@
 		Drill->UnplatedCount++;
 }
 
-static void InitializeDrill(DrillTypePtr drill, pcb_pin_t *pin, pcb_element_t *element)
+static void drill_init(DrillTypePtr drill, pcb_pin_t *pin, pcb_element_t *element)
 {
 	void *ptr;
 
@@ -82,10 +82,10 @@
 	drill->PinN = 0;
 	drill->hole = NULL;
 	drill->PinMax = 0;
-	ptr = (void *) GetDrillPinMemory(drill);
+	ptr = (void *) drill_pin_alloc(drill);
 	*((pcb_pin_t **) ptr) = pin;
 	if (element) {
-		ptr = (void *) GetDrillElementMemory(drill);
+		ptr = (void *) drill_element_alloc(drill);
 		*((pcb_element_t **) ptr) = element;
 		drill->PinCount = 1;
 	}
@@ -95,7 +95,7 @@
 		drill->UnplatedCount = 1;
 }
 
-static int DrillQSort(const void *va, const void *vb)
+static int drill_qsort_cmp(const void *va, const void *vb)
 {
 	DrillType *a = (DrillType *) va;
 	DrillType *b = (DrillType *) vb;
@@ -102,7 +102,7 @@
 	return a->DrillSize - b->DrillSize;
 }
 
-DrillInfoTypePtr GetDrillInfo(pcb_data_t *top)
+DrillInfoTypePtr drill_get_info(pcb_data_t *top)
 {
 	DrillInfoTypePtr AllDrills;
 	DrillTypePtr Drill = NULL;
@@ -121,9 +121,9 @@
 			continue;
 		if (!DrillFound) {
 			DrillFound = pcb_true;
-			Drill = GetDrillInfoDrillMemory(AllDrills);
+			Drill = drill_info_alloc(AllDrills);
 			Drill->DrillSize = proto->hdia;
-			FillDrill(Drill, (pcb_any_obj_t *)ps, !proto->hplated);
+			drill_fill(Drill, (pcb_any_obj_t *)ps, !proto->hplated);
 		}
 		else {
 			if (Drill->DrillSize != proto->hdia) {
@@ -131,30 +131,30 @@
 				{
 					if (drill->DrillSize == proto->hdia) {
 						Drill = drill;
-						FillDrill(Drill, (pcb_any_obj_t *)ps, !proto->hplated);
+						drill_fill(Drill, (pcb_any_obj_t *)ps, !proto->hplated);
 						break;
 					}
 				}
 				PCB_END_LOOP;
 				if (Drill->DrillSize != proto->hdia) {
-					Drill = GetDrillInfoDrillMemory(AllDrills);
+					Drill = drill_info_alloc(AllDrills);
 					Drill->DrillSize = proto->hdia;
-					FillDrill(Drill, (pcb_any_obj_t *)ps, !proto->hplated);
+					drill_fill(Drill, (pcb_any_obj_t *)ps, !proto->hplated);
 				}
 			}
 			else
-				FillDrill(Drill, (pcb_any_obj_t *)ps, !proto->hplated);
+				drill_fill(Drill, (pcb_any_obj_t *)ps, !proto->hplated);
 		}
 	}
 	pcb_r_end(&it);
 
-	qsort(AllDrills->Drill, AllDrills->DrillN, sizeof(DrillType), DrillQSort);
+	qsort(AllDrills->Drill, AllDrills->DrillN, sizeof(DrillType), drill_qsort_cmp);
 	return AllDrills;
 }
 
 #define ROUND(x,n) ((int)(((x)+(n)/2)/(n))*(n))
 
-void RoundDrillInfo(DrillInfoTypePtr d, int roundto)
+void drill_round_info(DrillInfoTypePtr d, int roundto)
 {
 	unsigned int i = 0;
 
@@ -204,7 +204,7 @@
 	}
 }
 
-void FreeDrillInfo(DrillInfoTypePtr Drills)
+void drill_info_free(DrillInfoTypePtr Drills)
 {
 	DRILL_LOOP(Drills);
 	{
@@ -219,7 +219,7 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a Drill, allocates memory if necessary
  */
-DrillTypePtr GetDrillInfoDrillMemory(DrillInfoTypePtr DrillInfo)
+DrillTypePtr drill_info_alloc(DrillInfoTypePtr DrillInfo)
 {
 	DrillTypePtr drill = DrillInfo->Drill;
 
@@ -236,7 +236,7 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a DrillPoint, allocates memory if necessary
  */
-pcb_any_obj_t **GetDrillPinMemory(DrillTypePtr Drill)
+pcb_any_obj_t **drill_pin_alloc(DrillTypePtr Drill)
 {
 	pcb_any_obj_t **pin;
 
@@ -255,7 +255,7 @@
 /* ---------------------------------------------------------------------------
  * get next slot for a DrillElement, allocates memory if necessary
  */
-pcb_any_obj_t **GetDrillElementMemory(DrillTypePtr Drill)
+pcb_any_obj_t **drill_element_alloc(DrillTypePtr Drill)
 {
 	pcb_any_obj_t **element;
 
Index: trunk/src_plugins/report/drill.h
===================================================================
--- trunk/src_plugins/report/drill.h	(revision 15734)
+++ trunk/src_plugins/report/drill.h	(revision 15735)
@@ -49,12 +49,12 @@
 	DrillTypePtr Drill;						/* plated holes */
 } DrillInfoType, *DrillInfoTypePtr;
 
-DrillInfoTypePtr GetDrillInfo(pcb_data_t *);
-void FreeDrillInfo(DrillInfoTypePtr);
-void RoundDrillInfo(DrillInfoTypePtr, int);
-DrillTypePtr GetDrillInfoDrillMemory(DrillInfoTypePtr);
-pcb_any_obj_t **GetDrillPinMemory(DrillTypePtr);
-pcb_any_obj_t **GetDrillElementMemory(DrillTypePtr);
+DrillInfoTypePtr drill_get_info(pcb_data_t *);
+void drill_info_free(DrillInfoTypePtr);
+void drill_round_info(DrillInfoTypePtr, int);
+DrillTypePtr drill_info_alloc(DrillInfoTypePtr);
+pcb_any_obj_t **drill_pin_alloc(DrillTypePtr);
+pcb_any_obj_t **drill_element_alloc(DrillTypePtr);
 
 #define DRILL_LOOP(top) do             {                           \
         pcb_cardinal_t        n;                                   \
Index: trunk/src_plugins/report/report.c
===================================================================
--- trunk/src_plugins/report/report.c	(revision 15734)
+++ trunk/src_plugins/report/report.c	(revision 15735)
@@ -80,8 +80,8 @@
 	char *stringlist, *thestring;
 	int total_drills = 0;
 
-	AllDrills = GetDrillInfo(PCB->Data);
-	RoundDrillInfo(AllDrills, 100);
+	AllDrills = drill_get_info(PCB->Data);
+	drill_round_info(AllDrills, 100);
 
 	for (n = 0; n < AllDrills->DrillN; n++) {
 		total_drills += AllDrills->Drill[n].PinCount;
@@ -111,7 +111,7 @@
 		while (*thestring != '\0')
 			thestring++;
 	}
-	FreeDrillInfo(AllDrills);
+	drill_info_free(AllDrills);
 	/* create dialog box */
 	pcb_gui->report_dialog("Drill Report", stringlist);