diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 9e27d4fc8e..ea20b483cd 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -61,7 +61,7 @@ jobs:
         env:
           RELEASE_VERSION: ${{ steps.version.outputs.RELEASE_VERSION }}
         run: |
-          # Translate the Github reference into a tag name.
+          # Translate the GitHub reference into a tag name.
           #
           # - `release` tag maps to `zeek:latest`
           # - `v*` tag (excluding `v*-dev` tags) maps to `zeek:RELEASE_VERSION`
diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 39f22a193e..71d7d08442 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -119,7 +119,7 @@ jobs:
 
       - name: Send email
         # Only send notifications for scheduled runs. Runs from pull requests
-        # show failures in the Github UI.
+        # show failures in the GitHub UI.
         if: failure() && github.event_name == 'schedule'
         uses: dawidd6/action-send-mail@v3.7.0
         with:
@@ -127,7 +127,7 @@ jobs:
           server_port: ${{secrets.SMTP_PORT}}
           username: ${{secrets.SMTP_USER}}
           password: ${{secrets.SMTP_PASS}}
-          subject: generate-docs Github Action failed!
+          subject: generate-docs GitHub Action failed!
           body: generate-docs job of ${{github.repository}} Failed! See https://github.com/${{github.repository}}/actions/runs/${{github.run_id}} for details.
           to: ${{secrets.MAIL_TO}}
-          from: Github Actions <${{secrets.MAIL_FROM}}>
+          from: GitHub Actions <${{secrets.MAIL_FROM}}>
diff --git a/NEWS b/NEWS
index 0360e1f136..503681dae0 100644
--- a/NEWS
+++ b/NEWS
@@ -699,7 +699,7 @@ New Functionality
 - A new external testsuite, https://github.com/zeek/zeek-testing-cluster,
   focuses on testing the emerging controller framework. It leverages the new
   official Zeek Docker image for building docker-compose test setups, driven via
-  btest. The Github CI setup now includes a workflow that deploys and runs this
+  btest. The GitHub CI setup now includes a workflow that deploys and runs this
   testsuite.
 
 - The GRE analyzer now supports the Aruba WLAN protocol type.