diff --git a/lib/MT/ArchiveType/Author.pm b/lib/MT/ArchiveType/Author.pm
index bc5afcb78..d41641428 100644
--- a/lib/MT/ArchiveType/Author.pm
+++ b/lib/MT/ArchiveType/Author.pm
@@ -21,12 +21,12 @@ sub archive_label {
 
 sub default_archive_templates {
     return [ {
-                label    => 'author/author-display-name/index.html',
+                label    => 'author/author-basename/index.html',
                 template => 'author/%-a/%f',
                 default  => 1
              },
              {
-                label    => 'author/author_display_name/index.html',
+                label    => 'author/author_basename/index.html',
                 template => 'author/%a/%f'
              },
     ];
diff --git a/lib/MT/ArchiveType/AuthorDaily.pm b/lib/MT/ArchiveType/AuthorDaily.pm
index bed87e683..433faa5fd 100644
--- a/lib/MT/ArchiveType/AuthorDaily.pm
+++ b/lib/MT/ArchiveType/AuthorDaily.pm
@@ -18,14 +18,15 @@ sub archive_label {
     return MT->translate('AUTHOR-DAILY_ADV');
 }
 
+# Corrected the problem where author archive mappings incorrectly implied that Display Names would be used in generating URLs when there is no guarantee that Display Names are unique.  Basenames must be used instead.  The code actually does the right thing in that it uses Author Basenames already, but the information displayed to the blog administrators in the CMS was never corrected until now.  BugzID: 86237.
 sub default_archive_templates {
     return [ {
-               label    => 'author/author-display-name/yyyy/mm/dd/index.html',
+               label    => 'author/author-basename/yyyy/mm/dd/index.html',
                template => 'author/%-a/%y/%m/%d/%f',
                default  => 1
              },
              {
-               label    => 'author/author_display_name/yyyy/mm/dd/index.html',
+               label    => 'author/author_basename/yyyy/mm/dd/index.html',
                template => 'author/%a/%y/%m/%d/%f'
              },
     ];
diff --git a/lib/MT/ArchiveType/AuthorMonthly.pm b/lib/MT/ArchiveType/AuthorMonthly.pm
index 0a01b8d7d..d42f6178e 100644
--- a/lib/MT/ArchiveType/AuthorMonthly.pm
+++ b/lib/MT/ArchiveType/AuthorMonthly.pm
@@ -20,12 +20,12 @@ sub archive_label {
 
 sub default_archive_templates {
     return [ {
-                label    => 'author/author-display-name/yyyy/mm/index.html',
+                label    => 'author/author-basename/yyyy/mm/index.html',
                 template => 'author/%-a/%y/%m/%f',
                 default  => 1
              },
              {
-                label    => 'author/author_display_name/yyyy/mm/index.html',
+                label    => 'author/author_basename/yyyy/mm/index.html',
                 template => 'author/%a/%y/%m/%f'
              },
     ];
diff --git a/lib/MT/ArchiveType/AuthorWeekly.pm b/lib/MT/ArchiveType/AuthorWeekly.pm
index 61dc5578a..cea54951c 100644
--- a/lib/MT/ArchiveType/AuthorWeekly.pm
+++ b/lib/MT/ArchiveType/AuthorWeekly.pm
@@ -20,12 +20,12 @@ sub archive_label {
 
 sub default_archive_templates {
     return [ {
-           label => 'author/author-display-name/yyyy/mm/day-week/index.html',
+           label => 'author/author-basename/yyyy/mm/day-week/index.html',
            template => 'author/%-a/%y/%m/%d-week/%f',
            default  => 1
          },
          {
-           label => 'author/author_display_name/yyyy/mm/day-week/index.html',
+           label => 'author/author_basename/yyyy/mm/day-week/index.html',
            template => 'author/%a/%y/%m/%d-week/%f'
          },
     ];
diff --git a/lib/MT/ArchiveType/AuthorYearly.pm b/lib/MT/ArchiveType/AuthorYearly.pm
index 7d1c541fe..2245df611 100644
--- a/lib/MT/ArchiveType/AuthorYearly.pm
+++ b/lib/MT/ArchiveType/AuthorYearly.pm
@@ -20,12 +20,12 @@ sub archive_label {
 
 sub default_archive_templates {
     return [ {
-                label    => 'author/author-display-name/yyyy/index.html',
+                label    => 'author/author-basename/yyyy/index.html',
                 template => 'author/%-a/%y/%f',
                 default  => 1
              },
              {
-                label    => 'author/author_display_name/yyyy/index.html',
+                label    => 'author/author_basename/yyyy/index.html',
                 template => 'author/%a/%y/%f'
              },
     ];
diff --git a/lib/MT/L10N/de.pm b/lib/MT/L10N/de.pm
index 76fb23f38..7c321a2f3 100644
--- a/lib/MT/L10N/de.pm
+++ b/lib/MT/L10N/de.pm
@@ -1517,24 +1517,12 @@ use vars qw( @ISA %Lexicon );
 
 ## lib/MT/ArchiveType/AuthorMonthly.pm
     'AUTHOR-MONTHLY_ADV' => 'monatliche Autorenarchive',
-    'author/author-display-name/yyyy/mm/index.html' =>
-      'autor/anzeigename-des-autors/jjjj/mm/index.html',
-    'author/author_display_name/yyyy/mm/index.html' =>
-      'autor/anzeigename_des_autors/jjjj/mm/index.html',
 
 ## lib/MT/ArchiveType/AuthorWeekly.pm
     'AUTHOR-WEEKLY_ADV' => 'wöchentliche Autorenarchive',
-    'author/author-display-name/yyyy/mm/day-week/index.html' =>
-      'autor/anzeigename-des-autors/jjjj/mm/tag-woche/index.html',
-    'author/author_display_name/yyyy/mm/day-week/index.html' =>
-      'autor/anzeigename_des_autors/jjjj/mm/tag-woche/index.html',
 
 ## lib/MT/ArchiveType/AuthorDaily.pm
     'AUTHOR-DAILY_ADV' => 'tägliche Autorenarchive',
-    'author/author-display-name/yyyy/mm/dd/index.html' =>
-      'autor/anzeigename-des-autors/jjjj/mm/tt/index.html',
-    'author/author_display_name/yyyy/mm/dd/index.html' =>
-      'autor/anzeigename_des_autors/jjjj/mm/tt/index.html',
 
 ## lib/MT/ArchiveType/Individual.pm
     'INDIVIDUAL_ADV'                    => 'Einzelarchive',
@@ -1566,10 +1554,6 @@ use vars qw( @ISA %Lexicon );
 
 ## lib/MT/ArchiveType/AuthorYearly.pm
     'AUTHOR-YEARLY_ADV' => 'jährliche Autorenarchive',
-    'author/author-display-name/yyyy/index.html' =>
-      'autor/anzeigename-des-autors/jjjj/index.html',
-    'author/author_display_name/yyyy/index.html' =>
-      'autor/anzeigename_des_autors/jjjj/index.html',
 
 ## lib/MT/ArchiveType/Monthly.pm
     'MONTHLY_ADV'        => 'Monatsarchive',
@@ -1599,10 +1583,6 @@ use vars qw( @ISA %Lexicon );
 
 ## lib/MT/ArchiveType/Author.pm
     'AUTHOR_ADV' => 'Autorenarchive',
-    'author/author-display-name/index.html' =>
-      'autor/anzeigename-des-autors/index.html',
-    'author/author_display_name/index.html' =>
-      'autor/anzeigename_des_autors/index.html',
 
 ## lib/MT/ArchiveType/CategoryYearly.pm
     'CATEGORY-YEARLY_ADV' => 'jährliche Kategoriearchive',
diff --git a/lib/MT/L10N/es.pm b/lib/MT/L10N/es.pm
index d764eca1a..c629e4309 100644
--- a/lib/MT/L10N/es.pm
+++ b/lib/MT/L10N/es.pm
@@ -1640,10 +1640,6 @@ use vars qw( @ISA %Lexicon );
 
 ## lib/MT/ArchiveType/Author.pm
     'AUTHOR_ADV' => 'por autor',
-    'author/author-display-name/index.html' =>
-      'autor/nombre-público-autor/index.html',
-    'author/author_display_name/index.html' =>
-      'autor/nombre-público-autor/index.html',
 
 ## lib/MT/ArchiveType/CategoryMonthly.pm
     'CATEGORY-MONTHLY_ADV' => 'por mes y categoría',
@@ -1672,17 +1668,9 @@ use vars qw( @ISA %Lexicon );
 
 ## lib/MT/ArchiveType/AuthorMonthly.pm
     'AUTHOR-MONTHLY_ADV' => 'por mes y autor',
-    'author/author-display-name/yyyy/mm/index.html' =>
-      'autor/nombre-público-autor/aaaa/mm/index.html',
-    'author/author_display_name/yyyy/mm/index.html' =>
-      'autor/nombre_público_autor/aaaa/mm/index.html',
 
 ## lib/MT/ArchiveType/AuthorDaily.pm
     'AUTHOR-DAILY_ADV' => 'por día y autor',
-    'author/author-display-name/yyyy/mm/dd/index.html' =>
-      'autor/nombre-público-autor/aaaa/mm/dd/index.html',
-    'author/author_display_name/yyyy/mm/dd/index.html' =>
-      'autor/nombre-público-autor/aaaa/mm/dd/index.html',
 
 ## lib/MT/ArchiveType/Individual.pm
     'INDIVIDUAL_ADV'              => 'por entrada',
@@ -1729,17 +1717,9 @@ use vars qw( @ISA %Lexicon );
 
 ## lib/MT/ArchiveType/AuthorYearly.pm
     'AUTHOR-YEARLY_ADV' => 'por año y autor',
-    'author/author-display-name/yyyy/index.html' =>
-      'autor/nombre-público-autor/aaaa/index.html',
-    'author/author_display_name/yyyy/index.html' =>
-      'author/nombre_público_autor/aaaa/index.html',
 
 ## lib/MT/ArchiveType/AuthorWeekly.pm
     'AUTHOR-WEEKLY_ADV' => 'por semana y autor',
-    'author/author-display-name/yyyy/mm/day-week/index.html' =>
-      'autor/nombre-público-autor/aaaa/mm/día-semana/index.html',
-    'author/author_display_name/yyyy/mm/day-week/index.html' =>
-      'autor/nombre-público-autor/aaaa/mm/día-semana/index.html',
 
 ## lib/MT/Util.pm
     'moments from now'               => 'dentro de unos momentos',
diff --git a/lib/MT/L10N/fr.pm b/lib/MT/L10N/fr.pm
index f71d8301c..769042bb1 100644
--- a/lib/MT/L10N/fr.pm
+++ b/lib/MT/L10N/fr.pm
@@ -1570,24 +1570,12 @@ use vars qw( @ISA %Lexicon );
 
 ## lib/MT/ArchiveType/AuthorMonthly.pm
     'AUTHOR-MONTHLY_ADV' => 'par auteurs et semaines',
-    'author/author-display-name/yyyy/mm/index.html' =>
-      'auteur/auteur-nom-affichage/aaaa/mm/index.html',
-    'author/author_display_name/yyyy/mm/index.html' =>
-      'auteur/auteur_nom_affichage/aaaa/mm/index.html',
 
 ## lib/MT/ArchiveType/AuthorWeekly.pm
     'AUTHOR-WEEKLY_ADV' => 'par auteurs et années',
-    'author/author-display-name/yyyy/mm/day-week/index.html' =>
-      'auteur/auteur-nom-affichage/aaaa/mm/jour-semaine/index.html',
-    'author/author_display_name/yyyy/mm/day-week/index.html' =>
-      'auteur/auteur_nom_affichage/aaaa/mm/jour-semaine/index.html',
 
 ## lib/MT/ArchiveType/AuthorDaily.pm
     'AUTHOR-DAILY_ADV' => 'par auteurs et jours',
-    'author/author-display-name/yyyy/mm/dd/index.html' =>
-      'auteur/afficher-nom-auteur/aaaa/mm/jj/index.html',
-    'author/author_display_name/yyyy/mm/dd/index.html' =>
-      'auteur/afficher_nom_auteur/aaaa/mm/jj/index.html',
 
 ## lib/MT/ArchiveType/Individual.pm
     'INDIVIDUAL_ADV'              => 'par notes',
@@ -1621,10 +1609,6 @@ use vars qw( @ISA %Lexicon );
 
 ## lib/MT/ArchiveType/AuthorYearly.pm
     'AUTHOR-YEARLY_ADV' => 'par auteurs et années',
-    'author/author-display-name/yyyy/index.html' =>
-      'auteur/auteur-nom-affichage/aaaa/index.html',
-    'author/author_display_name/yyyy/index.html' =>
-      'auteur/auteur_nom_affichage/aaaa/index.html',
 
 ## lib/MT/ArchiveType/Monthly.pm
     'MONTHLY_ADV'        => 'mensuelles',
@@ -1654,10 +1638,6 @@ use vars qw( @ISA %Lexicon );
 
 ## lib/MT/ArchiveType/Author.pm
     'AUTHOR_ADV' => 'par auteurs',
-    'author/author-display-name/index.html' =>
-      'auteur/auteur-nom-affichage/index.html',
-    'author/author_display_name/index.html' =>
-      'auteur/auteur_nom_affichage/index.html',
 
 ## lib/MT/ArchiveType/CategoryYearly.pm
     'CATEGORY-YEARLY_ADV' => 'par catégories et années',
diff --git a/lib/MT/L10N/ja.pm b/lib/MT/L10N/ja.pm
index 14623260c..9f493b400 100644
--- a/lib/MT/L10N/ja.pm
+++ b/lib/MT/L10N/ja.pm
@@ -1106,38 +1106,18 @@ LDAPディレクトリ上にユーザーがまだ残っている場合、いつ
 
 ## lib/MT/ArchiveType/Author.pm
     'AUTHOR_ADV' => 'ユーザー別',
-    'author/author-display-name/index.html' =>
-      'author/author-display-name/index.html',
-    'author/author_display_name/index.html' =>
-      'author/author_display_name/index.html',
 
 ## lib/MT/ArchiveType/AuthorDaily.pm
     'AUTHOR-DAILY_ADV' => 'ユーザー-日別',
-    'author/author-display-name/yyyy/mm/dd/index.html' =>
-      'author/author-display-name/yyyy/mm/dd/index.html',
-    'author/author_display_name/yyyy/mm/dd/index.html' =>
-      'author/author_display_name/yyyy/mm/dd/index.html',
 
 ## lib/MT/ArchiveType/AuthorMonthly.pm
     'AUTHOR-MONTHLY_ADV' => 'ユーザー-月別',
-    'author/author-display-name/yyyy/mm/index.html' =>
-      'author/author-display-name/yyyy/mm/index.html',
-    'author/author_display_name/yyyy/mm/index.html' =>
-      'author/author_display_name/yyyy/mm/index.html',
 
 ## lib/MT/ArchiveType/AuthorWeekly.pm
     'AUTHOR-WEEKLY_ADV' => 'ユーザー-週別',
-    'author/author-display-name/yyyy/mm/day-week/index.html' =>
-      'author/author-display-name/yyyy/mm/day-week/index.html',
-    'author/author_display_name/yyyy/mm/day-week/index.html' =>
-      'author/author_display_name/yyyy/mm/day-week/index.html',
 
 ## lib/MT/ArchiveType/AuthorYearly.pm
     'AUTHOR-YEARLY_ADV' => 'ユーザー-年別',
-    'author/author-display-name/yyyy/index.html' =>
-      'author/author-display-name/yyyy/index.html',
-    'author/author_display_name/yyyy/index.html' =>
-      'author/author_display_name/yyyy/index.html',
 
 ## lib/MT/ArchiveType/Category.pm
     'CATEGORY_ADV'                     => 'カテゴリ',
diff --git a/lib/MT/L10N/nl.pm b/lib/MT/L10N/nl.pm
index 50c9d35ef..0072bb565 100644
--- a/lib/MT/L10N/nl.pm
+++ b/lib/MT/L10N/nl.pm
@@ -1527,24 +1527,12 @@ use vars qw( @ISA %Lexicon );
 
 ## lib/MT/ArchiveType/AuthorMonthly.pm
     'AUTHOR-MONTHLY_ADV' => 'per auteur per maand',
-    'author/author-display-name/yyyy/mm/index.html' =>
-      'auteur/getoonde-naam-auteur/jjjj/mm/index.html',
-    'author/author_display_name/yyyy/mm/index.html' =>
-      'auteur/getoonde_naam_auteur/jjjj/mm/index.html',
 
 ## lib/MT/ArchiveType/AuthorWeekly.pm
     'AUTHOR-WEEKLY_ADV' => 'per auteur per week',
-    'author/author-display-name/yyyy/mm/day-week/index.html' =>
-      'auteur/auteur-getoonde-naam/jjjj/mm/dag-week/index.html',
-    'author/author_display_name/yyyy/mm/day-week/index.html' =>
-      'auteur/auteur_getoonde_naam/jjjj/mm/dag-week/index.html',
 
 ## lib/MT/ArchiveType/AuthorDaily.pm
     'AUTHOR-DAILY_ADV' => 'per auteur per dag',
-    'author/author-display-name/yyyy/mm/dd/index.html' =>
-      'auteur/getoonde-auteursnaam/jjjj/mm/dd/index.html',
-    'author/author_display_name/yyyy/mm/dd/index.html' =>
-      'auteur/getoonde_auteursnaam/jjjj/mm/dd/index.html',
 
 ## lib/MT/ArchiveType/Individual.pm
     'INDIVIDUAL_ADV'              => 'per bericht',
@@ -1578,10 +1566,6 @@ use vars qw( @ISA %Lexicon );
 
 ## lib/MT/ArchiveType/AuthorYearly.pm
     'AUTHOR-YEARLY_ADV' => 'per auteur per jaar',
-    'author/author-display-name/yyyy/index.html' =>
-      'auteur/auteur-getoonde-naam/jjjj/index.html',
-    'author/author_display_name/yyyy/index.html' =>
-      'auteur/auteur_getoonde_naam/jjjj/index.html',
 
 ## lib/MT/ArchiveType/Monthly.pm
     'MONTHLY_ADV'        => 'per maand',
@@ -1611,10 +1595,6 @@ use vars qw( @ISA %Lexicon );
 
 ## lib/MT/ArchiveType/Author.pm
     'AUTHOR_ADV' => 'per auteur',
-    'author/author-display-name/index.html' =>
-      'auteur/auteur-getoonde-naam/index.html',
-    'author/author_display_name/index.html' =>
-      'auteur/auteur_getoonde_naam/index.html',
 
 ## lib/MT/ArchiveType/CategoryYearly.pm
     'CATEGORY-YEARLY_ADV' => 'per categorie per jaar',
diff --git a/lib/MT/L10N/ru.pm b/lib/MT/L10N/ru.pm
index d09825fc4..6bb6002f7 100644
--- a/lib/MT/L10N/ru.pm
+++ b/lib/MT/L10N/ru.pm
@@ -1549,10 +1549,6 @@ sub numerate {
 
 ## lib/MT/ArchiveType/AuthorMonthly.pm
     'AUTHOR-MONTHLY_ADV' => 'авторов по месяцам',
-    'author/author-display-name/yyyy/mm/index.html' =>
-      'автор/отображаемое-имя/гггг/мм/index.html',
-    'author/author_display_name/yyyy/mm/index.html' =>
-      'автор/отображаемое_имя/гггг/мм/index.html',
 
 ## lib/MT/ArchiveType/Monthly.pm
     'MONTHLY_ADV'        => 'по месяцам',
@@ -1603,17 +1599,9 @@ sub numerate {
 
 ## lib/MT/ArchiveType/Author.pm
     'AUTHOR_ADV' => 'авторов',
-    'author/author-display-name/index.html' =>
-      'автор/отображаемое-имя/index.html',
-    'author/author_display_name/index.html' =>
-      'автор/отображаемое_имя/index.html',
 
 ## lib/MT/ArchiveType/AuthorYearly.pm
     'AUTHOR-YEARLY_ADV' => 'авторов по годам',
-    'author/author-display-name/yyyy/index.html' =>
-      'автор/отображаемое-имя/гггг/index.html',
-    'author/author_display_name/yyyy/index.html' =>
-      'автор/отображаемое_имя/гггг/index.html',
 
 ## lib/MT/ArchiveType/Weekly.pm
     'WEEKLY_ADV' => 'по неделям',
@@ -1622,10 +1610,6 @@ sub numerate {
 
 ## lib/MT/ArchiveType/AuthorWeekly.pm
     'AUTHOR-WEEKLY_ADV' => 'авторов по неделям',
-    'author/author-display-name/yyyy/mm/day-week/index.html' =>
-      'автор/отображаемое-имя/гггг/мм/день-недели/index.html',
-    'author/author_display_name/yyyy/mm/day-week/index.html' =>
-      'автор/отображаемое_имя/гггг/мм/день-недели/index.html',
 
 ## lib/MT/ArchiveType/CategoryMonthly.pm
     'CATEGORY-MONTHLY_ADV' => 'категорий по месяцам',
@@ -1650,10 +1634,6 @@ sub numerate {
 
 ## lib/MT/ArchiveType/AuthorDaily.pm
     'AUTHOR-DAILY_ADV' => 'авторов по дням',
-    'author/author-display-name/yyyy/mm/dd/index.html' =>
-      'автор/отображаемое-имя/гггг/мм/дд/index.html',
-    'author/author_display_name/yyyy/mm/dd/index.html' =>
-      'автор/отображаемое_имя/гггг/мм/дд/index.html',
 
 ## lib/MT/Config.pm
     'Configuration' => 'Конфигурация',