Forward-port ISDCF naming tweak from 1.x.