Clarify some macro names using ambisonic mixed-mode notation