updated names and links