clean and rename
clean an rename