Uniquer registrar names. #NONIUS-15 fixed