changed names of hook macros