diff --git a/symmetric/symmetric-assemble/TODO.txt b/symmetric/symmetric-assemble/TODO.txt
index 26f8b2ce9a..e7350d6498 100644
--- a/symmetric/symmetric-assemble/TODO.txt
+++ b/symmetric/symmetric-assemble/TODO.txt
@@ -62,6 +62,7 @@ DONE = +
 
 * Test timezone columns.  Do other databases other than oracle and postgres have timezone columns?
 * Test batch insert performance during routing (esp on oracle)
+* Test to make sure that autocreate for all databases doesn't recreate symmetricds artifacts every time it is run (DB2 might be having an issue right now)
 
 Performance Improvement Opportunities
 * Pluggable data loaders
diff --git a/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractTriggerRouterServiceTest.java b/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractTriggerRouterServiceTest.java
index edba81abf1..82ec84cc5a 100644
--- a/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractTriggerRouterServiceTest.java
+++ b/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractTriggerRouterServiceTest.java
@@ -371,8 +371,8 @@ public static int insert(Object[] values, ISqlTemplate jdbcTemplate, ISymmetricD
     }
 
     protected static boolean isBooleanSupported(ISymmetricDialect dbDialect) {
-        return !(DatabaseNamesConstants.ORACLE.equals(dbDialect.getName()) || DatabaseNamesConstants.DB2
-                .equals(dbDialect.getName()));
+        return !(DatabaseNamesConstants.ORACLE.equals(dbDialect.getPlatform().getName()) || DatabaseNamesConstants.DB2
+                .equals(dbDialect.getPlatform().getName()));
     }
 
     protected static Object[] filterValues(Object[] values, ISymmetricDialect dbDialect) {
diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2Platform.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2Platform.java
index 2b4dd73385..d58229c194 100644
--- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2Platform.java
+++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2Platform.java
@@ -25,6 +25,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.jumpmind.db.platform.AbstractJdbcDatabasePlatform;
+import org.jumpmind.db.platform.DatabaseNamesConstants;
 import org.jumpmind.db.platform.DatabasePlatformSettings;
 
 /*
@@ -33,7 +34,7 @@
 public class Db2Platform extends AbstractJdbcDatabasePlatform {
 
     /* Database name of this platform. */
-    public static final String DATABASENAME = "DB2";
+    public static final String DATABASENAME = DatabaseNamesConstants.DB2;
 
     /* The standard DB2 jdbc driver. */
     public static final String JDBC_DRIVER = "com.ibm.db2.jcc.DB2Driver";