diff --git a/core/scripts/migrate-db.sh b/core/scripts/migrate-db.sh
index 2d2144b..2e248cb 100755
--- a/core/scripts/migrate-db.sh
+++ b/core/scripts/migrate-db.sh
@@ -75,7 +75,7 @@
  *
  * THIS IS A GENERATED FILE. DO NOT EDIT.
  *
- * @see cores/scripts/migrate-db.sh
+ * @see core/scripts/migrate-db.sh
  * @see https://www.drupal.org/sandbox/benjy/2405029
  */
 
@@ -107,7 +107,7 @@ public function load() {
     // Order by primary keys
     $order = '';
     $query = "SELECT `COLUMN_NAME` FROM `information_schema`.`COLUMNS`
-    WHERE (`TABLE_SCHEMA` = 'd6_migrate') AND (`TABLE_NAME` = '{$table}') AND (`COLUMN_KEY` = 'PRI')
+    WHERE (`TABLE_SCHEMA` = '" . $options['database'] . "') AND (`TABLE_NAME` = '{$table}') AND (`COLUMN_KEY` = 'PRI')
     ORDER BY COLUMN_NAME";
     $results = $connection->query($query);
     while(($row = $results->fetchAssoc()) !== FALSE) {
@@ -122,7 +122,7 @@ public function load() {
     $query = $connection->query(_db_get_query($table) . $order);
     $values = '';
     // Only dump the actual table values if we're NOT looking at a cache table,
-    // watchdog, router, or sessions tables.
+    // watchdog or sessions tables.
     if (substr($table, 0, 5) !== 'cache' && !in_array($table, array('watchdog', 'sessions'))) {
       while(($row = $query->fetchAssoc()) !== FALSE) {
         $values .= '->values(' . Variable::export($row, '    ') . ')';