diff --git a/lib/http/__init__.py b/lib/http/__init__.py
index 2a9a843bfe5efd95813780e5794fcad552f790f4..550bcc14f294fc928a34a3686e812b6a174e78bf 100644
--- a/lib/http/__init__.py
+++ b/lib/http/__init__.py
@@ -369,7 +369,7 @@ class HttpSslParams(object):
                                            self.ssl_cert_pem)
 
 
-class HttpSocketBase(object):
+class HttpBase(object):
   """Base class for HTTP server and client.
 
   """
diff --git a/lib/http/client.py b/lib/http/client.py
index 50c91722ed625681b035701aad04a06c5f036c47..72836f1d269a61d922fb033f93af3c9d6b7b0944 100644
--- a/lib/http/client.py
+++ b/lib/http/client.py
@@ -141,7 +141,7 @@ class _HttpServerToClientMessageReader(http.HttpMessageReader):
     return http.HttpServerToClientStartLine(version, status, reason)
 
 
-class HttpClientRequestExecutor(http.HttpSocketBase):
+class HttpClientRequestExecutor(http.HttpBase):
   # Default headers
   DEFAULT_HEADERS = {
     http.HTTP_USER_AGENT: http.HTTP_GANETI_VERSION,
@@ -164,7 +164,7 @@ class HttpClientRequestExecutor(http.HttpSocketBase):
     @param req: Request object
 
     """
-    http.HttpSocketBase.__init__(self)
+    http.HttpBase.__init__(self)
     self.request = req
 
     self.poller = select.poll()
diff --git a/lib/http/server.py b/lib/http/server.py
index f94baaefade546760b682b0ad170efe18367952e..128d2051cd90c5e2104584665e4efce8862e9322 100644
--- a/lib/http/server.py
+++ b/lib/http/server.py
@@ -379,7 +379,7 @@ class _HttpServerRequestExecutor(object):
     self.response_msg.body = self.error_message_format % values
 
 
-class HttpServer(http.HttpSocketBase):
+class HttpServer(http.HttpBase):
   """Generic HTTP server class
 
   Users of this class must subclass it and override the HandleRequest function.
@@ -404,7 +404,7 @@ class HttpServer(http.HttpSocketBase):
                             it with our certificate
 
     """
-    http.HttpSocketBase.__init__(self)
+    http.HttpBase.__init__(self)
 
     self.mainloop = mainloop
     self.local_address = local_address