Rename symbol macros to a consistant naming scheme