Updated for "name_edition" format names.