Renaming and cleanup.