Again, add axis-based synonyms (XM/XP/...)