diff --git a/lib/server.php b/lib/server.php
index 2391952ea6b416320bef216d856f5f1780a63ddf..cabb15324ec36169ff0d950211bf95af008ae3a4 100644
--- a/lib/server.php
+++ b/lib/server.php
@@ -51,7 +51,7 @@ class Server extends SimpleContainer implements IServerContainer {
 		});
 		$this->registerService('TagManager', function($c) {
 			$user = \OC_User::getUser();
-			return new Tags($user);
+			return new TagManager($user);
 		});
 		$this->registerService('RootFolder', function($c) {
 			// TODO: get user and user manager from container as well