diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 39e4bb089d..259ec2beaf 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -11,7 +11,7 @@ assignees: ''
 
 A clear and concise description of what the bug is.
 
-## Steps to Reproduce
+## Steps to reproduce
 
 Steps to reproduce the behavior:
 
@@ -21,7 +21,7 @@ Steps to reproduce the behavior:
 
 ## Setup
 
-Please describe how did you start the server and relevant environment variables.
+Please describe how you started the server and provide a list of relevant environment variables.
 
 <details>
 <p>
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bab64f2da2..da49347cb0 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest an idea for improving OCIS
+about: Suggest an idea for improving oCIS
 title: ''
 labels: Category:Feature, Topic:needs-triage
 assignees: ''
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 179498c092..85ab9338dc 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,7 @@
 <!--
 Thanks for submitting a change to ownCloud!
 
-This is the bug tracker for the OCIS component. Find other components at https://github.com/owncloud/core/blob/master/.github/CONTRIBUTING.md#guidelines
+This is the bug tracker for the oCIS component. Find other components at https://github.com/owncloud/core/blob/master/.github/CONTRIBUTING.md#guidelines
 
 For fixing potential security issues please see https://owncloud.org/security/
 
@@ -55,4 +55,3 @@ Please set the following labels:
 - [ ] Unit tests added
 - [ ] Acceptance tests added
 - [ ] Documentation ticket raised: <link> 
-