Changed names of macros, so as not to collide with ESRAP.