From 2727baefc258e5e52bbc2fe55f7d7df60331ef2b Mon Sep 17 00:00:00 2001
From: Luke Kuzmish <lakuzmish@gmail.com>
Date: Thu, 4 Jul 2024 21:53:06 -0400
Subject: [PATCH] renaming

---
 .../Concerns/TagNormalizerAwareTrait.php      |  2 +-
 .../Contracts/TagNormalizerAware.php          |  2 +-
 .../Datadog/DatadogStatsDClientAdapter.php}   | 10 +++----
 .../InMemory/InMemoryClientAdapter.php}       | 26 +++++++++----------
 .../InMemory/Models/InMemoryCountRecord.php   |  2 +-
 .../Models/InMemoryDistributionRecord.php     |  2 +-
 .../InMemory/Models/InMemoryGaugeRecord.php   |  2 +-
 .../Models/InMemoryHistogramRecord.php        |  2 +-
 .../InMemory/Models/InMemorySetRecord.php     |  2 +-
 .../InMemory/Models/InMemoryStatsRecord.php   |  2 +-
 .../InMemory/Models/InMemoryTimingRecord.php  |  2 +-
 .../League/LeagueStatsDClientAdapter.php}     | 10 +++----
 .../StatsDClientAdapter.php}                  |  4 +--
 .../Datadog/DatadogLoggingClient.php          |  2 +-
 .../InMemory/InMemoryDecrementTest.php        | 12 ++++-----
 .../InMemory/InMemoryGaugeTest.php            | 10 +++----
 .../InMemory/InMemoryHistogramTest.php        | 10 +++----
 .../InMemory/InMemoryIncrementTest.php        | 14 +++++-----
 .../InMemory/InMemorySetTest.php              | 10 +++----
 .../InMemory/InMemoryTest.php                 | 16 ++++++------
 .../InMemory/InMemoryTimingTest.php           | 10 +++----
 .../League/LeagueStatsDClientTest.php         |  6 ++---
 .../Datadog/DatadogLoggingClientTest.php      |  4 +--
 tests/{ => Doubles}/ClockStub.php             |  2 +-
 24 files changed, 82 insertions(+), 82 deletions(-)
 rename src/{Clients => Adapters}/Concerns/TagNormalizerAwareTrait.php (88%)
 rename src/{Clients => Adapters}/Contracts/TagNormalizerAware.php (76%)
 rename src/{Clients/Datadog/DatadogStatsDClient.php => Adapters/Datadog/DatadogStatsDClientAdapter.php} (87%)
 rename src/{Clients/InMemory/InMemoryClient.php => Adapters/InMemory/InMemoryClientAdapter.php} (79%)
 rename src/{Clients => Adapters}/InMemory/Models/InMemoryCountRecord.php (81%)
 rename src/{Clients => Adapters}/InMemory/Models/InMemoryDistributionRecord.php (82%)
 rename src/{Clients => Adapters}/InMemory/Models/InMemoryGaugeRecord.php (82%)
 rename src/{Clients => Adapters}/InMemory/Models/InMemoryHistogramRecord.php (82%)
 rename src/{Clients => Adapters}/InMemory/Models/InMemorySetRecord.php (82%)
 rename src/{Clients => Adapters}/InMemory/Models/InMemoryStatsRecord.php (91%)
 rename src/{Clients => Adapters}/InMemory/Models/InMemoryTimingRecord.php (83%)
 rename src/{Clients/League/LeagueStatsDClient.php => Adapters/League/LeagueStatsDClientAdapter.php} (91%)
 rename src/{Clients/StatsDClient.php => Adapters/StatsDClientAdapter.php} (92%)
 rename src/{ => Clients}/Datadog/DatadogLoggingClient.php (90%)
 rename tests/{Clients => Adapters}/InMemory/InMemoryDecrementTest.php (80%)
 rename tests/{Clients => Adapters}/InMemory/InMemoryGaugeTest.php (79%)
 rename tests/{Clients => Adapters}/InMemory/InMemoryHistogramTest.php (81%)
 rename tests/{Clients => Adapters}/InMemory/InMemoryIncrementTest.php (78%)
 rename tests/{Clients => Adapters}/InMemory/InMemorySetTest.php (78%)
 rename tests/{Clients => Adapters}/InMemory/InMemoryTest.php (76%)
 rename tests/{Clients => Adapters}/InMemory/InMemoryTimingTest.php (80%)
 rename tests/{Clients => Adapters}/League/LeagueStatsDClientTest.php (68%)
 rename tests/{ => Clients}/Datadog/DatadogLoggingClientTest.php (91%)
 rename tests/{ => Doubles}/ClockStub.php (94%)

