macros and protocols wording fixes