CRM-12392 further problems arising from non-std BAO-naming