Merge pull request #2646 from abarth/rename_fixit

Execute rename fixit