chg MACRO to static const in protocol namespace