CEP - simplify names