diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index f142943f..9238752a 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: enhancement
+labels: feature request
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/device_support.md b/.github/ISSUE_TEMPLATE/new_device_support.md
similarity index 72%
rename from .github/ISSUE_TEMPLATE/device_support.md
rename to .github/ISSUE_TEMPLATE/new_device_support.md
index 91b4595e..6f701536 100644
--- a/.github/ISSUE_TEMPLATE/device_support.md
+++ b/.github/ISSUE_TEMPLATE/new_device_support.md
@@ -1,8 +1,8 @@
 ---
-name: Device support request
+name: New device support request
 about: Request support for a new device
 title: ''
-labels: device support
+labels: new device support
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/problem_report.md
similarity index 98%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/problem_report.md
index a0dd4965..538b9db0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/problem_report.md
@@ -1,8 +1,8 @@
 ---
-name: Bug report
+name: Problem report
 about: Create a report to help us improve
 title: ''
-labels: bug
+labels: problem
 assignees: ''
 
 ---