More renaming and link corrections.