Refactoring pretty_name to gazetteer_name