Adjust some of the Item Naming.