Clean up. File rename.