Renames and tidy ups