KAA-235: Rename macroses