diff --git a/lib/core/agent.py b/lib/core/agent.py
index 516abfe7d..6d61ca5c2 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -540,7 +540,7 @@ class Agent:
             limitStr = queries[kb.dbms].limit.query % (num+1, num+1)
             limitedQuery += " %s" % limitStr
 
-        elif kb.dbms == DMBS.ORACLE:
+        elif kb.dbms == DBMS.ORACLE:
             if " ORDER BY " in limitedQuery and "(SELECT " in limitedQuery:
                 orderBy = limitedQuery[limitedQuery.index(" ORDER BY "):]
                 limitedQuery = limitedQuery[:limitedQuery.index(" ORDER BY ")]
diff --git a/lib/core/common.py b/lib/core/common.py
index d2fa4ff34..8240fedc9 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -1420,7 +1420,7 @@ def getCompiledRegex(regex, *args):
 
 def getPartRun():
     """
-    Goes through call stack and finds constructs matching conf.dmbsHandler.*.
+    Goes through call stack and finds constructs matching conf.dbmsHandler.*.
     Returns it or its alias used in txt/common-outputs.txt
     """
 
diff --git a/plugins/dbms/access/fingerprint.py b/plugins/dbms/access/fingerprint.py
index 5aa2738af..3d491a70a 100644
--- a/plugins/dbms/access/fingerprint.py
+++ b/plugins/dbms/access/fingerprint.py
@@ -172,7 +172,7 @@ class Fingerprint(GenericFingerprint):
             result  = Request.queryPage(payload)
 
             if not result:
-                warnMsg = "the back-end DMBS is not Microsoft Access"
+                warnMsg = "the back-end DBMS is not Microsoft Access"
                 logger.warn(warnMsg)
                 return False
 
@@ -185,7 +185,7 @@ class Fingerprint(GenericFingerprint):
 
             return True
         else:
-            warnMsg = "the back-end DMBS is not Microsoft Access"
+            warnMsg = "the back-end DBMS is not Microsoft Access"
             logger.warn(warnMsg)
 
             return False
diff --git a/plugins/dbms/firebird/fingerprint.py b/plugins/dbms/firebird/fingerprint.py
index 41026d474..4744ac11a 100644
--- a/plugins/dbms/firebird/fingerprint.py
+++ b/plugins/dbms/firebird/fingerprint.py
@@ -127,7 +127,7 @@ class Fingerprint(GenericFingerprint):
             result  = Request.queryPage(payload)
 
             if not result:
-                warnMsg = "the back-end DMBS is not Firebird"
+                warnMsg = "the back-end DBMS is not Firebird"
                 logger.warn(warnMsg)
 
                 return False
@@ -143,7 +143,7 @@ class Fingerprint(GenericFingerprint):
 
             return True
         else:
-            warnMsg = "the back-end DMBS is not Firebird"
+            warnMsg = "the back-end DBMS is not Firebird"
             logger.warn(warnMsg)
 
             return False
diff --git a/plugins/dbms/maxdb/fingerprint.py b/plugins/dbms/maxdb/fingerprint.py
index db2fcd327..6fe419c31 100644
--- a/plugins/dbms/maxdb/fingerprint.py
+++ b/plugins/dbms/maxdb/fingerprint.py
@@ -129,7 +129,7 @@ class Fingerprint(GenericFingerprint):
             result  = Request.queryPage(payload)
 
             if not result:
-                warnMsg = "the back-end DMBS is not SAP MaxDB"
+                warnMsg = "the back-end DBMS is not SAP MaxDB"
                 logger.warn(warnMsg)
 
                 return False
@@ -145,7 +145,7 @@ class Fingerprint(GenericFingerprint):
 
             return True
         else:
-            warnMsg = "the back-end DMBS is not SAP MaxDB"
+            warnMsg = "the back-end DBMS is not SAP MaxDB"
             logger.warn(warnMsg)
 
             return False
diff --git a/plugins/dbms/mssqlserver/fingerprint.py b/plugins/dbms/mssqlserver/fingerprint.py
index 4ae17940d..df6cab3aa 100644
--- a/plugins/dbms/mssqlserver/fingerprint.py
+++ b/plugins/dbms/mssqlserver/fingerprint.py
@@ -144,7 +144,7 @@ class Fingerprint(GenericFingerprint):
 
             return True
         else:
-            warnMsg = "the back-end DMBS is not Microsoft SQL Server"
+            warnMsg = "the back-end DBMS is not Microsoft SQL Server"
             logger.warn(warnMsg)
 
             return False
