MapKit framework and tidy up names.