link and name fixes