clean up and rename.