Index: tools/tools/git/hooks/prepare-commit-msg
===================================================================
--- tools/tools/git/hooks/prepare-commit-msg
+++ tools/tools/git/hooks/prepare-commit-msg
@@ -43,20 +43,20 @@
 # Uncomment and complete these metadata fields, as appropriate:
 #
 # PR:		<If and which Problem Report is related.>
-# Reported by:	<If someone else reported the issue.>
-# Reviewed by:	<If someone else reviewed your modification.>
-# Tested by:	<If someone else tested the change.>
-# Approved by:	<If you needed approval for this commit.>
-# Obtained from:	<If the change is from a third party.>
+# Reported-by:	<If someone else reported the issue.>
+# Reviewed-by:	<If someone else reviewed your modification.>
+# Tested-by:	<If someone else tested the change.>
+# Approved-by:	<If you needed approval for this commit.>
+# Obtained-from:	<If the change is from a third party.>
 # Fixes:	<Short hash and title line of commit fixed by this change>
-# MFC after:	<N [day[s]|week[s]|month[s]].  Request a reminder email>
+# MFC-after:	<N [day[s]|week[s]|month[s]].  Request a reminder email>
 # Relnotes:	<Set to 'yes' for mention in release notes.>
 # Security:	<Vulnerability reference (one per line) or description.>
-# Sponsored by:	<If the change was sponsored by an organization.>
-# Pull Request:	<https://github.com/freebsd/<repo>/pull/###>
+# Sponsored-by:	<If the change was sponsored by an organization.>
+# Pull-request:	<https://github.com/freebsd/<repo>/pull/###>
 # Differential Revision:	<https://reviews.freebsd.org/D###>
 #
-# "Pull Request" and "Differential Revision" require the *full* GitHub or
+# "Pull-request" and "Differential Revision" require the *full* GitHub or
 # Phabricator URL.  The commit author should be set appropriately, using
 # \`git commit --author\` if someone besides the committer sent in the change.
 $(awk '/^#$/,EOF' "$1")