Grouper groupee

If Grouper does it, Tilapia should follow suite

Change-Id: I3aac57e4d1e5cb8eb2b02234c35dd75ba8fc1d4b