Cleanup.
Rename files.