Be more careful when mangling DCP names to fit ISDCF.