Changed names of macros.