diff --git a/.github/workflows/changelog.yml b/.github/workflows/releasenote.yml
similarity index 72%
rename from .github/workflows/changelog.yml
rename to .github/workflows/releasenote.yml
index 0aeb3d2f..7948b1d5 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/releasenote.yml
@@ -1,15 +1,15 @@
-name: Changelog
+name: Release notes
 on:
   push:
     branches:
       - master
   pull_request:
-    # Important that we run on `labeled` and `unlabeled` to pick up `changelog/no-changelog` being added/removed
+    # Important that we run on `labeled` and `unlabeled` to pick up `no-releasenote` being added/removed
     # DEV: [opened, reopened, synchronize] is the default
     types: [opened, reopened, synchronize, labeled, unlabeled, ready_for_review]
 jobs:
   validate:
-    name: Validate changelog
+    name: Validate release notes
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -18,12 +18,12 @@ jobs:
           fetch-depth: 0
 
       # Ensure a new reno release note was added in this PR.
-      # Use `reno new <slug>` to add a new note to `releasenotes/notes`,
-      #   or add `changelog/no-changelog` label if no release note is needed.
+      # Use `reno new <slug>` to add a new note to `no-releasenote`,
+      #   or add `no-releasenote` label if no release note is needed.
       - name: Ensure release note added
         # Only run this on pull requests
         if: github.event_name == 'pull_request'
-        run: scripts/check-releasenotes
+        run: releasenotes/check-releasenotes
 
       - uses: actions/setup-python@v2
         name: Install Python
@@ -33,5 +33,5 @@ jobs:
       - name: Install Dependencies
         run: pip install reno docutils
 
-      - name: Lint changelog notes
+      - name: Lint release notes
         run: reno lint
diff --git a/scripts/check-releasenotes b/releasenotes/check-releasenotes
similarity index 78%
rename from scripts/check-releasenotes
rename to releasenotes/check-releasenotes
index 8cc59219..9533b448 100755
--- a/scripts/check-releasenotes
+++ b/releasenotes/check-releasenotes
@@ -11,9 +11,9 @@ echo "JQ: $(which jq)"
 
 
 # Skip the label check if we do not have a GitHub event path
-if [[ -f "${GITHUB_EVENT_PATH}" ]] && jq -e '.pull_request?.labels[]?.name | select(. == "no-changelog")' "${GITHUB_EVENT_PATH}";
+if [[ -f "${GITHUB_EVENT_PATH}" ]] && jq -e '.pull_request?.labels[]?.name | select(. == "no-releasenote")' "${GITHUB_EVENT_PATH}";
 then
-    echo "PR has label 'no-changelog', skipping validation"
+    echo "PR has label 'no-releasenote', skipping validation"
     exit 0
 fi
 
@@ -24,6 +24,6 @@ then
     exit 0
 else
     echo "Release note not found."
-    echo "Use 'reno new <slug>' to add a new note to 'releasenotes/notes', or add the label 'no-changelog' to skip this validation"
+    echo "Use 'reno new <slug>' to add a new note to 'releasenotes/notes', or add the label 'no-releasenote' to skip this validation"
     exit 1
 fi