ISDCF name fixes with > 6 channels and HI/VI (#1633).