diff --git a/src/Api/Abstracts/AbstractAllApi.php b/src/Api/Abstracts/AbstractAllApiRequester.php
similarity index 92%
rename from src/Api/Abstracts/AbstractAllApi.php
rename to src/Api/Abstracts/AbstractAllApiRequester.php
index 55a8b30..dc89fa9 100644
--- a/src/Api/Abstracts/AbstractAllApi.php
+++ b/src/Api/Abstracts/AbstractAllApiRequester.php
@@ -8,10 +8,10 @@ use Gitea\Client;
 use Gitea\Collections\ApiItemCollection;
 use Gitea\Models\Repository;
 
-use Gitea\Api\Abstracts\AbstractApi;
-use Gitea\Api\Interfaces\AllApiInterface;
+use Gitea\Api\Abstracts\AbstractApiRequester;
+use Gitea\Api\Interfaces\AllRequesterInterface;
 
-abstract class AbstractAllApi extends AbstractApi implements AllApiInterface
+abstract class AbstractAllApiRequester extends AbstractApiRequester implements AllRequesterInterface
 {
     /**
      * The maximum number of pages to process when
diff --git a/src/Api/Abstracts/AbstractApi.php b/src/Api/Abstracts/AbstractApiRequester.php
similarity index 98%
rename from src/Api/Abstracts/AbstractApi.php
rename to src/Api/Abstracts/AbstractApiRequester.php
index e81c769..53e7934 100644
--- a/src/Api/Abstracts/AbstractApi.php
+++ b/src/Api/Abstracts/AbstractApiRequester.php
@@ -4,14 +4,14 @@ namespace Gitea\Api\Abstracts;
 
 use Gitea\Client;
 
-use Gitea\Api\Interfaces\ApiInterface;
+use Gitea\Api\Interfaces\ApiRequesterInterface;
 
 /**
  * Abstract class for Api classes
  *
  * @author Benjamin Blake (sitelease.ca)
  */
-abstract class AbstractApi implements ApiInterface
+abstract class AbstractApiRequester implements ApiRequesterInterface
 {
     /**
      * The client
diff --git a/src/Api/Interfaces/AllApiInterface.php b/src/Api/Interfaces/AllRequesterInterface.php
similarity index 97%
rename from src/Api/Interfaces/AllApiInterface.php
rename to src/Api/Interfaces/AllRequesterInterface.php
index 85e278f..7713a68 100644
--- a/src/Api/Interfaces/AllApiInterface.php
+++ b/src/Api/Interfaces/AllRequesterInterface.php
@@ -9,7 +9,7 @@ use Gitea\Client;
  *
  * @author Benjamin Blake (sitelease.ca)
  */
-interface AllApiInterface
+interface AllRequesterInterface
 {
     /**
      * The maximum number of pages to process when
diff --git a/src/Api/Interfaces/ApiInterface.php b/src/Api/Interfaces/ApiRequesterInterface.php
similarity index 98%
rename from src/Api/Interfaces/ApiInterface.php
rename to src/Api/Interfaces/ApiRequesterInterface.php
index b90ec1f..66bdaf3 100644
--- a/src/Api/Interfaces/ApiInterface.php
+++ b/src/Api/Interfaces/ApiRequesterInterface.php
@@ -9,7 +9,7 @@ use Gitea\Client;
  *
  * @author Benjamin Blake (sitelease.ca)
  */
-interface ApiInterface
+interface ApiRequesterInterface
 {
     /**
      * @param Client $client