Changed store names and updated to new hotplate/store infrastructure