renames and cleanup