diff --git a/phpBB/includes/functions_tricky_update.php b/phpBB/includes/functions_database_helper.php
similarity index 100%
rename from phpBB/includes/functions_tricky_update.php
rename to phpBB/includes/functions_database_helper.php
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index cd938e83a0..db9fbd90bd 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -417,7 +417,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
 		// Update the topic watch table.
 		if (!function_exists('phpbb_update_rows_avoiding_duplicates_notify_status'))
 		{
-			include($phpbb_root_path . 'includes/functions_tricky_update.' . $phpEx);
+			include($phpbb_root_path . 'includes/functions_database_helper.' . $phpEx);
 		}
 		phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 29dabdd2a2..66d0c7a47e 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -622,7 +622,7 @@ function merge_posts($topic_id, $to_topic_id)
 			// If the topic no longer exist, we will update the topic watch table.
 			if (!function_exists('phpbb_update_rows_avoiding_duplicates_notify_status'))
 			{
-				include($phpbb_root_path . 'includes/functions_tricky_update.' . $phpEx);
+				include($phpbb_root_path . 'includes/functions_database_helper.' . $phpEx);
 			}
 			phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
 		}
diff --git a/tests/functions_tricky_update/fixtures/bookmarks_duplicates.xml b/tests/functions_database_helper/fixtures/bookmarks_duplicates.xml
similarity index 100%
rename from tests/functions_tricky_update/fixtures/bookmarks_duplicates.xml
rename to tests/functions_database_helper/fixtures/bookmarks_duplicates.xml
diff --git a/tests/functions_tricky_update/fixtures/topics_watch_duplicates.xml b/tests/functions_database_helper/fixtures/topics_watch_duplicates.xml
similarity index 100%
rename from tests/functions_tricky_update/fixtures/topics_watch_duplicates.xml
rename to tests/functions_database_helper/fixtures/topics_watch_duplicates.xml
diff --git a/tests/functions_tricky_update/update_rows_avoiding_duplicates_notify_status_test.php b/tests/functions_database_helper/update_rows_avoiding_duplicates_notify_status_test.php
similarity index 98%
rename from tests/functions_tricky_update/update_rows_avoiding_duplicates_notify_status_test.php
rename to tests/functions_database_helper/update_rows_avoiding_duplicates_notify_status_test.php
index 9052585552..6c0f2da1e1 100644
--- a/tests/functions_tricky_update/update_rows_avoiding_duplicates_notify_status_test.php
+++ b/tests/functions_database_helper/update_rows_avoiding_duplicates_notify_status_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions_tricky_update.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_database_helper.php';
 
 class phpbb_update_rows_avoiding_duplicates_notify_status_test extends phpbb_database_test_case
 {
diff --git a/tests/functions_tricky_update/update_rows_avoiding_duplicates_test.php b/tests/functions_database_helper/update_rows_avoiding_duplicates_test.php
similarity index 98%
rename from tests/functions_tricky_update/update_rows_avoiding_duplicates_test.php
rename to tests/functions_database_helper/update_rows_avoiding_duplicates_test.php
index 6142997408..2f01d29d15 100644
--- a/tests/functions_tricky_update/update_rows_avoiding_duplicates_test.php
+++ b/tests/functions_database_helper/update_rows_avoiding_duplicates_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions_tricky_update.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_database_helper.php';
 
 class phpbb_update_rows_avoiding_duplicates_test extends phpbb_database_test_case
 {