Fixed name and links