Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4859)
+++ trunk/doc-rnd/hacking/renames	(revision 4860)
@@ -247,3 +247,6 @@
 DestroyCrosshair -> pcb_crosshair_uninit
 FitCrosshairIntoGrid -> pcb_crosshair_grid_fit
 CenterDisplay -> pcb_center_display
+FreeDataMemory -> pcb_data_free
+IsDataEmpty -> pcb_data_is_empty
+GetDataBoundingBox -> pcb_data_bbox
Index: trunk/src/board.c
===================================================================
--- trunk/src/board.c	(revision 4859)
+++ trunk/src/board.c	(revision 4860)
@@ -46,7 +46,7 @@
 	free(pcb->Filename);
 	free(pcb->PrintFilename);
 	rats_patch_destroy(pcb);
-	FreeDataMemory(pcb->Data);
+	pcb_data_free(pcb->Data);
 	free(pcb->Data);
 	/* release font symbols */
 	for (i = 0; i <= MAX_FONTPOSITION; i++)
Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 4859)
+++ trunk/src/buffer.c	(revision 4860)
@@ -85,7 +85,7 @@
  */
 void pcb_set_buffer_bbox(pcb_buffer_t *Buffer)
 {
-	pcb_box_t *box = GetDataBoundingBox(Buffer->Data);
+	pcb_box_t *box = pcb_data_bbox(Buffer->Data);
 
 	if (box)
 		Buffer->BoundingBox = *box;
@@ -97,7 +97,7 @@
 void pcb_buffer_clear(pcb_buffer_t *Buffer)
 {
 	if (Buffer && Buffer->Data) {
-		FreeDataMemory(Buffer->Data);
+		pcb_data_free(Buffer->Data);
 		Buffer->Data->pcb = PCB;
 	}
 }
Index: trunk/src/data.c
===================================================================
--- trunk/src/data.c	(revision 4859)
+++ trunk/src/data.c	(revision 4860)
@@ -178,7 +178,7 @@
 /* ---------------------------------------------------------------------------
  * free memory used by data struct
  */
-void FreeDataMemory(pcb_data_t * data)
+void pcb_data_free(pcb_data_t * data)
 {
 	pcb_layer_t *layer;
 	int i;
@@ -255,7 +255,7 @@
 /* ---------------------------------------------------------------------------
  * returns pcb_true if data area is empty
  */
-pcb_bool IsDataEmpty(pcb_data_t *Data)
+pcb_bool pcb_data_is_empty(pcb_data_t *Data)
 {
 	pcb_bool hasNoObjects;
 	pcb_cardinal_t i;
@@ -271,7 +271,7 @@
  * gets minimum and maximum coordinates
  * returns NULL if layout is empty
  */
-pcb_box_t *GetDataBoundingBox(pcb_data_t *Data)
+pcb_box_t *pcb_data_bbox(pcb_data_t *Data)
 {
 	static pcb_box_t box;
 	/* FIX ME: use r_search to do this much faster */
@@ -340,6 +340,6 @@
 		box.Y2 = MAX(box.Y2, polygon->BoundingBox.Y2);
 	}
 	ENDALL_LOOP;
-	return (IsDataEmpty(Data) ? NULL : &box);
+	return (pcb_data_is_empty(Data) ? NULL : &box);
 }
 
Index: trunk/src/data.h
===================================================================
--- trunk/src/data.h	(revision 4859)
+++ trunk/src/data.h	(revision 4860)
@@ -121,8 +121,8 @@
 	pcb_via_cb_t vcb
 );
 
-void FreeDataMemory(pcb_data_t *);
-pcb_bool IsDataEmpty(pcb_data_t *);
-pcb_box_t *GetDataBoundingBox(pcb_data_t *Data);
+void pcb_data_free(pcb_data_t *);
+pcb_bool pcb_data_is_empty(pcb_data_t *);
+pcb_box_t *pcb_data_bbox(pcb_data_t *Data);
 
 #endif
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 4859)
+++ trunk/src/obj_elem.c	(revision 4860)
@@ -173,7 +173,7 @@
 	 * Now we detach the single element from the buffer and then clear the
 	 * buffer, ready to receive the smashed elements.  As a result of detaching
 	 * it the single element is orphaned from the buffer and thus will not be
-	 * free()'d by FreeDataMemory (called via ClearBuffer).  This leaves it
+	 * free()'d by pcb_data_free(called via ClearBuffer).  This leaves it
 	 * around for us to smash bits off it.  It then becomes our responsibility,
 	 * however, to free the single element when we're finished with it.
 	 */
Index: trunk/src/undo.c
===================================================================
--- trunk/src/undo.c	(revision 4859)
+++ trunk/src/undo.c	(revision 4860)
@@ -1164,7 +1164,7 @@
 		free(UndoList);
 		UndoList = NULL;
 		if (RemoveList) {
-			FreeDataMemory(RemoveList);
+			pcb_data_free(RemoveList);
 			free(RemoveList);
 			RemoveList = NULL;
 		}
Index: trunk/src_plugins/autocrop/autocrop.c
===================================================================
--- trunk/src_plugins/autocrop/autocrop.c	(revision 4859)
+++ trunk/src_plugins/autocrop/autocrop.c	(revision 4860)
@@ -185,7 +185,7 @@
 	pcb_coord_t dx, dy, pad;
 	pcb_box_t *box;
 
-	box = GetDataBoundingBox(PCB->Data);	/* handy! */
+	box = pcb_data_bbox(PCB->Data);	/* handy! */
 	if (!box || (box->X1 == box->X2 || box->Y1 == box->Y2)) {
 		/* board would become degenerate */
 		return 0;
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 4859)
+++ trunk/src_plugins/export_png/png.c	(revision 4860)
@@ -441,7 +441,7 @@
 	region.Y2 = PCB->MaxHeight;
 
 	if (options[HA_only_visible].int_value)
-		bounds = GetDataBoundingBox(PCB->Data);
+		bounds = pcb_data_bbox(PCB->Data);
 	else
 		bounds = &region;
 
@@ -647,7 +647,7 @@
 
 	/* figure out width and height of the board */
 	if (options[HA_only_visible].int_value) {
-		bbox = GetDataBoundingBox(PCB->Data);
+		bbox = pcb_data_bbox(PCB->Data);
 		x_shift = bbox->X1;
 		y_shift = bbox->Y1;
 		h = bbox->Y2 - bbox->Y1;
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 4859)
+++ trunk/src_plugins/export_ps/eps.c	(revision 4860)
@@ -196,7 +196,7 @@
 	region.Y2 = PCB->MaxHeight;
 
 	if (options[HA_only_visible].int_value)
-		bounds = GetDataBoundingBox(PCB->Data);
+		bounds = pcb_data_bbox(PCB->Data);
 	else
 		bounds = &region;
 
Index: trunk/src_plugins/hid_gtk/gtkhid-main.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-main.c	(revision 4859)
+++ trunk/src_plugins/hid_gtk/gtkhid-main.c	(revision 4860)
@@ -1391,7 +1391,7 @@
 	}
 
 	/* check if layout is empty */
-	if (!IsDataEmpty(PCB->Data)) {
+	if (!pcb_data_is_empty(PCB->Data)) {
 		ghid_dialog_print(printer);
 	}
 	else
@@ -1444,7 +1444,7 @@
 {
 
 	/* check if layout is empty */
-	if (!IsDataEmpty(PCB->Data)) {
+	if (!pcb_data_is_empty(PCB->Data)) {
 		ghid_dialog_export();
 	}
 	else