Updated names and links