clean and rename