diff --git a/src/Clients/Concerns/TagNormalizerAwareTrait.php b/src/Adapters/Concerns/TagNormalizerAwareTrait.php
similarity index 88%
rename from src/Clients/Concerns/TagNormalizerAwareTrait.php
rename to src/Adapters/Concerns/TagNormalizerAwareTrait.php
index d9695df..a86a031 100644
--- a/src/Clients/Concerns/TagNormalizerAwareTrait.php
+++ b/src/Adapters/Concerns/TagNormalizerAwareTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Clients\Concerns;
+namespace Cosmastech\StatsDClient\Adapters\Concerns;
 
 use Cosmastech\StatsDClient\TagNormalizers\TagNormalizer;
 
diff --git a/src/Clients/Contracts/TagNormalizerAware.php b/src/Adapters/Contracts/TagNormalizerAware.php
similarity index 76%
rename from src/Clients/Contracts/TagNormalizerAware.php
rename to src/Adapters/Contracts/TagNormalizerAware.php
index 1a55a34..8ef8dfe 100644
--- a/src/Clients/Contracts/TagNormalizerAware.php
+++ b/src/Adapters/Contracts/TagNormalizerAware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Clients\Contracts;
+namespace Cosmastech\StatsDClient\Adapters\Contracts;
 
 use Cosmastech\StatsDClient\TagNormalizers\TagNormalizer;
 
diff --git a/src/Clients/Datadog/DatadogStatsDClient.php b/src/Adapters/Datadog/DatadogStatsDClientAdapter.php
similarity index 87%
rename from src/Clients/Datadog/DatadogStatsDClient.php
rename to src/Adapters/Datadog/DatadogStatsDClientAdapter.php
index 3778999..1f1ba74 100644
--- a/src/Clients/Datadog/DatadogStatsDClient.php
+++ b/src/Adapters/Datadog/DatadogStatsDClientAdapter.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Clients\Datadog;
+namespace Cosmastech\StatsDClient\Adapters\Datadog;
 
-use Cosmastech\StatsDClient\Clients\Concerns\TagNormalizerAwareTrait;
-use Cosmastech\StatsDClient\Clients\Contracts\TagNormalizerAware;
-use Cosmastech\StatsDClient\Clients\StatsDClient;
+use Cosmastech\StatsDClient\Adapters\Concerns\TagNormalizerAwareTrait;
+use Cosmastech\StatsDClient\Adapters\Contracts\TagNormalizerAware;
+use Cosmastech\StatsDClient\Adapters\StatsDClientAdapter;
 use Cosmastech\StatsDClient\TagNormalizers\NoopTagNormalizer;
 use DataDog\DogStatsd;
 
