Changed the names of the Warehouses

-New names of the warehouses added
-Also reduced the redundant conditions on the item table