diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 22cc606..5b8b2aa 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,18 +1,17 @@
 ---
-name: Bug report
-about: Use this template to report a bug in the current API. Do not use this template for
-  new feature requests or anything else. 
-title: "[BUG] "
+name: Bug report / change request
+about: Use this template to report a bug in the current API or is your want to see a small change. Do not use this template for new features or anything else. 
+title: "[BUG] or [CHANGE REQUEST] "
 labels: ''
 assignees: ''
 
 ---
 
 ## API Version
-<!--- In what version of the API did you find the bug? -->
+<!--- In what version of the API did you find the bug or do you base your change on? -->
 
 ## Summary
-<!--- Provide a general summary of the issue. -->
+<!--- Provide a general summary of the issue of the change request. -->
 
 ## Expected Behavior
 <!--- Tell us what should happen. -->
@@ -26,6 +25,7 @@ assignees: ''
 ## Steps to Reproduce
 <!--- Provide a link to a live example, or an unambiguous set of steps to -->
 <!--- reproduce this bug. Include a flow of API calls to reproduce, if relevant. -->
+<!--- If this is a change request, provide a flow of where the current functionality is located that you want to change. --->
 1.
 2.
 3.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index ae47eec..e7ae8bd 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest a new feature for the TOMP-API. Do not use this template for bug reports, only for new aspects!
+about: Suggest a new feature for the TOMP-API. Do not use this template for bug reports, only for new aspects! If you want to change existing functionality, please use a bug report / change request.
 title: "[FEATURE REQUEST] "
 labels: ''
 assignees: ''
@@ -8,22 +8,22 @@ assignees: ''
 ---
 
 ## Is your feature request related to a problem? Please describe.
-<!-- A clear and concise description of what the problem is. E.g. I'm always frustrated when [...] -->
+<!--- A clear and concise description of what the problem is. E.g. I'm always frustrated when [...] -->
 
 ## Urgency
-<!-- How urgent is your request? Please choos between critical, major or minor. -->
-<!-- Critical (the TOMP API is not usable if this is not implemented), because ... -->
-<!-- Major (the TOMP API works as advertised but this is really neccessary to implement), because ... -->
-<!-- Minor (this feature is a nice to have, no rush to implement this), because ... -->
+<!--- How urgent is your request? Please choos between critical, major or minor. -->
+<!--- Critical (the TOMP API is not usable if this is not implemented), because ... -->
+<!--- Major (the TOMP API works as advertised but this is really neccessary to implement), because ... -->
+<!--- Minor (this feature is a nice to have, no rush to implement this), because ... -->
 
 ## Additional context
-<!-- Add any other context about the feature request here. -->
+<!--- Add any other context about the feature request here. -->
 
 ## Describe the solution you'd like
-<!-- A clear and concise description of what you want to happen. -->
+<!--- 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. -->
+<!--- A clear and concise description of any alternative solutions or features you've considered. -->
 
 ## Possible Implementation
-<!--- Not obligatory, but suggest an idea for implementing addition or change -->
\ No newline at end of file
+<!--- Not obligatory, but suggest an idea for implementing addition or change. -->
\ No newline at end of file