Fixing and renaming