diff --git a/src/models/webhook_events.rs b/src/models/webhook_events.rs
index 0c5f10f9..e404d2d6 100644
--- a/src/models/webhook_events.rs
+++ b/src/models/webhook_events.rs
@@ -49,7 +49,7 @@
 //!
 //! let event = WebhookEvent::try_from_header_and_body(event_name, json)?;
 //! assert_eq!(event.kind, WebhookEventType::Ping);
-//! let WebhookEventPayload::PingWebhookEvent(ping_event) = event.specific else { panic!("checked for event.kind type before unwrapping") };
+//! let WebhookEventPayload::Ping(ping_event) = event.specific else { panic!("checked for event.kind type before unwrapping") };
 //! assert_eq!(ping_event.hook.unwrap().app_id.unwrap(), AppId(360617));
 //! # Ok::<(), serde_json::Error>(())
 //! ```
@@ -725,257 +725,221 @@ impl WebhookEventType {
         data: serde_json::Value,
     ) -> Result<WebhookEventPayload, serde_json::Error> {
         match self {
-            WebhookEventType::BranchProtectionRule => {
-                Ok(WebhookEventPayload::BranchProtectionRuleWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
-            }
-            WebhookEventType::CheckRun => Ok(WebhookEventPayload::CheckRunWebhookEvent(Box::new(
+            WebhookEventType::BranchProtectionRule => Ok(
+                WebhookEventPayload::BranchProtectionRule(Box::new(serde_json::from_value(data)?)),
+            ),
+            WebhookEventType::CheckRun => Ok(WebhookEventPayload::CheckRun(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::CheckSuite => Ok(WebhookEventPayload::CheckSuite(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::CheckSuite => Ok(WebhookEventPayload::CheckSuiteWebhookEvent(
+            WebhookEventType::CodeScanningAlert => Ok(WebhookEventPayload::CodeScanningAlert(
                 Box::new(serde_json::from_value(data)?),
             )),
-            WebhookEventType::CodeScanningAlert => {
-                Ok(WebhookEventPayload::CodeScanningAlertWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
-            }
-            WebhookEventType::CommitComment => Ok(WebhookEventPayload::CommitCommentWebhookEvent(
+            WebhookEventType::CommitComment => Ok(WebhookEventPayload::CommitComment(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::Create => Ok(WebhookEventPayload::Create(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::Delete => Ok(WebhookEventPayload::Delete(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::DependabotAlert => Ok(WebhookEventPayload::DependabotAlert(
                 Box::new(serde_json::from_value(data)?),
             )),
-            WebhookEventType::Create => Ok(WebhookEventPayload::CreateWebhookEvent(Box::new(
+            WebhookEventType::DeployKey => Ok(WebhookEventPayload::DeployKey(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::Delete => Ok(WebhookEventPayload::DeleteWebhookEvent(Box::new(
+            WebhookEventType::Deployment => Ok(WebhookEventPayload::Deployment(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::DependabotAlert => {
-                Ok(WebhookEventPayload::DependabotAlertWebhookEvent(Box::new(
+            WebhookEventType::DeploymentProtectionRule => {
+                Ok(WebhookEventPayload::DeploymentProtectionRule(Box::new(
                     serde_json::from_value(data)?,
                 )))
             }
-            WebhookEventType::DeployKey => Ok(WebhookEventPayload::DeployKeyWebhookEvent(
+            WebhookEventType::DeploymentStatus => Ok(WebhookEventPayload::DeploymentStatus(
                 Box::new(serde_json::from_value(data)?),
             )),
-            WebhookEventType::Deployment => Ok(WebhookEventPayload::DeploymentWebhookEvent(
+            WebhookEventType::Discussion => Ok(WebhookEventPayload::Discussion(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::DiscussionComment => Ok(WebhookEventPayload::DiscussionComment(
                 Box::new(serde_json::from_value(data)?),
             )),
-            WebhookEventType::DeploymentProtectionRule => {
-                Ok(WebhookEventPayload::DeploymentProtectionRuleWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
-            }
-            WebhookEventType::DeploymentStatus => {
-                Ok(WebhookEventPayload::DeploymentStatusWebhookEvent(Box::new(
+            WebhookEventType::Fork => Ok(WebhookEventPayload::Fork(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::GithubAppAuthorization => {
+                Ok(WebhookEventPayload::GithubAppAuthorization(Box::new(
                     serde_json::from_value(data)?,
                 )))
             }
-            WebhookEventType::Discussion => Ok(WebhookEventPayload::DiscussionWebhookEvent(
-                Box::new(serde_json::from_value(data)?),
-            )),
-            WebhookEventType::DiscussionComment => {
-                Ok(WebhookEventPayload::DiscussionCommentWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
-            }
-            WebhookEventType::Fork => Ok(WebhookEventPayload::ForkWebhookEvent(Box::new(
+            WebhookEventType::Gollum => Ok(WebhookEventPayload::Gollum(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::GithubAppAuthorization => {
-                Ok(WebhookEventPayload::GithubAppAuthorizationWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
-            }
-            WebhookEventType::Gollum => Ok(WebhookEventPayload::GollumWebhookEvent(Box::new(
+            WebhookEventType::Installation => Ok(WebhookEventPayload::Installation(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::Installation => Ok(WebhookEventPayload::InstallationWebhookEvent(
-                Box::new(serde_json::from_value(data)?),
-            )),
             WebhookEventType::InstallationRepositories => {
-                Ok(WebhookEventPayload::InstallationRepositoriesWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
-            }
-            WebhookEventType::InstallationTarget => {
-                Ok(WebhookEventPayload::InstallationTargetWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
+                Ok(WebhookEventPayload::InstallationRepositories(Box::new(
+                    serde_json::from_value(data)?,
+                )))
             }
-            WebhookEventType::IssueComment => Ok(WebhookEventPayload::IssueCommentWebhookEvent(
+            WebhookEventType::InstallationTarget => Ok(WebhookEventPayload::InstallationTarget(
                 Box::new(serde_json::from_value(data)?),
             )),
-            WebhookEventType::Issues => Ok(WebhookEventPayload::IssuesWebhookEvent(Box::new(
+            WebhookEventType::IssueComment => Ok(WebhookEventPayload::IssueComment(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::Label => Ok(WebhookEventPayload::LabelWebhookEvent(Box::new(
+            WebhookEventType::Issues => Ok(WebhookEventPayload::Issues(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::MarketplacePurchase => {
-                Ok(WebhookEventPayload::MarketplacePurchaseWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
-            }
-            WebhookEventType::Member => Ok(WebhookEventPayload::MemberWebhookEvent(Box::new(
+            WebhookEventType::Label => Ok(WebhookEventPayload::Label(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::Membership => Ok(WebhookEventPayload::MembershipWebhookEvent(
-                Box::new(serde_json::from_value(data)?),
-            )),
-            WebhookEventType::MergeGroup => Ok(WebhookEventPayload::MergeGroupWebhookEvent(
+            WebhookEventType::MarketplacePurchase => Ok(WebhookEventPayload::MarketplacePurchase(
                 Box::new(serde_json::from_value(data)?),
             )),
-            WebhookEventType::Meta => Ok(WebhookEventPayload::MetaWebhookEvent(Box::new(
+            WebhookEventType::Member => Ok(WebhookEventPayload::Member(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::Milestone => Ok(WebhookEventPayload::MilestoneWebhookEvent(
-                Box::new(serde_json::from_value(data)?),
-            )),
-            WebhookEventType::OrgBlock => Ok(WebhookEventPayload::OrgBlockWebhookEvent(Box::new(
+            WebhookEventType::Membership => Ok(WebhookEventPayload::Membership(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::Organization => Ok(WebhookEventPayload::OrganizationWebhookEvent(
-                Box::new(serde_json::from_value(data)?),
-            )),
-            WebhookEventType::Package => Ok(WebhookEventPayload::PackageWebhookEvent(Box::new(
+            WebhookEventType::MergeGroup => Ok(WebhookEventPayload::MergeGroup(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::PageBuild => Ok(WebhookEventPayload::PageBuildWebhookEvent(
-                Box::new(serde_json::from_value(data)?),
-            )),
-            WebhookEventType::PersonalAccessTokenRequest => {
-                Ok(WebhookEventPayload::PersonalAccessTokenRequestWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
-            }
-            WebhookEventType::Ping => Ok(WebhookEventPayload::PingWebhookEvent(Box::new(
+            WebhookEventType::Meta => Ok(WebhookEventPayload::Meta(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::ProjectCard => Ok(WebhookEventPayload::ProjectCardWebhookEvent(
-                Box::new(serde_json::from_value(data)?),
-            )),
-            WebhookEventType::Project => Ok(WebhookEventPayload::ProjectWebhookEvent(Box::new(
+            WebhookEventType::Milestone => Ok(WebhookEventPayload::Milestone(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::ProjectColumn => Ok(WebhookEventPayload::ProjectColumnWebhookEvent(
-                Box::new(serde_json::from_value(data)?),
-            )),
-            WebhookEventType::ProjectsV2 => Ok(WebhookEventPayload::ProjectsV2WebhookEvent(
-                Box::new(serde_json::from_value(data)?),
-            )),
-            WebhookEventType::ProjectsV2Item => {
-                Ok(WebhookEventPayload::ProjectsV2ItemWebhookEvent(Box::new(
+            WebhookEventType::OrgBlock => Ok(WebhookEventPayload::OrgBlock(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::Organization => Ok(WebhookEventPayload::Organization(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::Package => Ok(WebhookEventPayload::Package(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::PageBuild => Ok(WebhookEventPayload::PageBuild(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::PersonalAccessTokenRequest => {
+                Ok(WebhookEventPayload::PersonalAccessTokenRequest(Box::new(
                     serde_json::from_value(data)?,
                 )))
             }
-            WebhookEventType::Public => Ok(WebhookEventPayload::PublicWebhookEvent(Box::new(
+            WebhookEventType::Ping => Ok(WebhookEventPayload::Ping(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::PullRequest => Ok(WebhookEventPayload::PullRequestWebhookEvent(
+            WebhookEventType::ProjectCard => Ok(WebhookEventPayload::ProjectCard(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::Project => Ok(WebhookEventPayload::Project(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::ProjectColumn => Ok(WebhookEventPayload::ProjectColumn(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::ProjectsV2 => Ok(WebhookEventPayload::ProjectsV2(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::ProjectsV2Item => Ok(WebhookEventPayload::ProjectsV2Item(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::Public => Ok(WebhookEventPayload::Public(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::PullRequest => Ok(WebhookEventPayload::PullRequest(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::PullRequestReview => Ok(WebhookEventPayload::PullRequestReview(
                 Box::new(serde_json::from_value(data)?),
             )),
-            WebhookEventType::PullRequestReview => {
-                Ok(WebhookEventPayload::PullRequestReviewWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
-            }
             WebhookEventType::PullRequestReviewComment => {
-                Ok(WebhookEventPayload::PullRequestReviewCommentWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
+                Ok(WebhookEventPayload::PullRequestReviewComment(Box::new(
+                    serde_json::from_value(data)?,
+                )))
             }
             WebhookEventType::PullRequestReviewThread => {
-                Ok(WebhookEventPayload::PullRequestReviewThreadWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
-            }
-            WebhookEventType::Push => Ok(WebhookEventPayload::PushWebhookEvent(Box::new(
-                serde_json::from_value(data)?,
-            ))),
-            WebhookEventType::RegistryPackage => {
-                Ok(WebhookEventPayload::RegistryPackageWebhookEvent(Box::new(
+                Ok(WebhookEventPayload::PullRequestReviewThread(Box::new(
                     serde_json::from_value(data)?,
                 )))
             }
-            WebhookEventType::Release => Ok(WebhookEventPayload::ReleaseWebhookEvent(Box::new(
+            WebhookEventType::Push => Ok(WebhookEventPayload::Push(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::RepositoryAdvisory => {
-                Ok(WebhookEventPayload::RepositoryAdvisoryWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
-            }
-            WebhookEventType::Repository => Ok(WebhookEventPayload::RepositoryWebhookEvent(
+            WebhookEventType::RegistryPackage => Ok(WebhookEventPayload::RegistryPackage(
                 Box::new(serde_json::from_value(data)?),
             )),
-            WebhookEventType::RepositoryDispatch => {
-                Ok(WebhookEventPayload::RepositoryDispatchWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
-            }
-            WebhookEventType::RepositoryImport => {
-                Ok(WebhookEventPayload::RepositoryImportWebhookEvent(Box::new(
+            WebhookEventType::Release => Ok(WebhookEventPayload::Release(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::RepositoryAdvisory => Ok(WebhookEventPayload::RepositoryAdvisory(
+                Box::new(serde_json::from_value(data)?),
+            )),
+            WebhookEventType::Repository => Ok(WebhookEventPayload::Repository(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::RepositoryDispatch => Ok(WebhookEventPayload::RepositoryDispatch(
+                Box::new(serde_json::from_value(data)?),
+            )),
+            WebhookEventType::RepositoryImport => Ok(WebhookEventPayload::RepositoryImport(
+                Box::new(serde_json::from_value(data)?),
+            )),
+            WebhookEventType::RepositoryVulnerabilityAlert => {
+                Ok(WebhookEventPayload::RepositoryVulnerabilityAlert(Box::new(
                     serde_json::from_value(data)?,
                 )))
             }
-            WebhookEventType::RepositoryVulnerabilityAlert => Ok(
-                WebhookEventPayload::RepositoryVulnerabilityAlertWebhookEvent(Box::new(
-                    serde_json::from_value(data)?,
-                )),
-            ),
-            WebhookEventType::SecretScanningAlert => {
-                Ok(WebhookEventPayload::SecretScanningAlertWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
-            }
-            WebhookEventType::SecretScanningAlertLocation => Ok(
-                WebhookEventPayload::SecretScanningAlertLocationWebhookEvent(Box::new(
-                    serde_json::from_value(data)?,
-                )),
-            ),
-            WebhookEventType::SecurityAdvisory => {
-                Ok(WebhookEventPayload::SecurityAdvisoryWebhookEvent(Box::new(
+            WebhookEventType::SecretScanningAlert => Ok(WebhookEventPayload::SecretScanningAlert(
+                Box::new(serde_json::from_value(data)?),
+            )),
+            WebhookEventType::SecretScanningAlertLocation => {
+                Ok(WebhookEventPayload::SecretScanningAlertLocation(Box::new(
                     serde_json::from_value(data)?,
                 )))
             }
-            WebhookEventType::SecurityAndAnalysis => {
-                Ok(WebhookEventPayload::SecurityAndAnalysisWebhookEvent(
-                    Box::new(serde_json::from_value(data)?),
-                ))
-            }
-            WebhookEventType::Sponsorship => Ok(WebhookEventPayload::SponsorshipWebhookEvent(
+            WebhookEventType::SecurityAdvisory => Ok(WebhookEventPayload::SecurityAdvisory(
                 Box::new(serde_json::from_value(data)?),
             )),
-            WebhookEventType::Star => Ok(WebhookEventPayload::StarWebhookEvent(Box::new(
+            WebhookEventType::SecurityAndAnalysis => Ok(WebhookEventPayload::SecurityAndAnalysis(
+                Box::new(serde_json::from_value(data)?),
+            )),
+            WebhookEventType::Sponsorship => Ok(WebhookEventPayload::Sponsorship(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::Status => Ok(WebhookEventPayload::StatusWebhookEvent(Box::new(
+            WebhookEventType::Star => Ok(WebhookEventPayload::Star(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::TeamAdd => Ok(WebhookEventPayload::TeamAddWebhookEvent(Box::new(
+            WebhookEventType::Status => Ok(WebhookEventPayload::Status(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::Team => Ok(WebhookEventPayload::TeamWebhookEvent(Box::new(
+            WebhookEventType::TeamAdd => Ok(WebhookEventPayload::TeamAdd(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::Watch => Ok(WebhookEventPayload::WatchWebhookEvent(Box::new(
+            WebhookEventType::Team => Ok(WebhookEventPayload::Team(Box::new(
                 serde_json::from_value(data)?,
             ))),
-            WebhookEventType::WorkflowDispatch => {
-                Ok(WebhookEventPayload::WorkflowDispatchWebhookEvent(Box::new(
-                    serde_json::from_value(data)?,
-                )))
-            }
-            WebhookEventType::WorkflowJob => Ok(WebhookEventPayload::WorkflowJobWebhookEvent(
-                Box::new(serde_json::from_value(data)?),
-            )),
-            WebhookEventType::WorkflowRun => Ok(WebhookEventPayload::WorkflowRunWebhookEvent(
+            WebhookEventType::Watch => Ok(WebhookEventPayload::Watch(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::WorkflowDispatch => Ok(WebhookEventPayload::WorkflowDispatch(
                 Box::new(serde_json::from_value(data)?),
             )),
-            WebhookEventType::Unknown(_) => {
-                Ok(WebhookEventPayload::UnknownWebhookEvent(Box::new(data)))
-            }
+            WebhookEventType::WorkflowJob => Ok(WebhookEventPayload::WorkflowJob(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::WorkflowRun => Ok(WebhookEventPayload::WorkflowRun(Box::new(
+                serde_json::from_value(data)?,
+            ))),
+            WebhookEventType::Unknown(_) => Ok(WebhookEventPayload::Unknown(Box::new(data))),
         }
     }
 }
@@ -1017,7 +981,7 @@ mod tests {
         let event = WebhookEventType::Installation
             .parse_specific_payload(serde_json::from_str(json).unwrap())
             .unwrap();
-        let WebhookEventPayload::InstallationWebhookEvent(install_event) = event else {panic!(" event is of the wrong type {:?}", event)};
+        let WebhookEventPayload::Installation(install_event) = event else {panic!(" event is of the wrong type {:?}", event)};
         assert_eq!(
             install_event.action,
             InstallationWebhookEventAction::Created
@@ -1032,7 +996,7 @@ mod tests {
         let event = WebhookEventType::Installation
             .parse_specific_payload(serde_json::from_str(json).unwrap())
             .unwrap();
-        let WebhookEventPayload::InstallationWebhookEvent(install_event) = event else {panic!(" event is of the wrong type {:?}", event)};
+        let WebhookEventPayload::Installation(install_event) = event else {panic!(" event is of the wrong type {:?}", event)};
         assert_eq!(
             install_event.action,
             InstallationWebhookEventAction::Deleted
@@ -1049,7 +1013,7 @@ mod tests {
         let event = WebhookEventType::InstallationRepositories
             .parse_specific_payload(serde_json::from_str(json).unwrap())
             .unwrap();
-        let WebhookEventPayload::InstallationRepositoriesWebhookEvent(install_repositories_event) = event else {panic!(" event is of the wrong type {:?}", event)};
+        let WebhookEventPayload::InstallationRepositories(install_repositories_event) = event else {panic!(" event is of the wrong type {:?}", event)};
         assert_eq!(
             install_repositories_event.action,
             InstallationRepositoriesWebhookEventAction::Removed
@@ -1067,7 +1031,7 @@ mod tests {
         let event = WebhookEventType::IssueComment
             .parse_specific_payload(serde_json::from_str(json).unwrap())
             .unwrap();
-        let WebhookEventPayload::IssueCommentWebhookEvent(issue_comment_event) = event else {panic!(" event is of the wrong type {:?}", event)};
+        let WebhookEventPayload::IssueComment(issue_comment_event) = event else {panic!(" event is of the wrong type {:?}", event)};
         assert_eq!(
             issue_comment_event.action,
             IssueCommentWebhookEventAction::Created
@@ -1081,7 +1045,7 @@ mod tests {
         let event = WebhookEventType::IssueComment
             .parse_specific_payload(serde_json::from_str(json).unwrap())
             .unwrap();
-        let WebhookEventPayload::IssueCommentWebhookEvent(issue_comment_event) = event else {panic!(" event is of the wrong type {:?}", event)};
+        let WebhookEventPayload::IssueComment(issue_comment_event) = event else {panic!(" event is of the wrong type {:?}", event)};
         assert_eq!(
             issue_comment_event.action,
             IssueCommentWebhookEventAction::Deleted
@@ -1094,7 +1058,7 @@ mod tests {
         let event = WebhookEventType::IssueComment
             .parse_specific_payload(serde_json::from_str(json).unwrap())
             .unwrap();
-        let WebhookEventPayload::IssueCommentWebhookEvent(issue_comment_event) = event else {panic!(" event is of the wrong type {:?}", event)};
+        let WebhookEventPayload::IssueComment(issue_comment_event) = event else {panic!(" event is of the wrong type {:?}", event)};
         assert_eq!(
             issue_comment_event.action,
             IssueCommentWebhookEventAction::Edited
@@ -1108,7 +1072,7 @@ mod tests {
         let event = WebhookEventType::Issues
             .parse_specific_payload(serde_json::from_str(json).unwrap())
             .unwrap();
-        let WebhookEventPayload::IssuesWebhookEvent(issues_event) = event else {panic!(" event is of the wrong type {:?}", event)};
+        let WebhookEventPayload::Issues(issues_event) = event else {panic!(" event is of the wrong type {:?}", event)};
         assert_eq!(issues_event.action, IssuesWebhookEventAction::Labeled);
     }
 
@@ -1118,7 +1082,7 @@ mod tests {
         let event = WebhookEventType::Issues
             .parse_specific_payload(serde_json::from_str(json).unwrap())
             .unwrap();
-        let WebhookEventPayload::IssuesWebhookEvent(issues_event) = event else {panic!(" event is of the wrong type {:?}", event)};
+        let WebhookEventPayload::Issues(issues_event) = event else {panic!(" event is of the wrong type {:?}", event)};
         assert_eq!(issues_event.action, IssuesWebhookEventAction::Opened);
     }
 
@@ -1128,7 +1092,7 @@ mod tests {
         let event = WebhookEventType::Ping
             .parse_specific_payload(serde_json::from_str(json).unwrap())
             .unwrap();
-        let WebhookEventPayload::PingWebhookEvent(ping_event) = event else {panic!(" event is of the wrong type {:?}", event)};
+        let WebhookEventPayload::Ping(ping_event) = event else {panic!(" event is of the wrong type {:?}", event)};
         assert_eq!(ping_event.hook.unwrap().id, 423885699);
     }
 
@@ -1138,7 +1102,7 @@ mod tests {
         let event = WebhookEventType::PullRequest
             .parse_specific_payload(serde_json::from_str(json).unwrap())
             .unwrap();
-        let WebhookEventPayload::PullRequestWebhookEvent(pull_request_event) = event else {panic!(" event is of the wrong type {:?}", event)};
+        let WebhookEventPayload::PullRequest(pull_request_event) = event else {panic!(" event is of the wrong type {:?}", event)};
         assert_eq!(
             pull_request_event.action,
             PullRequestWebhookEventAction::Closed
@@ -1152,7 +1116,7 @@ mod tests {
         let event = WebhookEventType::PullRequest
             .parse_specific_payload(serde_json::from_str(json).unwrap())
             .unwrap();
-        let WebhookEventPayload::PullRequestWebhookEvent(pull_request_event) = event else {panic!(" event is of the wrong type {:?}", event)};
+        let WebhookEventPayload::PullRequest(pull_request_event) = event else {panic!(" event is of the wrong type {:?}", event)};
         assert_eq!(
             pull_request_event.action,
             PullRequestWebhookEventAction::Opened
@@ -1166,7 +1130,7 @@ mod tests {
         let event = WebhookEventType::PullRequest
             .parse_specific_payload(serde_json::from_str(json).unwrap())
             .unwrap();
-        let WebhookEventPayload::PullRequestWebhookEvent(pull_request_event) = event else {panic!(" event is of the wrong type {:?}", event)};
+        let WebhookEventPayload::PullRequest(pull_request_event) = event else {panic!(" event is of the wrong type {:?}", event)};
         assert_eq!(
             pull_request_event.action,
             PullRequestWebhookEventAction::Synchronize
@@ -1179,7 +1143,7 @@ mod tests {
         let event = WebhookEventType::Repository
             .parse_specific_payload(serde_json::from_str(json).unwrap())
             .unwrap();
-        let WebhookEventPayload::RepositoryWebhookEvent(repository_event) = event else {panic!(" event is of the wrong type {:?}", event)};
+        let WebhookEventPayload::Repository(repository_event) = event else {panic!(" event is of the wrong type {:?}", event)};
         assert_eq!(
             repository_event.action,
             RepositoryWebhookEventAction::Deleted
diff --git a/src/models/webhook_events/payload.rs b/src/models/webhook_events/payload.rs
index 9f0a908d..fa149aef 100644
--- a/src/models/webhook_events/payload.rs
+++ b/src/models/webhook_events/payload.rs
@@ -88,73 +88,73 @@ use serde::{Deserialize, Serialize};
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[non_exhaustive]
 pub enum WebhookEventPayload {
-    BranchProtectionRuleWebhookEvent(Box<BranchProtectionRuleWebhookEventPayload>),
-    CheckRunWebhookEvent(Box<CheckRunWebhookEventPayload>),
-    CheckSuiteWebhookEvent(Box<CheckSuiteWebhookEventPayload>),
-    CodeScanningAlertWebhookEvent(Box<CodeScanningAlertWebhookEventPayload>),
-    CommitCommentWebhookEvent(Box<CommitCommentWebhookEventPayload>),
-    CreateWebhookEvent(Box<CreateWebhookEventPayload>),
-    DeleteWebhookEvent(Box<DeleteWebhookEventPayload>),
-    DependabotAlertWebhookEvent(Box<DependabotAlertWebhookEventPayload>),
-    DeployKeyWebhookEvent(Box<DeployKeyWebhookEventPayload>),
-    DeploymentWebhookEvent(Box<DeploymentWebhookEventPayload>),
-    DeploymentProtectionRuleWebhookEvent(Box<DeploymentProtectionRuleWebhookEventPayload>),
-    DeploymentStatusWebhookEvent(Box<DeploymentStatusWebhookEventPayload>),
-    DiscussionWebhookEvent(Box<DiscussionWebhookEventPayload>),
-    DiscussionCommentWebhookEvent(Box<DiscussionCommentWebhookEventPayload>),
-    ForkWebhookEvent(Box<ForkWebhookEventPayload>),
-    GithubAppAuthorizationWebhookEvent(Box<GithubAppAuthorizationWebhookEventPayload>),
-    GollumWebhookEvent(Box<GollumWebhookEventPayload>),
-    InstallationWebhookEvent(Box<InstallationWebhookEventPayload>),
-    InstallationRepositoriesWebhookEvent(Box<InstallationRepositoriesWebhookEventPayload>),
-    InstallationTargetWebhookEvent(Box<InstallationTargetWebhookEventPayload>),
-    IssueCommentWebhookEvent(Box<IssueCommentWebhookEventPayload>),
-    IssuesWebhookEvent(Box<IssuesWebhookEventPayload>),
-    LabelWebhookEvent(Box<LabelWebhookEventPayload>),
-    MarketplacePurchaseWebhookEvent(Box<MarketplacePurchaseWebhookEventPayload>),
-    MemberWebhookEvent(Box<MemberWebhookEventPayload>),
-    MembershipWebhookEvent(Box<MembershipWebhookEventPayload>),
-    MergeGroupWebhookEvent(Box<MergeGroupWebhookEventPayload>),
-    MetaWebhookEvent(Box<MetaWebhookEventPayload>),
-    MilestoneWebhookEvent(Box<MilestoneWebhookEventPayload>),
-    OrgBlockWebhookEvent(Box<OrgBlockWebhookEventPayload>),
-    OrganizationWebhookEvent(Box<OrganizationWebhookEventPayload>),
-    PackageWebhookEvent(Box<PackageWebhookEventPayload>),
-    PageBuildWebhookEvent(Box<PageBuildWebhookEventPayload>),
-    PersonalAccessTokenRequestWebhookEvent(Box<PersonalAccessTokenRequestWebhookEventPayload>),
-    PingWebhookEvent(Box<PingWebhookEventPayload>),
-    ProjectCardWebhookEvent(Box<ProjectCardWebhookEventPayload>),
-    ProjectWebhookEvent(Box<ProjectWebhookEventPayload>),
-    ProjectColumnWebhookEvent(Box<ProjectColumnWebhookEventPayload>),
-    ProjectsV2WebhookEvent(Box<ProjectsV2WebhookEventPayload>),
-    ProjectsV2ItemWebhookEvent(Box<ProjectsV2ItemWebhookEventPayload>),
-    PublicWebhookEvent(Box<PublicWebhookEventPayload>),
-    PullRequestWebhookEvent(Box<PullRequestWebhookEventPayload>),
-    PullRequestReviewWebhookEvent(Box<PullRequestReviewWebhookEventPayload>),
-    PullRequestReviewCommentWebhookEvent(Box<PullRequestReviewCommentWebhookEventPayload>),
-    PullRequestReviewThreadWebhookEvent(Box<PullRequestReviewThreadWebhookEventPayload>),
-    PushWebhookEvent(Box<PushWebhookEventPayload>),
-    RegistryPackageWebhookEvent(Box<RegistryPackageWebhookEventPayload>),
-    ReleaseWebhookEvent(Box<ReleaseWebhookEventPayload>),
-    RepositoryAdvisoryWebhookEvent(Box<RepositoryAdvisoryWebhookEventPayload>),
-    RepositoryWebhookEvent(Box<RepositoryWebhookEventPayload>),
-    RepositoryDispatchWebhookEvent(Box<RepositoryDispatchWebhookEventPayload>),
-    RepositoryImportWebhookEvent(Box<RepositoryImportWebhookEventPayload>),
-    RepositoryVulnerabilityAlertWebhookEvent(Box<RepositoryVulnerabilityAlertWebhookEventPayload>),
-    SecretScanningAlertWebhookEvent(Box<SecretScanningAlertWebhookEventPayload>),
-    SecretScanningAlertLocationWebhookEvent(Box<SecretScanningAlertLocationWebhookEventPayload>),
-    SecurityAdvisoryWebhookEvent(Box<SecurityAdvisoryWebhookEventPayload>),
-    SecurityAndAnalysisWebhookEvent(Box<SecurityAndAnalysisWebhookEventPayload>),
-    SponsorshipWebhookEvent(Box<SponsorshipWebhookEventPayload>),
-    StarWebhookEvent(Box<StarWebhookEventPayload>),
-    StatusWebhookEvent(Box<StatusWebhookEventPayload>),
-    TeamAddWebhookEvent(Box<TeamAddWebhookEventPayload>),
-    TeamWebhookEvent(Box<TeamWebhookEventPayload>),
-    WatchWebhookEvent(Box<WatchWebhookEventPayload>),
-    WorkflowDispatchWebhookEvent(Box<WorkflowDispatchWebhookEventPayload>),
-    WorkflowJobWebhookEvent(Box<WorkflowJobWebhookEventPayload>),
-    WorkflowRunWebhookEvent(Box<WorkflowRunWebhookEventPayload>),
-    UnknownWebhookEvent(Box<serde_json::Value>),
+    BranchProtectionRule(Box<BranchProtectionRuleWebhookEventPayload>),
+    CheckRun(Box<CheckRunWebhookEventPayload>),
+    CheckSuite(Box<CheckSuiteWebhookEventPayload>),
+    CodeScanningAlert(Box<CodeScanningAlertWebhookEventPayload>),
+    CommitComment(Box<CommitCommentWebhookEventPayload>),
+    Create(Box<CreateWebhookEventPayload>),
+    Delete(Box<DeleteWebhookEventPayload>),
+    DependabotAlert(Box<DependabotAlertWebhookEventPayload>),
+    DeployKey(Box<DeployKeyWebhookEventPayload>),
+    Deployment(Box<DeploymentWebhookEventPayload>),
+    DeploymentProtectionRule(Box<DeploymentProtectionRuleWebhookEventPayload>),
+    DeploymentStatus(Box<DeploymentStatusWebhookEventPayload>),
+    Discussion(Box<DiscussionWebhookEventPayload>),
+    DiscussionComment(Box<DiscussionCommentWebhookEventPayload>),
+    Fork(Box<ForkWebhookEventPayload>),
+    GithubAppAuthorization(Box<GithubAppAuthorizationWebhookEventPayload>),
+    Gollum(Box<GollumWebhookEventPayload>),
+    Installation(Box<InstallationWebhookEventPayload>),
+    InstallationRepositories(Box<InstallationRepositoriesWebhookEventPayload>),
+    InstallationTarget(Box<InstallationTargetWebhookEventPayload>),
+    IssueComment(Box<IssueCommentWebhookEventPayload>),
+    Issues(Box<IssuesWebhookEventPayload>),
+    Label(Box<LabelWebhookEventPayload>),
+    MarketplacePurchase(Box<MarketplacePurchaseWebhookEventPayload>),
+    Member(Box<MemberWebhookEventPayload>),
+    Membership(Box<MembershipWebhookEventPayload>),
+    MergeGroup(Box<MergeGroupWebhookEventPayload>),
+    Meta(Box<MetaWebhookEventPayload>),
+    Milestone(Box<MilestoneWebhookEventPayload>),
+    OrgBlock(Box<OrgBlockWebhookEventPayload>),
+    Organization(Box<OrganizationWebhookEventPayload>),
+    Package(Box<PackageWebhookEventPayload>),
+    PageBuild(Box<PageBuildWebhookEventPayload>),
+    PersonalAccessTokenRequest(Box<PersonalAccessTokenRequestWebhookEventPayload>),
+    Ping(Box<PingWebhookEventPayload>),
+    ProjectCard(Box<ProjectCardWebhookEventPayload>),
+    Project(Box<ProjectWebhookEventPayload>),
+    ProjectColumn(Box<ProjectColumnWebhookEventPayload>),
+    ProjectsV2(Box<ProjectsV2WebhookEventPayload>),
+    ProjectsV2Item(Box<ProjectsV2ItemWebhookEventPayload>),
+    Public(Box<PublicWebhookEventPayload>),
+    PullRequest(Box<PullRequestWebhookEventPayload>),
+    PullRequestReview(Box<PullRequestReviewWebhookEventPayload>),
+    PullRequestReviewComment(Box<PullRequestReviewCommentWebhookEventPayload>),
+    PullRequestReviewThread(Box<PullRequestReviewThreadWebhookEventPayload>),
+    Push(Box<PushWebhookEventPayload>),
+    RegistryPackage(Box<RegistryPackageWebhookEventPayload>),
+    Release(Box<ReleaseWebhookEventPayload>),
+    RepositoryAdvisory(Box<RepositoryAdvisoryWebhookEventPayload>),
+    Repository(Box<RepositoryWebhookEventPayload>),
+    RepositoryDispatch(Box<RepositoryDispatchWebhookEventPayload>),
+    RepositoryImport(Box<RepositoryImportWebhookEventPayload>),
+    RepositoryVulnerabilityAlert(Box<RepositoryVulnerabilityAlertWebhookEventPayload>),
+    SecretScanningAlert(Box<SecretScanningAlertWebhookEventPayload>),
+    SecretScanningAlertLocation(Box<SecretScanningAlertLocationWebhookEventPayload>),
+    SecurityAdvisory(Box<SecurityAdvisoryWebhookEventPayload>),
+    SecurityAndAnalysis(Box<SecurityAndAnalysisWebhookEventPayload>),
+    Sponsorship(Box<SponsorshipWebhookEventPayload>),
+    Star(Box<StarWebhookEventPayload>),
+    Status(Box<StatusWebhookEventPayload>),
+    TeamAdd(Box<TeamAddWebhookEventPayload>),
+    Team(Box<TeamWebhookEventPayload>),
+    Watch(Box<WatchWebhookEventPayload>),
+    WorkflowDispatch(Box<WorkflowDispatchWebhookEventPayload>),
+    WorkflowJob(Box<WorkflowJobWebhookEventPayload>),
+    WorkflowRun(Box<WorkflowRunWebhookEventPayload>),
+    Unknown(Box<serde_json::Value>),
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]