changed group names as well