diff --git a/lib/Discovery/Crm/Companies/Discovery.php b/lib/Discovery/Crm/Companies/Discovery.php
index 849b74134..ded37616d 100644
--- a/lib/Discovery/Crm/Companies/Discovery.php
+++ b/lib/Discovery/Crm/Companies/Discovery.php
@@ -19,10 +19,10 @@
  */
 class Discovery extends ObjectDiscovery
 {
-  public function gdprApi()
-  {
-      $config = $this->config->convertToClientConfig(Configuration::class);
+    public function gdprApi()
+    {
+        $config = $this->config->convertToClientConfig(Configuration::class);
 
-      return new GDPRApi($this->client, $config);
-  }
+        return new GDPRApi($this->client, $config);
+    }
 }
diff --git a/lib/Discovery/Crm/Deals/Discovery.php b/lib/Discovery/Crm/Deals/Discovery.php
index ee9172f0c..98e19b78b 100644
--- a/lib/Discovery/Crm/Deals/Discovery.php
+++ b/lib/Discovery/Crm/Deals/Discovery.php
@@ -19,10 +19,10 @@
  */
 class Discovery extends ObjectDiscovery
 {
-  public function gdprApi()
-  {
-      $config = $this->config->convertToClientConfig(Configuration::class);
+    public function gdprApi()
+    {
+        $config = $this->config->convertToClientConfig(Configuration::class);
 
-      return new GDPRApi($this->client, $config);
-  }
+        return new GDPRApi($this->client, $config);
+    }
 }
