Ingredient Name cleanup refactor