diff --git a/apps/files_sharing/lib/Controller/DeletedShareAPIController.php b/apps/files_sharing/lib/Controller/DeletedShareAPIController.php
index 6c7242ef61..766331b28f 100644
--- a/apps/files_sharing/lib/Controller/DeletedShareAPIController.php
+++ b/apps/files_sharing/lib/Controller/DeletedShareAPIController.php
@@ -201,7 +201,7 @@ class DeletedShareAPIController extends OCSController {
 	 * If the Talk application is not enabled or the helper is not available
 	 * a QueryException is thrown instead.
 	 *
-	 * @return \OCA\Spreed\Share\Helper\DeletedShareAPIController
+	 * @return \OCA\Talk\Share\Helper\DeletedShareAPIController
 	 * @throws QueryException
 	 */
 	private function getRoomShareHelper() {
@@ -209,6 +209,6 @@ class DeletedShareAPIController extends OCSController {
 			throw new QueryException();
 		}
 
-		return $this->serverContainer->query('\OCA\Spreed\Share\Helper\DeletedShareAPIController');
+		return $this->serverContainer->query('\OCA\Talk\Share\Helper\DeletedShareAPIController');
 	}
 }
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
index 09489861e1..86573bcfd7 100644
--- a/apps/files_sharing/lib/Controller/ShareAPIController.php
+++ b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -1138,7 +1138,7 @@ class ShareAPIController extends OCSController {
 	 * If the Talk application is not enabled or the helper is not available
 	 * a QueryException is thrown instead.
 	 *
-	 * @return \OCA\Spreed\Share\Helper\ShareAPIController
+	 * @return \OCA\Talk\Share\Helper\ShareAPIController
 	 * @throws QueryException
 	 */
 	private function getRoomShareHelper() {
@@ -1146,7 +1146,7 @@ class ShareAPIController extends OCSController {
 			throw new QueryException();
 		}
 
-		return $this->serverContainer->query('\OCA\Spreed\Share\Helper\ShareAPIController');
+		return $this->serverContainer->query('\OCA\Talk\Share\Helper\ShareAPIController');
 	}
 
 
diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
index dcf264aae6..3d4dee5c64 100644
--- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php
@@ -661,7 +661,7 @@ class ShareAPIControllerTest extends TestCase {
 				->with('spreed')
 				->willReturn(true);
 
-			$helper = $this->getMockBuilder('\OCA\Spreed\Share\Helper\ShareAPIController')
+			$helper = $this->getMockBuilder('\OCA\Talk\Share\Helper\ShareAPIController')
 				->setMethods(array('canAccessShare'))
 				->getMock();
 			$helper->method('canAccessShare')
@@ -669,7 +669,7 @@ class ShareAPIControllerTest extends TestCase {
 				->willReturn($canAccessShareByHelper);
 
 			$this->serverContainer->method('query')
-				->with('\OCA\Spreed\Share\Helper\ShareAPIController')
+				->with('\OCA\Talk\Share\Helper\ShareAPIController')
 				->willReturn($helper);
 		}
 
@@ -1306,7 +1306,7 @@ class ShareAPIControllerTest extends TestCase {
 			->with('spreed')
 			->willReturn(true);
 
-		$helper = $this->getMockBuilder('\OCA\Spreed\Share\Helper\ShareAPIController')
+		$helper = $this->getMockBuilder('\OCA\Talk\Share\Helper\ShareAPIController')
 			->setMethods(array('createShare'))
 			->getMock();
 		$helper->method('createShare')
@@ -1329,7 +1329,7 @@ class ShareAPIControllerTest extends TestCase {
 			));
 
 		$this->serverContainer->method('query')
-			->with('\OCA\Spreed\Share\Helper\ShareAPIController')
+			->with('\OCA\Talk\Share\Helper\ShareAPIController')
 			->willReturn($helper);
 
 		$this->shareManager->method('createShare')
@@ -1429,7 +1429,7 @@ class ShareAPIControllerTest extends TestCase {
 			->with('spreed')
 			->willReturn(true);
 
-		$helper = $this->getMockBuilder('\OCA\Spreed\Share\Helper\ShareAPIController')
+		$helper = $this->getMockBuilder('\OCA\Talk\Share\Helper\ShareAPIController')
 			->setMethods(array('createShare'))
 			->getMock();
 		$helper->method('createShare')
@@ -1447,7 +1447,7 @@ class ShareAPIControllerTest extends TestCase {
 			));
 
 		$this->serverContainer->method('query')
-			->with('\OCA\Spreed\Share\Helper\ShareAPIController')
+			->with('\OCA\Talk\Share\Helper\ShareAPIController')
 			->willReturn($helper);
 
 		$this->shareManager->expects($this->never())->method('createShare');
@@ -3342,7 +3342,7 @@ class ShareAPIControllerTest extends TestCase {
 				->with('spreed')
 				->willReturn(true);
 
-			$helper = $this->getMockBuilder('\OCA\Spreed\Share\Helper\ShareAPIController')
+			$helper = $this->getMockBuilder('\OCA\Talk\Share\Helper\ShareAPIController')
 				->setMethods(array('formatShare'))
 				->getMock();
 			$helper->method('formatShare')
@@ -3350,7 +3350,7 @@ class ShareAPIControllerTest extends TestCase {
 				->willReturn($formatShareByHelper);
 
 			$this->serverContainer->method('query')
-				->with('\OCA\Spreed\Share\Helper\ShareAPIController')
+				->with('\OCA\Talk\Share\Helper\ShareAPIController')
 				->willReturn($helper);
 		}
 
diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php
index 6cb6c082df..bbd36ab134 100644
--- a/lib/private/Share20/ProviderFactory.php
+++ b/lib/private/Share20/ProviderFactory.php
@@ -60,7 +60,7 @@ class ProviderFactory implements IProviderFactory {
 	private $shareByCircleProvider = null;
 	/** @var bool */
 	private $circlesAreNotAvailable = false;
-	/** @var \OCA\Spreed\Share\RoomShareProvider */
+	/** @var \OCA\Talk\Share\RoomShareProvider */
 	private $roomShareProvider = null;
 
 	/**
@@ -239,7 +239,7 @@ class ProviderFactory implements IProviderFactory {
 			}
 
 			try {
-				$this->roomShareProvider = $this->serverContainer->query('\OCA\Spreed\Share\RoomShareProvider');
+				$this->roomShareProvider = $this->serverContainer->query('\OCA\Talk\Share\RoomShareProvider');
 			} catch (\OCP\AppFramework\QueryException $e) {
 				return null;
 			}