By prefixing with XMSS_, we hopefully prevent conflicts
This also performs numerous consistency fixes