Sort sbit: simplify macro names