rename macros to stay consistent with term.cil