diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py
index 0d20672ce..5a4f954b9 100644
--- a/src/common/stanza_session.py
+++ b/src/common/stanza_session.py
@@ -210,7 +210,7 @@ class ArchivingStanzaSession(StanzaSession):
 
 		self.send(request)
 
-	def respond_archiving_bob(self, form):
+	def respond_archiving(self, form):
 		field = form.getField('logging')
 		options = [x[1] for x in field.getOptions()]
 		values = field.getValues()
@@ -246,7 +246,7 @@ class ArchivingStanzaSession(StanzaSession):
 
 		self.send(response)
 
-	def accept_archiving_bob(self, form):
+	def we_accept_archiving(self, form):
 		if self.negotiated['logging'] == 'mustnot':
 			self.loggable = False
 		log.debug('archiving session accepted: %s' % self.loggable)
@@ -255,7 +255,7 @@ class ArchivingStanzaSession(StanzaSession):
 		if self.control:
 			self.control.print_archiving_session_details()
 
-	def accept_archiving_alice(self, form):
+	def archiving_accepted(self, form):
 		negotiated = {}
 		ask_user = {}
 		not_acceptable = []
diff --git a/src/session.py b/src/session.py
index 3a84976c2..6a830fe13 100644
--- a/src/session.py
+++ b/src/session.py
@@ -401,7 +401,7 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
 			if form.getType() == 'form' and 'security' in form.asDict():
 				security_options = [x[1] for x in form.getField('security').getOptions()]
 				if security_options == ['none']:
-					self.respond_archiving_bob(form)
+					self.respond_archiving(form)
 				else:
 					# bob responds
 
@@ -443,7 +443,7 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
 			elif self.status == 'requested-archiving' and form.getType() == \
 			'submit':
 				try:
-					self.accept_archiving_alice(form)
+					self.archiving_accepted(form)
 				except exceptions.NegotiationError, details:
 					self.fail_bad_negotiation(details)
 
@@ -485,7 +485,7 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
 			elif self.status == 'responded-archiving' and form.getType() == \
 			'result':
 				try:
-					self.accept_archiving_bob(form)
+					self.we_accept_archiving(form)
 				except exceptions.NegotiationError, details:
 					self.fail_bad_negotiation(details)