diff --git a/plugins/dbms/access/fingerprint.py b/plugins/dbms/access/fingerprint.py
index b686cdefd..cb460188b 100644
--- a/plugins/dbms/access/fingerprint.py
+++ b/plugins/dbms/access/fingerprint.py
@@ -132,7 +132,7 @@ class Fingerprint(GenericFingerprint):
             value += DBMS.ACCESS
             return value
 
-        actVer = formatDBMSfp() + " (%s)" % (self.__sandBoxCheck())
+        actVer = format.getDbms() + " (%s)" % (self.__sandBoxCheck())
         blank  = " " * 15
         value += "active fingerprint: %s" % actVer
 
@@ -142,7 +142,7 @@ class Fingerprint(GenericFingerprint):
             if re.search("-log$", kb.data.banner):
                 banVer += ", logging enabled"
 
-            banVer = formatDBMSfp([banVer])
+            banVer = format.getDbms([banVer])
             value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
 
         htmlErrorFp = format.getErrorParsedDBMSes()
diff --git a/plugins/dbms/firebird/fingerprint.py b/plugins/dbms/firebird/fingerprint.py
index 695fc6450..5b4ac6dc0 100644
--- a/plugins/dbms/firebird/fingerprint.py
+++ b/plugins/dbms/firebird/fingerprint.py
@@ -50,7 +50,7 @@ class Fingerprint(GenericFingerprint):
             value += DBMS.FIREBIRD
             return value
 
-        actVer  = formatDBMSfp() + " (%s)" % (self.__dialectCheck())
+        actVer  = format.getDbms() + " (%s)" % (self.__dialectCheck())
         blank       = " " * 15
         value      += "active fingerprint: %s" % actVer
 
@@ -60,7 +60,7 @@ class Fingerprint(GenericFingerprint):
             if re.search("-log$", kb.data.banner):
                 banVer += ", logging enabled"
 
-            banVer = formatDBMSfp([banVer])
+            banVer = format.getDbms([banVer])
             value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
 
         htmlErrorFp = format.getErrorParsedDBMSes()
diff --git a/plugins/dbms/maxdb/fingerprint.py b/plugins/dbms/maxdb/fingerprint.py
index d0ac75f19..cfbd4348a 100644
--- a/plugins/dbms/maxdb/fingerprint.py
+++ b/plugins/dbms/maxdb/fingerprint.py
@@ -84,7 +84,7 @@ class Fingerprint(GenericFingerprint):
             value += DBMS.MAXDB
             return value
 
-        actVer = formatDBMSfp() + " (%s)" % self.__versionCheck()
+        actVer = format.getDbms() + " (%s)" % self.__versionCheck()
         blank  = " " * 15
         value += "active fingerprint: %s" % actVer
 
diff --git a/plugins/dbms/mssqlserver/fingerprint.py b/plugins/dbms/mssqlserver/fingerprint.py
index 9c4e37406..6894ca14d 100644
--- a/plugins/dbms/mssqlserver/fingerprint.py
+++ b/plugins/dbms/mssqlserver/fingerprint.py
@@ -42,7 +42,7 @@ class Fingerprint(GenericFingerprint):
                 value += "%s\n" % dbmsOsFp
 
         value += "back-end DBMS: "
-        actVer = formatDBMSfp()
+        actVer = format.getDbms()
 
         if not conf.extensiveFp:
             value += actVer
diff --git a/plugins/dbms/oracle/fingerprint.py b/plugins/dbms/oracle/fingerprint.py
index 95b58c193..724453972 100644
--- a/plugins/dbms/oracle/fingerprint.py
+++ b/plugins/dbms/oracle/fingerprint.py
@@ -46,13 +46,13 @@ class Fingerprint(GenericFingerprint):
             value += DBMS.ORACLE
             return value
 
-        actVer      = formatDBMSfp()
+        actVer      = format.getDbms()
         blank       = " " * 15
         value      += "active fingerprint: %s" % actVer
 
         if kb.bannerFp:
             banVer = kb.bannerFp["dbmsVersion"] if 'dbmsVersion' in kb.bannerFp else None
-            banVer = formatDBMSfp([banVer])
+            banVer = format.getDbms([banVer])
             value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
 
         htmlErrorFp = format.getErrorParsedDBMSes()
diff --git a/plugins/dbms/postgresql/fingerprint.py b/plugins/dbms/postgresql/fingerprint.py
index e5a66ad40..5207ec85a 100644
--- a/plugins/dbms/postgresql/fingerprint.py
+++ b/plugins/dbms/postgresql/fingerprint.py
@@ -49,13 +49,13 @@ class Fingerprint(GenericFingerprint):
             value += DBMS.PGSQL
             return value
 
-        actVer      = formatDBMSfp()
+        actVer      = format.getDbms()
         blank       = " " * 15
         value      += "active fingerprint: %s" % actVer
 
         if kb.bannerFp:
             banVer = kb.bannerFp["dbmsVersion"] if 'dbmsVersion' in kb.bannerFp else None
-            banVer = formatDBMSfp([banVer])
+            banVer = format.getDbms([banVer])
             value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
 
         htmlErrorFp = format.getErrorParsedDBMSes()
diff --git a/plugins/dbms/sqlite/fingerprint.py b/plugins/dbms/sqlite/fingerprint.py
index ae0123ea2..25ee5416c 100644
--- a/plugins/dbms/sqlite/fingerprint.py
+++ b/plugins/dbms/sqlite/fingerprint.py
@@ -45,13 +45,13 @@ class Fingerprint(GenericFingerprint):
             value += DBMS.SQLITE
             return value
 
-        actVer = formatDBMSfp()
+        actVer = format.getDbms()
         blank  = " " * 15
         value += "active fingerprint: %s" % actVer
 
         if kb.bannerFp:
             banVer = kb.bannerFp["dbmsVersion"]
-            banVer = formatDBMSfp([banVer])
+            banVer = format.getDbms([banVer])
             value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
 
         htmlErrorFp = format.getErrorParsedDBMSes()
diff --git a/plugins/dbms/sybase/fingerprint.py b/plugins/dbms/sybase/fingerprint.py
index 57a3fd6f1..ef1c585ed 100644
--- a/plugins/dbms/sybase/fingerprint.py
+++ b/plugins/dbms/sybase/fingerprint.py
@@ -45,13 +45,13 @@ class Fingerprint(GenericFingerprint):
             value += DBMS.SYBASE
             return value
 
-        actVer = formatDBMSfp()
+        actVer = format.getDbms()
         blank  = " " * 15
         value += "active fingerprint: %s" % actVer
 
         if kb.bannerFp:
             banVer = kb.bannerFp["dbmsVersion"]
-            banVer = formatDBMSfp([banVer])
+            banVer = format.getDbms([banVer])
             value += "\n%sbanner parsing fingerprint: %s" % (blank, banVer)
 
         htmlErrorFp = format.getErrorParsedDBMSes()