Better handle when roles are renamed in messages

This isn't exhaustive or perfect, but a decent start. The message system
probably needs to gain some support for possessives to make this
comprehensive.

Author: skizzerz