diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index d36ee462..4412c7c2 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -371,6 +371,11 @@
 
     <!--
         Federation registrationAuthority URIs.
+
+        Bean names are generally constructed from the 2-letter
+        ISO country code, underscore, and the federation acronym.
+
+        The list is ordered by bean name.
     -->
     <bean id="al_rash_registrar"         parent="String" c:_="https://eduid.rash.al"/>
     <bean id="am_afire_registrar"        parent="String" c:_="https://aai.asnet.am"/>
@@ -410,6 +415,7 @@
     <bean id="it_idem_registrar"         parent="String" c:_="http://www.idem.garr.it/"/>
     <bean id="jp_gakunin_registrar"      parent="String" c:_="https://www.gakunin.jp"/>
     <bean id="kr_kafe_registrar"         parent="String" c:_="http://kafe.kreonet.net"/>
+    <bean id="kg_krena_registrar"        parent="String" c:_="https://www.kif.kg"/>
     <bean id="lb_life_registrar"         parent="String" c:_="http://life.aub.edu.lb"/><!-- A guess -->
     <bean id="lk_liaf_registrar"         parent="String" c:_="https://liaf.ac.lk"/>
     <bean id="lt_litnet_registrar"       parent="String" c:_="https://fedi.litnet.lt"/>
@@ -419,6 +425,7 @@
     <bean id="md_leaf_registrar"         parent="String" c:_="http://federations.renam.md/"/>
     <bean id="me_eduid_registrar"        parent="String" c:_="http://mren.ac.me"/><!-- A guess -->
     <bean id="mk_aaiedumk_registrar"     parent="String" c:_="https://rr.aaiedu.mk"/>
+    <bean id="mt_ricerca_registrar"      parent="String" c:_="https://id.ricerka.net.mt"/>
     <bean id="mw_maren_registrar"        parent="String" c:_="https://maren.ac.mw"/><!-- A guess -->
     <bean id="my_sifulan_registrar"      parent="String" c:_="https://sifulan.my"/>
     <bean id="mx_fenix_registrar"        parent="String" c:_="http://www.fenix.org.mx/"/><!-- A guess -->
@@ -440,6 +447,7 @@
     <bean id="sg_sgaf_registrar"         parent="String" c:_="https://www.singaren.net.sg"/>
     <bean id="si_arnes_registrar"        parent="String" c:_="http://aai.arnes.si"/>
     <bean id="sk_safeid_registrar"       parent="String" c:_="http://safeid.sk"/>
+    <bean id="tj_tarena_registrar"       parent="String" c:_="http://www.tidf.tj/"/>
     <bean id="tr_yetkim_registrar"       parent="String" c:_="https://yetkim.ulakbim.gov.tr/"/>
     <bean id="ua_peano_registrar"        parent="String" c:_="https://peano.uran.ua"/>
     <bean id="ug_rif_registrar"          parent="String" c:_="https://www.renu.ac.ug"/>
@@ -466,89 +474,99 @@
                 <!--
                     eduGAIN participant registration authority display names as country codes.
 
+                    The display name for a country with only one registrar
+                    is the ISO 2-letter country code.
+
+                    If there is more than one registrar, each will be given
+                    a display name constructed from the country code, a hyphen,
+                    and a federation acronym.
+
                     The ordering here is as on the eduGAIN status page:
 
-                    http://www.edugain.org/technical/status.php
+                    https://technical.edugain.org/status
                 -->
-                <entry key-ref="dz_arnaai_registrar"          value="DZ"/>
-                <entry key-ref="ar_mate_registrar"            value="AR"/>
-                <entry key-ref="am_afire_registrar"           value="AM"/>
                 <entry key-ref="au_aaf_registrar"             value="AU"/>
+                <entry key-ref="hr_eduhr_registrar"           value="HR"/>
+                <entry key-ref="mk_aaiedumk_registrar"        value="MK"/>
                 <entry key-ref="at_aconet_registrar"          value="AT"/>
-                <entry key-ref="by_febas_registrar"           value="BY"/>
+                <entry key-ref="am_afire_registrar"           value="AM"/>
+                <entry key-ref="dz_arnaai_registrar"          value="DZ"/>
+                <entry key-ref="si_arnes_registrar"           value="SI"/>
                 <entry key-ref="be_belnet_registrar"          value="BE"/>