diff --git a/plugins/dbms/mysql/fingerprint.py b/plugins/dbms/mysql/fingerprint.py
index 6696cdabf..d24cd4a2a 100644
--- a/plugins/dbms/mysql/fingerprint.py
+++ b/plugins/dbms/mysql/fingerprint.py
@@ -168,7 +168,7 @@ class Fingerprint(GenericFingerprint):
             result  = Request.queryPage(payload)
 
             if not result:
-                warnMsg = "the back-end DMBS is not MySQL"
+                warnMsg = "the back-end DBMS is not MySQL"
                 logger.warn(warnMsg)
 
                 return False
@@ -248,7 +248,7 @@ class Fingerprint(GenericFingerprint):
 
             return True
         else:
-            warnMsg = "the back-end DMBS is not MySQL"
+            warnMsg = "the back-end DBMS is not MySQL"
             logger.warn(warnMsg)
 
             return False
diff --git a/plugins/dbms/oracle/fingerprint.py b/plugins/dbms/oracle/fingerprint.py
index 65dd69ea3..cb533d22a 100644
--- a/plugins/dbms/oracle/fingerprint.py
+++ b/plugins/dbms/oracle/fingerprint.py
@@ -96,7 +96,7 @@ class Fingerprint(GenericFingerprint):
                 result  = Request.queryPage(payload)
 
             if not result:
-                warnMsg = "the back-end DMBS is not Oracle"
+                warnMsg = "the back-end DBMS is not Oracle"
                 logger.warn(warnMsg)
 
                 return False
@@ -122,7 +122,7 @@ class Fingerprint(GenericFingerprint):
 
             return True
         else:
-            warnMsg = "the back-end DMBS is not Oracle"
+            warnMsg = "the back-end DBMS is not Oracle"
             logger.warn(warnMsg)
 
             return False
diff --git a/plugins/dbms/postgresql/fingerprint.py b/plugins/dbms/postgresql/fingerprint.py
index bfa4720d3..f86881262 100644
--- a/plugins/dbms/postgresql/fingerprint.py
+++ b/plugins/dbms/postgresql/fingerprint.py
@@ -97,7 +97,7 @@ class Fingerprint(GenericFingerprint):
             result  = Request.queryPage(payload)
 
             if not result:
-                warnMsg = "the back-end DMBS is not PostgreSQL"
+                warnMsg = "the back-end DBMS is not PostgreSQL"
                 logger.warn(warnMsg)
 
                 return False
@@ -142,7 +142,7 @@ class Fingerprint(GenericFingerprint):
 
             return True
         else:
-            warnMsg = "the back-end DMBS is not PostgreSQL"
+            warnMsg = "the back-end DBMS is not PostgreSQL"
             logger.warn(warnMsg)
 
             return False
diff --git a/plugins/dbms/sqlite/fingerprint.py b/plugins/dbms/sqlite/fingerprint.py
index eeac695db..b306b5257 100644
--- a/plugins/dbms/sqlite/fingerprint.py
+++ b/plugins/dbms/sqlite/fingerprint.py
@@ -91,7 +91,7 @@ class Fingerprint(GenericFingerprint):
             result  = Request.queryPage(payload)
 
             if not result:
-                warnMsg = "the back-end DMBS is not SQLite"
+                warnMsg = "the back-end DBMS is not SQLite"
                 logger.warn(warnMsg)
 
                 return False
@@ -108,7 +108,7 @@ class Fingerprint(GenericFingerprint):
 
             return True
         else:
-            warnMsg = "the back-end DMBS is not SQLite"
+            warnMsg = "the back-end DBMS is not SQLite"
             logger.warn(warnMsg)
 
             return False
diff --git a/plugins/dbms/sybase/fingerprint.py b/plugins/dbms/sybase/fingerprint.py
index 75bdbed5b..8e08ea6e0 100644
--- a/plugins/dbms/sybase/fingerprint.py
+++ b/plugins/dbms/sybase/fingerprint.py
@@ -90,7 +90,7 @@ class Fingerprint(GenericFingerprint):
             result  = Request.queryPage(payload)
 
             if not result:
-                warnMsg = "the back-end DMBS is not Sybase"
+                warnMsg = "the back-end DBMS is not Sybase"
                 logger.warn(warnMsg)
 
                 return False
@@ -113,7 +113,7 @@ class Fingerprint(GenericFingerprint):
 
             return True
         else:
-            warnMsg = "the back-end DMBS is not Sybase"
+            warnMsg = "the back-end DBMS is not Sybase"
             logger.warn(warnMsg)
 
             return False