Renaming and link cleanup