Minor change in names of macros.