Add Nexus, and clean names