diff --git a/lib/core/enums.py b/lib/core/enums.py
index e5dc5b6bf..ad4ad1ea6 100644
--- a/lib/core/enums.py
+++ b/lib/core/enums.py
@@ -33,7 +33,7 @@ class DBMS:
     PGSQL = "PostgreSQL"
     SQLITE = "SQLite"
     SYBASE = "Sybase"
-    HSQLDB = "HyperSQL"
+    HSQLDB = "HSQLDB"
 
 class DBMS_DIRECTORY_NAME:
     ACCESS = "access"
diff --git a/plugins/dbms/hsqldb/__init__.py b/plugins/dbms/hsqldb/__init__.py
index e882eee52..acd7cb85f 100644
--- a/plugins/dbms/hsqldb/__init__.py
+++ b/plugins/dbms/hsqldb/__init__.py
@@ -17,7 +17,7 @@ from plugins.generic.misc import Miscellaneous
 
 class HSQLDBMap(Syntax, Fingerprint, Enumeration, Filesystem, Miscellaneous, Takeover):
     """
-    This class defines HyperSQL methods
+    This class defines HSQLDB methods
     """
 
     def __init__(self):
diff --git a/plugins/dbms/hsqldb/filesystem.py b/plugins/dbms/hsqldb/filesystem.py
index b83675c1b..4d945835a 100644
--- a/plugins/dbms/hsqldb/filesystem.py
+++ b/plugins/dbms/hsqldb/filesystem.py
@@ -13,9 +13,9 @@ class Filesystem(GenericFilesystem):
         GenericFilesystem.__init__(self)
 
     def readFile(self, rFile):
-        errMsg = "on HyperSQL it is not possible to read files"
+        errMsg = "on HSQLDB it is not possible to read files"
         raise SqlmapUnsupportedFeatureException(errMsg)
 
     def writeFile(self, wFile, dFile, fileType=None, forceCheck=False):
-        errMsg = "on HyperSQL it is not possible to read files"
+        errMsg = "on HSQLDB it is not possible to read files"
         raise SqlmapUnsupportedFeatureException(errMsg)
diff --git a/plugins/dbms/hsqldb/fingerprint.py b/plugins/dbms/hsqldb/fingerprint.py
index 0949b44db..c76e0e716 100644
--- a/plugins/dbms/hsqldb/fingerprint.py
+++ b/plugins/dbms/hsqldb/fingerprint.py
@@ -146,5 +146,5 @@ class Fingerprint(GenericFingerprint):
             return False
 
     def getHostname(self):
-        warnMsg = "on HyperSQL it is not possible to enumerate the hostname"
+        warnMsg = "on HSQLDB it is not possible to enumerate the hostname"
         logger.warn(warnMsg)
diff --git a/plugins/dbms/hsqldb/takeover.py b/plugins/dbms/hsqldb/takeover.py
index 65cfe4c31..d2c8eacfe 100644
--- a/plugins/dbms/hsqldb/takeover.py
+++ b/plugins/dbms/hsqldb/takeover.py
@@ -13,19 +13,19 @@ class Takeover(GenericTakeover):
         GenericTakeover.__init__(self)
 
     def osCmd(self):
-        errMsg = "on HyperSQL it is not possible to execute commands"
+        errMsg = "on HSQLDB it is not possible to execute commands"
         raise SqlmapUnsupportedFeatureException(errMsg)
 
     def osShell(self):
-        errMsg = "on HyperSQL it is not possible to execute commands"
+        errMsg = "on HSQLDB it is not possible to execute commands"
         raise SqlmapUnsupportedFeatureException(errMsg)
 
     def osPwn(self):
-        errMsg = "on HyperSQL it is not possible to establish an "
+        errMsg = "on HSQLDB it is not possible to establish an "
         errMsg += "out-of-band connection"
         raise SqlmapUnsupportedFeatureException(errMsg)
 
     def osSmb(self):
-        errMsg = "on HyperSQL it is not possible to establish an "
+        errMsg = "on HSQLDB it is not possible to establish an "
         errMsg += "out-of-band connection"
         raise SqlmapUnsupportedFeatureException(errMsg)