Refactored store names