Changing over from naming macros to explicit function names