Fixing links and renaming