Fixing renames