diff --git a/xml/payloads.xml b/xml/payloads.xml
index a6c17485b..dd93d0671 100644
--- a/xml/payloads.xml
+++ b/xml/payloads.xml
@@ -2244,7 +2244,7 @@ Formats:
     </test>
 	
 	<test>
-        <title>HSQL &gt;= 1.7.2 Server stacked queries</title>
+        <title>HSQLDB &gt;= 1.7.2 Server stacked queries</title>
         <stype>4</stype>
         <level>1</level>
         <risk>0</risk>
@@ -2259,13 +2259,13 @@ Formats:
             <time>[SLEEPTIME]</time>
         </response>
         <details>
-            <dbms>HSQL</dbms>
+            <dbms>HSQLDB</dbms>
 			<dbms_version>&gt;= 1.7.2</dbms_version>
         </details>
     </test>
 	
     <test>
-        <title>HSQL &gt;= 2.0 Server stacked queries</title>
+        <title>HSQLDB &gt;= 2.0 Server stacked queries</title>
         <stype>4</stype>
         <level>1</level>
         <risk>0</risk>
@@ -2280,7 +2280,7 @@ Formats:
             <time>[SLEEPTIME]</time>
         </response>
         <details>
-            <dbms>HSQL</dbms>
+            <dbms>HSQLDB</dbms>
             <dbms_version>&gt;= 2.0</dbms_version>
         </details>
     </test>
@@ -2753,7 +2753,7 @@ Formats:
     </test>
 	
     <test>
-        <title>HSQL &gt;= 1.7.2 AND time-based blind (heavy query)</title>
+        <title>HSQLDB &gt;= 1.7.2 AND time-based blind (heavy query)</title>
         <stype>5</stype>
         <level>2</level>
         <risk>2</risk>
@@ -2767,13 +2767,13 @@ Formats:
             <time>[SLEEPTIME]</time>
         </response>
         <details>
-            <dbms>HSQL</dbms>
+            <dbms>HSQLDB</dbms>
             <dbms_version>&gt;= 1.7.2</dbms_version>
         </details>
     </test>
 
     <test>
-        <title>HSQL &gt;= 1.7.2 AND time-based blind (heavy query - comment)</title>
+        <title>HSQLDB &gt;= 1.7.2 AND time-based blind (heavy query - comment)</title>
         <stype>5</stype>
         <level>5</level>
         <risk>2</risk>
@@ -2788,13 +2788,13 @@ Formats:
             <time>[DELAYED]</time>
         </response>
         <details>
-            <dbms>HSQL</dbms>
+            <dbms>HSQLDB</dbms>
             <dbms_version>&gt;= 1.7.2</dbms_version>
         </details>
     </test>
 	
     <test>
-        <title>HSQL &gt; 2.0 AND time-based blind (heavy query)</title>
+        <title>HSQLDB &gt; 2.0 AND time-based blind (heavy query)</title>
         <stype>5</stype>
         <level>2</level>
         <risk>2</risk>
@@ -2808,13 +2808,13 @@ Formats:
             <time>[SLEEPTIME]</time>
         </response>
         <details>
-            <dbms>HSQL</dbms>
+            <dbms>HSQLDB</dbms>
             <dbms_version>&gt; 2.0</dbms_version>
         </details>
     </test>
 
     <test>
-        <title>HSQL &gt; 2.0 AND time-based blind (heavy query - comment)</title>
+        <title>HSQLDB &gt; 2.0 AND time-based blind (heavy query - comment)</title>
         <stype>5</stype>
         <level>5</level>
         <risk>2</risk>
@@ -2829,7 +2829,7 @@ Formats:
             <time>[DELAYED]</time>
         </response>
         <details>
-            <dbms>HSQL</dbms>
+            <dbms>HSQLDB</dbms>
             <dbms_version>&gt; 2.0</dbms_version>
         </details>
     </test>
@@ -3054,7 +3054,7 @@ Formats:
     </test>
 	
     <test>
-        <title>HSQL &gt;= 1.7.2 OR time-based blind (heavy query)</title>
+        <title>HSQLDB &gt;= 1.7.2 OR time-based blind (heavy query)</title>
         <stype>5</stype>
         <level>2</level>
         <risk>2</risk>
@@ -3068,13 +3068,13 @@ Formats:
             <time>[SLEEPTIME]</time>
         </response>
         <details>
-            <dbms>HSQL</dbms>
+            <dbms>HSQLDB</dbms>
 			<dbms_version>&gt;= 1.7.2</dbms_version>
         </details>
     </test>
 
     <test>
