Refactored for consistent naming between geocoding services.