diff --git a/lib/FederatedItems/CircleSetting.php b/lib/FederatedItems/CircleSetting.php
index 167a96a11..f1563e586 100644
--- a/lib/FederatedItems/CircleSetting.php
+++ b/lib/FederatedItems/CircleSetting.php
@@ -31,17 +31,17 @@
 
 namespace OCA\Circles\FederatedItems;
 
-use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize;
 use OCA\Circles\Db\CircleRequest;
 use OCA\Circles\IFederatedItem;
 use OCA\Circles\IFederatedItemAsyncProcess;
 use OCA\Circles\Model\Federated\FederatedEvent;
 use OCA\Circles\Model\Helpers\MemberHelper;
+use OCA\Circles\Tools\Traits\TDeserialize;
 
 class CircleSetting implements
 	IFederatedItem,
 	IFederatedItemAsyncProcess {
-	use TNC22Deserialize;
+	use TDeserialize;
 
 
 	/** @var CircleRequest */
diff --git a/lib/Service/SendMailService.php b/lib/Service/SendMailService.php
index 7c3305b35..0662578f6 100644
--- a/lib/Service/SendMailService.php
+++ b/lib/Service/SendMailService.php
@@ -31,12 +31,12 @@
 
 namespace OCA\Circles\Service;
 
-use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
-use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
 use Exception;
 use OCA\Circles\Model\Circle;
 use OCA\Circles\Model\Member;
 use OCA\Circles\Model\ShareWrapper;
+use OCA\Circles\Tools\Traits\TArrayTools;
+use OCA\Circles\Tools\Traits\TStringTools;
 use OCP\Defaults;
 use OCP\IL10N;
 use OCP\Mail\IEMailTemplate;