Consistent use of cx as abbreviated prefix

Change-Id: Ic1d64ead13e30db028137b4276e56112824b7513