PIM-1584 Fixes Group entity shortname