Attempt to fix group naming