Switch CX classes to use _