4 files changed, 18 insertions, 18 deletions

diff --git a/src/mailman/model/docs/listmanager.txt b/src/mailman/model/docs/listmanager.txt
index 7235049c7..b571d9680 100644
--- a/src/mailman/model/docs/listmanager.txt
+++ b/src/mailman/model/docs/listmanager.txt
@@ -26,7 +26,7 @@ list to the system.
 
     >>> print mlist.list_name
     _xtest
-    >>> print mlist.host_name
+    >>> print mlist.mail_host
     example.com
     >>> print mlist.fqdn_listname
     _xtest@example.com
diff --git a/src/mailman/model/docs/mailinglist.txt b/src/mailman/model/docs/mailinglist.txt
index 4d3250e76..895068e52 100644
--- a/src/mailman/model/docs/mailinglist.txt
+++ b/src/mailman/model/docs/mailinglist.txt
@@ -18,7 +18,7 @@ name (i.e. local part) and host name.
 
     >>> print mlist.list_name
     aardvark
-    >>> print mlist.host_name
+    >>> print mlist.mail_host
     example.com
 
 
diff --git a/src/mailman/model/listmanager.py b/src/mailman/model/listmanager.py
index 99c961e85..851b52618 100644
--- a/src/mailman/model/listmanager.py
+++ b/src/mailman/model/listmanager.py
@@ -50,7 +50,7 @@ class ListManager:
         mlist = config.db.store.find(
             MailingList,
             MailingList.list_name == listname,
-            MailingList.host_name == hostname).one()
+            MailingList.mail_host == hostname).one()
         if mlist:
             raise ListAlreadyExistsError(fqdn_listname)
         mlist = MailingList(fqdn_listname)
@@ -63,7 +63,7 @@ class ListManager:
         listname, at, hostname = fqdn_listname.partition('@')
         mlist = config.db.store.find(MailingList,
                                      list_name=listname,
-                                     host_name=hostname).one()
+                                     mail_host=hostname).one()
         if mlist is not None:
             # XXX Fixme
             mlist._restore()
@@ -88,7 +88,7 @@ class ListManager:
     def names(self):
         """See `IListManager`."""
         for mlist in config.db.store.find(MailingList):
-            yield '{0}@{1}'.format(mlist.list_name, mlist.host_name)
+            yield '{0}@{1}'.format(mlist.list_name, mlist.mail_host)
 
     # XXX 2010-02-24 barry Get rid of this.
     def get_mailing_lists(self):
diff --git a/src/mailman/model/mailinglist.py b/src/mailman/model/mailinglist.py
index 2d972a24a..fe5355806 100644
--- a/src/mailman/model/mailinglist.py
+++ b/src/mailman/model/mailinglist.py
@@ -71,7 +71,7 @@ class MailingList(Model):
 
     # List identity
     list_name = Unicode()
-    host_name = Unicode()
+    mail_host = Unicode()
     list_id = Unicode()
     include_list_post_header = Bool()
     include_rfc2369_headers = Bool()
@@ -192,7 +192,7 @@ class MailingList(Model):
         listname, at, hostname = fqdn_listname.partition('@')
         assert hostname, 'Bad list name: {0}'.format(fqdn_listname)
         self.list_name = listname
-        self.host_name = hostname
+        self.mail_host = hostname
         # For the pending database
         self.next_request_id = 1
         self._restore()
@@ -219,12 +219,12 @@ class MailingList(Model):
     @property
     def fqdn_listname(self):
         """See `IMailingList`."""
-        return '{0}@{1}'.format(self.list_name, self.host_name)
+        return '{0}@{1}'.format(self.list_name, self.mail_host)
 
     @property
     def domain(self):
         """See `IMailingList`."""
-        return getUtility(IDomainManager)[self.host_name]
+        return getUtility(IDomainManager)[self.mail_host]
 
     @property
     def scheme(self):
@@ -257,49 +257,49 @@ class MailingList(Model):
     @property
     def no_reply_address(self):
         """See `IMailingList`."""
-        return '{0}@{1}'.format(config.mailman.noreply_address, self.host_name)
+        return '{0}@{1}'.format(config.mailman.noreply_address, self.mail_host)
 
     @property
     def owner_address(self):
         """See `IMailingList`."""
-        return '{0}-owner@{1}'.format(self.list_name, self.host_name)
+        return '{0}-owner@{1}'.format(self.list_name, self.mail_host)
 
     @property
     def request_address(self):
         """See `IMailingList`."""
-        return '{0}-request@{1}'.format(self.list_name, self.host_name)
+        return '{0}-request@{1}'.format(self.list_name, self.mail_host)
 
     @property
     def bounces_address(self):
         """See `IMailingList`."""
-        return '{0}-bounces@{1}'.format(self.list_name, self.host_name)
+        return '{0}-bounces@{1}'.format(self.list_name, self.mail_host)
 
     @property
     def join_address(self):
         """See `IMailingList`."""
-        return '{0}-join@{1}'.format(self.list_name, self.host_name)
+        return '{0}-join@{1}'.format(self.list_name, self.mail_host)
 
     @property
     def leave_address(self):
         """See `IMailingList`."""
-        return '{0}-leave@{1}'.format(self.list_name, self.host_name)
+        return '{0}-leave@{1}'.format(self.list_name, self.mail_host)
 
     @property
     def subscribe_address(self):
         """See `IMailingList`."""
-        return '{0}-subscribe@{1}'.format(self.list_name, self.host_name)
+        return '{0}-subscribe@{1}'.format(self.list_name, self.mail_host)
 
     @property
     def unsubscribe_address(self):
         """See `IMailingList`."""
-        return '{0}-unsubscribe@{1}'.format(self.list_name, self.host_name)
+        return '{0}-unsubscribe@{1}'.format(self.list_name, self.mail_host)
 
     def confirm_address(self, cookie):
         """See `IMailingList`."""
         local_part = expand(config.mta.verp_confirm_format, dict(
             address = '{0}-confirm'.format(self.list_name),
             cookie  = cookie))
-        return '{0}@{1}'.format(local_part, self.host_name)
+        return '{0}@{1}'.format(local_part, self.mail_host)
 
     @property
     def preferred_language(self):