diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 43e6cffa33..9af36c682f 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -10,7 +10,7 @@ OCP\App::addNavigationEntry(array("id" => "files_index",
 	"icon" => OCP\Util::imagePath("core", "places/files.svg"),
 	"name" => $l->t("Files")));
 
-OC_Search::registerProvider('OC_Search_Provider_File');
+\OC::$server->getSearch()->registerProvider('OC\Search\Provider\File');
 
 $templateManager = OC_Helper::getFileTemplateManager();
 $templateManager->registerTemplate('text/html', 'core/templates/filetemplates/template.html');
diff --git a/search/ajax/search.php b/search/ajax/search.php
index 0cc1f9d30c..546fccc644 100644
--- a/search/ajax/search.php
+++ b/search/ajax/search.php
@@ -26,7 +26,7 @@ OC_JSON::checkLoggedIn();
 
 $query=(isset($_GET['query']))?$_GET['query']:'';
 if($query) {
-	$result=OC_Search::search($query);
+	$result = \OC::$server->getSearch()->search($query);
 	OC_JSON::encodedPrint($result);
 }
 else {