diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index 6405d5b7c8..ab8db65d6d 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# A hook to check syntax of a phpBB3 commit message, per:
+# A hook to check syntax of a phpBB commit message, per:
 # * <https://area51.phpbb.com/docs/dev/master/development/git.html>
 # * <http://area51.phpbb.com/phpBB/viewtopic.php?p=209919#p209919>
 #
diff --git a/git-tools/merge.php b/git-tools/merge.php
index a9bb051401..7feda88933 100755
--- a/git-tools/merge.php
+++ b/git-tools/merge.php
@@ -56,7 +56,7 @@ catch (RuntimeException $e)
 function work($pull_id, $remote)
 {
 	// Get some basic data
-	$pull = get_pull('phpbb', 'phpbb3', $pull_id);
+	$pull = get_pull('phpbb', 'phpbb', $pull_id);
 
 	if (!$pull_id)
 	{
@@ -79,7 +79,7 @@ function work($pull_id, $remote)
 			run("git checkout develop-olympus");
 			run("git pull $remote develop-olympus");
 
-			add_remote($pull_user, 'phpbb3');
+			add_remote($pull_user, 'phpbb');
 			run("git fetch $pull_user");
 			run("git merge --no-ff $pull_user/$pull_branch");
 			run("phpBB/vendor/bin/phpunit");
@@ -94,7 +94,7 @@ function work($pull_id, $remote)
 			run("git checkout develop");
 			run("git pull $remote develop");
 
-			add_remote($pull_user, 'phpbb3');
+			add_remote($pull_user, 'phpbb');
 			run("git fetch $pull_user");
 			run("git merge --no-ff $pull_user/$pull_branch");
 			run("phpBB/vendor/bin/phpunit");