Atom => AtomLocation, other cleanup
AtomLocation => RealAtomLocation
comment