Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4932)
+++ trunk/doc-rnd/hacking/renames	(revision 4933)
@@ -514,3 +514,6 @@
 RemoveFreeRat -> pcb_rat_free
 CreateNewRat -> pcb_rat_new
 DeleteRats -> pcb_rats_delete
+GetTextMemory -> pcb_text_alloc
+RemoveFreeText -> pcb_text_free
+CreateNewText -> pcb_text_new
Index: trunk/src/action_helper.c
===================================================================
--- trunk/src/action_helper.c	(revision 4932)
+++ trunk/src/action_helper.c	(revision 4933)
@@ -911,7 +911,7 @@
 
 					if (GetLayerGroupNumberByNumber(INDEXOFCURRENT) == GetLayerGroupNumberByNumber(solder_silk_layer))
 						flag |= PCB_FLAG_ONSOLDER;
-					if ((text = CreateNewText(CURRENT, &PCB->Font, Note.X,
+					if ((text = pcb_text_new(CURRENT, &PCB->Font, Note.X,
 																		Note.Y, 0, conf_core.design.text_scale, string, pcb_flag_make(flag))) != NULL) {
 						AddObjectToCreateUndoList(PCB_TYPE_TEXT, CURRENT, text, text);
 						IncrementUndoSerialNumber();
Index: trunk/src/data.c
===================================================================
--- trunk/src/data.c	(revision 4932)
+++ trunk/src/data.c	(revision 4933)
@@ -218,7 +218,7 @@
 
 		list_map0(&layer->Line, pcb_line_t, pcb_line_free);
 		list_map0(&layer->Arc,  pcb_arc_t,  pcb_arc_free);
-		list_map0(&layer->Text, pcb_text_t, RemoveFreeText);
+		list_map0(&layer->Text, pcb_text_t, pcb_text_free);
 		POLYGON_LOOP(layer);
 		{
 			pcb_poly_free_fields(polygon);
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 4932)
+++ trunk/src/obj_text.c	(revision 4933)
@@ -48,7 +48,7 @@
 
 /*** allocation ***/
 /* get next slot for a text object, allocates memory if necessary */
-pcb_text_t *GetTextMemory(pcb_layer_t * layer)
+pcb_text_t *pcb_text_alloc(pcb_layer_t * layer)
 {
 	pcb_text_t *new_obj;
 
@@ -58,7 +58,7 @@
 	return new_obj;
 }
 
-void RemoveFreeText(pcb_text_t * data)
+void pcb_text_free(pcb_text_t * data)
 {
 	textlist_remove(data);
 	free(data);
@@ -67,7 +67,7 @@
 /*** utility ***/
 
 /* creates a new text on a layer */
-pcb_text_t *CreateNewText(pcb_layer_t *Layer, pcb_font_t *PCBFont, pcb_coord_t X, pcb_coord_t Y, unsigned Direction, int Scale, char *TextString, pcb_flag_t Flags)
+pcb_text_t *pcb_text_new(pcb_layer_t *Layer, pcb_font_t *PCBFont, pcb_coord_t X, pcb_coord_t Y, unsigned Direction, int Scale, char *TextString, pcb_flag_t Flags)
 {
 	pcb_text_t *text;
 
@@ -74,7 +74,7 @@
 	if (TextString == NULL)
 		return NULL;
 
-	text = GetTextMemory(Layer);
+	text = pcb_text_alloc(Layer);
 	if (text == NULL)
 		return NULL;
 
@@ -221,7 +221,7 @@
 {
 	pcb_layer_t *layer = &ctx->buffer.dst->Layer[GetLayerNumber(ctx->buffer.src, Layer)];
 
-	return (CreateNewText(layer, &PCB->Font, Text->X, Text->Y, Text->Direction, Text->Scale, Text->TextString, pcb_flag_mask(Text->Flags, ctx->buffer.extraflg)));
+	return (pcb_text_new(layer, &PCB->Font, Text->X, Text->Y, Text->Direction, Text->Scale, Text->TextString, pcb_flag_mask(Text->Flags, ctx->buffer.extraflg)));
 }
 
 /* moves a text to buffer without allocating memory for the name */
@@ -327,7 +327,7 @@
 {
 	pcb_text_t *text;
 
-	text = CreateNewText(Layer, &PCB->Font, Text->X + ctx->copy.DeltaX,
+	text = pcb_text_new(Layer, &PCB->Font, Text->X + ctx->copy.DeltaX,
 											 Text->Y + ctx->copy.DeltaY, Text->Direction, Text->Scale, Text->TextString, pcb_flag_mask(Text->Flags, PCB_FLAG_FOUND));
 	DrawText(Layer, text);
 	AddObjectToCreateUndoList(PCB_TYPE_TEXT, Layer, text, text);
@@ -402,7 +402,7 @@
 	free(Text->TextString);
 	r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
 
-	RemoveFreeText(Text);
+	pcb_text_free(Text);
 
 	return NULL;
 }
Index: trunk/src/obj_text.h
===================================================================
--- trunk/src/obj_text.h	(revision 4932)
+++ trunk/src/obj_text.h	(revision 4933)
@@ -42,11 +42,10 @@
 };
 
 
-pcb_text_t *GetTextMemory(pcb_layer_t * layer);
-void RemoveFreeText(pcb_text_t * data);
+pcb_text_t *pcb_text_alloc(pcb_layer_t * layer);
+void pcb_text_free(pcb_text_t * data);
+pcb_text_t *pcb_text_new(pcb_layer_t *Layer, pcb_font_t *PCBFont, pcb_coord_t X, pcb_coord_t Y, unsigned Direction, int Scale, char *TextString, pcb_flag_t Flags);
 
-pcb_text_t *CreateNewText(pcb_layer_t *Layer, pcb_font_t *PCBFont, pcb_coord_t X, pcb_coord_t Y, unsigned Direction, int Scale, char *TextString, pcb_flag_t Flags);
-
 /* Add objects without creating them or making any "sanity modifications" to them */
 void pcb_add_text_on_layer(pcb_layer_t *Layer, pcb_text_t *text, pcb_font_t *PCBFont);
 
Index: trunk/src_plugins/hid_gtk/ghid-propedit.c
===================================================================
--- trunk/src_plugins/hid_gtk/ghid-propedit.c	(revision 4932)
+++ trunk/src_plugins/hid_gtk/ghid-propedit.c	(revision 4933)
@@ -346,7 +346,7 @@
 		0.0, 90.0,
 		PCB_MIL_TO_COORD(20), PCB_MIL_TO_COORD(20), pcb_flag_make(PCB_FLAG_CLEARLINE));
 
-		CreateNewText(preview_pcb.Data->Layer+0, &PCB->Font,
+		pcb_text_new(preview_pcb.Data->Layer+0, &PCB->Font,
 							PCB_MIL_TO_COORD(850), PCB_MIL_TO_COORD(1150), 0, 100, "Text", pcb_flag_make(PCB_FLAG_CLEARLINE));
 
 	{
Index: trunk/src_plugins/io_kicad/read.c
===================================================================
--- trunk/src_plugins/io_kicad/read.c	(revision 4932)
+++ trunk/src_plugins/io_kicad/read.c	(revision 4933)
@@ -334,7 +334,7 @@
 			}
 		}
 
-		CreateNewText( &st->PCB->Data->Layer[PCBLayer], &st->PCB->Font, X, Y, direction, scaling, text, Flags);
+		pcb_text_new( &st->PCB->Data->Layer[PCBLayer], &st->PCB->Font, X, Y, direction, scaling, text, Flags);
 		return 0; /* create new font */
 	}
 	return -1;
Index: trunk/src_plugins/io_lihata/read.c
===================================================================
--- trunk/src_plugins/io_lihata/read.c	(revision 4932)
+++ trunk/src_plugins/io_lihata/read.c	(revision 4933)
@@ -499,7 +499,7 @@
 	if (ly != NULL) {
 		if (role != NULL)
 			return -1;
-		text = GetTextMemory(ly);
+		text = pcb_text_alloc(ly);
 	}
 	else if (el != NULL) {
 		if (role == NULL)
Index: trunk/src_plugins/io_pcb/parse_y.c
===================================================================
--- trunk/src_plugins/io_pcb/parse_y.c	(revision 4932)
+++ trunk/src_plugins/io_pcb/parse_y.c	(revision 4933)
@@ -2310,7 +2310,7 @@
 #line 1068 "parse_y.y" /* yacc.c:1646  */
     {
 					/* use a default scale of 100% */
-				CreateNewText(Layer,yyFont,OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), 100, (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
+				pcb_text_new(Layer,yyFont,OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), 100, (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer)));
 				free ((yyvsp[-2].string));
 			}
 #line 2317 "parse_y.c" /* yacc.c:1646  */
@@ -2324,11 +2324,11 @@
 					pcb_layer_t *lay = &yyData->Layer[yyData->LayerN +
 						(((yyvsp[-1].integer) & PCB_FLAG_ONSOLDER) ? SOLDER_LAYER : COMPONENT_LAYER)];
 
-					CreateNewText(lay ,yyFont, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string),
+					pcb_text_new(lay ,yyFont, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string),
 						      pcb_flag_old((yyvsp[-1].integer)));
 				}
 				else
-					CreateNewText(Layer, yyFont, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string),
+					pcb_text_new(Layer, yyFont, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string),
 						      pcb_flag_old((yyvsp[-1].integer)));
 				free ((yyvsp[-2].string));
 			}
