diff --git a/.github/ISSUE_TEMPLATE/dev-handoff.md b/.github/ISSUE_TEMPLATE/handoff-dev.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/dev-handoff.md
rename to .github/ISSUE_TEMPLATE/handoff-dev.md
diff --git a/.github/ISSUE_TEMPLATE/design-dev-on-offboard.md b/.github/ISSUE_TEMPLATE/on-offboard-design-dev.md
similarity index 98%
rename from .github/ISSUE_TEMPLATE/design-dev-on-offboard.md
rename to .github/ISSUE_TEMPLATE/on-offboard-design-dev.md
index 3a0a54c2..8dcea92d 100644
--- a/.github/ISSUE_TEMPLATE/design-dev-on-offboard.md
+++ b/.github/ISSUE_TEMPLATE/on-offboard-design-dev.md
@@ -1,5 +1,5 @@
 ---
-name: Onboarding/Offboarding Dev/Design
+name: "Onboarding/Offboarding: Dev & Design"
 about: This template is for Dev or Design team Leads or PMs outlining the process of on and offboarding
   new members
 title: 'Onboarding/Offboarding [TEAM]: [NAME]'
diff --git a/.github/ISSUE_TEMPLATE/pm-on-offboard.md b/.github/ISSUE_TEMPLATE/on-offboard-pm.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/pm-on-offboard.md
rename to .github/ISSUE_TEMPLATE/on-offboard-pm.md
diff --git a/.github/ISSUE_TEMPLATE/ux-researcher-on-offboard.md b/.github/ISSUE_TEMPLATE/on-offboard-ux-researcher.md
similarity index 96%
rename from .github/ISSUE_TEMPLATE/ux-researcher-on-offboard.md
rename to .github/ISSUE_TEMPLATE/on-offboard-ux-researcher.md
index 0dcfb557..9c7db8ca 100644
--- a/.github/ISSUE_TEMPLATE/ux-researcher-on-offboard.md
+++ b/.github/ISSUE_TEMPLATE/on-offboard-ux-researcher.md
@@ -1,5 +1,5 @@
 ---
-name: Onboarding/Offboarding UX Researcher
+name: "Onboarding/Offboarding: UX Researcher"
 about: 'This template provides checklist of the steps required for on/off boarding
   any UX Researcher. Issue should be created and completed by PM/Lead. '
 title: ''
diff --git a/.github/ISSUE_TEMPLATE/content-self-onboard.md b/.github/ISSUE_TEMPLATE/prework-content.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/content-self-onboard.md
rename to .github/ISSUE_TEMPLATE/prework-content.md
diff --git a/.github/ISSUE_TEMPLATE/design-self-onboard.md b/.github/ISSUE_TEMPLATE/prework-design.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/design-self-onboard.md
rename to .github/ISSUE_TEMPLATE/prework-design.md
diff --git a/.github/ISSUE_TEMPLATE/dev-self-onboard.md b/.github/ISSUE_TEMPLATE/prework-dev.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/dev-self-onboard.md
rename to .github/ISSUE_TEMPLATE/prework-dev.md