Fix names and links