Clean-up and rename