diff --git a/composer.json b/composer.json
index 35d43dc..553cb8f 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,8 @@
     "autoload": {
         "psr-4": {
             "PHPay\\": "src/",
-            "Asaas\\": "src/Gateways/Asaas/",
+            "PHPay\\Asaas\\": "src/Gateways/Asaas/",
+            "PHPay\\Efi\\": "src/Gateways/Efi/",
             "Efi\\": "src/Gateways/Efi/",
             "AsaasCustomer\\": "src/Gateways/Asaas/Resources/Customer/"
         }
diff --git a/examples/asaas/charges.php b/examples/asaas/charges.php
index ca5e595..2682fa2 100644
--- a/examples/asaas/charges.php
+++ b/examples/asaas/charges.php
@@ -1,6 +1,6 @@
 <?php
 
-use PHPay\Gateways\Asaas\AsaasGateway;
+use PHPay\Asaas\AsaasGateway;
 use PHPay\PHPay;
 
 require_once __DIR__ . '/../../vendor/autoload.php';
diff --git a/examples/efi/charges.php b/examples/efi/charges.php
index ae4edec..6a4c062 100644
--- a/examples/efi/charges.php
+++ b/examples/efi/charges.php
@@ -1,6 +1,6 @@
 <?php
 
-use PHPay\Gateways\Efi\EfiGateway;
+use PHPay\Efi\EfiGateway;
 use PHPay\PHPay;
 
 require_once __DIR__ . '/../../vendor/autoload.php';
@@ -31,6 +31,7 @@
 
 /**
  * get all charges
+ *
  * @return array charges
  */
 $phpay
diff --git a/src/Gateways/Asaas/AsaasGateway.php b/src/Gateways/Asaas/AsaasGateway.php
index f1237ad..4c2ac58 100644
--- a/src/Gateways/Asaas/AsaasGateway.php
+++ b/src/Gateways/Asaas/AsaasGateway.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPay\Gateways\Asaas;
+namespace PHPay\Asaas;
 
 use Asaas\Interface\AsaasGatewayInterface;
 use Asaas\Resources\Charge\Charge;
diff --git a/src/Gateways/Efi/EfiGateway.php b/src/Gateways/Efi/EfiGateway.php
index cd1092b..feebe72 100644
--- a/src/Gateways/Efi/EfiGateway.php
+++ b/src/Gateways/Efi/EfiGateway.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPay\Gateways\Efi;
+namespace PHPay\Efi;
 
 use Efi\Interface\EfiGatewayInterface;
 use Efi\Resources\Authorization\Authorization;
diff --git a/src/Gateways/Efi/Resources/Charge/Charge.php b/src/Gateways/Efi/Resources/Charge/Charge.php
index bc918ea..00e77cf 100644
--- a/src/Gateways/Efi/Resources/Charge/Charge.php
+++ b/src/Gateways/Efi/Resources/Charge/Charge.php
@@ -78,7 +78,6 @@ public function setCustomer(array $customer): Charge
      *
      * @param array<mixed> $queryParams
      * @return ChargeInterface
-     * @deprecated
      */
     public function setQueryParams(array $queryParams): ChargeInterface
     {