Fix group-* and grouppage-* message

* group-* should be plural for consistency

Change-Id: I7af9caa3190c2c07cb0e6047b51498289a4e57af