fixup wording based on message framework