#618: Consistentify item names