refactor item names