Fixed names in CdmUtils