diff --git a/include/upgrader/streams/core.sig b/include/upgrader/streams/core.sig
index ce6d3fd6537de8fbe1b5c9acda7833e5972d37b6..dde6378298e6727d0811c37a9bb84e632106e0bf 100644
--- a/include/upgrader/streams/core.sig
+++ b/include/upgrader/streams/core.sig
@@ -1 +1 @@
-17f0cc96b366a747113622fa4780f9bc
+61c9d5d71093d3595b3d41855386a905
diff --git a/include/upgrader/streams/core/dad45ca2-17f0cc96.cleanup.sql b/include/upgrader/streams/core/dad45ca2-61c9d5d7.cleanup.sql
similarity index 100%
rename from include/upgrader/streams/core/dad45ca2-17f0cc96.cleanup.sql
rename to include/upgrader/streams/core/dad45ca2-61c9d5d7.cleanup.sql
diff --git a/include/upgrader/streams/core/dad45ca2-17f0cc96.patch.sql b/include/upgrader/streams/core/dad45ca2-61c9d5d7.patch.sql
similarity index 97%
rename from include/upgrader/streams/core/dad45ca2-17f0cc96.patch.sql
rename to include/upgrader/streams/core/dad45ca2-61c9d5d7.patch.sql
index d6c7bd6304bb56cdaba8a4c38700ca5fcf9b7185..5f20643aaa0b0a6650ad27307db00307492f1bac 100644
--- a/include/upgrader/streams/core/dad45ca2-17f0cc96.patch.sql
+++ b/include/upgrader/streams/core/dad45ca2-61c9d5d7.patch.sql
@@ -1,6 +1,6 @@
 /**
  * @version v1.8.0-dpr1 Dynamic Forms
- * @signature 17f0cc96b366a747113622fa4780f9bc
+ * @signature 61c9d5d71093d3595b3d41855386a905
  *
  * Adds the database structure for the dynamic forms feature and migrates
  * the database from the legacy <=1.7 format to the new format with the
@@ -120,5 +120,5 @@ ALTER TABLE `%TABLE_PREFIX%ticket`
 
 -- Finished with patch
 UPDATE `%TABLE_PREFIX%config`
-    SET `value` = '17f0cc96b366a747113622fa4780f9bc'
+    SET `value` = '61c9d5d71093d3595b3d41855386a905'
     WHERE `key` = 'schema_signature' AND `namespace` = 'core';
diff --git a/include/upgrader/streams/core/dad45ca2-17f0cc96.task.php b/include/upgrader/streams/core/dad45ca2-61c9d5d7.task.php
similarity index 100%
rename from include/upgrader/streams/core/dad45ca2-17f0cc96.task.php
rename to include/upgrader/streams/core/dad45ca2-61c9d5d7.task.php
diff --git a/setup/inc/streams/core/install-mysql.sql b/setup/inc/streams/core/install-mysql.sql
index e5859e815129110747cd04653679859e6ce9c2f8..c5610347c21115bf3ed52d43b837ebfe72502be1 100644
--- a/setup/inc/streams/core/install-mysql.sql
+++ b/setup/inc/streams/core/install-mysql.sql
@@ -211,7 +211,7 @@ CREATE TABLE `%TABLE_PREFIX%form_entry` (
     `created` datetime NOT NULL,
     `updated` datetime NOT NULL,
     PRIMARY KEY (`id`),
-    KEY `entry_lookup` (`object_id`, `object_type`)
+    KEY `entry_lookup` (`object_type`, `object_id`)
 ) DEFAULT CHARSET=utf8;
 
 DROP TABLE IF EXISTS `%TABLE_PREFIX%form_entry_values`;