Renamed arcXLinks to arcs, etc.