Simplify groupchat names

two other minor tweaks