diff --git a/lib/Discovery/Cms/SourceCode/Discovery.php b/lib/Discovery/Cms/SourceCode/Discovery.php
index 5d12d45da..a808d7c82 100644
--- a/lib/Discovery/Cms/SourceCode/Discovery.php
+++ b/lib/Discovery/Cms/SourceCode/Discovery.php
@@ -9,9 +9,9 @@
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
- * @method ContentApi     contentApi()
- * @method ExtractApi     extractApi()
- * @method MetadataApi    metadataApi()
- * @method ValidationApi  validationApi()
+ * @method ContentApi    contentApi()
+ * @method ExtractApi    extractApi()
+ * @method MetadataApi   metadataApi()
+ * @method ValidationApi validationApi()
  */
 class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Crm/Companies/Discovery.php b/lib/Discovery/Crm/Companies/Discovery.php
index 349fb795a..a65d834f5 100644
--- a/lib/Discovery/Crm/Companies/Discovery.php
+++ b/lib/Discovery/Crm/Companies/Discovery.php
@@ -9,9 +9,9 @@
 use HubSpot\Discovery\Crm\ObjectDiscovery;
 
 /**
- * @method BasicApi     basicApi()
- * @method BatchApi     batchApi()
- * @method MergeApi     mergeApi()
- * @method SearchApi    searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method MergeApi  mergeApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends ObjectDiscovery {}
diff --git a/lib/Discovery/Crm/Contacts/Discovery.php b/lib/Discovery/Crm/Contacts/Discovery.php
index de4c328b4..83eb48ff0 100644
--- a/lib/Discovery/Crm/Contacts/Discovery.php
+++ b/lib/Discovery/Crm/Contacts/Discovery.php
@@ -11,11 +11,11 @@
 use HubSpot\Discovery\Crm\ObjectDiscovery;
 
 /**
- * @method BasicApi     basicApi()
- * @method BatchApi     batchApi()
- * @method GDPRApi      gdprApi()
- * @method MergeApi     mergeApi()
- * @method SearchApi    searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method GDPRApi   gdprApi()
+ * @method MergeApi  mergeApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends ObjectDiscovery
 {
diff --git a/lib/Discovery/Crm/Deals/Discovery.php b/lib/Discovery/Crm/Deals/Discovery.php
index c94035ac0..da18c7d35 100644
--- a/lib/Discovery/Crm/Deals/Discovery.php
+++ b/lib/Discovery/Crm/Deals/Discovery.php
@@ -9,9 +9,9 @@
 use HubSpot\Discovery\Crm\ObjectDiscovery;
 
 /**
- * @method BasicApi     basicApi()
- * @method BatchApi     batchApi()
- * @method MergeApi     mergeApi()
- * @method SearchApi    searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method MergeApi  mergeApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends ObjectDiscovery {}
diff --git a/lib/Discovery/Crm/LineItems/Discovery.php b/lib/Discovery/Crm/LineItems/Discovery.php
index 90eaa258b..816f253c3 100644
--- a/lib/Discovery/Crm/LineItems/Discovery.php
+++ b/lib/Discovery/Crm/LineItems/Discovery.php
@@ -8,8 +8,8 @@
 use HubSpot\Discovery\Crm\ObjectDiscovery;
 
 /**
- * @method BasicApi        basicApi()
- * @method BatchApi        batchApi()
- * @method SearchApi       searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends ObjectDiscovery {}
diff --git a/lib/Discovery/Crm/Objects/Calls/Discovery.php b/lib/Discovery/Crm/Objects/Calls/Discovery.php
index 355d85ddc..eb0efa396 100644
--- a/lib/Discovery/Crm/Objects/Calls/Discovery.php
+++ b/lib/Discovery/Crm/Objects/Calls/Discovery.php
@@ -8,8 +8,8 @@
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
- * @method BasicApi        basicApi()
- * @method BatchApi        batchApi()
- * @method SearchApi       searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Crm/Objects/Communications/Discovery.php b/lib/Discovery/Crm/Objects/Communications/Discovery.php
index 1020200cd..b34c142c6 100644
--- a/lib/Discovery/Crm/Objects/Communications/Discovery.php
+++ b/lib/Discovery/Crm/Objects/Communications/Discovery.php
@@ -8,8 +8,8 @@
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
- * @method BasicApi        basicApi()
- * @method BatchApi        batchApi()
- * @method SearchApi       searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Crm/Objects/Emails/Discovery.php b/lib/Discovery/Crm/Objects/Emails/Discovery.php
index c255f2a00..b3f67509c 100644
--- a/lib/Discovery/Crm/Objects/Emails/Discovery.php
+++ b/lib/Discovery/Crm/Objects/Emails/Discovery.php
@@ -8,8 +8,8 @@
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
- * @method BasicApi        basicApi()
- * @method BatchApi        batchApi()
- * @method SearchApi       searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Crm/Objects/FeedbackSubmissions/Discovery.php b/lib/Discovery/Crm/Objects/FeedbackSubmissions/Discovery.php
index 5463abc93..526849451 100644
--- a/lib/Discovery/Crm/Objects/FeedbackSubmissions/Discovery.php
+++ b/lib/Discovery/Crm/Objects/FeedbackSubmissions/Discovery.php
@@ -8,8 +8,8 @@
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
- * @method BasicApi        basicApi()
- * @method BatchApi        batchApi()
- * @method SearchApi       searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Crm/Objects/Goals/Discovery.php b/lib/Discovery/Crm/Objects/Goals/Discovery.php
index 4a6676e43..471948369 100644
--- a/lib/Discovery/Crm/Objects/Goals/Discovery.php
+++ b/lib/Discovery/Crm/Objects/Goals/Discovery.php
@@ -5,12 +5,11 @@
 use HubSpot\Client\Crm\Objects\Goals\Api\BasicApi;
 use HubSpot\Client\Crm\Objects\Goals\Api\BatchApi;
 use HubSpot\Client\Crm\Objects\Goals\Api\SearchApi;
-use HubSpot\Client\Crm\Objects\Goals\Configuration;
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
- * @method BasicApi        basicApi()
- * @method BatchApi        batchApi()
- * @method SearchApi       searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Crm/Objects/Meetings/Discovery.php b/lib/Discovery/Crm/Objects/Meetings/Discovery.php
index 778001d14..7eecdd345 100644
--- a/lib/Discovery/Crm/Objects/Meetings/Discovery.php
+++ b/lib/Discovery/Crm/Objects/Meetings/Discovery.php
@@ -8,8 +8,8 @@
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
- * @method BasicApi     basicApi()
- * @method BatchApi     batchApi()
- * @method SearchApi    searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Crm/Objects/Notes/Discovery.php b/lib/Discovery/Crm/Objects/Notes/Discovery.php
index 6367a325b..0b0bbd8cb 100644
--- a/lib/Discovery/Crm/Objects/Notes/Discovery.php
+++ b/lib/Discovery/Crm/Objects/Notes/Discovery.php
@@ -8,8 +8,8 @@
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
- * @method BasicApi     basicApi()
- * @method BatchApi     batchApi()
- * @method SearchApi    searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Crm/Objects/PostalMail/Discovery.php b/lib/Discovery/Crm/Objects/PostalMail/Discovery.php
index 6640d6549..92f7e9915 100644
--- a/lib/Discovery/Crm/Objects/PostalMail/Discovery.php
+++ b/lib/Discovery/Crm/Objects/PostalMail/Discovery.php
@@ -8,8 +8,8 @@
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
- * @method BasicApi        basicApi()
- * @method BatchApi        batchApi()
- * @method SearchApi       searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Crm/Objects/Tasks/Discovery.php b/lib/Discovery/Crm/Objects/Tasks/Discovery.php
index e62742553..98cce378d 100644
--- a/lib/Discovery/Crm/Objects/Tasks/Discovery.php
+++ b/lib/Discovery/Crm/Objects/Tasks/Discovery.php
@@ -8,8 +8,8 @@
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
- * @method BasicApi        basicApi()
- * @method BatchApi        batchApi()
- * @method SearchApi       searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Crm/Objects/Taxes/Discovery.php b/lib/Discovery/Crm/Objects/Taxes/Discovery.php
index 623e57ab3..035554ad6 100644
--- a/lib/Discovery/Crm/Objects/Taxes/Discovery.php
+++ b/lib/Discovery/Crm/Objects/Taxes/Discovery.php
@@ -8,8 +8,8 @@
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
- * @method BasicApi        basicApi()
- * @method BatchApi        batchApi()
- * @method SearchApi       searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Crm/Products/Discovery.php b/lib/Discovery/Crm/Products/Discovery.php
index 479c85a5a..293f20613 100644
--- a/lib/Discovery/Crm/Products/Discovery.php
+++ b/lib/Discovery/Crm/Products/Discovery.php
@@ -8,8 +8,8 @@
 use HubSpot\Discovery\Crm\ObjectDiscovery;
 
 /**
- * @method BasicApi     basicApi()
- * @method BatchApi     batchApi()
- * @method SearchApi    searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends ObjectDiscovery {}
diff --git a/lib/Discovery/Crm/Quotes/Discovery.php b/lib/Discovery/Crm/Quotes/Discovery.php
index 858de7907..2e0172faa 100644
--- a/lib/Discovery/Crm/Quotes/Discovery.php
+++ b/lib/Discovery/Crm/Quotes/Discovery.php
@@ -8,8 +8,8 @@
 use HubSpot\Discovery\Crm\ObjectDiscovery;
 
 /**
- * @method BasicApi     basicApi()
- * @method BatchApi     batchApi()
- * @method SearchApi    searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends ObjectDiscovery {}
diff --git a/lib/Discovery/Crm/Schemas/Discovery.php b/lib/Discovery/Crm/Schemas/Discovery.php
index fb9f7a95b..4bb12115a 100644
--- a/lib/Discovery/Crm/Schemas/Discovery.php
+++ b/lib/Discovery/Crm/Schemas/Discovery.php
@@ -6,6 +6,6 @@
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
- * @method CoreApi  coreApi()
+ * @method CoreApi coreApi()
  */
 class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Crm/Tickets/Discovery.php b/lib/Discovery/Crm/Tickets/Discovery.php