@@ -2350,10 +2350,10 @@
 					pcb_layer_t *lay = &yyData->Layer[yyData->LayerN +
 						(((yyvsp[-1].flagtype).f & PCB_FLAG_ONSOLDER) ? SOLDER_LAYER : COMPONENT_LAYER)];
 
-					CreateNewText(lay, yyFont, NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string), (yyvsp[-1].flagtype));
+					pcb_text_new(lay, yyFont, NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string), (yyvsp[-1].flagtype));
 				}
 				else
-					CreateNewText(Layer, yyFont, NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string), (yyvsp[-1].flagtype));
+					pcb_text_new(Layer, yyFont, NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), (yyvsp[-4].number), (yyvsp[-3].number), (yyvsp[-2].string), (yyvsp[-1].flagtype));
 				free ((yyvsp[-2].string));
 			}
 #line 2360 "parse_y.c" /* yacc.c:1646  */
Index: trunk/src_plugins/io_pcb/parse_y.y
===================================================================
--- trunk/src_plugins/io_pcb/parse_y.y	(revision 4932)
+++ trunk/src_plugins/io_pcb/parse_y.y	(revision 4933)
@@ -1067,7 +1067,7 @@
 		: T_TEXT '(' measure measure number STRING INTEGER ')'
 			{
 					/* use a default scale of 100% */
-				CreateNewText(Layer,yyFont,OU ($3), OU ($4), $5, 100, $6, pcb_flag_old($7));
+				pcb_text_new(Layer,yyFont,OU ($3), OU ($4), $5, 100, $6, pcb_flag_old($7));
 				free ($6);
 			}
 		;