diff --git a/lib/Discovery/Discovery.php b/lib/Discovery/Discovery.php
index e73897d52..a931d6dd1 100644
--- a/lib/Discovery/Discovery.php
+++ b/lib/Discovery/Discovery.php
@@ -21,15 +21,15 @@ class Discovery extends DiscoveryBase
 {
     /**
      * @param $options = [
-     *                  'method' => string, // Optional. Default value GET
-     *                  'path' => string, // Optional. Default value null
-     *                  'headers' => array, // Optional.
-     *                  'body' => mixed, // Optional.
-     *                  'authType' => enum(none, accessToken, hapikey), // Optional.
-     *                  'baseUrl' => string, // Optional.
-     *                  'qs' => array, // Optional.
-     *                  'defaultJson' => bool, // Optional.
-     *                  ]
+     *                 'method' => string, // Optional. Default value GET
+     *                 'path' => string, // Optional. Default value null
+     *                 'headers' => array, // Optional.
+     *                 'body' => mixed, // Optional.
+     *                 'authType' => enum(none, accessToken, hapikey), // Optional.
+     *                 'baseUrl' => string, // Optional.
+     *                 'qs' => array, // Optional.
+     *                 'defaultJson' => bool, // Optional.
+     *                 ]
      */
     public function apiRequest(array $options = [])
     {
diff --git a/tests/spec/Discovery/Auth/DiscoverySpec.php b/tests/spec/Discovery/Auth/DiscoverySpec.php
index eb5e73126..e4448f338 100644
--- a/tests/spec/Discovery/Auth/DiscoverySpec.php
+++ b/tests/spec/Discovery/Auth/DiscoverySpec.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use HubSpot\Config;
+use HubSpot\Discovery\Auth\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -15,7 +16,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Auth\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Auth/OAuth/DiscoverySpec.php b/tests/spec/Discovery/Auth/OAuth/DiscoverySpec.php
index 1c4e4a547..e928c3ced 100644
--- a/tests/spec/Discovery/Auth/OAuth/DiscoverySpec.php
+++ b/tests/spec/Discovery/Auth/OAuth/DiscoverySpec.php
@@ -7,6 +7,7 @@
 use HubSpot\Client\Auth\OAuth\Api\RefreshTokensApi;
 use HubSpot\Client\Auth\OAuth\Api\TokensApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Auth\OAuth\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -18,7 +19,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Auth\OAuth\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Automation/Actions/DiscoverySpec.php b/tests/spec/Discovery/Automation/Actions/DiscoverySpec.php
index d5d95f5c8..ad97d81b5 100644
--- a/tests/spec/Discovery/Automation/Actions/DiscoverySpec.php
+++ b/tests/spec/Discovery/Automation/Actions/DiscoverySpec.php
@@ -3,7 +3,12 @@
 namespace spec\HubSpot\Discovery\Automation\Actions;
 
 use GuzzleHttp\Client;
+use HubSpot\Client\Automation\Actions\Api\CallbacksApi;
+use HubSpot\Client\Automation\Actions\Api\DefinitionsApi;
+use HubSpot\Client\Automation\Actions\Api\FunctionsApi;
+use HubSpot\Client\Automation\Actions\Api\RevisionsApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Automation\Actions\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -15,14 +20,14 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Automation\Actions\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
     {
-        $this->callbacksApi()->shouldHaveType(\HubSpot\Client\Automation\Actions\Api\CallbacksApi::class);
-        $this->definitionsApi()->shouldHaveType(\HubSpot\Client\Automation\Actions\Api\DefinitionsApi::class);
-        $this->functionsApi()->shouldHaveType(\HubSpot\Client\Automation\Actions\Api\FunctionsApi::class);
-        $this->revisionsApi()->shouldHaveType(\HubSpot\Client\Automation\Actions\Api\RevisionsApi::class);
+        $this->callbacksApi()->shouldHaveType(CallbacksApi::class);
+        $this->definitionsApi()->shouldHaveType(DefinitionsApi::class);
+        $this->functionsApi()->shouldHaveType(FunctionsApi::class);
+        $this->revisionsApi()->shouldHaveType(RevisionsApi::class);
     }
 }
diff --git a/tests/spec/Discovery/Automation/DiscoverySpec.php b/tests/spec/Discovery/Automation/DiscoverySpec.php
index 79bff79a2..1e2b5e0eb 100644
--- a/tests/spec/Discovery/Automation/DiscoverySpec.php
+++ b/tests/spec/Discovery/Automation/DiscoverySpec.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use HubSpot\Config;
+use HubSpot\Discovery\Automation\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -15,7 +16,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Automation\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Cms/AuditLogs/DiscoverySpec.php b/tests/spec/Discovery/Cms/AuditLogs/DiscoverySpec.php
index 6c00d2e92..35c951550 100644
--- a/tests/spec/Discovery/Cms/AuditLogs/DiscoverySpec.php
+++ b/tests/spec/Discovery/Cms/AuditLogs/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Cms\AuditLogs\Api\AuditLogsApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Cms\AuditLogs\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,7 +17,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Cms\AuditLogs\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Cms/Blogs/Authors/DiscoverySpec.php b/tests/spec/Discovery/Cms/Blogs/Authors/DiscoverySpec.php
index 4234bbd7b..03a364b7f 100644
--- a/tests/spec/Discovery/Cms/Blogs/Authors/DiscoverySpec.php
+++ b/tests/spec/Discovery/Cms/Blogs/Authors/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Cms\Blogs\Authors\Api\BlogAuthorsApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Cms\Blogs\Authors\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,7 +17,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Cms\Blogs\Authors\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Cms/Blogs/BlogPosts/DiscoverySpec.php b/tests/spec/Discovery/Cms/Blogs/BlogPosts/DiscoverySpec.php
index cd9cb1a94..82ff245ca 100644
--- a/tests/spec/Discovery/Cms/Blogs/BlogPosts/DiscoverySpec.php
+++ b/tests/spec/Discovery/Cms/Blogs/BlogPosts/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Cms\Blogs\BlogPosts\Api\BlogPostsApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Cms\Blogs\BlogPosts\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,7 +17,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Cms\Blogs\BlogPosts\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Cms/Blogs/DiscoverySpec.php b/tests/spec/Discovery/Cms/Blogs/DiscoverySpec.php
index 4f79fd572..b2d48257e 100644
--- a/tests/spec/Discovery/Cms/Blogs/DiscoverySpec.php
+++ b/tests/spec/Discovery/Cms/Blogs/DiscoverySpec.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use HubSpot\Config;
+use HubSpot\Discovery\Cms\Blogs\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -15,7 +16,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Cms\Blogs\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Cms/Blogs/Tags/DiscoverySpec.php b/tests/spec/Discovery/Cms/Blogs/Tags/DiscoverySpec.php
index 34b61d546..66945bec3 100644
--- a/tests/spec/Discovery/Cms/Blogs/Tags/DiscoverySpec.php
+++ b/tests/spec/Discovery/Cms/Blogs/Tags/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Cms\Blogs\Tags\Api\BlogTagsApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Cms\Blogs\Tags\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,7 +17,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Cms\Blogs\Tags\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Cms/DiscoverySpec.php b/tests/spec/Discovery/Cms/DiscoverySpec.php
index 450be79c7..1773208ee 100644
--- a/tests/spec/Discovery/Cms/DiscoverySpec.php
+++ b/tests/spec/Discovery/Cms/DiscoverySpec.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use HubSpot\Config;
+use HubSpot\Discovery\Cms\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -15,7 +16,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Cms\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Cms/Domains/DiscoverySpec.php b/tests/spec/Discovery/Cms/Domains/DiscoverySpec.php
index 9a62a2e8f..b577a0049 100644
--- a/tests/spec/Discovery/Cms/Domains/DiscoverySpec.php
+++ b/tests/spec/Discovery/Cms/Domains/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Cms\Domains\Api\DomainsApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Cms\Domains\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,7 +17,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Cms\Domains\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Cms/Pages/DiscoverySpec.php b/tests/spec/Discovery/Cms/Pages/DiscoverySpec.php
index 7877422c1..a099ca2f4 100644
--- a/tests/spec/Discovery/Cms/Pages/DiscoverySpec.php
+++ b/tests/spec/Discovery/Cms/Pages/DiscoverySpec.php
@@ -6,6 +6,7 @@
 use HubSpot\Client\Cms\Pages\Api\LandingPagesApi;
 use HubSpot\Client\Cms\Pages\Api\SitePagesApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Cms\Pages\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -17,7 +18,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Cms\Pages\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Cms/Performance/DiscoverySpec.php b/tests/spec/Discovery/Cms/Performance/DiscoverySpec.php
index 6bb45826f..a5ea2be8a 100644
--- a/tests/spec/Discovery/Cms/Performance/DiscoverySpec.php
+++ b/tests/spec/Discovery/Cms/Performance/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Cms\Performance\Api\PublicPerformanceApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Cms\Performance\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,7 +17,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Cms\Performance\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Cms/SiteSearch/DiscoverySpec.php b/tests/spec/Discovery/Cms/SiteSearch/DiscoverySpec.php
index 5da8729d6..4809117b5 100644
--- a/tests/spec/Discovery/Cms/SiteSearch/DiscoverySpec.php
+++ b/tests/spec/Discovery/Cms/SiteSearch/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Cms\SiteSearch\Api\PublicApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Cms\SiteSearch\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,7 +17,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Cms\SiteSearch\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Cms/SourceCode/DiscoverySpec.php b/tests/spec/Discovery/Cms/SourceCode/DiscoverySpec.php
index 540d65626..1b50ae103 100644
--- a/tests/spec/Discovery/Cms/SourceCode/DiscoverySpec.php
+++ b/tests/spec/Discovery/Cms/SourceCode/DiscoverySpec.php
@@ -9,6 +9,7 @@
 use HubSpot\Client\Cms\SourceCode\Api\SourceCodeExtractApi;
 use HubSpot\Client\Cms\SourceCode\Api\ValidationApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Cms\SourceCode\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -20,7 +21,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Cms\SourceCode\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Cms/UrlRedirects/DiscoverySpec.php b/tests/spec/Discovery/Cms/UrlRedirects/DiscoverySpec.php
index 226af904f..b7c95e5a7 100644
--- a/tests/spec/Discovery/Cms/UrlRedirects/DiscoverySpec.php
+++ b/tests/spec/Discovery/Cms/UrlRedirects/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Cms\UrlRedirects\Api\RedirectsApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Cms\UrlRedirects\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,7 +17,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Cms\UrlRedirects\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/CommunicationPreferences/DiscoverySpec.php b/tests/spec/Discovery/CommunicationPreferences/DiscoverySpec.php
index 93ff7bf49..0d44cdc19 100644
--- a/tests/spec/Discovery/CommunicationPreferences/DiscoverySpec.php
+++ b/tests/spec/Discovery/CommunicationPreferences/DiscoverySpec.php
@@ -6,6 +6,7 @@
 use HubSpot\Client\CommunicationPreferences\Api\DefinitionApi;
 use HubSpot\Client\CommunicationPreferences\Api\StatusApi;
 use HubSpot\Config;
+use HubSpot\Discovery\CommunicationPreferences\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -17,7 +18,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\CommunicationPreferences\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Conversations/DiscoverySpec.php b/tests/spec/Discovery/Conversations/DiscoverySpec.php
index 8082ce9ba..e21a36972 100644
--- a/tests/spec/Discovery/Conversations/DiscoverySpec.php
+++ b/tests/spec/Discovery/Conversations/DiscoverySpec.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use HubSpot\Config;
+use HubSpot\Discovery\Conversations\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -15,7 +16,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Conversations\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Conversations/VisitorIdentification/DiscoverySpec.php b/tests/spec/Discovery/Conversations/VisitorIdentification/DiscoverySpec.php
index 788185ad1..7e809f91f 100644
--- a/tests/spec/Discovery/Conversations/VisitorIdentification/DiscoverySpec.php
+++ b/tests/spec/Discovery/Conversations/VisitorIdentification/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Conversations\VisitorIdentification\Api\GenerateApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Conversations\VisitorIdentification\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,7 +17,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Conversations\VisitorIdentification\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Associations/DiscoverySpec.php b/tests/spec/Discovery/Crm/Associations/DiscoverySpec.php
index 22daa1fa5..c16028c03 100644
--- a/tests/spec/Discovery/Crm/Associations/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Associations/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Crm\Associations\Api\BatchApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Associations\Discovery;
 use HubSpot\Discovery\Crm\Associations\Schema\Discovery as SchemaDiscovery;
 use HubSpot\Discovery\Crm\Associations\V4\Discovery as V4Discovery;
 use PhpSpec\ObjectBehavior;
@@ -18,7 +19,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Associations\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Associations/Schema/DiscoverySpec.php b/tests/spec/Discovery/Crm/Associations/Schema/DiscoverySpec.php
index c7f280965..621a4d7b4 100644
--- a/tests/spec/Discovery/Crm/Associations/Schema/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Associations/Schema/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Crm\Associations\Schema\Api\TypesApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Associations\Schema\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,7 +17,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Associations\Schema\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Associations/V4/DiscoverySpec.php b/tests/spec/Discovery/Crm/Associations/V4/DiscoverySpec.php
index e8263cc13..adbd101d3 100644
--- a/tests/spec/Discovery/Crm/Associations/V4/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Associations/V4/DiscoverySpec.php
@@ -6,6 +6,7 @@
 use HubSpot\Client\Crm\Associations\V4\Api\BasicApi;
 use HubSpot\Client\Crm\Associations\V4\Api\BatchApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Associations\V4\Discovery;
 use HubSpot\Discovery\Crm\Associations\V4\Schema\Discovery as SchemaDiscovery;
 use PhpSpec\ObjectBehavior;
 
@@ -18,7 +19,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Associations\V4\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Associations/V4/Schema/DiscoverySpec.php b/tests/spec/Discovery/Crm/Associations/V4/Schema/DiscoverySpec.php
index b5580458c..20bded899 100644
--- a/tests/spec/Discovery/Crm/Associations/V4/Schema/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Associations/V4/Schema/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Crm\Associations\V4\Schema\Api\DefinitionsApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Associations\V4\Schema\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,7 +17,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Associations\V4\Schema\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Companies/DiscoverySpec.php b/tests/spec/Discovery/Crm/Companies/DiscoverySpec.php
index 15ece2cbd..dbc401d7f 100644
--- a/tests/spec/Discovery/Crm/Companies/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Companies/DiscoverySpec.php
@@ -9,6 +9,7 @@
 use HubSpot\Client\Crm\Companies\Api\PublicObjectApi;
 use HubSpot\Client\Crm\Companies\Api\SearchApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Companies\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -20,7 +21,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Companies\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Contacts/DiscoverySpec.php b/tests/spec/Discovery/Crm/Contacts/DiscoverySpec.php
index b2f568eb0..80ac08a04 100644
--- a/tests/spec/Discovery/Crm/Contacts/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Contacts/DiscoverySpec.php
@@ -9,6 +9,7 @@
 use HubSpot\Client\Crm\Contacts\Api\PublicObjectApi;
 use HubSpot\Client\Crm\Contacts\Api\SearchApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Contacts\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -20,7 +21,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Contacts\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Deals/DiscoverySpec.php b/tests/spec/Discovery/Crm/Deals/DiscoverySpec.php
index cd511e6cf..0a23970a0 100644
--- a/tests/spec/Discovery/Crm/Deals/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Deals/DiscoverySpec.php
@@ -9,6 +9,7 @@
 use HubSpot\Client\Crm\Deals\Api\PublicObjectApi;
 use HubSpot\Client\Crm\Deals\Api\SearchApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Deals\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -20,7 +21,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Deals\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/DiscoverySpec.php b/tests/spec/Discovery/Crm/DiscoverySpec.php
index 4b40fbbef..546f372db 100644
--- a/tests/spec/Discovery/Crm/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/DiscoverySpec.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -15,7 +16,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Extensions/Calling/DiscoverySpec.php b/tests/spec/Discovery/Crm/Extensions/Calling/DiscoverySpec.php
index 163721d44..1c6133cbe 100644
--- a/tests/spec/Discovery/Crm/Extensions/Calling/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Extensions/Calling/DiscoverySpec.php
@@ -6,6 +6,7 @@
 use HubSpot\Client\Crm\Extensions\Calling\Api\RecordingSettingsApi;
 use HubSpot\Client\Crm\Extensions\Calling\Api\SettingsApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Extensions\Calling\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -17,7 +18,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Extensions\Calling\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Extensions/Cards/DiscoverySpec.php b/tests/spec/Discovery/Crm/Extensions/Cards/DiscoverySpec.php
index 33b5a8a62..9438cccd0 100644
--- a/tests/spec/Discovery/Crm/Extensions/Cards/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Extensions/Cards/DiscoverySpec.php
@@ -6,6 +6,7 @@
 use HubSpot\Client\Crm\Extensions\Cards\Api\CardsApi;
 use HubSpot\Client\Crm\Extensions\Cards\Api\SampleResponseApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Extensions\Cards\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -17,7 +18,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Extensions\Cards\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Extensions/DiscoverySpec.php b/tests/spec/Discovery/Crm/Extensions/DiscoverySpec.php
index be20dc6bd..7477ad8c6 100644
--- a/tests/spec/Discovery/Crm/Extensions/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Extensions/DiscoverySpec.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Extensions\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -15,7 +16,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Extensions\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Extensions/Videoconferencing/DiscoverySpec.php b/tests/spec/Discovery/Crm/Extensions/Videoconferencing/DiscoverySpec.php
index 7f5af0eb1..cebcb8fad 100644
--- a/tests/spec/Discovery/Crm/Extensions/Videoconferencing/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Extensions/Videoconferencing/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Crm\Extensions\Videoconferencing\Api\SettingsApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Extensions\Videoconferencing\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,7 +17,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Extensions\Videoconferencing\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Imports/DiscoverySpec.php b/tests/spec/Discovery/Crm/Imports/DiscoverySpec.php
index 1c030addc..3d3cecdfe 100644
--- a/tests/spec/Discovery/Crm/Imports/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Imports/DiscoverySpec.php
@@ -6,6 +6,7 @@
 use HubSpot\Client\Crm\Imports\Api\CoreApi;
 use HubSpot\Client\Crm\Imports\Api\PublicImportsApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Imports\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -17,7 +18,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Imports\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/LineItems/DiscoverySpec.php b/tests/spec/Discovery/Crm/LineItems/DiscoverySpec.php
index a9b5b5c2b..0a3237e89 100644
--- a/tests/spec/Discovery/Crm/LineItems/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/LineItems/DiscoverySpec.php
@@ -9,6 +9,7 @@
 use HubSpot\Client\Crm\LineItems\Api\PublicObjectApi;
 use HubSpot\Client\Crm\LineItems\Api\SearchApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\LineItems\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -20,7 +21,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\LineItems\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Lists/DiscoverySpec.php b/tests/spec/Discovery/Crm/Lists/DiscoverySpec.php
index fc9267ecc..8be4fae28 100644
--- a/tests/spec/Discovery/Crm/Lists/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Lists/DiscoverySpec.php
@@ -6,6 +6,7 @@
 use HubSpot\Client\Crm\Lists\Api\ListsApi;
 use HubSpot\Client\Crm\Lists\Api\MembershipsApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Lists\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -17,7 +18,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Lists\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Products/DiscoverySpec.php b/tests/spec/Discovery/Crm/Products/DiscoverySpec.php
index 8d603a38f..027f76246 100644
--- a/tests/spec/Discovery/Crm/Products/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Products/DiscoverySpec.php
@@ -9,6 +9,7 @@
 use HubSpot\Client\Crm\Products\Api\PublicObjectApi;
 use HubSpot\Client\Crm\Products\Api\SearchApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Products\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -20,7 +21,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Products\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Quotes/DiscoverySpec.php b/tests/spec/Discovery/Crm/Quotes/DiscoverySpec.php
index d85f96986..9f9761e4e 100644
--- a/tests/spec/Discovery/Crm/Quotes/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Quotes/DiscoverySpec.php
@@ -9,6 +9,7 @@
 use HubSpot\Client\Crm\Quotes\Api\PublicObjectApi;
 use HubSpot\Client\Crm\Quotes\Api\SearchApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Quotes\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -20,7 +21,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Quotes\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Tickets/DiscoverySpec.php b/tests/spec/Discovery/Crm/Tickets/DiscoverySpec.php
index 686270ae7..50370c8b4 100644
--- a/tests/spec/Discovery/Crm/Tickets/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Tickets/DiscoverySpec.php
@@ -9,6 +9,7 @@
 use HubSpot\Client\Crm\Tickets\Api\PublicObjectApi;
 use HubSpot\Client\Crm\Tickets\Api\SearchApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Tickets\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -20,7 +21,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Tickets\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Crm/Timeline/DiscoverySpec.php b/tests/spec/Discovery/Crm/Timeline/DiscoverySpec.php
index 09ae34866..67e1cd1d2 100644
--- a/tests/spec/Discovery/Crm/Timeline/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Timeline/DiscoverySpec.php
@@ -7,6 +7,7 @@
 use HubSpot\Client\Crm\Timeline\Api\TemplatesApi;
 use HubSpot\Client\Crm\Timeline\Api\TokensApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Crm\Timeline\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -18,7 +19,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Crm\Timeline\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/DiscoverySpec.php b/tests/spec/Discovery/DiscoverySpec.php
index af276d2f8..4e8c183b2 100644
--- a/tests/spec/Discovery/DiscoverySpec.php
+++ b/tests/spec/Discovery/DiscoverySpec.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use HubSpot\Config;
+use HubSpot\Discovery\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -15,7 +16,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Events/DiscoverySpec.php b/tests/spec/Discovery/Events/DiscoverySpec.php
index f95f8c7b6..c09be1b0c 100644
--- a/tests/spec/Discovery/Events/DiscoverySpec.php
+++ b/tests/spec/Discovery/Events/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Events\Api\EventsApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Events\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,7 +17,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Events\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Events/Send/DiscoverySpec.php b/tests/spec/Discovery/Events/Send/DiscoverySpec.php
index 7359ef0f5..fa31d074c 100644
--- a/tests/spec/Discovery/Events/Send/DiscoverySpec.php
+++ b/tests/spec/Discovery/Events/Send/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Events\Send\Api\CustomEventDataApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Events\Send\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,7 +17,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Events\Send\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Files/DiscoverySpec.php b/tests/spec/Discovery/Files/DiscoverySpec.php
index f7d1072a3..fd1a627ef 100644
--- a/tests/spec/Discovery/Files/DiscoverySpec.php
+++ b/tests/spec/Discovery/Files/DiscoverySpec.php
@@ -6,6 +6,7 @@
 use HubSpot\Client\Files\Api\FilesApi;
 use HubSpot\Client\Files\Api\FoldersApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Files\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -17,7 +18,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Files\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Settings/BusinessUnits/DiscoverySpec.php b/tests/spec/Discovery/Settings/BusinessUnits/DiscoverySpec.php
index f3fdb6f85..539e495ad 100644
--- a/tests/spec/Discovery/Settings/BusinessUnits/DiscoverySpec.php
+++ b/tests/spec/Discovery/Settings/BusinessUnits/DiscoverySpec.php
@@ -5,6 +5,7 @@
 use GuzzleHttp\Client;
 use HubSpot\Client\Settings\BusinessUnits\Api\BusinessUnitApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Settings\BusinessUnits\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,7 +17,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Settings\BusinessUnits\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Settings/DiscoverySpec.php b/tests/spec/Discovery/Settings/DiscoverySpec.php
index 495e38c09..47850206b 100644
--- a/tests/spec/Discovery/Settings/DiscoverySpec.php
+++ b/tests/spec/Discovery/Settings/DiscoverySpec.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client;
 use HubSpot\Config;
+use HubSpot\Discovery\Settings\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -15,7 +16,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Settings\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Settings/Users/DiscoverySpec.php b/tests/spec/Discovery/Settings/Users/DiscoverySpec.php
index 1a37c29a1..faa14b648 100644
--- a/tests/spec/Discovery/Settings/Users/DiscoverySpec.php
+++ b/tests/spec/Discovery/Settings/Users/DiscoverySpec.php
@@ -7,6 +7,7 @@
 use HubSpot\Client\Settings\Users\Api\TeamsApi;
 use HubSpot\Client\Settings\Users\Api\UsersApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Settings\Users\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -18,7 +19,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Settings\Users\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
diff --git a/tests/spec/Discovery/Webhooks/DiscoverySpec.php b/tests/spec/Discovery/Webhooks/DiscoverySpec.php
index 84e8da1aa..6e2889b8b 100644
--- a/tests/spec/Discovery/Webhooks/DiscoverySpec.php
+++ b/tests/spec/Discovery/Webhooks/DiscoverySpec.php
@@ -6,6 +6,7 @@
 use HubSpot\Client\Webhooks\Api\SettingsApi;
 use HubSpot\Client\Webhooks\Api\SubscriptionsApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Webhooks\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -17,7 +18,7 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Webhooks\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()