diff --git a/dbptk-core/src/test/java/com/databasepreservation/modules/siard/out/metadata/TestSIARDDK1007TableIndexFileStrategy.java b/dbptk-core/src/test/java/com/databasepreservation/modules/siard/out/metadata/TestSIARDDK1007TableIndexFileStrategy.java
index 644e84057..e90f70b9a 100644
--- a/dbptk-core/src/test/java/com/databasepreservation/modules/siard/out/metadata/TestSIARDDK1007TableIndexFileStrategy.java
+++ b/dbptk-core/src/test/java/com/databasepreservation/modules/siard/out/metadata/TestSIARDDK1007TableIndexFileStrategy.java
@@ -9,10 +9,10 @@
 
 import static org.testng.AssertJUnit.assertEquals;
 
-import com.databasepreservation.modules.siard.common.adapters.SIARDDK1007Adapter;
-import com.databasepreservation.modules.siard.common.adapters.SIARDDK128Adapter;
 import org.testng.annotations.Test;
 
+import com.databasepreservation.modules.siard.common.adapters.SIARDDK1007Adapter;
+
 /**
  * @author Andreas Kring <andreas@magenta.dk>
  *
diff --git a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARDDKTableIndexFileStrategy.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARDDKTableIndexFileStrategy.java
index 07217ab04..fa1e18567 100644
--- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARDDKTableIndexFileStrategy.java
+++ b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARDDKTableIndexFileStrategy.java
@@ -58,9 +58,9 @@ public Object generateXML(DatabaseStructure dbStructure) throws ModuleException
 
     // Set dbName - mandatory
     if (dbStructure.getDbOriginalName() != null) {
-      siarddkBinding.setDbName(dbStructure.getDbOriginalName());
+      siarddkBinding.setDbName(escapeString(dbStructure.getDbOriginalName()));
     } else {
-      siarddkBinding.setDbName(dbStructure.getName());
+      siarddkBinding.setDbName(escapeString(dbStructure.getName()));
     }
 
     // Set databaseProduct