diff --git a/lib/private/group/backend.php b/lib/private/group/backend.php
index 29f24fb307..ed2a2f4bb6 100644
--- a/lib/private/group/backend.php
+++ b/lib/private/group/backend.php
@@ -53,7 +53,7 @@ define('OC_GROUP_BACKEND_COUNT_USERS',       0x00100000);
 /**
  * Abstract base class for user management
  */
-abstract class OC_Group_Backend implements OC_Group_Interface {
+abstract class OC_Group_Backend implements \OCP\GroupInterface {
 	/**
 	 * error code for functions not provided by the group backend
 	 */
@@ -82,7 +82,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	* @return int bitwise-or'ed actions
 	*
 	* Returns the supported actions as int to be
-	* compared with OC_USER_BACKEND_CREATE_USER etc.
+	* compared with \OC_Group_Backend::CREATE_GROUP etc.
 	*/
 	public function getSupportedActions() {
 		$actions = 0;
@@ -101,7 +101,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	* @return bool
 	*
 	* Returns the supported actions as int to be
-	* compared with OC_GROUP_BACKEND_CREATE_GROUP etc.
+	* compared with \OC_Group_Backend::CREATE_GROUP etc.
 	*/
 	public function implementsActions($actions) {
 		return (bool)($this->getSupportedActions() & $actions);
diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 8a21c77b58..2c28f3b0e7 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -33,6 +33,7 @@
 namespace OC\Group;
 
 use OC\Hooks\PublicEmitter;
+use OCP\GroupInterface;
 use OCP\IGroupManager;
 
 /**
@@ -52,7 +53,7 @@ use OCP\IGroupManager;
  */
 class Manager extends PublicEmitter implements IGroupManager {
 	/**
-	 * @var \OC_Group_Backend[]|\OC_Group_Database[] $backends
+	 * @var GroupInterface[] $backends
 	 */
 	private $backends = array();
 
@@ -121,7 +122,7 @@ class Manager extends PublicEmitter implements IGroupManager {
 	}
 
 	/**
-	 * @param \OC_Group_Backend $backend
+	 * @param \OCP\GroupInterface $backend
 	 */
 	public function addBackend($backend) {
 		$this->backends[] = $backend;
diff --git a/lib/public/igroupmanager.php b/lib/public/igroupmanager.php
index 5ec780e447..7eabc8a59b 100644
--- a/lib/public/igroupmanager.php
+++ b/lib/public/igroupmanager.php
@@ -53,7 +53,7 @@ interface IGroupManager {
 	public function isBackendUsed($backendClass);
 
 	/**
-	 * @param \OCP\UserInterface $backend
+	 * @param \OCP\GroupInterface $backend
 	 * @since 8.0.0
 	 */
 	public function addBackend($backend);