Index: djopt.c
===================================================================
--- djopt.c	(revision 15868)
+++ djopt.c	(revision 15869)
@@ -437,7 +437,7 @@
 
 	from = (char *) linelist_first(&lyr->Line);
 	nl = pcb_line_new(PCB->Data->Layer + layer, x1, y1, x2, y2, thick, clear, flags);
-	pcb_undo_add_obj_to_create(PCB_TYPE_LINE, lyr, nl, nl);
+	pcb_undo_add_obj_to_create(PCB_OBJ_LINE, lyr, nl, nl);
 
 	to = (char *) linelist_first(&lyr->Line);
 	if (from != to) {
@@ -483,7 +483,7 @@
 		pcb_line_t *nl;
 		dprintf
 			("New line \033[35m%#mD to %#mD from l%d t%#mS c%#mS f%s\033[0m\n",
-			 s->x, s->y, e->x, e->y, layer, example->Thickness, example->Clearance, pcb_strflg_f2s(example->Flags, PCB_TYPE_LINE, NULL));
+			 s->x, s->y, e->x, e->y, layer, example->Thickness, example->Clearance, pcb_strflg_f2s(example->Flags, PCB_OBJ_LINE, NULL));
 		nl = create_pcb_line(layer, s->x, s->y, e->x, e->y, example->Thickness, example->Clearance, example->Flags);
 
 		if (!nl)
@@ -638,13 +638,13 @@
 	ls = LAYER_PTR(l->layer);
 	ld = LAYER_PTR(layer);
 
-	pcb_move_obj_to_layer(PCB_TYPE_LINE, ls, l->line, 0, ld, 0);
+	pcb_move_obj_to_layer(PCB_OBJ_LINE, ls, l->line, 0, ld, 0);
 	l->layer = layer;
 }
 
 static void remove_via_at(corner_s * c)
 {
-	pcb_remove_object(PCB_TYPE_PSTK, c->via, 0, 0);
+	pcb_remove_object(PCB_OBJ_PSTK, c->via, 0, 0);
 	c->via = 0;
 }
 
@@ -709,7 +709,7 @@
 	c->y = y;
 	via = c->via;
 	if (via) {
-		pcb_move_obj(PCB_TYPE_PSTK, via, via, via, x - via->x, y - via->y);
+		pcb_move_obj(PCB_OBJ_PSTK, via, via, via, x - via->x, y - via->y);
 		dprintf("via move %#mD to %#mD\n", via->x, via->y, x, y);
 	}
 	for (i = 0; i < c->n_lines; i++) {
@@ -716,10 +716,10 @@
 		pcb_line_t *tl = c->lines[i]->line;
 		if (tl) {
 			if (c->lines[i]->s == c) {
-				pcb_move_obj(PCB_TYPE_LINE_POINT, LAYER_PTR(c->lines[i]->layer), tl, &tl->Point1, x - (tl->Point1.X), y - (tl->Point1.Y));
+				pcb_move_obj(PCB_OBJ_LINE_POINT, LAYER_PTR(c->lines[i]->layer), tl, &tl->Point1, x - (tl->Point1.X), y - (tl->Point1.Y));
 			}
 			else {
-				pcb_move_obj(PCB_TYPE_LINE_POINT, LAYER_PTR(c->lines[i]->layer), tl, &tl->Point2, x - (tl->Point2.X), y - (tl->Point2.Y));
+				pcb_move_obj(PCB_OBJ_LINE_POINT, LAYER_PTR(c->lines[i]->layer), tl, &tl->Point2, x - (tl->Point2.X), y - (tl->Point2.Y));
 			}
 			dprintf("Line %p moved to %#mD %#mD\n", (void *) tl, tl->Point1.X, tl->Point1.Y, tl->Point2.X, tl->Point2.Y);
 		}
@@ -811,7 +811,7 @@
 	add_line_to_corner(l, c);
 	add_line_to_corner(ls, c);
 
-	pcb_move_obj(PCB_TYPE_LINE_POINT, LAYER_PTR(l->layer), l->line, &l->line->Point2,
+	pcb_move_obj(PCB_OBJ_LINE_POINT, LAYER_PTR(l->layer), l->line, &l->line->Point2,
 						 c->x - (l->line->Point2.X), c->y - (l->line->Point2.Y));
 
 	return 1;
@@ -2120,7 +2120,7 @@
 							c[ci]->lines[li]->s->x, c[ci]->lines[li]->s->y,
 							c[ci]->lines[li]->e->x, c[ci]->lines[li]->e->y,
 							c[ci]->lines[li]->line->Thickness,
-							c[ci]->lines[li]->line->Clearance, pcb_strflg_f2s(c[ci]->lines[li]->line->Flags, PCB_TYPE_LINE, NULL));
+							c[ci]->lines[li]->line->Clearance, pcb_strflg_f2s(c[ci]->lines[li]->line->Flags, PCB_OBJ_LINE, NULL));
 			/* Pads are disqualified, as we want to mimic a trace line. */
 			if (c[ci]->lines[li]->line == (pcb_line_t *) c[ci]->pad) {
 				dprintf("  bad, pad\n");