Updated store names to make them neater