Index: obj_line.h
===================================================================
--- obj_line.h	(revision 4921)
+++ obj_line.h	(revision 4922)
@@ -46,11 +46,11 @@
 } pcb_attached_line_t;
 
 
-pcb_line_t *GetLineMemory(pcb_layer_t * layer);
-void RemoveFreeLine(pcb_line_t * data);
+pcb_line_t *pcb_line_new(pcb_layer_t * layer);
+void pcb_line_free(pcb_line_t * data);
 
-pcb_line_t *CreateDrawnLineOnLayer(pcb_layer_t *Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_flag_t Flags);
-pcb_line_t *CreateNewLineOnLayer(pcb_layer_t *Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_flag_t Flags);
+pcb_line_t *pcb_line_new_on_layer_merge(pcb_layer_t *Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_flag_t Flags);
+pcb_line_t *pcb_line_new_on_layer(pcb_layer_t *Layer, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness, pcb_coord_t Clearance, pcb_flag_t Flags);
 
 /* Add objects without creating them or making any "sanity modifications" to them */
 void pcb_add_line_on_layer(pcb_layer_t *Layer, pcb_line_t *Line);