Fixes #ConvertToInt32 and #RenamedCorrectly