diff --git a/.github/ISSUE_TEMPLATE/bug_macos.yml b/.github/ISSUE_TEMPLATE/bug_appkit.yml
similarity index 96%
rename from .github/ISSUE_TEMPLATE/bug_macos.yml
rename to .github/ISSUE_TEMPLATE/bug_appkit.yml
index b10f5f0e0..21a06c87b 100644
--- a/.github/ISSUE_TEMPLATE/bug_macos.yml
+++ b/.github/ISSUE_TEMPLATE/bug_appkit.yml
@@ -1,8 +1,8 @@
-name: MacOS bug
+name: macOS bug
 description: Create a macOS-specific bug report
 labels:
   - B - bug
-  - DS - macos
+  - DS - appkit
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/bug_ios.yml b/.github/ISSUE_TEMPLATE/bug_uikit.yml
similarity index 93%
rename from .github/ISSUE_TEMPLATE/bug_ios.yml
rename to .github/ISSUE_TEMPLATE/bug_uikit.yml
index c410dd403..a522a5d91 100644
--- a/.github/ISSUE_TEMPLATE/bug_ios.yml
+++ b/.github/ISSUE_TEMPLATE/bug_uikit.yml
@@ -1,8 +1,8 @@
 name: iOS bug
-description: Create an iOS-specific bug report
+description: Create an iOS/UIKit-specific bug report
 labels:
   - B - bug
-  - DS - ios
+  - DS - uikit
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/bug_windows.yml b/.github/ISSUE_TEMPLATE/bug_win32.yml
similarity index 98%
rename from .github/ISSUE_TEMPLATE/bug_windows.yml
rename to .github/ISSUE_TEMPLATE/bug_win32.yml
index 6869f1b9d..c2a9289b7 100644
--- a/.github/ISSUE_TEMPLATE/bug_windows.yml
+++ b/.github/ISSUE_TEMPLATE/bug_win32.yml
@@ -2,7 +2,7 @@ name: Windows bug
 description: Create a Windows-specific bug report
 labels:
   - B - bug
-  - DS - windows
+  - DS - win32
 body:
   - type: markdown
     attributes: