simplify item/line names, use consistently everywhere