renaming and polishing