Refactored geopoint aliases