diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 038c8541b22787493f0ec9d2f36dd94650aae70c..09af8ebef84d76d90f451afdd222c7244ea68ec2 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,5 +1 @@
-Please fill out one of the templates on: https://github.com/Homebrew/brew/issues/new/choose
-
-If you want to ask a question please do so on our Discourse: https://discourse.brew.sh
-
-We will close issues asking questions without comment.
\ No newline at end of file
+# Please fill out one of the templates on: https://github.com/Homebrew/brew/issues/new/choose or we will close it without comment.
diff --git a/.github/ISSUE_TEMPLATE/Reproducible-Bug-Report.md b/.github/ISSUE_TEMPLATE/bug.md
similarity index 55%
rename from .github/ISSUE_TEMPLATE/Reproducible-Bug-Report.md
rename to .github/ISSUE_TEMPLATE/bug.md
index 5c2456e2a3539806f23afeb08c06f0d2a9f30235..8d6d31cf96abbe47a7d4ec7f3b7741fd6c9bc534 100644
--- a/.github/ISSUE_TEMPLATE/Reproducible-Bug-Report.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,10 +1,10 @@
 ---
-name: Reproducible Bug Report
+name: New issue for Reproducible Bug
 about: "If you're sure it's reproducible and not just your machine: submit an issue so we can investigate."
 
 ---
 
-**Please note that we will close your issue without comment if you delete, do not read or do not fill out the issue checklist below and provide ALL the requested information. If you repeatedly fail to use the issue template, we will block you from ever submitting issues to Homebrew again.**
+# Please note we will close your issue without comment if you delete, do not read or do not fill out the issue checklist below and provide ALL the requested information. If you repeatedly fail to use the issue template, we will block you from ever submitting issues to Homebrew again.
 
 - [ ] ran `brew update` and can still reproduce the problem?
 - [ ] ran `brew doctor`, fixed all issues and can still reproduce the problem?
@@ -12,11 +12,11 @@ about: "If you're sure it's reproducible and not just your machine: submit an is
 
 <!-- To help us debug your issue, please complete these sections: -->
 
-# What you were trying to do (and why)
+## What you were trying to do (and why)
 
 <!-- replace me -->
 
-# What happened (include command output)
+## What happened (include command output)
 
 <!-- replace me -->
 
@@ -29,10 +29,10 @@ about: "If you're sure it's reproducible and not just your machine: submit an is
   </pre>
 </details>
 
-# What you expected to happen
+## What you expected to happen
 
 <!-- replace me -->
 
-# Step-by-step reproduction instructions (by running `brew` commands)
+## Step-by-step reproduction instructions (by running `brew` commands)
 
 <!-- replace me -->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index a7f771e723a03785f094d32730672714526dfe77..eb2c4408187dd94688fbb31f07895ee0a74f922a 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,15 +1,15 @@
 blank_issues_enabled: false
 
 contact_links:
-- name: Discourse
+- name: Get help on Discourse
   url: https://discourse.brew.sh
   about: Have a question? Not sure if your issue affects everyone reproducibly? The quickest way to get help is on Homebrew's Discourse!
-- name: Homebrew/homebrew-core
+- name: New issue on Homebrew/homebrew-core
   url: https://github.com/Homebrew/homebrew-core/issues/new/choose
   about: On macOS/Mac OS X? Having a `brew` problem with a `brew install` or `brew upgrade` of a single formula/package? Report it to Homebrew/homebrew-core (the macOS core tap/repository).
-- name: Homebrew/homebrew-cask
+- name: New issue on Homebrew/homebrew-cask
   url: https://github.com/Homebrew/homebrew-cask/issues/new/choose
   about: Having a `brew cask` problem? Report it to Homebrew/homebrew-cask (the cask tap/repository).
-- name: Homebrew/linuxbrew-core
+- name: New issue on Homebrew/linuxbrew-core
   url: https://github.com/Homebrew/linuxbrew-core/issues/new/choose
   about: On Linux? Having a `brew` problem with a `brew install` or `brew upgrade` of a single formula/package? Report it to Homebrew/linuxbrew-core (the Linux core tap/repository).
diff --git a/.github/ISSUE_TEMPLATE/New-Feature-Suggestion.md b/.github/ISSUE_TEMPLATE/feature.md
similarity index 94%
rename from .github/ISSUE_TEMPLATE/New-Feature-Suggestion.md
rename to .github/ISSUE_TEMPLATE/feature.md
index 842a0a93d9bed6e9ec810cb23b012f4bb6305c95..9033c7b4d70f076e716ff0289d63548d34354196 100644
--- a/.github/ISSUE_TEMPLATE/New-Feature-Suggestion.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -1,5 +1,5 @@
 ---
-name: New Feature Suggestion
+name: New issue for Feature Suggestion
 about: Request our thoughts on your suggestion for a new feature for Homebrew.
 
 ---