diff --git a/.github/ISSUE_TEMPLATE/Bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
similarity index 97%
rename from .github/ISSUE_TEMPLATE/Bug_report.yml
rename to .github/ISSUE_TEMPLATE/01_bug_report.yml
index 63f419bf8f9..7dd353d8f04 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -1,5 +1,5 @@
-name: "Bug Report"
-description: Use this template to report a bug
+name: "🐞 Bug Report"
+description: Use this template to report a bug.
 labels: ["bug"]
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/Service_team_request.yml b/.github/ISSUE_TEMPLATE/02_feature_request.yml
similarity index 96%
rename from .github/ISSUE_TEMPLATE/Service_team_request.yml
rename to .github/ISSUE_TEMPLATE/02_feature_request.yml
index 0000acbc989..bebc0358210 100644
--- a/.github/ISSUE_TEMPLATE/Service_team_request.yml
+++ b/.github/ISSUE_TEMPLATE/02_feature_request.yml
@@ -1,5 +1,5 @@
-name: "[Microsoft Internal / Service Team] Feature Request"
-description: Use this template to create a feature request for microsoft internal or service team
+name: "✨ Feature Request"
+description: Use this template to create a feature request from Microsoft internal or service team.
 labels: ["feature-request"]
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/03_community_idea.md
similarity index 90%
rename from .github/ISSUE_TEMPLATE/Feature_request.md
rename to .github/ISSUE_TEMPLATE/03_community_idea.md
index 2026904798b..eca16de36b5 100644
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/03_community_idea.md
@@ -1,6 +1,6 @@
 ---
-name: "\U0001F680Feature request"
-about: Suggest an idea for this project
+name: "Community Idea"
+about: Suggest an idea for this project.
 title: ''
 labels: ''
 assignees: ''
diff --git a/.github/ISSUE_TEMPLATE/docs_feedback.yml b/.github/ISSUE_TEMPLATE/04_documentation_issue.yml
similarity index 95%
rename from .github/ISSUE_TEMPLATE/docs_feedback.yml
rename to .github/ISSUE_TEMPLATE/04_documentation_issue.yml
index e1bcb7ecfdd..c7e9a748c36 100644
--- a/.github/ISSUE_TEMPLATE/docs_feedback.yml
+++ b/.github/ISSUE_TEMPLATE/04_documentation_issue.yml
@@ -1,5 +1,5 @@
-name: ✒️ Reference documentation issue or question
-description: Report reference documentation related issue
+name: Documentation Issue
+description: Report reference documentation related issue.
 title: '[Reference feedback]: '
 labels: [needs-triage]
 
diff --git a/.github/ISSUE_TEMPLATE/what_if.yml b/.github/ISSUE_TEMPLATE/05_what-if_feedback.yml
similarity index 95%
rename from .github/ISSUE_TEMPLATE/what_if.yml
rename to .github/ISSUE_TEMPLATE/05_what-if_feedback.yml
index b59ef87e61e..47401b93538 100644
--- a/.github/ISSUE_TEMPLATE/what_if.yml
+++ b/.github/ISSUE_TEMPLATE/05_what-if_feedback.yml
@@ -1,5 +1,5 @@
-name: "What-If Feature Issue"
-description: Report issues or request enhancements for Azure CLI What-If feature
+name: "What-If Feedback"
+description: Report issues or request enhancements for What-If feature.
 labels: ["what-if"]
 body:
   - type: markdown