Decommission Magnesium

Finally.
Rename macros