Normalised #ifdef names with CM

Change-Id: If94f65760b6dcd4c68aa7e968cf9fcd48ba0a2b0