Clean up and rename