renames and fixes