PIM-1584 Still fixing entities short name