-class DatadogStatsDClient implements StatsDClient, TagNormalizerAware
+class DatadogStatsDClientAdapter implements StatsDClientAdapter, TagNormalizerAware
 {
     use TagNormalizerAwareTrait;
 
diff --git a/src/Clients/InMemory/InMemoryClient.php b/src/Adapters/InMemory/InMemoryClientAdapter.php
similarity index 79%
rename from src/Clients/InMemory/InMemoryClient.php
rename to src/Adapters/InMemory/InMemoryClientAdapter.php
index f7a5e72..043e01d 100644
--- a/src/Clients/InMemory/InMemoryClient.php
+++ b/src/Adapters/InMemory/InMemoryClientAdapter.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Clients\InMemory;
-
-use Cosmastech\StatsDClient\Clients\Concerns\TagNormalizerAwareTrait;
-use Cosmastech\StatsDClient\Clients\Contracts\TagNormalizerAware;
-use Cosmastech\StatsDClient\Clients\InMemory\Models\InMemoryCountRecord;
-use Cosmastech\StatsDClient\Clients\InMemory\Models\InMemoryDistributionRecord;
-use Cosmastech\StatsDClient\Clients\InMemory\Models\InMemoryGaugeRecord;
-use Cosmastech\StatsDClient\Clients\InMemory\Models\InMemoryHistogramRecord;
-use Cosmastech\StatsDClient\Clients\InMemory\Models\InMemorySetRecord;
-use Cosmastech\StatsDClient\Clients\InMemory\Models\InMemoryStatsRecord;
-use Cosmastech\StatsDClient\Clients\InMemory\Models\InMemoryTimingRecord;
-use Cosmastech\StatsDClient\Clients\StatsDClient;
+namespace Cosmastech\StatsDClient\Adapters\InMemory;
+
+use Cosmastech\StatsDClient\Adapters\Concerns\TagNormalizerAwareTrait;
+use Cosmastech\StatsDClient\Adapters\Contracts\TagNormalizerAware;
+use Cosmastech\StatsDClient\Adapters\InMemory\Models\InMemoryCountRecord;
+use Cosmastech\StatsDClient\Adapters\InMemory\Models\InMemoryDistributionRecord;
+use Cosmastech\StatsDClient\Adapters\InMemory\Models\InMemoryGaugeRecord;
+use Cosmastech\StatsDClient\Adapters\InMemory\Models\InMemoryHistogramRecord;
+use Cosmastech\StatsDClient\Adapters\InMemory\Models\InMemorySetRecord;
+use Cosmastech\StatsDClient\Adapters\InMemory\Models\InMemoryStatsRecord;
+use Cosmastech\StatsDClient\Adapters\InMemory\Models\InMemoryTimingRecord;
+use Cosmastech\StatsDClient\Adapters\StatsDClientAdapter;
 use Cosmastech\StatsDClient\TagNormalizers\NoopTagNormalizer;
 use Psr\Clock\ClockInterface;
 
-class InMemoryClient implements StatsDClient, TagNormalizerAware
+class InMemoryClientAdapter implements StatsDClientAdapter, TagNormalizerAware
 {
     use TagNormalizerAwareTrait;
 
diff --git a/src/Clients/InMemory/Models/InMemoryCountRecord.php b/src/Adapters/InMemory/Models/InMemoryCountRecord.php
similarity index 81%
rename from src/Clients/InMemory/Models/InMemoryCountRecord.php
rename to src/Adapters/InMemory/Models/InMemoryCountRecord.php
index 294db42..166033d 100644
--- a/src/Clients/InMemory/Models/InMemoryCountRecord.php
+++ b/src/Adapters/InMemory/Models/InMemoryCountRecord.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Clients\InMemory\Models;
+namespace Cosmastech\StatsDClient\Adapters\InMemory\Models;
 
 use DateTimeImmutable;
 
diff --git a/src/Clients/InMemory/Models/InMemoryDistributionRecord.php b/src/Adapters/InMemory/Models/InMemoryDistributionRecord.php
similarity index 82%
rename from src/Clients/InMemory/Models/InMemoryDistributionRecord.php
rename to src/Adapters/InMemory/Models/InMemoryDistributionRecord.php
index e18e01b..ad75eae 100644
--- a/src/Clients/InMemory/Models/InMemoryDistributionRecord.php
+++ b/src/Adapters/InMemory/Models/InMemoryDistributionRecord.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Clients\InMemory\Models;
+namespace Cosmastech\StatsDClient\Adapters\InMemory\Models;
 
 use DateTimeImmutable;
 
diff --git a/src/Clients/InMemory/Models/InMemoryGaugeRecord.php b/src/Adapters/InMemory/Models/InMemoryGaugeRecord.php
similarity index 82%
rename from src/Clients/InMemory/Models/InMemoryGaugeRecord.php
rename to src/Adapters/InMemory/Models/InMemoryGaugeRecord.php
index 6a93e70..9ec3122 100644
--- a/src/Clients/InMemory/Models/InMemoryGaugeRecord.php
+++ b/src/Adapters/InMemory/Models/InMemoryGaugeRecord.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Clients\InMemory\Models;
+namespace Cosmastech\StatsDClient\Adapters\InMemory\Models;
 
 use DateTimeImmutable;
 
diff --git a/src/Clients/InMemory/Models/InMemoryHistogramRecord.php b/src/Adapters/InMemory/Models/InMemoryHistogramRecord.php
similarity index 82%
rename from src/Clients/InMemory/Models/InMemoryHistogramRecord.php
rename to src/Adapters/InMemory/Models/InMemoryHistogramRecord.php
index 196d80e..b6bd03b 100644
--- a/src/Clients/InMemory/Models/InMemoryHistogramRecord.php
+++ b/src/Adapters/InMemory/Models/InMemoryHistogramRecord.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Clients\InMemory\Models;
+namespace Cosmastech\StatsDClient\Adapters\InMemory\Models;
 
 use DateTimeImmutable;
 
diff --git a/src/Clients/InMemory/Models/InMemorySetRecord.php b/src/Adapters/InMemory/Models/InMemorySetRecord.php
similarity index 82%
rename from src/Clients/InMemory/Models/InMemorySetRecord.php
rename to src/Adapters/InMemory/Models/InMemorySetRecord.php
index fd88348..20daa9b 100644
--- a/src/Clients/InMemory/Models/InMemorySetRecord.php
+++ b/src/Adapters/InMemory/Models/InMemorySetRecord.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Clients\InMemory\Models;
+namespace Cosmastech\StatsDClient\Adapters\InMemory\Models;
 
 use DateTimeImmutable;
 
diff --git a/src/Clients/InMemory/Models/InMemoryStatsRecord.php b/src/Adapters/InMemory/Models/InMemoryStatsRecord.php
similarity index 91%
rename from src/Clients/InMemory/Models/InMemoryStatsRecord.php
rename to src/Adapters/InMemory/Models/InMemoryStatsRecord.php
index e99d696..341199e 100644
--- a/src/Clients/InMemory/Models/InMemoryStatsRecord.php
+++ b/src/Adapters/InMemory/Models/InMemoryStatsRecord.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Clients\InMemory\Models;
+namespace Cosmastech\StatsDClient\Adapters\InMemory\Models;
 
 class InMemoryStatsRecord
 {
diff --git a/src/Clients/InMemory/Models/InMemoryTimingRecord.php b/src/Adapters/InMemory/Models/InMemoryTimingRecord.php
similarity index 83%
rename from src/Clients/InMemory/Models/InMemoryTimingRecord.php
rename to src/Adapters/InMemory/Models/InMemoryTimingRecord.php
index bae1524..8bd18d9 100644
--- a/src/Clients/InMemory/Models/InMemoryTimingRecord.php
+++ b/src/Adapters/InMemory/Models/InMemoryTimingRecord.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Clients\InMemory\Models;
+namespace Cosmastech\StatsDClient\Adapters\InMemory\Models;
 
 use DateTimeImmutable;
 
diff --git a/src/Clients/League/LeagueStatsDClient.php b/src/Adapters/League/LeagueStatsDClientAdapter.php
similarity index 91%
rename from src/Clients/League/LeagueStatsDClient.php
rename to src/Adapters/League/LeagueStatsDClientAdapter.php
index 6c7a11d..1d770bb 100644
--- a/src/Clients/League/LeagueStatsDClient.php
+++ b/src/Adapters/League/LeagueStatsDClientAdapter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Clients\League;
+namespace Cosmastech\StatsDClient\Adapters\League;
 
-use Cosmastech\StatsDClient\Clients\Concerns\TagNormalizerAwareTrait;
-use Cosmastech\StatsDClient\Clients\Contracts\TagNormalizerAware;
-use Cosmastech\StatsDClient\Clients\StatsDClient;
+use Cosmastech\StatsDClient\Adapters\Concerns\TagNormalizerAwareTrait;
+use Cosmastech\StatsDClient\Adapters\Contracts\TagNormalizerAware;
+use Cosmastech\StatsDClient\Adapters\StatsDClientAdapter;
 use Cosmastech\StatsDClient\Utility\SampleRateDecider\Contracts\SampleRateSendDecider as SampleRateSendDeciderInterface;
 use Cosmastech\StatsDClient\Utility\SampleRateDecider\SampleRateSendDecider;
 use League\StatsD\Client;
@@ -12,7 +12,7 @@
 use League\StatsD\Exception\ConnectionException;
 use League\StatsD\StatsDClient as LeagueStatsDClientInterface;
 
-class LeagueStatsDClient implements StatsDClient, TagNormalizerAware
+class LeagueStatsDClientAdapter implements StatsDClientAdapter, TagNormalizerAware
 {
     use TagNormalizerAwareTrait;
 
diff --git a/src/Clients/StatsDClient.php b/src/Adapters/StatsDClientAdapter.php
similarity index 92%
rename from src/Clients/StatsDClient.php
rename to src/Adapters/StatsDClientAdapter.php
index c83b0df..e555e34 100644
--- a/src/Clients/StatsDClient.php
+++ b/src/Adapters/StatsDClientAdapter.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Clients;
+namespace Cosmastech\StatsDClient\Adapters;
 
-interface StatsDClient
+interface StatsDClientAdapter
 {
     public function timing(string $stat, float $durationMs, float $sampleRate = 1.0, array $tags = []): void;
 
diff --git a/src/Datadog/DatadogLoggingClient.php b/src/Clients/Datadog/DatadogLoggingClient.php
similarity index 90%
rename from src/Datadog/DatadogLoggingClient.php
rename to src/Clients/Datadog/DatadogLoggingClient.php
index 5e4b56a..9d7271e 100644
--- a/src/Datadog/DatadogLoggingClient.php
+++ b/src/Clients/Datadog/DatadogLoggingClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Datadog;
+namespace Cosmastech\StatsDClient\Clients\Datadog;
 
 use DataDog\DogStatsd;
 use Psr\Log\LoggerInterface;
diff --git a/tests/Clients/InMemory/InMemoryDecrementTest.php b/tests/Adapters/InMemory/InMemoryDecrementTest.php
similarity index 80%
rename from tests/Clients/InMemory/InMemoryDecrementTest.php
rename to tests/Adapters/InMemory/InMemoryDecrementTest.php
index 341fde2..331faf5 100644
--- a/tests/Clients/InMemory/InMemoryDecrementTest.php
+++ b/tests/Adapters/InMemory/InMemoryDecrementTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Tests\Clients\InMemory;
+namespace Cosmastech\StatsDClient\Tests\Adapters\InMemory;
 
-use Cosmastech\StatsDClient\Clients\InMemory\InMemoryClient;
+use Cosmastech\StatsDClient\Adapters\InMemory\InMemoryClientAdapter;
 use Cosmastech\StatsDClient\Tests\BaseTestCase;
-use Cosmastech\StatsDClient\Tests\ClockStub;
+use Cosmastech\StatsDClient\Tests\Doubles\ClockStub;
 use Cosmastech\StatsDClient\Tests\Doubles\TagNormalizerSpy;
 use DateTimeImmutable;
 use PHPUnit\Framework\Attributes\Test;
@@ -17,7 +17,7 @@ public function recordsCountRecord()
         // Given
         $stubDateTime = new DateTimeImmutable("2024-02-18 14:22:19");
 
-        $inMemoryClient = new InMemoryClient(
+        $inMemoryClient = new InMemoryClientAdapter(
             new ClockStub($stubDateTime)
         );
 
@@ -37,7 +37,7 @@ public function recordsCountRecord()
     public function normalizesTags()
     {
         // Given
-        $inMemoryClient = new InMemoryClient(new ClockStub(new DateTimeImmutable()));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub(new DateTimeImmutable()));
 
         // And
         $tagNormalizerSpy = new TagNormalizerSpy();
@@ -54,7 +54,7 @@ public function normalizesTags()
     public function positiveValue_convertsToANegativeNumber()
     {
         // Given
-        $inMemoryClient = new InMemoryClient(new ClockStub(new DateTimeImmutable()));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub(new DateTimeImmutable()));
 
         // When
         $inMemoryClient->decrement("some-stat", value: 1845);
diff --git a/tests/Clients/InMemory/InMemoryGaugeTest.php b/tests/Adapters/InMemory/InMemoryGaugeTest.php
similarity index 79%
rename from tests/Clients/InMemory/InMemoryGaugeTest.php
rename to tests/Adapters/InMemory/InMemoryGaugeTest.php
index 0aa4a7f..29a40d1 100644
--- a/tests/Clients/InMemory/InMemoryGaugeTest.php
+++ b/tests/Adapters/InMemory/InMemoryGaugeTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Tests\Clients\InMemory;
+namespace Cosmastech\StatsDClient\Tests\Adapters\InMemory;
 
-use Cosmastech\StatsDClient\Clients\InMemory\InMemoryClient;
+use Cosmastech\StatsDClient\Adapters\InMemory\InMemoryClientAdapter;
 use Cosmastech\StatsDClient\Tests\BaseTestCase;
-use Cosmastech\StatsDClient\Tests\ClockStub;
+use Cosmastech\StatsDClient\Tests\Doubles\ClockStub;
 use Cosmastech\StatsDClient\Tests\Doubles\TagNormalizerSpy;
 use DateTimeImmutable;
 use PHPUnit\Framework\Attributes\Test;
@@ -16,7 +16,7 @@ public function storesGaugeRecord()
     {
         // Given
         $stubDateTime = new DateTimeImmutable("2018-02-13 18:50:00");
-        $inMemoryClient = new InMemoryClient(new ClockStub($stubDateTime));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub($stubDateTime));
 
         // When
         $inMemoryClient->gauge("gauge-stat", 23488);
@@ -37,7 +37,7 @@ public function storesGaugeRecord()
     public function normalizesTags()
     {
         // Given
-        $inMemoryClient = new InMemoryClient(new ClockStub(new DateTimeImmutable()));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub(new DateTimeImmutable()));
 
         // And
         $tagNormalizerSpy = new TagNormalizerSpy();
diff --git a/tests/Clients/InMemory/InMemoryHistogramTest.php b/tests/Adapters/InMemory/InMemoryHistogramTest.php
similarity index 81%
rename from tests/Clients/InMemory/InMemoryHistogramTest.php
rename to tests/Adapters/InMemory/InMemoryHistogramTest.php
index ed44f23..5f9079a 100644
--- a/tests/Clients/InMemory/InMemoryHistogramTest.php
+++ b/tests/Adapters/InMemory/InMemoryHistogramTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Tests\Clients\InMemory;
+namespace Cosmastech\StatsDClient\Tests\Adapters\InMemory;
 
-use Cosmastech\StatsDClient\Clients\InMemory\InMemoryClient;
+use Cosmastech\StatsDClient\Adapters\InMemory\InMemoryClientAdapter;
 use Cosmastech\StatsDClient\Tests\BaseTestCase;
-use Cosmastech\StatsDClient\Tests\ClockStub;
+use Cosmastech\StatsDClient\Tests\Doubles\ClockStub;
 use Cosmastech\StatsDClient\Tests\Doubles\TagNormalizerSpy;
 use DateTimeImmutable;
 use PHPUnit\Framework\Attributes\Test;
@@ -16,7 +16,7 @@ public function storesHistogramRecord()
     {
         // Given
         $stubDateTime = new DateTimeImmutable("2018-02-13 18:50:00");
-        $inMemoryClient = new InMemoryClient(new ClockStub($stubDateTime));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub($stubDateTime));
 
         // When
         $inMemoryClient->histogram(
@@ -42,7 +42,7 @@ public function storesHistogramRecord()
     public function normalizesTags()
     {
         // Given
-        $inMemoryClient = new InMemoryClient(new ClockStub(new DateTimeImmutable()));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub(new DateTimeImmutable()));
 
         // And
         $tagNormalizerSpy = new TagNormalizerSpy();
diff --git a/tests/Clients/InMemory/InMemoryIncrementTest.php b/tests/Adapters/InMemory/InMemoryIncrementTest.php
similarity index 78%
rename from tests/Clients/InMemory/InMemoryIncrementTest.php
rename to tests/Adapters/InMemory/InMemoryIncrementTest.php
index e71555b..05f08d6 100644
--- a/tests/Clients/InMemory/InMemoryIncrementTest.php
+++ b/tests/Adapters/InMemory/InMemoryIncrementTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Tests\Clients\InMemory;
+namespace Cosmastech\StatsDClient\Tests\Adapters\InMemory;
 
-use Cosmastech\StatsDClient\Clients\InMemory\InMemoryClient;
-use Cosmastech\StatsDClient\Clients\InMemory\Models\InMemoryCountRecord;
+use Cosmastech\StatsDClient\Adapters\InMemory\InMemoryClientAdapter;
+use Cosmastech\StatsDClient\Adapters\InMemory\Models\InMemoryCountRecord;
 use Cosmastech\StatsDClient\Tests\BaseTestCase;
-use Cosmastech\StatsDClient\Tests\ClockStub;
+use Cosmastech\StatsDClient\Tests\Doubles\ClockStub;
 use Cosmastech\StatsDClient\Tests\Doubles\TagNormalizerSpy;
 use DateTimeImmutable;
 use PHPUnit\Framework\Attributes\Test;
@@ -17,7 +17,7 @@ public function recordsCountRecord()
     {
         // Given
         $stubDateTime = new DateTimeImmutable("2024-01-19 00:00:00");
-        $inMemoryClient = new InMemoryClient(
+        $inMemoryClient = new InMemoryClientAdapter(
             new ClockStub($stubDateTime)
         );
 
@@ -41,7 +41,7 @@ public function recordsCountRecord()
     public function recordsTags()
     {
         // Given
-        $inMemoryClient = new InMemoryClient(new ClockStub(new DateTimeImmutable()));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub(new DateTimeImmutable()));
 
         // When
         $inMemoryClient->increment("hello", tags: ["abc" => 199, "xyz" => "end"]);
@@ -55,7 +55,7 @@ public function recordsTags()
     public function normalizesTags()
     {
         // Given
-        $inMemoryClient = new InMemoryClient(new ClockStub(new DateTimeImmutable()));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub(new DateTimeImmutable()));
 
         // And
         $tagNormalizerSpy = new TagNormalizerSpy();
diff --git a/tests/Clients/InMemory/InMemorySetTest.php b/tests/Adapters/InMemory/InMemorySetTest.php
similarity index 78%
rename from tests/Clients/InMemory/InMemorySetTest.php
rename to tests/Adapters/InMemory/InMemorySetTest.php
index 1345ceb..72fb2f8 100644
--- a/tests/Clients/InMemory/InMemorySetTest.php
+++ b/tests/Adapters/InMemory/InMemorySetTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Tests\Clients\InMemory;
+namespace Cosmastech\StatsDClient\Tests\Adapters\InMemory;
 
-use Cosmastech\StatsDClient\Clients\InMemory\InMemoryClient;
+use Cosmastech\StatsDClient\Adapters\InMemory\InMemoryClientAdapter;
 use Cosmastech\StatsDClient\Tests\BaseTestCase;
-use Cosmastech\StatsDClient\Tests\ClockStub;
+use Cosmastech\StatsDClient\Tests\Doubles\ClockStub;
 use Cosmastech\StatsDClient\Tests\Doubles\TagNormalizerSpy;
 use DateTimeImmutable;
 use PHPUnit\Framework\Attributes\Test;
@@ -16,7 +16,7 @@ public function storesSetRecord()
     {
         // Given
         $stubDateTime = new DateTimeImmutable("2018-02-13 18:50:00");
-        $inMemoryClient = new InMemoryClient(new ClockStub($stubDateTime));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub($stubDateTime));
 
         // When
         $inMemoryClient->set("set-test", 14);
@@ -37,7 +37,7 @@ public function storesSetRecord()
     public function normalizesTags()
     {
         // Given
-        $inMemoryClient = new InMemoryClient(new ClockStub(new DateTimeImmutable()));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub(new DateTimeImmutable()));
 
         // And
         $tagNormalizerSpy = new TagNormalizerSpy();
diff --git a/tests/Clients/InMemory/InMemoryTest.php b/tests/Adapters/InMemory/InMemoryTest.php
similarity index 76%
rename from tests/Clients/InMemory/InMemoryTest.php
rename to tests/Adapters/InMemory/InMemoryTest.php
index e114953..2a6c076 100644
--- a/tests/Clients/InMemory/InMemoryTest.php
+++ b/tests/Adapters/InMemory/InMemoryTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Tests\Clients\InMemory;
+namespace Cosmastech\StatsDClient\Tests\Adapters\InMemory;
 
-use Cosmastech\StatsDClient\Clients\InMemory\InMemoryClient;
-use Cosmastech\StatsDClient\Clients\InMemory\Models\InMemoryStatsRecord;
+use Cosmastech\StatsDClient\Adapters\InMemory\InMemoryClientAdapter;
+use Cosmastech\StatsDClient\Adapters\InMemory\Models\InMemoryStatsRecord;
 use Cosmastech\StatsDClient\Tests\BaseTestCase;
-use Cosmastech\StatsDClient\Tests\ClockStub;
+use Cosmastech\StatsDClient\Tests\Doubles\ClockStub;
 use Cosmastech\StatsDClient\Tests\Doubles\TagNormalizerSpy;
 use DateTimeImmutable;
 use PHPUnit\Framework\Attributes\Test;
@@ -16,7 +16,7 @@ class InMemoryTest extends BaseTestCase
     public function getStats_returnsInMemoryStatsRecord()
     {
         // Given
-        $inMemoryClient = new InMemoryClient(new ClockStub(new DateTimeImmutable()));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub(new DateTimeImmutable()));
 
         // When
         $record = $inMemoryClient->getStats();
@@ -30,7 +30,7 @@ public function getStats_returnsInMemoryStatsRecord()
     public function reset_clearsStats()
     {
         // Given
-        $inMemoryClient = new InMemoryClient(new ClockStub(new DateTimeImmutable()));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub(new DateTimeImmutable()));
 
         // And set some data
         $inMemoryClient->increment("bogus", 1, ["tag1" => true], 99);
@@ -49,7 +49,7 @@ public function reset_clearsStats()
     public function setTagNormalizer()
     {
         // Given
-        $inMemoryClient = new InMemoryClient(new ClockStub(new DateTimeImmutable()));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub(new DateTimeImmutable()));
 
         // And
         $tagNormalizerSpy = new TagNormalizerSpy();
@@ -66,7 +66,7 @@ public function setTagNormalizer()
     public function getClient_returnsNull()
     {
         // Given
-        $inMemoryClient = new InMemoryClient(new ClockStub(new DateTimeImmutable()));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub(new DateTimeImmutable()));
 
         // When
         $client = $inMemoryClient->getClient();
diff --git a/tests/Clients/InMemory/InMemoryTimingTest.php b/tests/Adapters/InMemory/InMemoryTimingTest.php
similarity index 80%
rename from tests/Clients/InMemory/InMemoryTimingTest.php
rename to tests/Adapters/InMemory/InMemoryTimingTest.php
index a0089c2..4198e3b 100644
--- a/tests/Clients/InMemory/InMemoryTimingTest.php
+++ b/tests/Adapters/InMemory/InMemoryTimingTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Tests\Clients\InMemory;
+namespace Cosmastech\StatsDClient\Tests\Adapters\InMemory;
 
-use Cosmastech\StatsDClient\Clients\InMemory\InMemoryClient;
+use Cosmastech\StatsDClient\Adapters\InMemory\InMemoryClientAdapter;
 use Cosmastech\StatsDClient\Tests\BaseTestCase;
-use Cosmastech\StatsDClient\Tests\ClockStub;
+use Cosmastech\StatsDClient\Tests\Doubles\ClockStub;
 use Cosmastech\StatsDClient\Tests\Doubles\TagNormalizerSpy;
 use DateTimeImmutable;
 use PHPUnit\Framework\Attributes\Test;
@@ -16,7 +16,7 @@ public function storesTimingRecord()
     {
         // Given
         $stubDateTime = new DateTimeImmutable("2019-02-13 07:56:00");
-        $inMemoryClient = new InMemoryClient(new ClockStub($stubDateTime));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub($stubDateTime));
 
         // When
         $inMemoryClient->timing("timing-stat", 199, 0.2, ["timing" => "some-value"]);
@@ -37,7 +37,7 @@ public function storesTimingRecord()
     public function normalizesTags()
     {
         // Given
-        $inMemoryClient = new InMemoryClient(new ClockStub(new DateTimeImmutable()));
+        $inMemoryClient = new InMemoryClientAdapter(new ClockStub(new DateTimeImmutable()));
 
         // And
         $tagNormalizerSpy = new TagNormalizerSpy();
diff --git a/tests/Clients/League/LeagueStatsDClientTest.php b/tests/Adapters/League/LeagueStatsDClientTest.php
similarity index 68%
rename from tests/Clients/League/LeagueStatsDClientTest.php
rename to tests/Adapters/League/LeagueStatsDClientTest.php
index cf58a28..3955a99 100644
--- a/tests/Clients/League/LeagueStatsDClientTest.php
+++ b/tests/Adapters/League/LeagueStatsDClientTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Tests\Clients\League;
+namespace Cosmastech\StatsDClient\Tests\Adapters\League;
 
-use Cosmastech\StatsDClient\Clients\League\LeagueStatsDClient;
+use Cosmastech\StatsDClient\Adapters\League\LeagueStatsDClientAdapter;
 use Cosmastech\StatsDClient\Tests\BaseTestCase;
 use League\StatsD\StatsDClient;
 use PHPUnit\Framework\Attributes\Test;
@@ -13,7 +13,7 @@ class LeagueStatsDClientTest extends BaseTestCase
     public function getClient_returnsLeagueStatsDClient()
     {
         // Given
-        $leagueStatsDClient = LeagueStatsDClient::fromConfig([]);
+        $leagueStatsDClient = LeagueStatsDClientAdapter::fromConfig([]);
 
         // When
         $client = $leagueStatsDClient->getClient();
diff --git a/tests/Datadog/DatadogLoggingClientTest.php b/tests/Clients/Datadog/DatadogLoggingClientTest.php
similarity index 91%
rename from tests/Datadog/DatadogLoggingClientTest.php
rename to tests/Clients/Datadog/DatadogLoggingClientTest.php
index 652ae19..5902b9a 100644
--- a/tests/Datadog/DatadogLoggingClientTest.php
+++ b/tests/Clients/Datadog/DatadogLoggingClientTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Tests\Datadog;
+namespace Cosmastech\StatsDClient\Tests\Clients\Datadog;
 
 use Cosmastech\PsrLoggerSpy\LogFactory;
 use Cosmastech\PsrLoggerSpy\LoggerSpy;
-use Cosmastech\StatsDClient\Datadog\DatadogLoggingClient;
+use Cosmastech\StatsDClient\Clients\Datadog\DatadogLoggingClient;
 use Cosmastech\StatsDClient\Tests\BaseTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
diff --git a/tests/ClockStub.php b/tests/Doubles/ClockStub.php
similarity index 94%
rename from tests/ClockStub.php
rename to tests/Doubles/ClockStub.php
index f8843f3..e688648 100644
--- a/tests/ClockStub.php
+++ b/tests/Doubles/ClockStub.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cosmastech\StatsDClient\Tests;
+namespace Cosmastech\StatsDClient\Tests\Doubles;
 
 use DateTimeImmutable;
 use InvalidArgumentException;