index 0aa3d4142..c18aa0f5c 100644
--- a/lib/Discovery/Crm/Tickets/Discovery.php
+++ b/lib/Discovery/Crm/Tickets/Discovery.php
@@ -9,9 +9,9 @@
 use HubSpot\Discovery\Crm\ObjectDiscovery;
 
 /**
- * @method BasicApi     basicApi()
- * @method BatchApi     batchApi()
- * @method MergeApi     mergeApi()
- * @method SearchApi    searchApi()
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method MergeApi  mergeApi()
+ * @method SearchApi searchApi()
  */
 class Discovery extends ObjectDiscovery {}
diff --git a/lib/Discovery/Discovery.php b/lib/Discovery/Discovery.php
index 2f8d358e0..be4939e2b 100644
--- a/lib/Discovery/Discovery.php
+++ b/lib/Discovery/Discovery.php
@@ -5,17 +5,17 @@
 use HubSpot\Http\Request;
 
 /**
- * @method Automation\Discovery                 automation()
- * @method Cms\Discovery                        cms()
- * @method Conversations\Discovery              conversations()
- * @method CommunicationPreferences\Discovery   communicationPreferences()
- * @method Crm\Discovery                        crm()
- * @method Events\Discovery                     events()
- * @method Files\Discovery                      files()
- * @method Marketing\Discovery                  marketing()
- * @method Oauth\Discovery                      oauth()
- * @method Settings\Discovery                   settings()
- * @method Webhooks\Discovery                   webhooks()
+ * @method Automation\Discovery               automation()
+ * @method Cms\Discovery                      cms()
+ * @method Conversations\Discovery            conversations()
+ * @method CommunicationPreferences\Discovery communicationPreferences()
+ * @method Crm\Discovery                      crm()
+ * @method Events\Discovery                   events()
+ * @method Files\Discovery                    files()
+ * @method Marketing\Discovery                marketing()
+ * @method Oauth\Discovery                    oauth()
+ * @method Settings\Discovery                 settings()
+ * @method Webhooks\Discovery                 webhooks()
  */
 class Discovery extends DiscoveryBase
 {
diff --git a/lib/Discovery/Marketing/Events/Discovery.php b/lib/Discovery/Marketing/Events/Discovery.php
index d8d533322..cfb237812 100644
--- a/lib/Discovery/Marketing/Events/Discovery.php
+++ b/lib/Discovery/Marketing/Events/Discovery.php
@@ -2,20 +2,26 @@
 
 namespace HubSpot\Discovery\Marketing\Events;
 
-use HubSpot\Client\Marketing\Events\Api\AttendanceSubscriberStateChangesApi;
+use HubSpot\Client\Marketing\Events\Api\AddEventAttendeesApi;
 use HubSpot\Client\Marketing\Events\Api\BasicApi;
+use HubSpot\Client\Marketing\Events\Api\BatchApi;
+use HubSpot\Client\Marketing\Events\Api\ChangePropertyApi;
+use HubSpot\Client\Marketing\Events\Api\IdentifiersApi;
 use HubSpot\Client\Marketing\Events\Api\ListAssociationsApi;
-use HubSpot\Client\Marketing\Events\Api\ParticipantStateApi;
+use HubSpot\Client\Marketing\Events\Api\RetrieveParticipantStateApi;
 use HubSpot\Client\Marketing\Events\Api\SettingsApi;
 use HubSpot\Client\Marketing\Events\Api\SubscriberStateChangesApi;
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
- * @method AttendanceSubscriberStateChangesApi attendanceSubscriberStateChangesApi()
- * @method BasicApi                            basicApi()
- * @method ListAssociationsApi                 listAssociationsApi()
- * @method ParticipantStateApi                 participantStateApi()
- * @method SettingsApi                         settingsApi()
- * @method SubscriberStateChangesApi           subscriberStateChangesApi()
+ * @method AddEventAttendeesApi        addEventAttendeesApi()
+ * @method BasicApi                    basicApi()
+ * @method BatchApi                    batchApi()
+ * @method ChangePropertyApi           changePropertyApi()
+ * @method IdentifiersApi              identifiersApi()
+ * @method ListAssociationsApi         listAssociationsApi()
+ * @method RetrieveParticipantStateApi retrieveParticipantStateApi()
+ * @method SettingsApi                 settingsApi()
+ * @method SubscriberStateChangesApi   subscriberStateChangesApi()
  */
 class Discovery extends DiscoveryBase {}
diff --git a/tests/spec/Discovery/Marketing/Events/DiscoverySpec.php b/tests/spec/Discovery/Marketing/Events/DiscoverySpec.php
index 2bc371f20..100602928 100644
--- a/tests/spec/Discovery/Marketing/Events/DiscoverySpec.php
+++ b/tests/spec/Discovery/Marketing/Events/DiscoverySpec.php
@@ -3,10 +3,13 @@
 namespace spec\HubSpot\Discovery\Marketing\Events;
 
 use GuzzleHttp\Client;
-use HubSpot\Client\Marketing\Events\Api\AttendanceSubscriberStateChangesApi;
+use HubSpot\Client\Marketing\Events\Api\AddEventAttendeesApi;
 use HubSpot\Client\Marketing\Events\Api\BasicApi;
+use HubSpot\Client\Marketing\Events\Api\BatchApi;
+use HubSpot\Client\Marketing\Events\Api\ChangePropertyApi;
+use HubSpot\Client\Marketing\Events\Api\IdentifiersApi;
 use HubSpot\Client\Marketing\Events\Api\ListAssociationsApi;
-use HubSpot\Client\Marketing\Events\Api\ParticipantStateApi;
+use HubSpot\Client\Marketing\Events\Api\RetrieveParticipantStateApi;
 use HubSpot\Client\Marketing\Events\Api\SettingsApi;
 use HubSpot\Client\Marketing\Events\Api\SubscriberStateChangesApi;
 use HubSpot\Config;
@@ -27,10 +30,13 @@ public function it_is_initializable()
 
     public function it_creates_clients()
     {
-        $this->attendanceSubscriberStateChangesApi()->shouldHaveType(AttendanceSubscriberStateChangesApi::class);
+        $this->addEventAttendeesApi()->shouldHaveType(AddEventAttendeesApi::class);
         $this->basicApi()->shouldHaveType(BasicApi::class);
+        $this->batchApi()->shouldHaveType(BatchApi::class);
+        $this->changePropertyApi()->shouldHaveType(ChangePropertyApi::class);
+        $this->identifiersApi()->shouldHaveType(IdentifiersApi::class);
         $this->listAssociationsApi()->shouldHaveType(ListAssociationsApi::class);
-        $this->participantStateApi()->shouldHaveType(ParticipantStateApi::class);
+        $this->retrieveParticipantStateApi()->shouldHaveType(RetrieveParticipantStateApi::class);
         $this->settingsApi()->shouldHaveType(SettingsApi::class);
         $this->subscriberStateChangesApi()->shouldHaveType(SubscriberStateChangesApi::class);
     }