Fix include after class rename
Wording changes proposed by Jan
Wrap custom message label