more profile cleanup and renames in geoip