More v13.3 multi-name updates