diff --git a/CHANGELOG b/CHANGELOG
index bc83d8d0d5..2632138dba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Rename HttpDaemon into XMLRPCDaemon
 * Improve TranslateFactory to fetch all translations for a report in one query
 * Handle displayname on webdav.collection
 * Handle current-user-privilege-set on webdav.collection
diff --git a/trytond/protocols/xmlrpc.py b/trytond/protocols/xmlrpc.py
index 8a295a827b..6308eb8f58 100644
--- a/trytond/protocols/xmlrpc.py
+++ b/trytond/protocols/xmlrpc.py
@@ -171,7 +171,7 @@ class SecureThreadedXMLRPCServer6(SecureThreadedXMLRPCServer):
     address_family = socket.AF_INET6
 
 
-class HttpDaemon(threading.Thread):
+class XMLRPCDaemon(threading.Thread):
 
     def __init__(self, interface, port, secure=False):
         threading.Thread.__init__(self)
diff --git a/trytond/server.py b/trytond/server.py
index fb98bb3f19..b10d43ca08 100644
--- a/trytond/server.py
+++ b/trytond/server.py
@@ -151,8 +151,8 @@ class TrytonServer(object):
 
         # Launch Server
         if CONFIG['xmlrpc']:
-            from trytond.protocols.xmlrpc import HttpDaemon
-            httpd = HttpDaemon(CONFIG['interface'], CONFIG['xmlport'],
+            from trytond.protocols.xmlrpc import XMLRPCDaemon
+            xmlrpcd = XMLRPCDaemon(CONFIG['interface'], CONFIG['xmlport'],
                     CONFIG['secure_xmlrpc'])
             self.logger.info("starting XML-RPC%s protocol, port %d" % \
                     (CONFIG['secure_xmlrpc'] and ' Secure' or '',
@@ -182,7 +182,7 @@ class TrytonServer(object):
             if CONFIG['netrpc']:
                 netrpcd.stop()
             if CONFIG['xmlrpc']:
-                httpd.stop()
+                xmlrpcd.stop()
             if CONFIG['webdav']:
                 webdavd.stop()
             if CONFIG['pidfile']:
@@ -212,7 +212,7 @@ class TrytonServer(object):
         if CONFIG['netrpc']:
             netrpcd.start()
         if CONFIG['xmlrpc']:
-            httpd.start()
+            xmlrpcd.start()
         if CONFIG['webdav']:
             webdavd.start()