diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index bf67c2781..6f2e01b3f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug Report
 about: Create a report to help us improve
-labels: 'type: bug, triage'
+labels: 'type: bug, issue: triage'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
index 56ea9fb64..343defc12 100644
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -1,7 +1,7 @@
 ---
 name: Documentation
 about: Report an issue with our documentation
-labels: 'type: documentation, triage'
+labels: 'type: documentation, issue: triage'
 assignees: ''
 
 ---
@@ -21,10 +21,10 @@ assignees: ''
 
 **What**
 
-<!-- What kind of content is it? 
-  -  Check a box with an 'x' between the brackets: [x] 
+<!-- What kind of content is it?
+  -  Check a box with an 'x' between the brackets: [x]
   -->
-  
+
 - [ ] Text
 - [ ] Image or Gif
 - [ ] Other
@@ -39,6 +39,6 @@ assignees: ''
 
 **Additional context**
 
-<!-- Add any other context about the problem here. 
+<!-- Add any other context about the problem here.
   -  If this is related to a specific pull request, link to it.
   -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 5b85b635c..668e1adb1 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-labels: 'type: feature request, triage'
+labels: 'type: feature request, issue: triage'
 assignees: ''
 
 ---
diff --git a/.github/PULL_REQUEST_TEMPLATE/goog_module.md b/.github/PULL_REQUEST_TEMPLATE/goog_module.md
deleted file mode 100644
index b2341a52b..000000000
--- a/.github/PULL_REQUEST_TEMPLATE/goog_module.md
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- Suggested PR title: Migrate PATH/TO/FILE.js to goog.module syntax -->
-
-## The basics
-
-- [ ] I branched from `goog_module`
-- [ ] My pull request is against `goog_module`
-- [ ] My code follows the [style guide](
-      https://developers.google.com/blockly/guides/modify/web/style-guide)
-- [ ] My code is presented in the form suggested in the [module
-      conversion guide](https://github.com/google/blockly/issues/5026)
-- [ ] I have run `npm test`.
-
-## The details
-### Resolves
-
-Part of #5026
-
-### Proposed Changes
-
-Converts `PATH/TO/FILE.js` to `goog.module` with ES6 `const`/`let`.
-
-### Additional Information
-
-<!-- Anything else we should know? -->