diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml
index e51d3990cea..0b3b026a9e3 100644
--- a/apps/federation/appinfo/info.xml
+++ b/apps/federation/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
 	<id>federation</id>
 	<name>Federation</name>
-	<description>ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description>
+	<description>Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description>
 	<licence>AGPL</licence>
 	<author>Bjoern Schiessle</author>
 	<version>0.1.0</version>
diff --git a/apps/federation/lib/Controller/SettingsController.php b/apps/federation/lib/Controller/SettingsController.php
index 0c5601b3c85..5a157d5aca5 100644
--- a/apps/federation/lib/Controller/SettingsController.php
+++ b/apps/federation/lib/Controller/SettingsController.php
@@ -70,7 +70,7 @@ class SettingsController extends Controller {
 			[
 				'url' => $url,
 				'id' => $id,
-				'message' => (string) $this->l->t('Server added to the list of trusted ownClouds')
+				'message' => (string) $this->l->t('Added to the list of trusted servers')
 			]
 		);
 	}
@@ -111,8 +111,8 @@ class SettingsController extends Controller {
 		}
 
 		if ($this->trustedServers->isOwnCloudServer($url) === false) {
-			$message = 'No ownCloud server found';
-			$hint = $this->l->t('No ownCloud server found');
+			$message = 'No server to federate found';
+			$hint = $this->l->t('No server to federate found');
 			throw new HintException($message, $hint);
 		}
 
diff --git a/apps/federation/lib/DbHandler.php b/apps/federation/lib/DbHandler.php
index 0fab491be89..015a06c035c 100644
--- a/apps/federation/lib/DbHandler.php
+++ b/apps/federation/lib/DbHandler.php
@@ -61,7 +61,7 @@ class DbHandler {
 	}
 
 	/**
-	 * add server to the list of trusted ownCloud servers
+	 * add server to the list of trusted servers
 	 *
 	 * @param string $url
 	 * @return int
@@ -93,7 +93,7 @@ class DbHandler {
 	}
 
 	/**
-	 * remove server from the list of trusted ownCloud servers
+	 * remove server from the list of trusted servers
 	 *
 	 * @param int $id
 	 */
diff --git a/apps/federation/lib/TrustedServers.php b/apps/federation/lib/TrustedServers.php
index 39feca13d22..c8ab4dec632 100644
--- a/apps/federation/lib/TrustedServers.php
+++ b/apps/federation/lib/TrustedServers.php
@@ -94,7 +94,7 @@ class TrustedServers {
 	}
 
 	/**
-	 * add server to the list of trusted ownCloud servers
+	 * add server to the list of trusted servers
 	 *
 	 * @param $url
 	 * @return int server id
@@ -160,7 +160,7 @@ class TrustedServers {
 	}
 
 	/**
-	 * remove server from the list of trusted ownCloud servers
+	 * remove server from the list of trusted servers
 	 *
 	 * @param int $id
 	 */
@@ -242,7 +242,7 @@ class TrustedServers {
 		$decoded = json_decode($status, true);
 		if (!empty($decoded) && isset($decoded['version'])) {
 			if (!version_compare($decoded['version'], '9.0.0', '>=')) {
-				throw new HintException('Remote server version is too low. ownCloud 9.0 is required.');
+				throw new HintException('Remote server version is too low. 9.0 is required.');
 			}
 			return true;
 		}
diff --git a/apps/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php
index ce66214de7c..e86d8beb75e 100644
--- a/apps/federation/templates/settings-admin.php
+++ b/apps/federation/templates/settings-admin.php
@@ -8,14 +8,14 @@ style('federation', 'settings-admin')
 ?>
 <div id="ocFederationSettings" class="section">
 	<h2><?php p($l->t('Federation')); ?></h2>
-	<em><?php p($l->t('ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></em>
+	<em><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></em>
 
 	<p>
 		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
 		<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label>
 	</p>
 
-	<h3><?php p($l->t('Trusted ownCloud Servers')); ?></h3>
+	<h3><?php p($l->t('Trusted Servers')); ?></h3>
 	<p id="ocFederationAddServer">
 		<button id="ocFederationAddServerButton" class=""><?php p($l->t('+ Add ownCloud server')); ?></button>
 		<input id="serverUrl" class="hidden" type="text" value="" placeholder="<?php p($l->t('ownCloud Server')); ?>" name="server_url"/>
diff --git a/apps/federation/tests/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php
index ea92f5eccec..363e93a3021 100644
--- a/apps/federation/tests/TrustedServersTest.php
+++ b/apps/federation/tests/TrustedServersTest.php
@@ -341,7 +341,7 @@ class TrustedServersTest extends TestCase {
 	/**
 	 * @dataProvider dataTestCheckOwnCloudVersionTooLow
 	 * @expectedException \OC\HintException
-	 * @expectedExceptionMessage Remote server version is too low. ownCloud 9.0 is required.
+	 * @expectedExceptionMessage Remote server version is too low. 9.0 is required.
 	 */
 	public function testCheckOwnCloudVersionTooLow($status) {
 		$this->invokePrivate($this->trustedServers, 'checkOwnCloudVersion', [$status]);