Fix renames for multiple words