diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 731119a9957..fd6e6546824 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,9 @@
+<!---
+A technical comment, you are free to remove or leave it as it is when PR is created
+The following categories are used in the next scripts, update them accordingly
+utils/changelog/changelog.py
+tests/ci/run_check.py
+-->
 ### Changelog category (leave one):
 - New Feature
 - Improvement
diff --git a/tests/ci/run_check.py b/tests/ci/run_check.py
index ebdb7e9594a..bd70134760a 100644
--- a/tests/ci/run_check.py
+++ b/tests/ci/run_check.py
@@ -25,11 +25,14 @@ CAN_BE_TESTED_LABEL = "can be tested"
 DO_NOT_TEST_LABEL = "do not test"
 SUBMODULE_CHANGED_LABEL = "submodule changed"
 
+# They are used in .github/PULL_REQUEST_TEMPLATE.md, keep comments there
+# updated accordingly
 LABELS = {
     "pr-backward-incompatible": ["Backward Incompatible Change"],
     "pr-bugfix": [
         "Bug Fix",
         "Bug Fix (user-visible misbehaviour in official stable or prestable release)",
+        "Bug Fix (user-visible misbehavior in official stable or prestable release)",
     ],
     "pr-build": [
         "Build/Testing/Packaging Improvement",
diff --git a/utils/changelog/changelog.py b/utils/changelog/changelog.py
index a846c240055..f98494ec303 100755
--- a/utils/changelog/changelog.py
+++ b/utils/changelog/changelog.py
@@ -19,6 +19,8 @@ from git_helper import is_shallow, git_runner as runner
 
 # This array gives the preferred category order, and is also used to
 # normalize category names.
+# Categories are used in .github/PULL_REQUEST_TEMPLATE.md, keep comments there
+# updated accordingly
 categories_preferred_order = (
     "Backward Incompatible Change",
     "New Feature",