Refactored how item names propagate to the view model