diff --git a/lib/parse/html.py b/lib/parse/html.py
index 3014f1d13..d929da925 100644
--- a/lib/parse/html.py
+++ b/lib/parse/html.py
@@ -15,7 +15,7 @@ from lib.core.data import kb
 from lib.core.data import paths
 from lib.core.threads import getCurrentThreadData
 
-class htmlHandler(ContentHandler):
+class HTMLHandler(ContentHandler):
     """
     This class defines methods to parse the input HTML page to
     fingerprint the back-end database management system
@@ -50,7 +50,7 @@ def htmlParser(page):
 
     xmlfile = paths.ERRORS_XML
     checkFile(xmlfile)
-    handler = htmlHandler(page)
+    handler = HTMLHandler(page)
 
     parseXmlFile(xmlfile, handler)
 
diff --git a/lib/takeover/abstraction.py b/lib/takeover/abstraction.py
index f29a93e3a..0af3d98ce 100644
--- a/lib/takeover/abstraction.py
+++ b/lib/takeover/abstraction.py
@@ -20,13 +20,13 @@ from lib.core.shell import autoCompletion
 from lib.request import inject
 from lib.takeover.udf import UDF
 from lib.takeover.web import Web
-from lib.takeover.xp_cmdshell import xp_cmdshell
+from lib.takeover.xp_cmdshell import Xp_cmdshell
 
 
-class Abstraction(Web, UDF, xp_cmdshell):
+class Abstraction(Web, UDF, Xp_cmdshell):
     """
     This class defines an abstraction layer for OS takeover functionalities
-    to UDF / xp_cmdshell objects
+    to UDF / Xp_cmdshell objects
     """
 
     def __init__(self):
@@ -35,7 +35,7 @@ class Abstraction(Web, UDF, xp_cmdshell):
 
         UDF.__init__(self)
         Web.__init__(self)
-        xp_cmdshell.__init__(self)
+        Xp_cmdshell.__init__(self)
 
     def execCmd(self, cmd, silent=False):
         if self.webBackdoorUrl and not isTechniqueAvailable(PAYLOAD.TECHNIQUE.STACKED):
diff --git a/lib/takeover/xp_cmdshell.py b/lib/takeover/xp_cmdshell.py
index ed75645ab..a51864778 100644
--- a/lib/takeover/xp_cmdshell.py
+++ b/lib/takeover/xp_cmdshell.py
@@ -32,7 +32,7 @@ from lib.core.exception import sqlmapUnsupportedFeatureException
 from lib.core.threads import getCurrentThreadData
 from lib.request import inject
 
-class xp_cmdshell:
+class Xp_cmdshell:
     """
     This class defines methods to deal with Microsoft SQL Server
     xp_cmdshell extended procedure for plugins.