-                <entry key-ref="br_cafe_registrar"            value="BR"/>
                 <entry key-ref="ca_caf_registrar"             value="CA"/>
+                <entry key-ref="br_cafe_registrar"            value="BR"/>
+                <entry key-ref="mz_cafmoz_registrar"          value="MZ"/>
+                <entry key-ref="cn_carsi_registrar"           value="CN-CARSI"/>
                 <entry key-ref="cl_cofre_registrar"           value="CL"/>
-                <entry key-ref="cn_carsi_registrar"           value="CN"/>
                 <entry key-ref="co_colfire_registrar"         value="CO"/>
-                <entry key-ref="hr_eduhr_registrar"           value="HR"/>
                 <entry key-ref="cy_cynet_registrar"           value="CY"/>
+                <entry key-ref="de_dfnaai_registrar"          value="DE"/>
+                <entry key-ref="ie_edugate_registrar"         value="IE"/>
                 <entry key-ref="cz_eduid_registrar"           value="CZ"/>
-                <entry key-ref="dk_wayf_registrar"            value="DK"/>
-                <entry key-ref="ec_minga_registrar"           value="EC"/>
-                <entry key-ref="ee_taat_registrar"            value="EE"/>
-                <entry key-ref="fi_haka_registrar"            value="FI"/>
+                <entry key-ref="hu_eduid_registrar"           value="HU"/>
+                <entry key-ref="lu_eduid_registrar"           value="LU"/>
+                <entry key-ref="ma_eduidm_registrar"          value="MA"/>
+                <entry key-ref="by_febas_registrar"           value="BY"/>
+                <entry key-ref="ru_fedurus_registrar"         value="RU-FEDURUS"/>
+                <entry key-ref="no_feide_registrar"           value="NO"/>
                 <entry key-ref="fr_renater_registrar"         value="FR"/>
+                <entry key-ref="zm_fidern_registrar"          value="ZM"/>
+                <entry key-ref="jp_gakunin_registrar"         value="JP"/>
                 <entry key-ref="ge_gif_registrar"             value="GE"/>
-                <entry key-ref="de_dfnaai_registrar"          value="DE"/>
                 <entry key-ref="gr_grnet_registrar"           value="GR"/>
+                <entry key-ref="fi_haka_registrar"            value="FI"/>
                 <entry key-ref="hk_hkaf_registrar"            value="HK"/>
-                <entry key-ref="hu_eduid_registrar"           value="HU"/>
+                <entry key-ref="it_idem_registrar"            value="IT"/>
+                <entry key-ref="us_incommon_registrar"        value="US"/>
                 <entry key-ref="in_infed_registrar"           value="IN"/>
                 <entry key-ref="ir_irfed_registrar"           value="IR"/>
-                <entry key-ref="ie_edugate_registrar"         value="IE"/>
                 <entry key-ref="il_iif_registrar"             value="IL"/>
-                <entry key-ref="it_idem_registrar"            value="IT"/>
-                <entry key-ref="jp_gakunin_registrar"         value="JP"/>
                 <entry key-ref="kr_kafe_registrar"            value="KR"/>
-                <entry key-ref="lt_litnet_registrar"          value="LT"/>
+                <entry key-ref="kg_krena_registrar"           value="KG"/>
                 <entry key-ref="lv_laife_registrar"           value="LV"/>
-                <entry key-ref="lu_eduid_registrar"           value="LU"/>
-                <entry key-ref="mk_aaiedumk_registrar"        value="MK"/>
-                <entry key-ref="my_sifulan_registrar"         value="MY"/>
                 <entry key-ref="md_leaf_registrar"            value="MD"/>
