diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 31796d39..25c9b425 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,7 +11,7 @@ If you have questions about how to install or use Nextcloud, please direct these
   - Go to one of the repositories, click "issues" and type any word in the top search/command bar.
   - You can also filter by appending e. g. "state:open" to the search string.
   - More info on [search syntax within github](https://help.github.com/articles/searching-issues)
-* This repository ([Usage report/Survey client](https://github.com/nextcloud/survey_client/issues)) is *only* for issues within the Nextcloud Survey client code.
+* This repository ([Usage survey client](https://github.com/nextcloud/survey_client/issues)) is *only* for issues within the Nextcloud usage survey client code.
 * __SECURITY__: Report any potential security bug to us via [our HackerOne page](https://hackerone.com/nextcloud) or security@nextcloud.com following our [security policy](https://nextcloud.com/security/) instead of filing an issue in our bug tracker.
 * Report the issue using our [template][template], it includes all the information we need to track down the issue.
 
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 2851f310..d4c55dd2 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,10 +1,10 @@
 <!--
-Thanks for reporting issues back to Nextcloud! This is the issue tracker of the Nextcloud Usage report/Survey client App, if you have any support question please check out https://help.nextcloud.com/
+Thanks for reporting issues back to Nextcloud! This is the issue tracker of the Usage survey client app, if you have any support question please check out https://help.nextcloud.com/
 
-This is the bug tracker for the Usage report/Survey client App. Find other components at https://github.com/nextcloud/core/blob/master/CONTRIBUTING.md#guidelines
+This is the bug tracker for the Usage survey client app. Find other components at https://github.com/nextcloud/core/blob/master/CONTRIBUTING.md#guidelines
 
 To make it possible for us to help you please fill out below information carefully.
---> 
+-->
 ### Steps to reproduce
 1.
 2.
@@ -33,7 +33,7 @@ Tell us what happens instead
 
 ```
 Login as admin user into your Nextcloud and access
-http://example.com/index.php/settings/integrity/failed 
+http://example.com/index.php/settings/integrity/failed
 paste the results here.
 ```
 
@@ -52,7 +52,7 @@ If you have access to your command line run e.g.:
 sudo -u www-data php occ config:list system
 from within your ownCloud installation folder
 
-or 
+or
 
 Insert your config.php content here
 (Without the database password, passwordsalt and secret)
@@ -77,6 +77,6 @@ Insert your Nextcloud log here
 Insert your browser log here, this could for example include:
 
 a) The javascript console log
-b) The network log 
+b) The network log
 c) ...
 ```
diff --git a/README.md b/README.md
index 7e182277..c19fdfea 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Usage report / Survey client
+# Usage survey client
 
 Sends anonymized data to Nextcloud to help us to improve Nextcloud. You
 always have full control over the content sent to Nextcloud and can disable
diff --git a/appinfo/app.php b/appinfo/app.php
index 7764901a..b89ae378 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -32,7 +32,7 @@ function() {
 	function() use ($l) {
 		return [
 			'id' => 'survey_client',
-			'name' => $l->t('Survey Client'),
+			'name' => $l->t('Usage survey'),
 		];
 	}
 );
diff --git a/appinfo/info.xml b/appinfo/info.xml
index ad54d960..0497d435 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <info>
     <id>survey_client</id>
-    <name>Usage report</name>
+    <name>Usage survey</name>
     <description>
         Sends anonymized data to Nextcloud to help us to improve Nextcloud. You
         always have full control over the content sent to Nextcloud and can disable
diff --git a/lib/Settings/AdminSection.php b/lib/Settings/AdminSection.php
index d3ec789e..3a4ed848 100644
--- a/lib/Settings/AdminSection.php
+++ b/lib/Settings/AdminSection.php
@@ -51,7 +51,7 @@ public function getID() {
 	 * @return string
 	 */
 	public function getName() {
-		return $this->l->t('Usage report');
+		return $this->l->t('Usage survey');
 	}
 
 	/**
diff --git a/templates/admin.php b/templates/admin.php
index 102b3e0e..9afb67f7 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -27,7 +27,7 @@
 ?>
 
 <div id="survey_client" class="section">
-	<h2><?php p($l->t('Usage report')); ?></h2>
+	<h2><?php p($l->t('Usage survey')); ?></h2>
 
 	<p>
 		<?php p($l->t('You can help us to improve Nextcloud be sending us some data about your current setup and usage.')); ?>
@@ -42,7 +42,7 @@
 	<p>
 		<input id="survey_client_monthly_report" name="survey_client_monthly_report"
 			   type="checkbox" class="checkbox" value="1" <?php if ($_['is_enabled']): ?> checked="checked"<?php endif; ?> />
-		<label for="survey_client_monthly_report"><?php p($l->t('Send "Usage report" monthly')); ?></label>
+		<label for="survey_client_monthly_report"><?php p($l->t('Send usage survey monthly')); ?></label>
 	</p>
 
 	<h3><?php p($l->t('Data to send')); ?></h3>