1. Renaming country to city for merchant
2. Renaming type to category for shop