diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug.md
similarity index 89%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/bug.md
index bd02cfe..d73d32d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,10 +1,10 @@
 ---
-name: 🐛 Bug report
+name: 🐛 Bug
 about: Create a report to help us improve
 labels: bug
 title: 🐛 [Bug] 
 ---
 <!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
 
-## 🐛 Bugreport
+## 🐛 Bug
 <!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the bug is.-->
diff --git a/.github/ISSUE_TEMPLATE/devops_ticket.md b/.github/ISSUE_TEMPLATE/devops.md
similarity index 88%
rename from .github/ISSUE_TEMPLATE/devops_ticket.md
rename to .github/ISSUE_TEMPLATE/devops.md
index 981d0fd..038fcc8 100644
--- a/.github/ISSUE_TEMPLATE/devops_ticket.md
+++ b/.github/ISSUE_TEMPLATE/devops.md
@@ -1,10 +1,10 @@
 ---
-name: 💥 DevOps ticket
+name: 💥 DevOp
 about: Help us manage our deployed Software.
 labels: devops
 title: 💥 [DevOps]
 ---
 <!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
 
-## 💥 DevOps ticket
+## 💥 DevOps
 <!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to .github/ISSUE_TEMPLATE/feature.md
diff --git a/.github/ISSUE_TEMPLATE/refactor_ticket.md b/.github/ISSUE_TEMPLATE/refactor.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/refactor_ticket.md
rename to .github/ISSUE_TEMPLATE/refactor.md