Move protocol enums into definitions header
Make constant formatting consistent