Updating terminology and fixing broken links