diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug_report.yml
rename to .github/ISSUE_TEMPLATE/bug.yml
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature.yml
similarity index 99%
rename from .github/ISSUE_TEMPLATE/feature_request.yml
rename to .github/ISSUE_TEMPLATE/feature.yml
index 7e86297..eddf02f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -3,6 +3,7 @@ description: Request a new feature or enhancement
 title: "<title>"
 labels:
   - feature
+
 body:
   - type: checkboxes
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
index fdfcc68..6fb83c1 100644
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -3,6 +3,7 @@ description: Ask something about the project
 title: "<title>"
 labels:
   - question
+
 body:
   - type: checkboxes
     attributes:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9c75692..87a1742 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,20 +1,3 @@
-<!-- Provide a brief summary of your changes in the Title above -->
+## Summary
 
-#### Description
-<!-- Describe your changes in detail -->
-
-#### Motivation and Context
-<!-- Why is this change required? What problem does it solve? -->
-<!-- If it fixes an open issue, please link to the issue here. -->
-Closes #
-
-#### How Has This Been Tested?
-<!-- Please describe in detail how you tested your changes. -->
-<!-- Include details of your testing environment, tests ran to see how -->
-<!-- your change affects other areas of the code, etc. -->
-
-#### Checklist
-<!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] I have updated the documentation if needed.
-- [ ] I have updated the tests if needed.
+<!-- Describe your changes in detail here, if it closes an open issue, include "Closes #<issue>" -->
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index f979e27..2d76325 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -16,7 +16,7 @@ jobs:
       issues: write
 
     steps:
-      - name: Check out the repository
+      - name: Checkout Code
         uses: actions/checkout@v4
 
       - name: Run Labeler