Group message name fix

Uh, yeah so this is a fix for #1494 to make the naming scheme for Group messages more straightforward.