[FOLD] Tidy up headers for predicates
[FOLD] Rename to Message