diff --git a/lib/Discovery/Cms/Hubdb/Discovery.php b/lib/Discovery/Cms/Hubdb/Discovery.php
index 6b74d495..260dafa9 100644
--- a/lib/Discovery/Cms/Hubdb/Discovery.php
+++ b/lib/Discovery/Cms/Hubdb/Discovery.php
@@ -2,11 +2,15 @@
 
 namespace HubSpot\Discovery\Cms\Hubdb;
 
-use HubSpot\Client\Cms\Hubdb\Api\DefaultApi;
+use HubSpot\Client\Cms\Hubdb\Api\RowsApi;
+use HubSpot\Client\Cms\Hubdb\Api\RowsBatchApi;
+use HubSpot\Client\Cms\Hubdb\Api\TablesApi;
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
- * @method DefaultApi defaultApi()
+ * @method RowsApi      rowsApi()
+ * @method RowsBatchApi rowsBatchApi()
+ * @method TablesApi    tablesApi()
  */
 class Discovery extends DiscoveryBase
 {
diff --git a/tests/spec/Discovery/Cms/Hubdb/DiscoverySpec.php b/tests/spec/Discovery/Cms/Hubdb/DiscoverySpec.php
index 334be2f4..d9f92da7 100644
--- a/tests/spec/Discovery/Cms/Hubdb/DiscoverySpec.php
+++ b/tests/spec/Discovery/Cms/Hubdb/DiscoverySpec.php
@@ -3,8 +3,11 @@
 namespace spec\HubSpot\Discovery\Cms\Hubdb;
 
 use GuzzleHttp\Client;
-use HubSpot\Client\Cms\Hubdb\Api\DefaultApi;
+use HubSpot\Client\Cms\Hubdb\Api\RowsApi;
+use HubSpot\Client\Cms\Hubdb\Api\RowsBatchApi;
+use HubSpot\Client\Cms\Hubdb\Api\TablesApi;
 use HubSpot\Config;
+use HubSpot\Discovery\Cms\Hubdb\Discovery;
 use PhpSpec\ObjectBehavior;
 
 class DiscoverySpec extends ObjectBehavior
@@ -16,11 +19,13 @@ public function let(Client $client, Config $config)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType(\HubSpot\Discovery\Cms\Hubdb\Discovery::class);
+        $this->shouldHaveType(Discovery::class);
     }
 
     public function it_creates_clients()
     {
-        $this->defaultApi()->shouldHaveType(DefaultApi::class);
+        $this->rowsApi()->shouldHaveType(RowsApi::class);
+        $this->rowsBatchApi()->shouldHaveType(RowsBatchApi::class);
+        $this->tablesApi()->shouldHaveType(TablesApi::class);
     }
 }