Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 5055)
+++ trunk/doc-rnd/hacking/renames	(revision 5056)
@@ -1088,3 +1088,8 @@
 SWAP_IDENT -> PCB_SWAP_IDENT
 END_LOOP -> PCB_END_LOOP
 ENDALL_LOOP -> PCB_ENDALL_LOOP
+pcb_create_be_lenient -> pcb_create_being_lenient
+CreateBeLenient -> pcb_create_be_lenient
+CreateIDBump -> pcb_create_ID_bump
+CreateIDReset -> pcb_create_ID_reset
+CreateIDGet -> pcb_create_ID_get
Index: trunk/src/board.c
===================================================================
--- trunk/src/board.c	(revision 5055)
+++ trunk/src/board.c	(revision 5056)
@@ -90,7 +90,7 @@
 	ptr->Zoom = conf_core.editor.zoom;
 	ptr->MaxWidth = conf_core.design.max_width;
 	ptr->MaxHeight = conf_core.design.max_height;
-	ptr->ID = CreateIDGet();
+	ptr->ID = pcb_create_ID_get();
 	ptr->ThermScale = 0.5;
 
 	ptr->Bloat = conf_core.design.bloat;
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 5055)
+++ trunk/src/obj_arc.c	(revision 5056)
@@ -187,7 +187,7 @@
 	if (!Arc)
 		return (Arc);
 
-	Arc->ID = CreateIDGet();
+	Arc->ID = pcb_create_ID_get();
 	Arc->Flags = Flags;
 	Arc->Thickness = Thickness;
 	Arc->Clearance = Clearance;
Index: trunk/src/obj_common.c
===================================================================
--- trunk/src/obj_common.c	(revision 5055)
+++ trunk/src/obj_common.c	(revision 5056)
@@ -65,28 +65,28 @@
 /* current object ID; incremented after each creation of an object */
 long int ID = 1;
 
-pcb_bool pcb_create_be_lenient = pcb_false;
+pcb_bool pcb_create_being_lenient = pcb_false;
 
 /* ---------------------------------------------------------------------------
  *  Set the lenience mode.
  */
-void CreateBeLenient(pcb_bool v)
+void pcb_create_be_lenient(pcb_bool v)
 {
-	pcb_create_be_lenient = v;
+	pcb_create_being_lenient = v;
 }
 
-void CreateIDBump(int min_id)
+void pcb_create_ID_bump(int min_id)
 {
 	if (ID < min_id)
 		ID = min_id;
 }
 
-void CreateIDReset(void)
+void pcb_create_ID_reset(void)
 {
 	ID = 1;
 }
 
-long int CreateIDGet(void)
+long int pcb_create_ID_get(void)
 {
 	return ID++;
 }
Index: trunk/src/obj_common.h
===================================================================
--- trunk/src/obj_common.h	(revision 5055)
+++ trunk/src/obj_common.h	(revision 5056)
@@ -58,12 +58,12 @@
 /* pcb_true during file loads, for example to allow overlapping vias.
    pcb_false otherwise, to stop the user from doing normally dangerous
    things.  */
-void CreateBeLenient(pcb_bool);
-extern pcb_bool pcb_create_be_lenient;
+void pcb_create_be_lenient(pcb_bool);
+extern pcb_bool pcb_create_being_lenient;
 
-void CreateIDBump(int min_id);
-void CreateIDReset(void);
-long int CreateIDGet(void);
+void pcb_create_ID_bump(int min_id);
+void pcb_create_ID_reset(void);
+long int pcb_create_ID_get(void);
 
 /* ---------------------------------------------------------------------------
  * Do not change the following definitions even if they're not very
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 5055)
+++ trunk/src/obj_elem.c	(revision 5056)
@@ -585,7 +585,7 @@
 	NAMEONPCB_TEXT(Element).Element = Element;
 	VALUE_TEXT(Element).Element = Element;
 	Element->Flags = Flags;
-	Element->ID = CreateIDGet();
+	Element->ID = pcb_create_ID_get();
 
 #ifdef DEBUG
 	printf("  .... Leaving CreateNewElement.\n");
@@ -618,7 +618,7 @@
 	arc->StartAngle = angle;
 	arc->Delta = delta;
 	arc->Thickness = Thickness;
-	arc->ID = CreateIDGet();
+	arc->ID = pcb_create_ID_get();
 	return arc;
 }
 
@@ -639,7 +639,7 @@
 	line->Point2.Y = Y2;
 	line->Thickness = Thickness;
 	line->Flags = pcb_no_flags();
-	line->ID = CreateIDGet();
+	line->ID = pcb_create_ID_get();
 	return line;
 }
 
@@ -658,7 +658,7 @@
 
 	/* calculate size of the bounding box */
 	pcb_text_bbox(PCBFont, Text);
