2 files changed, 7 insertions, 7 deletions

diff --git a/Mailman/Archiver/Archiver.py b/Mailman/Archiver/Archiver.py
index 838ee13c6..f1029d66a 100644
--- a/Mailman/Archiver/Archiver.py
+++ b/Mailman/Archiver/Archiver.py
@@ -133,7 +133,7 @@ class Archiver:
     def ArchiveFileName(self):
         """The mbox name where messages are left for archive construction."""
         return os.path.join(self.archive_dir() + '.mbox',
-                            self.internal_name() + '.mbox')
+                            self.fqdn_listname + '.mbox')
 
     def GetBaseArchiveURL(self):
         if self.archive_private:
@@ -141,7 +141,7 @@ class Archiver:
         else:
             web_host = config.domains.get(self.host_name, self.host_name)
             url = Template(config.PUBLIC_ARCHIVE_URL).safe_substitute(
-                listname=self.internal_name(),
+                listname=self.fqdn_listname,
                 hostname=web_host,
                 fqdn_listname=self.fqdn_listname,
                 )
@@ -171,7 +171,7 @@ class Archiver:
             raise
 
     def ExternalArchive(self, ar, txt):
-        d = SafeDict({'listname': self.internal_name(),
+        d = SafeDict({'listname': self.fqdn_listname,
                       'hostname': self.host_name,
                       })
         cmd = ar % d
diff --git a/Mailman/Archiver/HyperArch.py b/Mailman/Archiver/HyperArch.py
index 2bdde575b..35474a0cb 100644
--- a/Mailman/Archiver/HyperArch.py
+++ b/Mailman/Archiver/HyperArch.py
@@ -184,7 +184,7 @@ def quick_maketext(templatefile, dict=None, lang=None, mlist=None):
     if mlist is None:
         listname = ''
     else:
-        listname = mlist._internal_name
+        listname = mlist.fqdn_listname
     if lang is None:
         if mlist is None:
             lang = mm_cfg.DEFAULT_SERVER_LANGUAGE
@@ -345,7 +345,7 @@ class Article(pipermail.Article):
         else:
             mlist = None
         if mlist:
-            d['__listname'] = self._mlist.internal_name()
+            d['__listname'] = self._mlist.fqdn_listname
         else:
             d['__listname'] = None
         # Delete a few other things we don't want in the pickle
@@ -741,7 +741,7 @@ class HyperArchive(pipermail.T):
 
     def html_TOC(self):
         mlist = self.maillist
-        listname = mlist.internal_name()
+        listname = mlist.fqdn_listname
         mbox = os.path.join(mlist.archive_dir()+'.mbox', listname+'.mbox')
         d = {"listname": mlist.real_name,
              "listinfo": mlist.GetScriptURL('listinfo', absolute=1),
@@ -823,7 +823,7 @@ class HyperArchive(pipermail.T):
             return 1
         self._lock_file = LockFile.LockFile(
             os.path.join(mm_cfg.LOCK_DIR,
-                         self.maillist.internal_name() + '-arch.lock'))
+                         self.maillist.fqdn_listname + '-arch.lock'))
         try:
             self._lock_file.lock(timeout=0.5)
         except LockFile.TimeOutError: