2 files changed, 15 insertions, 2 deletions

diff --git a/src/mailman/interfaces/subscriptions.py b/src/mailman/interfaces/subscriptions.py
index 9a20b9c0d..fb13d3d42 100644
--- a/src/mailman/interfaces/subscriptions.py
+++ b/src/mailman/interfaces/subscriptions.py
@@ -78,7 +78,7 @@ class TokenOwner(Enum):
 
 
 @public
-class ConfirmationNeededEvent:
+class RegistrationConfirmationNeededEvent:
     """Triggered when an address needs confirmation.
 
     Addresses must be verified before they can receive messages or post
@@ -92,6 +92,19 @@ class ConfirmationNeededEvent:
 
 
 @public
+class UnsubscriptionConfirmationNeededEvent:
+    """Triggered when an unsubscription request needs confirmation.
+
+    The confirmation message is sent to the user when this event is
+    triggered.
+    """
+    def __init__(self, mlist, token, email):
+        self.mlist = mlist
+        self.token = token
+        self.email = email
+
+
+@public
 class ISubscriptionService(Interface):
     """General subscription services."""
 
diff --git a/src/mailman/interfaces/template.py b/src/mailman/interfaces/template.py
index 442f1eeda..e576eb882 100644
--- a/src/mailman/interfaces/template.py
+++ b/src/mailman/interfaces/template.py
@@ -171,7 +171,7 @@ ALL_TEMPLATES = {
         'list:admin:notice:unrecognized',
         'list:admin:notice:unsubscribe',
         'list:member:digest:masthead',
-        'list:user:action:confirm',
+        'list:user:action:subscribe',
         'list:user:action:unsubscribe',
         'list:user:notice:hold',
         'list:user:notice:no-more-today',