diff --git a/lib/takeover/udf.py b/lib/takeover/udf.py
index 6ab9d6242..b0fe7be9a 100644
--- a/lib/takeover/udf.py
+++ b/lib/takeover/udf.py
@@ -50,7 +50,7 @@ class UDF:
     def __checkExistUdf(self, udf):
         logger.info("checking if UDF '%s' already exist" % udf)
 
-        query  = agent.forgeCaseStatement(queries[kb.dbms].checkUdf % (udf, udf))
+        query  = agent.forgeCaseStatement(queries[kb.dbms].check_udf.query % (udf, udf))
         exists = inject.getValue(query, resumeValue=False, unpack=False, charsetType=2)
 
         if exists == "1":
diff --git a/plugins/dbms/mssqlserver/enumeration.py b/plugins/dbms/mssqlserver/enumeration.py
index 06c0fae5a..1c30663d2 100644
--- a/plugins/dbms/mssqlserver/enumeration.py
+++ b/plugins/dbms/mssqlserver/enumeration.py
@@ -105,7 +105,7 @@ class Enumeration(GenericEnumeration):
         return kb.data.cachedTables
 
     def searchTable(self):
-        rootQuery = queries[kb.dbms].searchTable
+        rootQuery = queries[kb.dbms].search_table
         foundTbls = {}
         tblList = conf.tbl.split(",")
         tblCond = rootQuery.inband.condition
@@ -189,7 +189,7 @@ class Enumeration(GenericEnumeration):
         return foundTbls
 
     def searchColumn(self):
-        rootQuery = queries[kb.dbms].searchColumn
+        rootQuery = queries[kb.dbms].search_column
         foundCols = {}
         dbs = {}
         colList = conf.col.split(",")
diff --git a/plugins/dbms/oracle/enumeration.py b/plugins/dbms/oracle/enumeration.py
index c3cc35bec..8af5d42e3 100644
--- a/plugins/dbms/oracle/enumeration.py
+++ b/plugins/dbms/oracle/enumeration.py
@@ -174,7 +174,7 @@ class Enumeration(GenericEnumeration):
         return []
 
     def searchColumn(self):
-        rootQuery = queries[kb.dbms].searchColumn
+        rootQuery = queries[kb.dbms].search_column
         foundCols = {}
         dbs = { "USERS": {} }
         colList = conf.col.split(",")
diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index f52ecbf4a..ee30650d8 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -119,7 +119,7 @@ class Enumeration:
         infoMsg = "testing if current user is DBA"
         logger.info(infoMsg)
 
-        query = agent.forgeCaseStatement(queries[kb.dbms].isDba.query)
+        query = agent.forgeCaseStatement(queries[kb.dbms].is_dba.query)
 
         kb.data.isDba = inject.getValue(query, unpack=False, charsetType=1)
 
@@ -1045,7 +1045,7 @@ class Enumeration:
 
             conf.db = self.getCurrentDb()
 
-        rootQuery = queries[kb.dbms].dumpTable
+        rootQuery = queries[kb.dbms].dump_table
 
         if conf.col:
             colList = conf.col.split(",")
@@ -1307,7 +1307,7 @@ class Enumeration:
 
     def searchDb(self):
         foundDbs = []
-        rootQuery = queries[kb.dbms].searchDb
+        rootQuery = queries[kb.dbms].search_db
         dbList = conf.db.split(",")
 
         if kb.dbms == "MySQL" and not kb.data.has_information_schema:
@@ -1394,7 +1394,7 @@ class Enumeration:
             errMsg += "back-end DBMS is MySQL < 5.0"
             raise sqlmapUnsupportedFeatureException, errMsg
 
-        rootQuery = queries[kb.dbms].searchTable
+        rootQuery = queries[kb.dbms].search_table
         foundTbls = {}
         tblList = conf.tbl.split(",")
         tblCond = rootQuery.inband.condition
@@ -1515,7 +1515,7 @@ class Enumeration:
             errMsg += "back-end DBMS is MySQL < 5.0"
             raise sqlmapUnsupportedFeatureException, errMsg
 
-        rootQuery = queries[kb.dbms].searchColumn
+        rootQuery = queries[kb.dbms].search_column
         foundCols = {}
         dbs = {}
         colList = conf.col.split(",")