diff --git a/modules/marketing_cloud_address/tests/src/Functional/MarketingCloudAddressTest.php b/modules/marketing_cloud_address/tests/src/Functional/MarketingCloudAddressTest.php
index eee143f..fe18d5e 100644
--- a/modules/marketing_cloud_address/tests/src/Functional/MarketingCloudAddressTest.php
+++ b/modules/marketing_cloud_address/tests/src/Functional/MarketingCloudAddressTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\marketing_cloud_address\Functional;
 
-use League\JsonGuard;
-use League\JsonReference;
+use League\JsonGuard\Validator;
+use League\JsonReference\Dereferencer;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -45,9 +45,9 @@ class MarketingCloudAddressTest extends BrowserTestBase {
       ->set('do_not_send', TRUE)
       ->save();
     // Get schema validator.
-    $this->metaSchema = JsonReference\Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
+    $this->metaSchema = Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
 
-    $this->metaSchema = JsonReference\Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
+    $this->metaSchema = Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
     // Create service.
     $this->service = \Drupal::service('marketing_cloud_address.service');
     // Get marketing_cloud_assets config object.
@@ -63,7 +63,7 @@ class MarketingCloudAddressTest extends BrowserTestBase {
     $this->assertNotEmpty($schema, "json schema for validate_email is empty.");
     $schema = json_decode($schema);
     $this->assertNotEmpty($schema, "json schema for validate_email is invalid json.");
-    $validator = new JsonGuard\Validator($schema, $this->metaSchema);
+    $validator = new Validator($schema, $this->metaSchema);
     $this->assertNotFalse($validator->passes(), "schema validation failed for validate_email.");
     // Test validateEmail against expected inputs.
     $data = $this->validateEmailData();
diff --git a/modules/marketing_cloud_assets/tests/src/Functional/MarketingCloudAssetsTest.php b/modules/marketing_cloud_assets/tests/src/Functional/MarketingCloudAssetsTest.php
index ec35ff9..abc7a21 100644
--- a/modules/marketing_cloud_assets/tests/src/Functional/MarketingCloudAssetsTest.php
+++ b/modules/marketing_cloud_assets/tests/src/Functional/MarketingCloudAssetsTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\marketing_cloud_assets\Functional;
 
-use League\JsonGuard;
-use League\JsonReference;
+use League\JsonGuard\Validator;
+use League\JsonReference\Dereferencer;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -45,7 +45,7 @@ class MarketingCloudAssetsTest extends BrowserTestBase {
       ->set('do_not_send', TRUE)
       ->save();
     // Get schema validator.
-    $this->metaSchema = JsonReference\Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
+    $this->metaSchema = Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
     // Create service.
     $this->service = \Drupal::service('marketing_cloud_assets.service');
     // Get marketing_cloud_assets config object.
@@ -256,7 +256,7 @@ class MarketingCloudAssetsTest extends BrowserTestBase {
     $this->assertNotEmpty($schema, "json schema for $machineName definition is empty.");
     $schema = json_decode($schema);
     $this->assertNotEmpty($schema, "json schema for $machineName definition is invalid json.");
-    $validator = new JsonGuard\Validator($schema, $this->metaSchema);
+    $validator = new Validator($schema, $this->metaSchema);
     $this->assertNotFalse($validator->passes(), "schema validation failed for $machineName.");
   }
 
diff --git a/modules/marketing_cloud_campaigns/tests/src/Functional/MarketingCloudCampaignsTest.php b/modules/marketing_cloud_campaigns/tests/src/Functional/MarketingCloudCampaignsTest.php
index 7e9b561..c584b80 100644
--- a/modules/marketing_cloud_campaigns/tests/src/Functional/MarketingCloudCampaignsTest.php
+++ b/modules/marketing_cloud_campaigns/tests/src/Functional/MarketingCloudCampaignsTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\marketing_cloud_campaigns\Functional;
 
-use League\JsonGuard;
-use League\JsonReference;
+use League\JsonGuard\Validator;
+use League\JsonReference\Dereferencer;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -45,7 +45,7 @@ class MarketingCloudCampaignsTest extends BrowserTestBase {
       ->set('do_not_send', TRUE)
       ->save();
     // Get schema validator.
-    $this->metaSchema = JsonReference\Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
+    $this->metaSchema = Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
     // Create service.
     $this->service = \Drupal::service('marketing_cloud_campaigns.service');
     // Get marketing_cloud_assets config object.
@@ -249,7 +249,7 @@ class MarketingCloudCampaignsTest extends BrowserTestBase {
     $this->assertNotEmpty($schema, "json schema for $machineName definition is empty.");
     $schema = json_decode($schema);
     $this->assertNotEmpty($schema, "json schema for $machineName definition is invalid json.");
-    $validator = new JsonGuard\Validator($schema, $this->metaSchema);
+    $validator = new Validator($schema, $this->metaSchema);
     $this->assertNotFalse($validator->passes(), "schema validation failed for $machineName.");
   }
 
diff --git a/modules/marketing_cloud_contacts/tests/src/Functional/MarketingCloudContactsTest.php b/modules/marketing_cloud_contacts/tests/src/Functional/MarketingCloudContactsTest.php
index 800406b..599dbfc 100644
--- a/modules/marketing_cloud_contacts/tests/src/Functional/MarketingCloudContactsTest.php
+++ b/modules/marketing_cloud_contacts/tests/src/Functional/MarketingCloudContactsTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\marketing_cloud_contacts\Functional;
 
-use League\JsonGuard;
-use League\JsonReference;
+use League\JsonGuard\Validator;
+use League\JsonReference\Dereferencer;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -45,7 +45,7 @@ class MarketingCloudContactsTest extends BrowserTestBase {
       ->set('do_not_send', TRUE)
       ->save();
     // Get schema validator.
-    $this->metaSchema = JsonReference\Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
+    $this->metaSchema = Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
     // Create service.
     $this->service = \Drupal::service('marketing_cloud_contacts.service');
     // Get marketing_cloud_assets config object.
@@ -656,7 +656,7 @@ class MarketingCloudContactsTest extends BrowserTestBase {
     $this->assertNotEmpty($schema, "json schema for $machineName definition is empty.");
     $schema = json_decode($schema);
     $this->assertNotEmpty($schema, "json schema for $machineName definition is invalid json.");
-    $validator = new JsonGuard\Validator($schema, $this->metaSchema);
+    $validator = new Validator($schema, $this->metaSchema);
     $this->assertNotFalse($validator->passes(), "schema validation failed for $machineName.");
   }
 
diff --git a/modules/marketing_cloud_data_events/tests/src/Functional/MarketingCloudDataEventsTest.php b/modules/marketing_cloud_data_events/tests/src/Functional/MarketingCloudDataEventsTest.php
index 369c725..4386ffc 100644
--- a/modules/marketing_cloud_data_events/tests/src/Functional/MarketingCloudDataEventsTest.php
+++ b/modules/marketing_cloud_data_events/tests/src/Functional/MarketingCloudDataEventsTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\marketing_cloud_data_events\Functional;
 
-use League\JsonGuard;
-use League\JsonReference;
+use League\JsonGuard\Validator;
+use League\JsonReference\Dereferencer;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -45,7 +45,7 @@ class MarketingCloudDataEventsTest extends BrowserTestBase {
       ->set('do_not_send', TRUE)
       ->save();
     // Get schema validator.
-    $this->metaSchema = JsonReference\Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
+    $this->metaSchema = Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
     // Create service.
     $this->service = \Drupal::service('marketing_cloud_data_events.service');
     // Get marketing_cloud_data_events config object.
@@ -175,7 +175,7 @@ class MarketingCloudDataEventsTest extends BrowserTestBase {
     $this->assertNotEmpty($schema, "json schema for $machineName definition is empty.");
     $schema = json_decode($schema);
     $this->assertNotEmpty($schema, "json schema for $machineName definition is invalid json.");
-    $validator = new JsonGuard\Validator($schema, $this->metaSchema);
+    $validator = new Validator($schema, $this->metaSchema);
     $this->assertNotFalse($validator->passes(), "schema validation failed for $machineName.");
   }
 
diff --git a/modules/marketing_cloud_interaction/tests/src/Functional/MarketingCloudInteractionTest.php b/modules/marketing_cloud_interaction/tests/src/Functional/MarketingCloudInteractionTest.php
index 7b0728d..e7408ae 100644
--- a/modules/marketing_cloud_interaction/tests/src/Functional/MarketingCloudInteractionTest.php
+++ b/modules/marketing_cloud_interaction/tests/src/Functional/MarketingCloudInteractionTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\marketing_cloud_interaction\Functional;
 
-use League\JsonGuard;
-use League\JsonReference;
+use League\JsonGuard\Validator;
+use League\JsonReference\Dereferencer;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -45,7 +45,7 @@ class MarketingCloudInteractionTest extends BrowserTestBase {
       ->set('do_not_send', TRUE)
       ->save();
     // Get schema validator.
-    $this->metaSchema = JsonReference\Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
+    $this->metaSchema = Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
     // Create service.
     $this->service = \Drupal::service('marketing_cloud_interaction.service');
     // Get marketing_cloud_assets config object.
@@ -346,7 +346,7 @@ class MarketingCloudInteractionTest extends BrowserTestBase {
     $this->assertNotEmpty($schema, "json schema for $machineName definition is empty.");
     $schema = json_decode($schema);
     $this->assertNotEmpty($schema, "json schema for $machineName definition is invalid json.");
-    $validator = new JsonGuard\Validator($schema, $this->metaSchema);
+    $validator = new Validator($schema, $this->metaSchema);
     $this->assertNotFalse($validator->passes(), "schema validation failed for $machineName.");
   }
 
diff --git a/modules/marketing_cloud_messages/tests/src/Functional/MarketingCloudMessagesTest.php b/modules/marketing_cloud_messages/tests/src/Functional/MarketingCloudMessagesTest.php
index 43f972a..3231f37 100644
--- a/modules/marketing_cloud_messages/tests/src/Functional/MarketingCloudMessagesTest.php
+++ b/modules/marketing_cloud_messages/tests/src/Functional/MarketingCloudMessagesTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\marketing_cloud_messages\Functional;
 
-use League\JsonGuard;
-use League\JsonReference;
+use League\JsonGuard\Validator;
+use League\JsonReference\Dereferencer;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -45,7 +45,7 @@ class MarketingCloudMessagesTest extends BrowserTestBase {
       ->set('do_not_send', TRUE)
       ->save();
     // Get schema validator.
-    $this->metaSchema = JsonReference\Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
+    $this->metaSchema = Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
     // Create service.
     $this->service = \Drupal::service('marketing_cloud_messages.service');
     // Get marketing_cloud_assets config object.
@@ -129,7 +129,7 @@ class MarketingCloudMessagesTest extends BrowserTestBase {
     $this->assertNotEmpty($schema, "json schema for $machineName definition is empty.");
     $schema = json_decode($schema);
     $this->assertNotEmpty($schema, "json schema for $machineName definition is invalid json.");
-    $validator = new JsonGuard\Validator($schema, $this->metaSchema);
+    $validator = new Validator($schema, $this->metaSchema);
     $this->assertNotFalse($validator->passes(), "schema validation failed for $machineName.");
   }
 
diff --git a/modules/marketing_cloud_platform/tests/src/Functional/MarketingCloudPlatformTest.php b/modules/marketing_cloud_platform/tests/src/Functional/MarketingCloudPlatformTest.php
index 80df79f..df762f1 100644
--- a/modules/marketing_cloud_platform/tests/src/Functional/MarketingCloudPlatformTest.php
+++ b/modules/marketing_cloud_platform/tests/src/Functional/MarketingCloudPlatformTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\marketing_cloud_platform\Functional;
 
-use League\JsonGuard;
-use League\JsonReference;
+use League\JsonGuard\Validator;
+use League\JsonReference\Dereferencer;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -45,7 +45,7 @@ class MarketingCloudPlatformTest extends BrowserTestBase {
       ->set('do_not_send', TRUE)
       ->save();
     // Get schema validator.
-    $this->metaSchema = JsonReference\Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
+    $this->metaSchema = Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
     // Create service.
     $this->service = \Drupal::service('marketing_cloud_platform.service');
     // Get config object.
@@ -121,7 +121,7 @@ class MarketingCloudPlatformTest extends BrowserTestBase {
     $this->assertNotEmpty($schema, "json schema for $machineName definition is empty.");
     $schema = json_decode($schema);
     $this->assertNotEmpty($schema, "json schema for $machineName definition is invalid json.");
-    $validator = new JsonGuard\Validator($schema, $this->metaSchema);
+    $validator = new Validator($schema, $this->metaSchema);
     $this->assertNotFalse($validator->passes(), "schema validation failed for $machineName.");
   }
 
diff --git a/modules/marketing_cloud_push/tests/src/Functional/MarketingCloudPushTest.php b/modules/marketing_cloud_push/tests/src/Functional/MarketingCloudPushTest.php
index 8d72716..560a64a 100644
--- a/modules/marketing_cloud_push/tests/src/Functional/MarketingCloudPushTest.php
+++ b/modules/marketing_cloud_push/tests/src/Functional/MarketingCloudPushTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\marketing_cloud_push\Functional;
 
-use League\JsonGuard;
-use League\JsonReference;
+use League\JsonGuard\Validator;
+use League\JsonReference\Dereferencer;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -45,7 +45,7 @@ class MarketingCloudPushTest extends BrowserTestBase {
       ->set('do_not_send', TRUE)
       ->save();
     // Get schema validator.
-    $this->metaSchema = JsonReference\Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
+    $this->metaSchema = Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
     // Create service.
     $this->service = \Drupal::service('marketing_cloud_push.service');
     // Get config object.
@@ -683,7 +683,7 @@ class MarketingCloudPushTest extends BrowserTestBase {
     $this->assertNotEmpty($schema, "json schema for $machineName definition is empty.");
     $schema = json_decode($schema);
     $this->assertNotEmpty($schema, "json schema for $machineName definition is invalid json.");
-    $validator = new JsonGuard\Validator($schema, $this->metaSchema);
+    $validator = new Validator($schema, $this->metaSchema);
     $this->assertNotFalse($validator->passes(), "schema validation failed for $machineName.");
   }
 
diff --git a/modules/marketing_cloud_sms/tests/src/Functional/MarketingCloudSMSTest.php b/modules/marketing_cloud_sms/tests/src/Functional/MarketingCloudSMSTest.php
index 3924a2c..6965969 100644
--- a/modules/marketing_cloud_sms/tests/src/Functional/MarketingCloudSMSTest.php
+++ b/modules/marketing_cloud_sms/tests/src/Functional/MarketingCloudSMSTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\marketing_cloud_sms\Functional;
 
-use League\JsonGuard;
-use League\JsonReference;
+use League\JsonGuard\Validator;
+use League\JsonReference\Dereferencer;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -45,7 +45,7 @@ class MarketingCloudSMSTest extends BrowserTestBase {
       ->set('do_not_send', TRUE)
       ->save();
     // Get schema validator.
-    $this->metaSchema = JsonReference\Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
+    $this->metaSchema = Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
     // Create service.
     $this->service = \Drupal::service('marketing_cloud_sms.service');
     // Get config object.
@@ -720,7 +720,7 @@ class MarketingCloudSMSTest extends BrowserTestBase {
     $this->assertNotEmpty($schema, "json schema for $machineName definition is empty.");
     $schema = json_decode($schema);
     $this->assertNotEmpty($schema, "json schema for $machineName definition is invalid json.");
-    $validator = new JsonGuard\Validator($schema, $this->metaSchema);
+    $validator = new Validator($schema, $this->metaSchema);
     $this->assertNotFalse($validator->passes(), "schema validation failed for $machineName.");
   }
 
diff --git a/src/MarketingCloudService.php b/src/MarketingCloudService.php
index c931393..6449b9f 100644
--- a/src/MarketingCloudService.php
+++ b/src/MarketingCloudService.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\marketing_cloud;
 
-use League\JsonGuard;
-use League\JsonReference;
+use League\JsonGuard\Validator;
+use League\JsonReference\Dereferencer;
 use GuzzleHttp\Exception\RequestException;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Logger\LoggerChannelFactory;
@@ -154,8 +154,8 @@ abstract class MarketingCloudService {
 
       // Validate the schema.
       if ($validateSchema) {
-        $metaSchema = JsonReference\Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
-        $validator = new JsonGuard\Validator($schema, $metaSchema);
+        $metaSchema = Dereferencer::draft6()->dereference('http://json-schema.org/draft-06/schema#');
+        $validator = new Validator($schema, $metaSchema);
         if ($validator->fails()) {
           $message = $this->t('Errors were found in the schema for %machine_name in %module_name. Please check the logs.', ['%machine_name' => $machineName, '%module_name' => $moduleName]);
           $this->messenger->addError($message);
@@ -177,7 +177,7 @@ abstract class MarketingCloudService {
 
       // Validate input JSON against endpoint schema.
       if ($validateJson) {
-        $validator = new JsonGuard\Validator($data, $schema);
+        $validator = new Validator($data, $schema);
         if ($validator->fails()) {
           $errors = $validator->errors();
           foreach ($errors as $error) {