diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 00a149b..fb11ee3 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,5 +1,5 @@
 ---
-name: Feature request (plugin)
+name: Feature request
 about: Suggest an idea for this project
 title: ''
 labels: 'enhancement'
diff --git a/.github/ISSUE_TEMPLATE/feature_request_server.md b/.github/ISSUE_TEMPLATE/feature_request_server.md
deleted file mode 100644
index 54e7285..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request_server.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Feature request (server)
-about: Suggest an idea for this project
-title: ''
-labels: 'enhancement (server)'
-assignees: ''
-
----
-This template is used to suggest things to be added to the **Command Panels Server**, if you would like to suggest something for the **Command Panels Plugin**, click [here](https://github.com/rockyhawk64/CommandPanels/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=)
-
-### Is your feature request related to a problem? Please describe.
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-### Describe the solution you'd like
-A clear and concise description of what you want to happen.
-
-### Describe alternatives you've considered
-A clear and concise description of any alternative solutions or features you've considered.
-
-### Additional context
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/need_help.md b/.github/ISSUE_TEMPLATE/need-help.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/need_help.md
rename to .github/ISSUE_TEMPLATE/need-help.md