Changed 'NX' in macro names to 'SOD' (unfortunately)