comments fixed in RenameTypeConflictVars