Cleanup some cruft
Rename coordinate alias