-                <entry key-ref="ma_eduidm_registrar"          value="MA"/>
-                <entry key-ref="mz_cafmoz_registrar"          value="MZ"/>
-                <entry key-ref="no_feide_registrar"           value="NO"/>
-                <entry key-ref="nz_tuakiri_registrar"         value="NZ"/>
+                <entry key-ref="lt_litnet_registrar"          value="LT"/>
+                <entry key-ref="lk_liaf_registrar"            value="LK"/>
+                <entry key-ref="ar_mate_registrar"            value="AR"/>
+                <entry key-ref="ec_minga_registrar"           value="EC"/>
                 <entry key-ref="om_omankid_registrar"         value="OM-KID"/>
                 <entry key-ref="om_omren_registrar"           value="OM-REN"/>
-                <entry key-ref="pk_pkifed_registrar"          value="PK"/>
+                <entry key-ref="ua_peano_registrar"           value="UA"/>
                 <entry key-ref="pl_pionier_registrar"         value="PL"/>
+                <entry key-ref="pk_pkifed_registrar"          value="PK"/>
+                <entry key-ref="al_rash_registrar"            value="AL"/>
                 <entry key-ref="pt_rctsaai_registrar"         value="PT"/>
+                <entry key-ref="mt_ricerca_registrar"         value="MT"/>
+                <entry key-ref="ug_rif_registrar"             value="UG"/>
                 <entry key-ref="ro_edunetid_registrar"        value="RO"/>
-                <entry key-ref="ru_fedurus_registrar"         value="RU-FEDURUS"/>
                 <entry key-ref="ru_runnet_registrar"          value="RU-RUNNET"/>
                 <entry key-ref="sa_maeen_registrar"           value="SA"/>
-                <entry key-ref="sg_sgaf_registrar"            value="SG"/>
-                <entry key-ref="si_arnes_registrar"           value="SI"/>
                 <entry key-ref="za_safire_registrar"          value="ZA"/>
+                <entry key-ref="sg_sgaf_registrar"            value="SG"/>
+                <entry key-ref="my_sifulan_registrar"         value="MY"/>
                 <entry key-ref="es_sir_registrar"             value="ES"/>
-                <entry key-ref="lk_liaf_registrar"            value="LK"/>
+                <entry key-ref="nl_surfconext_registrar"      value="NL"/>
                 <entry key-ref="se_swamid_registrar"          value="SE"/>
                 <entry key-ref="ch_switchaai_registrar"       value="CH"/>
-                <entry key-ref="nl_surfconext_registrar"      value="NL"/>
-                <entry key-ref="tr_yetkim_registrar"          value="TR"/>
-                <entry key-ref="us_incommon_registrar"        value="US"/>
-                <entry key-ref="ug_rif_registrar"             value="UG"/>
-                <entry key-ref="ua_peano_registrar"           value="UA"/>
+                <entry key-ref="ee_taat_registrar"            value="EE"/>
+                <entry key-ref="nz_tuakiri_registrar"         value="NZ"/>
                 <entry key-ref="uk_ukf_registrar"             value="UK"/>
-                <entry key-ref="zm_fidern_registrar"          value="ZM"/>
+                <entry key-ref="dk_wayf_registrar"            value="DK"/>
+                <entry key-ref="tr_yetkim_registrar"          value="TR"/>
 
                 <!-- eduGAIN voting-only members -->
-                <entry key-ref="al_rash_registrar"            value="AL"/>
                 <entry key-ref="bg_bif_registrar"             value="BG"/>
                 <entry key-ref="it_gridp_registrar"           value="IT-GRIDP"/>
 
                 <!-- eduGAIN candidates -->
                 <entry key-ref="cn_cstcloud_registrar"        value="CN-CSTCLOUD"/>
-                <entry key-ref="lb_life_registrar"            value="LB"/>
-                <entry key-ref="mw_maren_registrar"           value="MW"/>
-                <entry key-ref="mx_fenix_registrar"           value="MX"/>
                 <entry key-ref="me_eduid_registrar"           value="ME"/>
+                <entry key-ref="mx_fenix_registrar"           value="MX"/>
                 <entry key-ref="rs_amres_registrar"           value="RS"/>
+                <entry key-ref="lb_life_registrar"            value="LB"/>
+                <entry key-ref="mw_maren_registrar"           value="MW"/>
                 <entry key-ref="sk_safeid_registrar"          value="SK"/>
+                <entry key-ref="tj_tarena_registrar"          value="TJ"/>
             </map>
         </property>
     </bean>