Normalised CFLAG name with CM

Change-Id: I60e6f31f708e4f068b5d6b407caaec3afa71960b