Cleanup and renames;