Fix Entity short name to be compatible with Model
PIM-1584 Fixes Entity shortname for Group