@@ -1081,11 +1081,11 @@
 					pcb_layer_t *lay = &yyData->Layer[yyData->LayerN +
 						(($8 & PCB_FLAG_ONSOLDER) ? SOLDER_LAYER : COMPONENT_LAYER)];
 
-					CreateNewText(lay ,yyFont, OU ($3), OU ($4), $5, $6, $7,
+					pcb_text_new(lay ,yyFont, OU ($3), OU ($4), $5, $6, $7,
 						      pcb_flag_old($8));
 				}
 				else
-					CreateNewText(Layer, yyFont, OU ($3), OU ($4), $5, $6, $7,
+					pcb_text_new(Layer, yyFont, OU ($3), OU ($4), $5, $6, $7,
 						      pcb_flag_old($8));
 				free ($7);
 			}
@@ -1106,10 +1106,10 @@
 					pcb_layer_t *lay = &yyData->Layer[yyData->LayerN +
 						(($8.f & PCB_FLAG_ONSOLDER) ? SOLDER_LAYER : COMPONENT_LAYER)];
 
-					CreateNewText(lay, yyFont, NU ($3), NU ($4), $5, $6, $7, $8);
+					pcb_text_new(lay, yyFont, NU ($3), NU ($4), $5, $6, $7, $8);
 				}
 				else
-					CreateNewText(Layer, yyFont, NU ($3), NU ($4), $5, $6, $7, $8);
+					pcb_text_new(Layer, yyFont, NU ($3), NU ($4), $5, $6, $7, $8);
 				free ($7);
 			}
 		;