-        <title>HSQL &gt;= 1.7.2 OR time-based blind (heavy query - comment)</title>
+        <title>HSQLDB &gt;= 1.7.2 OR time-based blind (heavy query - comment)</title>
         <stype>5</stype>
         <level>5</level>
         <risk>2</risk>
@@ -3089,13 +3089,13 @@ Formats:
             <time>[DELAYED]</time>
         </response>
         <details>
-            <dbms>HSQL</dbms>
+            <dbms>HSQLDB</dbms>
             <dbms_version>&gt;= 1.7.2</dbms_version>
         </details>
     </test>	
 	
     <test>
-        <title>HSQL &gt; 2.0 OR time-based blind (heavy query)</title>
+        <title>HSQLDB &gt; 2.0 OR time-based blind (heavy query)</title>
         <stype>5</stype>
         <level>2</level>
         <risk>2</risk>
@@ -3109,13 +3109,13 @@ Formats:
             <time>[SLEEPTIME]</time>
         </response>
         <details>
-            <dbms>HSQL</dbms>
+            <dbms>HSQLDB</dbms>
 			<dbms_version>&gt; 2.0</dbms_version>
         </details>
     </test>
 
     <test>
-        <title>HSQL &gt; 2.0 OR time-based blind (heavy query - comment)</title>
+        <title>HSQLDB &gt; 2.0 OR time-based blind (heavy query - comment)</title>
         <stype>5</stype>
         <level>5</level>
         <risk>2</risk>
@@ -3130,7 +3130,7 @@ Formats:
             <time>[DELAYED]</time>
         </response>
         <details>
-            <dbms>HSQL</dbms>
+            <dbms>HSQLDB</dbms>
             <dbms_version>&gt; 2.0</dbms_version>
         </details>
     </test>
@@ -3434,7 +3434,7 @@ Formats:
 	
 	<!-- Untested -->
     <test>
-        <title>HSQL &gt;= 1.7.2 time-based blind - Parameter replace (heavy query)</title>
+        <title>HSQLDB &gt;= 1.7.2 time-based blind - Parameter replace (heavy query)</title>
         <stype>5</stype>
         <level>2</level>
         <risk>2</risk>
@@ -3448,13 +3448,13 @@ Formats:
             <time>[SLEEPTIME]</time>
         </response>
         <details>
-            <dbms>HSQL</dbms>
+            <dbms>HSQLDB</dbms>
 			<dbms_version>&gt;= 1.7.2</dbms_version>
         </details>
     </test>
 	
     <test>
-        <title>HSQL &gt; 2.0 time-based blind - Parameter replace (heavy query)</title>
+        <title>HSQLDB &gt; 2.0 time-based blind - Parameter replace (heavy query)</title>
         <stype>5</stype>
         <level>2</level>
         <risk>2</risk>
@@ -3468,7 +3468,7 @@ Formats:
             <time>[SLEEPTIME]</time>
         </response>
         <details>
-            <dbms>HSQL</dbms>
+            <dbms>HSQLDB</dbms>
 			<dbms_version>&gt; 2.0</dbms_version>
         </details>
     </test>
@@ -3635,7 +3635,7 @@ Formats:
     </test>
 
 	<test>
-        <title>HSQL &gt;= 1.7.2 time-based blind - GROUP BY and ORDER BY clauses (heavy query)</title>
+        <title>HSQLDB &gt;= 1.7.2 time-based blind - GROUP BY and ORDER BY clauses (heavy query)</title>
         <stype>5</stype>
         <level>4</level>
         <risk>2</risk>
@@ -3650,13 +3650,13 @@ Formats:
             <time>[DELAYED]</time>
         </response>
         <details>
-            <dbms>HSQL</dbms>
+            <dbms>HSQLDB</dbms>
             <dbms_version>&gt;= 1.7.2</dbms_version>
         </details>
     </test>	
 	
 	<test>
-        <title>HSQL &gt; 2.0 time-based blind - GROUP BY and ORDER BY clauses (heavy query)</title>
+        <title>HSQLDB &gt; 2.0 time-based blind - GROUP BY and ORDER BY clauses (heavy query)</title>
         <stype>5</stype>
         <level>4</level>
         <risk>2</risk>
@@ -3670,7 +3670,7 @@ Formats:
             <time>[DELAYED]</time>
         </response>
         <details>
-            <dbms>HSQL</dbms>
+            <dbms>HSQLDB</dbms>
             <dbms_version>&gt; 2.0</dbms_version>
         </details>
     </test>