-	Text->ID = CreateIDGet();
+	Text->ID = pcb_create_ID_get();
 }
 
 /* mirrors the coordinates of an element; an additional offset is passed */
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 5055)
+++ trunk/src/obj_line.c	(revision 5056)
@@ -198,7 +198,7 @@
 	Line = pcb_line_alloc(Layer);
 	if (!Line)
 		return (Line);
-	Line->ID = CreateIDGet();
+	Line->ID = pcb_create_ID_get();
 	Line->Flags = Flags;
 	PCB_FLAG_CLEAR(PCB_FLAG_RAT, Line);
 	Line->Thickness = Thickness;
@@ -205,10 +205,10 @@
 	Line->Clearance = Clearance;
 	Line->Point1.X = X1;
 	Line->Point1.Y = Y1;
-	Line->Point1.ID = CreateIDGet();
+	Line->Point1.ID = pcb_create_ID_get();
 	Line->Point2.X = X2;
 	Line->Point2.Y = Y2;
-	Line->Point2.ID = CreateIDGet();
+	Line->Point2.ID = pcb_create_ID_get();
 	pcb_add_line_on_layer(Layer, Line);
 	return (Line);
 }
Index: trunk/src/obj_pad.c
===================================================================
--- trunk/src/obj_pad.c	(revision 5055)
+++ trunk/src/obj_pad.c	(revision 5056)
@@ -90,7 +90,7 @@
 	pad->Number = pcb_strdup_null(Number);
 	pad->Flags = Flags;
 	PCB_FLAG_CLEAR(PCB_FLAG_WARN, pad);
-	pad->ID = CreateIDGet();
+	pad->ID = pcb_create_ID_get();
 	pad->Element = Element;
 	return (pad);
 }
