Merge pull request #1180 from sandrine-bailleux-arm/sb/spm-rename

Rename some macros in SPM code