Cleanup and renames.