Index: trunk/src/obj_pinvia.c
===================================================================
--- trunk/src/obj_pinvia.c	(revision 5055)
+++ trunk/src/obj_pinvia.c	(revision 5056)
@@ -89,7 +89,7 @@
 {
 	pcb_pin_t *Via;
 
-	if (!pcb_create_be_lenient) {
+	if (!pcb_create_being_lenient) {
 		PCB_VIA_LOOP(Data);
 		{
 			if (pcb_distance(X, Y, via->X, via->Y) <= via->DrillingHole / 2 + DrillingHole / 2) {
@@ -121,7 +121,7 @@
 	Via->Flags = Flags;
 	PCB_FLAG_CLEAR(PCB_FLAG_WARN, Via);
 	PCB_FLAG_SET(PCB_FLAG_VIA, Via);
-	Via->ID = CreateIDGet();
+	Via->ID = pcb_create_ID_get();
 
 	/*
 	 * don't complain about PCB_MIN_PINORVIACOPPER on a mounting hole (pure
@@ -153,7 +153,7 @@
 	pin->Flags = Flags;
 	PCB_FLAG_CLEAR(PCB_FLAG_WARN, pin);
 	PCB_FLAG_SET(PCB_FLAG_PIN, pin);
-	pin->ID = CreateIDGet();
+	pin->ID = pcb_create_ID_get();
 	pin->Element = Element;
 
 	/*
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 5055)
+++ trunk/src/obj_poly.c	(revision 5056)
@@ -177,7 +177,7 @@
 
 	/* copy values */
 	polygon->Flags = Flags;
-	polygon->ID = CreateIDGet();
+	polygon->ID = pcb_create_ID_get();
 	polygon->Clipped = NULL;
 	polygon->NoHoles = NULL;
 	polygon->NoHolesValid = 0;
@@ -192,7 +192,7 @@
 	/* copy values */
 	point->X = X;
 	point->Y = Y;
-	point->ID = CreateIDGet();
+	point->ID = pcb_create_ID_get();
 	return (point);
 }
 
Index: trunk/src/obj_rat.c
===================================================================
--- trunk/src/obj_rat.c	(revision 5055)
+++ trunk/src/obj_rat.c	(revision 5056)
@@ -76,16 +76,16 @@
 	if (!Line)
 		return (Line);
 
-	Line->ID = CreateIDGet();
+	Line->ID = pcb_create_ID_get();
 	Line->Flags = Flags;
 	PCB_FLAG_SET(PCB_FLAG_RAT, Line);
 	Line->Thickness = Thickness;
 	Line->Point1.X = X1;
 	Line->Point1.Y = Y1;
-	Line->Point1.ID = CreateIDGet();
+	Line->Point1.ID = pcb_create_ID_get();
 	Line->Point2.X = X2;
 	Line->Point2.Y = Y2;
-	Line->Point2.ID = CreateIDGet();
+	Line->Point2.ID = pcb_create_ID_get();
 	Line->group1 = group1;
 	Line->group2 = group2;
 	pcb_line_bbox((pcb_line_t *) Line);
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 5055)
+++ trunk/src/obj_text.c	(revision 5056)
@@ -97,7 +97,7 @@
 {
 	/* calculate size of the bounding box */
 	pcb_text_bbox(PCBFont, text);
-	text->ID = CreateIDGet();
+	text->ID = pcb_create_ID_get();
 	if (!Layer->text_tree)
 		Layer->text_tree = pcb_r_create_tree(NULL, 0, 0);
 	pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) text, 0);
Index: trunk/src_plugins/io_lihata/read.c
===================================================================
--- trunk/src_plugins/io_lihata/read.c	(revision 5055)
+++ trunk/src_plugins/io_lihata/read.c	(revision 5056)
@@ -190,7 +190,7 @@
 		return -1;
 	}
 
-	CreateIDBump(tmp+1);
+	pcb_create_ID_bump(tmp+1);
 
 	*res = tmp;
 	return 0;
@@ -811,7 +811,7 @@
 	int n;
 	for(n = 0; n < vtptr_len(ids); n++) {
 		long int *id = ids->array[n];
-		*id = CreateIDGet();
+		*id = pcb_create_ID_get();
 	}
 	vtptr_uninit(ids);
 }
Index: trunk/src_plugins/io_pcb/parse_l.c
===================================================================
--- trunk/src_plugins/io_pcb/parse_l.c	(revision 5055)
+++ trunk/src_plugins/io_pcb/parse_l.c	(revision 5056)
@@ -2429,7 +2429,7 @@
 		 * on termination.
 		 */
 
-	CreateBeLenient (pcb_true);
+	pcb_create_be_lenient(pcb_true);
 
 #if !defined(HAS_ATEXIT)
 	if (PCB && PCB->Data)
@@ -2442,7 +2442,7 @@
 	/* clean up parse buffer */
 	pcb__delete_buffer(YY_CURRENT_BUFFER);
 
-	CreateBeLenient (pcb_false);
+	pcb_create_be_lenient(pcb_false);
 
 	if (Pipe != NULL)
 		return returncode;
Index: trunk/src_plugins/io_pcb/parse_l.l
===================================================================
--- trunk/src_plugins/io_pcb/parse_l.l	(revision 5055)
+++ trunk/src_plugins/io_pcb/parse_l.l	(revision 5056)
@@ -288,7 +288,7 @@
 		 * on termination.
 		 */
 
-	CreateBeLenient (pcb_true);
+	pcb_create_be_lenient(pcb_true);
 
 #if !defined(HAS_ATEXIT)
 	if (PCB && PCB->Data)
@@ -301,7 +301,7 @@
 	/* clean up parse buffer */
 	yy_delete_buffer(YY_CURRENT_BUFFER);
 
-	CreateBeLenient (pcb_false);
+	pcb_create_be_lenient(pcb_false);
 
 	if (Pipe != NULL)
 		return returncode;