Updating links and fixing names