DDF-247: Renamed incorrect group ids