Correcting refactoring issues.

Author: dcarbone

src/Agent/AgentClient.php

@@ -24,7 +24,7 @@
  * Class AgentClient
  * @package DCarbone\PHPConsulAPI\Agent
  */
-class AgentApiClient extends AbstractApiClient
+class AgentClient extends AbstractApiClient
 {
     /** @var null|AgentSelf */
     private $_self = null;

src/Catalog/CatalogClient.php

@@ -26,7 +26,7 @@
  * Class CatalogClient
  * @package DCarbone\PHPConsulAPI\Catalog
  */
-class CatalogApiClient extends AbstractApiClient
+class CatalogClient extends AbstractApiClient
 {
     /**
      * @param CatalogRegistration $catalogRegistration

src/Consul.php

@@ -16,36 +16,36 @@
    limitations under the License.
 */
 
-use DCarbone\PHPConsulAPI\Agent\AgentApiClient;
-use DCarbone\PHPConsulAPI\Catalog\CatalogApiClient;
-use DCarbone\PHPConsulAPI\Coordinate\CoordinateApiClient;
-use DCarbone\PHPConsulAPI\Event\EventApiClient;
-use DCarbone\PHPConsulAPI\Health\HealthApiClient;
-use DCarbone\PHPConsulAPI\KV\KVApiClient;
-use DCarbone\PHPConsulAPI\Session\SessionApiClient;
-use DCarbone\PHPConsulAPI\Status\StatusApiClient;
+use DCarbone\PHPConsulAPI\Agent\AgentClient;
+use DCarbone\PHPConsulAPI\Catalog\CatalogClient;
+use DCarbone\PHPConsulAPI\Coordinate\CoordinateClient;
+use DCarbone\PHPConsulAPI\Event\EventClient;
+use DCarbone\PHPConsulAPI\Health\HealthClient;
+use DCarbone\PHPConsulAPI\KV\KVClient;
+use DCarbone\PHPConsulAPI\Session\SessionClient;
+use DCarbone\PHPConsulAPI\Status\StatusClient;
 
 /**
  * Class Consul
  * @package DCarbone\PHPConsulAPI
  */
 class Consul
 {
-    /** @var KVApiClient */
+    /** @var KVClient */
     public $KV;
-    /** @var AgentApiClient */
+    /** @var AgentClient */
     public $Agent;
-    /** @var CatalogApiClient */
+    /** @var CatalogClient */
     public $Catalog;
-    /** @var StatusApiClient */
+    /** @var StatusClient */
     public $Status;
-    /** @var EventApiClient */
+    /** @var EventClient */
     public $Event;
-    /** @var HealthApiClient */
+    /** @var HealthClient */
     public $Health;
-    /** @var CoordinateApiClient */
+    /** @var CoordinateClient */
     public $Coordinate;
-    /** @var SessionApiClient */
+    /** @var SessionClient */
     public $Session;
 
     /**
@@ -69,13 +69,13 @@ public function __construct(Config $config = null)
                 $config->setScheme($def->getScheme());
         }
 
-        $this->KV = new KVApiClient($config);
-        $this->Agent = new AgentApiClient($config);
-        $this->Catalog = new CatalogApiClient($config);
-        $this->Status = new StatusApiClient($config);
-        $this->Event = new EventApiClient($config);
-        $this->Health = new HealthApiClient($config);
-        $this->Coordinate = new CoordinateApiClient($config);
-        $this->Session = new SessionApiClient($config);
+        $this->KV = new KVClient($config);
+        $this->Agent = new AgentClient($config);
+        $this->Catalog = new CatalogClient($config);
+        $this->Status = new StatusClient($config);
+        $this->Event = new EventClient($config);
+        $this->Health = new HealthClient($config);
+        $this->Coordinate = new CoordinateClient($config);
+        $this->Session = new SessionClient($config);
     }
 }

src/Coordinate/CoordinateClient.php

@@ -25,7 +25,7 @@
  * Class CoordinateClient
  * @package DCarbone\PHPConsulAPI\Coordinate
  */
-class CoordinateApiClient extends AbstractApiClient
+class CoordinateClient extends AbstractApiClient
 {
     /**
      * @return array(

src/Event/EventClient.php

@@ -26,7 +26,7 @@
  * Class EventClient
  * @package DCarbone\PHPConsulAPI
  */
-class EventApiClient extends AbstractApiClient
+class EventClient extends AbstractApiClient
 {
     /**
      * @param UserEvent $event

src/Health/HealthClient.php

@@ -26,7 +26,7 @@
  * Class HealthClient
  * @package DCarbone\PHPConsulAPI\Health
  */
-class HealthApiClient extends AbstractApiClient
+class HealthClient extends AbstractApiClient
 {
     /**
      * @param string $node

src/KV/KVClient.php

@@ -27,7 +27,7 @@
  * Class KVClient
  * @package DCarbone\PHPConsulAPI\KV
  */
-class KVApiClient extends AbstractApiClient
+class KVClient extends AbstractApiClient
 {
     /**
      * @param string $key Name of key to retrieve value for

src/Session/SessionClient.php

@@ -27,7 +27,7 @@
  * Class SessionClient
  * @package DCarbone\PHPConsulAPI\Session
  */
-class SessionApiClient extends AbstractApiClient
+class SessionClient extends AbstractApiClient
 {
     const SessionBehaviorRelease = 'release';
     const SessionBehaviorDelete = 'delete';

src/Status/StatusClient.php

@@ -23,7 +23,7 @@
  * Class StatusClient
  * @package DCarbone\PHPConsulAPI\Status
  */
-class StatusApiClient extends AbstractApiClient
+class StatusClient extends AbstractApiClient
 {
     /**
      * @return array(