Refactored Items to only end in "Item" on item types