diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index d03f13f85..68f9c62b8 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -77,5 +77,5 @@ export interface User {
   premiumType?: number;
 }
 
-export type DiscordUser = SnakeCaseProps<DiscordUserInternal>;
+export type DiscordUser = SnakeCasedPropertiesDeep<DiscordUserInternal>;
 ```
diff --git a/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts b/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts
index 97fbf2a50..c576e6acf 100644
--- a/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts
+++ b/src/handlers/guilds/GUILD_INTEGRATIONS_UPDATE.ts
@@ -1,7 +1,7 @@
 import { eventHandlers } from "../../bot.ts";
 import { cacheHandlers } from "../../cache.ts";
 import { DiscordGatewayPayload } from "../../types/gateway/gateway_payload.ts";
-import { DiscordGuildIntegrationsUpdate } from "../../types/guilds/guild_integrations_update.ts";
+import { DiscordGuildIntegrationsUpdate } from "../../types/integration/guild_integrations_update.ts";
 
 export async function handleGuildIntegrationsUpdate(
   data: DiscordGatewayPayload,
diff --git a/src/helpers/messages/send_message.ts b/src/helpers/messages/send_message.ts
index cb3c9a603..812c8469b 100644
--- a/src/helpers/messages/send_message.ts
+++ b/src/helpers/messages/send_message.ts
@@ -2,7 +2,6 @@ import { cacheHandlers } from "../../cache.ts";
 import { rest } from "../../rest/rest.ts";
 import { structures } from "../../structures/mod.ts";
 import { DiscordChannelTypes } from "../../types/channels/channel_types.ts";
-import { DiscordenoCreateMessage } from "../../types/discordeno/create_message.ts";
 import { DiscordAllowedMentionsTypes } from "../../types/messages/allowed_mentions_types.ts";
 import { DiscordMessage } from "../../types/messages/message.ts";
 import { Errors } from "../../types/misc/errors.ts";
diff --git a/src/structures/message.ts b/src/structures/message.ts
index 99d8eb926..da9852c7a 100644
--- a/src/structures/message.ts
+++ b/src/structures/message.ts
@@ -9,7 +9,6 @@ import { removeAllReactions } from "../helpers/messages/remove_all_reactions.ts"
 import { removeReaction } from "../helpers/messages/remove_reaction.ts";
 import { removeReactionEmoji } from "../helpers/messages/remove_reaction_emoji.ts";
 import { sendMessage } from "../helpers/messages/send_message.ts";
-import { DiscordenoCreateMessage } from "../types/discordeno/create_message.ts";
 import { GuildMember } from "../types/guilds/guild_member.ts";
 import { EditMessage } from "../types/messages/edit_message.ts";
 import { DiscordMessage, Message } from "../types/messages/message.ts";
diff --git a/src/types/audit_log/audit_log.ts b/src/types/audit_log/audit_log.ts
index 3d9ed9311..bc335f694 100644
--- a/src/types/audit_log/audit_log.ts
+++ b/src/types/audit_log/audit_log.ts
@@ -1,6 +1,6 @@
-import { Integration } from "../guilds/integration.ts";
+import { Integration } from "../integration/integration.ts";
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { Webhook } from "../webhooks/webhook.ts";
 import { AuditLogEntry } from "./audit_log_entry.ts";
 
@@ -16,4 +16,4 @@ export interface AuditLog {
 }
 
 /** https://discord.com/developers/docs/resources/audit-log#audit-log-object */
-export type DiscordAuditLog = SnakeCaseProps<AuditLog>;
+export type DiscordAuditLog = SnakeCasedPropertiesDeep<AuditLog>;
diff --git a/src/types/audit_log/audit_log_change.ts b/src/types/audit_log/audit_log_change.ts
index 084ce644e..55e3b7a19 100644
--- a/src/types/audit_log/audit_log_change.ts
+++ b/src/types/audit_log/audit_log_change.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { AuditLogChangeValue } from "./audit_log_change_value.ts";
 
 export interface AuditLogChange {
@@ -11,4 +11,4 @@ export interface AuditLogChange {
 }
 
 /** https://discord.com/developers/docs/resources/audit-log#audit-log-change-object-audit-log-change-structure */
-export type DiscordAuditLogChange = SnakeCaseProps<AuditLogChange>;
+export type DiscordAuditLogChange = SnakeCasedPropertiesDeep<AuditLogChange>;
diff --git a/src/types/audit_log/audit_log_change_value.ts b/src/types/audit_log/audit_log_change_value.ts
index c3992e4cf..1028e35ff 100644
--- a/src/types/audit_log/audit_log_change_value.ts
+++ b/src/types/audit_log/audit_log_change_value.ts
@@ -1,88 +1,88 @@
 import { Overwrite } from "../channels/overwrite.ts";
 import { Role } from "../permissions/role.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export type AuditLogChangeValue =
   | {
-    newValue: string;
-    oldValue: string;
-    key:
-      | "name"
-      | "description"
-      | "discovery_splash_hash"
-      | "banner_hash"
-      | "preferred_locale"
-      | "rules_channel_id"
-      | "public_updates_channel_id"
-      | "icon_hash"
-      | "splash_hash"
-      | "owner_id"
-      | "region"
-      | "afk_channel_id"
-      | "vanity_url_code"
-      | "widget_channel_id"
-      | "system_channel_id"
-      | "topic"
-      | "application_id"
-      | "permissions"
-      | "allow"
-      | "deny"
-      | "code"
-      | "channel_id"
-      | "inviter_id"
-      | "nick"
-      | "avatar_hash"
-      | "id";
-  }
+      newValue: string;
+      oldValue: string;
+      key:
+        | "name"
+        | "description"
+        | "discovery_splash_hash"
+        | "banner_hash"
+        | "preferred_locale"
+        | "rules_channel_id"
+        | "public_updates_channel_id"
+        | "icon_hash"
+        | "splash_hash"
+        | "owner_id"
+        | "region"
+        | "afk_channel_id"
+        | "vanity_url_code"
+        | "widget_channel_id"
+        | "system_channel_id"
+        | "topic"
+        | "application_id"
+        | "permissions"
+        | "allow"
+        | "deny"
+        | "code"
+        | "channel_id"
+        | "inviter_id"
+        | "nick"
+        | "avatar_hash"
+        | "id";
+    }
   | {
-    newValue: number;
-    oldValue: number;
-    key:
-      | "afk_timeout"
-      | "mfa_level"
-      | "verification_level"
-      | "explicit_content_filter"
-      | "default_messagae_notifications"
-      | "prune_delete_days"
-      | "position"
-      | "bitrate"
-      | "rate_limit_per_user"
-      | "color"
-      | "max_uses"
-      | "uses"
-      | "max_age"
-      | "expire_behavior"
-      | "expire_grace_period"
-      | "user_limit";
-  }
+      newValue: number;
+      oldValue: number;
+      key:
+        | "afk_timeout"
+        | "mfa_level"
+        | "verification_level"
+        | "explicit_content_filter"
+        | "default_messagae_notifications"
+        | "prune_delete_days"
+        | "position"
+        | "bitrate"
+        | "rate_limit_per_user"
+        | "color"
+        | "max_uses"
+        | "uses"
+        | "max_age"
+        | "expire_behavior"
+        | "expire_grace_period"
+        | "user_limit";
+    }
   | {
-    newValue: Partial<Role>;
-    oldValue: Partial<Role>;
-    key: "$add" | "$remove";
-  }
+      newValue: Partial<Role>;
+      oldValue: Partial<Role>;
+      key: "$add" | "$remove";
+    }
   | {
-    newValue: boolean;
-    oldValue: boolean;
-    key:
-      | "widget_enabled"
-      | "nsfw"
-      | "hoist"
-      | "mentionable"
-      | "temporary"
-      | "deaf"
-      | "mute"
-      | "enable_emoticons";
-  }
+      newValue: boolean;
+      oldValue: boolean;
+      key:
+        | "widget_enabled"
+        | "nsfw"
+        | "hoist"
+        | "mentionable"
+        | "temporary"
+        | "deaf"
+        | "mute"
+        | "enable_emoticons";
+    }
   | {
-    newValue: Overwrite[];
-    oldValue: Overwrite[];
-    key: "permission_overwrites";
-  }
+      newValue: Overwrite[];
+      oldValue: Overwrite[];
+      key: "permission_overwrites";
+    }
   | {
-    newValue: string | number;
-    oldValue: string | number;
-    key: "type";
-  };
+      newValue: string | number;
+      oldValue: string | number;
+      key: "type";
+    };
 
 /** https://discord.com/developers/docs/resources/audit-log#audit-log-change-object-audit-log-change-structure */
-export type DiscordAuditLogChangeValue = SnakeCaseProps<AuditLogChangeValue>;
+export type DiscordAuditLogChangeValue = SnakeCasedPropertiesDeep<AuditLogChangeValue>;
diff --git a/src/types/audit_log/audit_log_entry.ts b/src/types/audit_log/audit_log_entry.ts
index c6b0ebf47..d08bb26b8 100644
--- a/src/types/audit_log/audit_log_entry.ts
+++ b/src/types/audit_log/audit_log_entry.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { AuditLogChange } from "./audit_log_change.ts";
 import { DiscordAuditLogEvents } from "./audit_log_events.ts";
 import { OptionalAuditEntryInfo } from "./optional_audit_entry_info.ts";
@@ -21,4 +21,4 @@ export interface AuditLogEntry {
 }
 
 /** https://discord.com/developers/docs/resources/audit-log#audit-log-entry-object-audit-log-entry-structure */
-export type DiscordAuditLogEntry = SnakeCaseProps<AuditLogEntry>;
+export type DiscordAuditLogEntry = SnakeCasedPropertiesDeep<AuditLogEntry>;
diff --git a/src/types/audit_log/get_guild_audit_log.ts b/src/types/audit_log/get_guild_audit_log.ts
index fa8820646..45b1537e5 100644
--- a/src/types/audit_log/get_guild_audit_log.ts
+++ b/src/types/audit_log/get_guild_audit_log.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordAuditLogEvents } from "./audit_log_events.ts";
 
 export interface GetGuildAuditLog {
@@ -13,4 +13,4 @@ export interface GetGuildAuditLog {
 }
 
 /** https://discord.com/developers/docs/resources/audit-log#get-guild-audit-log-query-string-parameters */
-export type DiscordGetGuildAuditLog = SnakeCaseProps<GetGuildAuditLog>;
+export type DiscordGetGuildAuditLog = SnakeCasedPropertiesDeep<GetGuildAuditLog>;
diff --git a/src/types/audit_log/optional_audit_entry_info.ts b/src/types/audit_log/optional_audit_entry_info.ts
index 1acc2e162..fa367803e 100644
--- a/src/types/audit_log/optional_audit_entry_info.ts
+++ b/src/types/audit_log/optional_audit_entry_info.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface OptionalAuditEntryInfo {
   /** Number of days after which inactive members were kicked */
@@ -20,6 +20,4 @@ export interface OptionalAuditEntryInfo {
 }
 
 /** https://discord.com/developers/docs/resources/audit-log#audit-log-entry-object-optional-audit-entry-info */
-export type DiscordOptionalAuditEntryInfo = SnakeCaseProps<
-  OptionalAuditEntryInfo
->;
+export type DiscordOptionalAuditEntryInfo = SnakeCasedPropertiesDeep<OptionalAuditEntryInfo>;
diff --git a/src/types/channels/channel.ts b/src/types/channels/channel.ts
index 6a08d46b6..185d7f7a3 100644
--- a/src/types/channels/channel.ts
+++ b/src/types/channels/channel.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordChannelTypes } from "./channel_types.ts";
 import { DiscordOverwrite, Overwrite } from "./overwrite.ts";
 
@@ -44,6 +44,6 @@ export interface Channel {
 
 /** https://discord.com/developers/docs/resources/channel#channel-object */
 export interface DiscordChannel
-  extends SnakeCaseProps<Omit<Channel, "permissionOverwrites">> {
+  extends SnakeCasedPropertiesDeep<Omit<Channel, "permissionOverwrites">> {
   permission_overwrites?: DiscordOverwrite[];
 }
diff --git a/src/types/channels/channel_mention.ts b/src/types/channels/channel_mention.ts
index 166668dc5..f6ec4def0 100644
--- a/src/types/channels/channel_mention.ts
+++ b/src/types/channels/channel_mention.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface ChannelMention {
   /** id of the channel */
@@ -12,4 +12,4 @@ export interface ChannelMention {
 }
 
 /** https://discord.com/developers/docs/resources/channel#channel-mention-object */
-export type DiscordChannelMention = SnakeCaseProps<ChannelMention>;
+export type DiscordChannelMention = SnakeCasedPropertiesDeep<ChannelMention>;
diff --git a/src/types/channels/channel_pins_update.ts b/src/types/channels/channel_pins_update.ts
index df38298c3..6d7bc4929 100644
--- a/src/types/channels/channel_pins_update.ts
+++ b/src/types/channels/channel_pins_update.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface ChannelPinsUpdate {
   /** The id of the guild */
@@ -10,4 +10,4 @@ export interface ChannelPinsUpdate {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#channel-pins-update */
-export type DiscordChannelPinsUpdate = SnakeCaseProps<ChannelPinsUpdate>;
+export type DiscordChannelPinsUpdate = SnakeCasedPropertiesDeep<ChannelPinsUpdate>;
diff --git a/src/types/channels/followed_channel.ts b/src/types/channels/followed_channel.ts
index 2b7a85ef2..c293c5316 100644
--- a/src/types/channels/followed_channel.ts
+++ b/src/types/channels/followed_channel.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface FollowedChannel {
   /** Source message id */
@@ -8,4 +8,4 @@ export interface FollowedChannel {
 }
 
 /** https://discord.com/developers/docs/resources/channel#followed-channel-object */
-export type DiscordFollowedChannel = SnakeCaseProps<FollowedChannel>;
+export type DiscordFollowedChannel = SnakeCasedPropertiesDeep<FollowedChannel>;
diff --git a/src/types/channels/modify_channel.ts b/src/types/channels/modify_channel.ts
index dd2926b3a..41c56776b 100644
--- a/src/types/channels/modify_channel.ts
+++ b/src/types/channels/modify_channel.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordChannelTypes } from "./channel_types.ts";
 import { DiscordOverwrite, Overwrite } from "./overwrite.ts";
 
@@ -27,6 +27,8 @@ export interface ModifyChannel {
 
 /** https://discord.com/developers/docs/resources/channel#modify-channel */
 export interface DiscordModifyChannel
-  extends SnakeCaseProps<Omit<ModifyChannel, "permissionOverwrites">> {
+  extends SnakeCasedPropertiesDeep<
+    Omit<ModifyChannel, "permissionOverwrites">
+  > {
   permission_overwrites?: DiscordOverwrite[];
 }
diff --git a/src/types/embeds/embed_author.ts b/src/types/embeds/embed_author.ts
index e81fd13ae..c6ff2bf25 100644
--- a/src/types/embeds/embed_author.ts
+++ b/src/types/embeds/embed_author.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface EmbedAuthor {
   /** Name of author */
@@ -12,4 +12,4 @@ export interface EmbedAuthor {
 }
 
 /** https://discord.com/developers/docs/resources/channel#embed-object-embed-author-structure */
-export type DiscordEmbedAuthor = SnakeCaseProps<EmbedAuthor>;
+export type DiscordEmbedAuthor = SnakeCasedPropertiesDeep<EmbedAuthor>;
diff --git a/src/types/embeds/embed_footer.ts b/src/types/embeds/embed_footer.ts
index cb887790a..9ccfe268d 100644
--- a/src/types/embeds/embed_footer.ts
+++ b/src/types/embeds/embed_footer.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface EmbedFooter {
   /** Footer text */
@@ -10,4 +10,4 @@ export interface EmbedFooter {
 }
 
 /** https://discord.com/developers/docs/resources/channel#embed-object-embed-footer-structure */
-export type DiscordEmbedFooter = SnakeCaseProps<EmbedFooter>;
+export type DiscordEmbedFooter = SnakeCasedPropertiesDeep<EmbedFooter>;
diff --git a/src/types/embeds/embed_image.ts b/src/types/embeds/embed_image.ts
index f71fb7aaf..2255c47bc 100644
--- a/src/types/embeds/embed_image.ts
+++ b/src/types/embeds/embed_image.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface EmbedImage {
   /** Source url of image (only supports http(s) and attachments) */
@@ -12,4 +12,4 @@ export interface EmbedImage {
 }
 
 /** https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure */
-export type DiscordEmbedImage = SnakeCaseProps<EmbedImage>;
+export type DiscordEmbedImage = SnakeCasedPropertiesDeep<EmbedImage>;
diff --git a/src/types/embeds/embed_thumbnail.ts b/src/types/embeds/embed_thumbnail.ts
index 4dcdfff0e..ee715a4f4 100644
--- a/src/types/embeds/embed_thumbnail.ts
+++ b/src/types/embeds/embed_thumbnail.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface EmbedThumbnail {
   /** Source url of thumbnail (only supports http(s) and attachments) */
@@ -12,4 +12,4 @@ export interface EmbedThumbnail {
 }
 
 /** https://discord.com/developers/docs/resources/channel#embed-object-embed-thumbnail-structure */
-export type DiscordEmbedThumbnail = SnakeCaseProps<EmbedThumbnail>;
+export type DiscordEmbedThumbnail = SnakeCasedPropertiesDeep<EmbedThumbnail>;
diff --git a/src/types/embeds/embed_video.ts b/src/types/embeds/embed_video.ts
index c94f468bd..468c494d0 100644
--- a/src/types/embeds/embed_video.ts
+++ b/src/types/embeds/embed_video.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface EmbedVideo {
   /** Source url of video */
@@ -12,4 +12,4 @@ export interface EmbedVideo {
 }
 
 /** https://discord.com/developers/docs/resources/channel#embed-object-embed-video-structure */
-export type DiscordEmbedVideo = SnakeCaseProps<EmbedVideo>;
+export type DiscordEmbedVideo = SnakeCasedPropertiesDeep<EmbedVideo>;
diff --git a/src/types/emojis/emoji.ts b/src/types/emojis/emoji.ts
index 3c648d6d1..eb6c6467b 100644
--- a/src/types/emojis/emoji.ts
+++ b/src/types/emojis/emoji.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface Emoji {
   /** Emoji id */
@@ -21,4 +21,4 @@ export interface Emoji {
 }
 
 /** https://discord.com/developers/docs/resources/emoji#emoji-object-emoji-structure */
-export type DiscordEmoji = SnakeCaseProps<Emoji>;
+export type DiscordEmoji = SnakeCasedPropertiesDeep<Emoji>;
diff --git a/src/types/emojis/guild_emojis_update.ts b/src/types/emojis/guild_emojis_update.ts
index d67c0e9dc..d680d1739 100644
--- a/src/types/emojis/guild_emojis_update.ts
+++ b/src/types/emojis/guild_emojis_update.ts
@@ -1,5 +1,5 @@
 import { Emoji } from "../emojis/emoji.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GuildEmojisUpdate {
   /** id of the guild */
@@ -9,4 +9,4 @@ export interface GuildEmojisUpdate {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#guild-emojis-update */
-export type DiscordGuildEmojisUpdate = SnakeCaseProps<GuildEmojisUpdate>;
+export type DiscordGuildEmojisUpdate = SnakeCasedPropertiesDeep<GuildEmojisUpdate>;
diff --git a/src/types/gateway/get_gateway_bot.ts b/src/types/gateway/get_gateway_bot.ts
index d58712904..d7e5954e6 100644
--- a/src/types/gateway/get_gateway_bot.ts
+++ b/src/types/gateway/get_gateway_bot.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { SessionStartLimit } from "./session_start_limit.ts";
 
 export interface GetGatewayBot {
@@ -11,4 +11,4 @@ export interface GetGatewayBot {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#get-gateway-bot */
-export type DiscordGetGatewayBot = SnakeCaseProps<GetGatewayBot>;
+export type DiscordGetGatewayBot = SnakeCasedPropertiesDeep<GetGatewayBot>;
diff --git a/src/types/gateway/hello.ts b/src/types/gateway/hello.ts
index e0def4c01..fcda1e013 100644
--- a/src/types/gateway/hello.ts
+++ b/src/types/gateway/hello.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface Hello {
   /** The interval (in milliseconds) the client should heartbeat with */
@@ -6,4 +6,4 @@ export interface Hello {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#hello */
-export type DiscordHello = SnakeCaseProps<Hello>;
+export type DiscordHello = SnakeCasedPropertiesDeep<Hello>;
diff --git a/src/types/gateway/identify.ts b/src/types/gateway/identify.ts
index 223d775ef..a39d4d887 100644
--- a/src/types/gateway/identify.ts
+++ b/src/types/gateway/identify.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { IdentifyConnectionProperties } from "./identify_connection_properties.ts";
 import { StatusUpdate } from "./status_update.ts";
 
@@ -22,4 +22,4 @@ export interface Identify {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#identify */
-export type DiscordIdentify = SnakeCaseProps<Identify>;
+export type DiscordIdentify = SnakeCasedPropertiesDeep<Identify>;
diff --git a/src/types/gateway/ready.ts b/src/types/gateway/ready.ts
index 5b19a07f4..258ff3429 100644
--- a/src/types/gateway/ready.ts
+++ b/src/types/gateway/ready.ts
@@ -1,7 +1,7 @@
 import { UnavailableGuild } from "../guilds/unavailable_guild.ts";
 import { Application } from "../oauth2/application.ts";
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface Ready {
   /** Gateway version */
@@ -17,10 +17,8 @@ export interface Ready {
   /** The shard information associated with this session, if sent when identifying */
   shard?: [number, number];
   /** Contains id and flags */
-  application:
-    & Partial<Application>
-    & Pick<Application, "id" | "flags">;
+  application: Partial<Application> & Pick<Application, "id" | "flags">;
 }
 
 /** https://discord.com/developers/docs/topics/gateway#ready */
-export type DiscordReady = SnakeCaseProps<Ready>;
+export type DiscordReady = SnakeCasedPropertiesDeep<Ready>;
diff --git a/src/types/gateway/session_start_limit.ts b/src/types/gateway/session_start_limit.ts
index 08dbd3469..4bfd204d3 100644
--- a/src/types/gateway/session_start_limit.ts
+++ b/src/types/gateway/session_start_limit.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface SessionStartLimit {
   /** The total number of session starts the current user is allowed */
@@ -12,4 +12,4 @@ export interface SessionStartLimit {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#session-start-limit-object */
-export type DiscordSessionStartLimit = SnakeCaseProps<SessionStartLimit>;
+export type DiscordSessionStartLimit = SnakeCasedPropertiesDeep<SessionStartLimit>;
diff --git a/src/types/gateway/status_update.ts b/src/types/gateway/status_update.ts
index c1afb2dc0..bfdf0158f 100644
--- a/src/types/gateway/status_update.ts
+++ b/src/types/gateway/status_update.ts
@@ -1,5 +1,5 @@
 import { Activity } from "../misc/activity.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordStatusTypes } from "./status_types.ts";
 
 export interface StatusUpdate {
@@ -14,4 +14,4 @@ export interface StatusUpdate {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#update-status */
-export type DiscordStatusUpdate = SnakeCaseProps<StatusUpdate>;
+export type DiscordStatusUpdate = SnakeCasedPropertiesDeep<StatusUpdate>;
diff --git a/src/types/guilds/ban.ts b/src/types/guilds/ban.ts
index 420a6f9c8..5fc4c5842 100644
--- a/src/types/guilds/ban.ts
+++ b/src/types/guilds/ban.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface Ban {
   /** The reason for the ban */
@@ -9,4 +9,4 @@ export interface Ban {
 }
 
 /** https://discord.com/developers/docs/resources/guild#ban-object */
-export type DiscordBan = SnakeCaseProps<Ban>;
+export type DiscordBan = SnakeCasedPropertiesDeep<Ban>;
diff --git a/src/types/guilds/begin_guild_prune.ts b/src/types/guilds/begin_guild_prune.ts
index 07ee2ae53..f93bf63dc 100644
--- a/src/types/guilds/begin_guild_prune.ts
+++ b/src/types/guilds/begin_guild_prune.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface BeginGuildPrune {
   /** Number of days to prune (1 or more), default: 7 */
@@ -10,6 +10,4 @@ export interface BeginGuildPrune {
 }
 
 /** https://discord.com/developers/docs/resources/guild#begin-guild-prune */
-export type DiscordBeginGuildPrune = SnakeCaseProps<
-  BeginGuildPrune
->;
+export type DiscordBeginGuildPrune = SnakeCasedPropertiesDeep<BeginGuildPrune>;
diff --git a/src/types/guilds/create_guild.ts b/src/types/guilds/create_guild.ts
index 226776583..9fa7577db 100644
--- a/src/types/guilds/create_guild.ts
+++ b/src/types/guilds/create_guild.ts
@@ -1,6 +1,6 @@
 import { Channel } from "../channels/channel.ts";
 import { Role } from "../permissions/role.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordDefaultMessageNotificationLevels } from "./default_message_notification_levels.ts";
 import { DiscordExplicitContentFilterLevels } from "./explicit_content_filter_levels.ts";
 import { DiscordVerificationLevels } from "./verification_levels.ts";
@@ -31,4 +31,4 @@ export interface CreateGuild {
 }
 
 /** https://discord.com/developers/docs/resources/guild#create-guild */
-export type DiscordCreateGuild = SnakeCaseProps<CreateGuild>;
+export type DiscordCreateGuild = SnakeCasedPropertiesDeep<CreateGuild>;
diff --git a/src/types/guilds/create_guild_ban.ts b/src/types/guilds/create_guild_ban.ts
index 073992c4a..beb2fb837 100644
--- a/src/types/guilds/create_guild_ban.ts
+++ b/src/types/guilds/create_guild_ban.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface CreateGuildBan {
   /** Number of days to delete messages for (0-7) */
@@ -8,4 +8,4 @@ export interface CreateGuildBan {
 }
 
 /** https://discord.com/developers/docs/resources/guild#create-guild-ban */
-export type DiscordCreateGuildBan = SnakeCaseProps<CreateGuildBan>;
+export type DiscordCreateGuildBan = SnakeCasedPropertiesDeep<CreateGuildBan>;
diff --git a/src/types/guilds/create_guild_channel.ts b/src/types/guilds/create_guild_channel.ts
index 5f9280343..8bbde8f24 100644
--- a/src/types/guilds/create_guild_channel.ts
+++ b/src/types/guilds/create_guild_channel.ts
@@ -1,6 +1,6 @@
 import { DiscordChannelTypes } from "../channels/channel_types.ts";
 import { DiscordOverwrite, Overwrite } from "../channels/overwrite.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface CreateGuildChannel {
   /** Channel name (2-100 characters) */
@@ -27,6 +27,8 @@ export interface CreateGuildChannel {
 
 /** https://discord.com/developers/docs/resources/guild#create-guild-channel */
 export interface DiscordCreateGuildChannel
-  extends SnakeCaseProps<Omit<CreateGuildChannel, "permissionOverwrites">> {
+  extends SnakeCasedPropertiesDeep<
+    Omit<CreateGuildChannel, "permissionOverwrites">
+  > {
   permission_overwrites: DiscordOverwrite[];
 }
diff --git a/src/types/guilds/get_guild.ts b/src/types/guilds/get_guild.ts
index 2226a94e4..b56abc303 100644
--- a/src/types/guilds/get_guild.ts
+++ b/src/types/guilds/get_guild.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GetGuildQuery {
   /** When true, will return approximate member and presence counts for the guild */
@@ -6,4 +6,4 @@ export interface GetGuildQuery {
 }
 
 /** https://discord.com/developers/docs/resources/guild#get-guild */
-export type DiscordGetGuildQuery = SnakeCaseProps<GetGuildQuery>;
+export type DiscordGetGuildQuery = SnakeCasedPropertiesDeep<GetGuildQuery>;
diff --git a/src/types/guilds/get_guild_prune_count.ts b/src/types/guilds/get_guild_prune_count.ts
index 38c58f026..79476bde6 100644
--- a/src/types/guilds/get_guild_prune_count.ts
+++ b/src/types/guilds/get_guild_prune_count.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GetGuildPruneCountQuery {
   /** Number of days to count prune for (1 or more), default: 7 */
@@ -8,6 +8,4 @@ export interface GetGuildPruneCountQuery {
 }
 
 /** https://discord.com/developers/docs/resources/guild#get-guild-prune-count */
-export type DiscordGetGuildPruneCountQuery = SnakeCaseProps<
-  GetGuildPruneCountQuery
->;
+export type DiscordGetGuildPruneCountQuery = SnakeCasedPropertiesDeep<GetGuildPruneCountQuery>;
diff --git a/src/types/guilds/guild.ts b/src/types/guilds/guild.ts
index 78a08ab1d..c346f9f22 100644
--- a/src/types/guilds/guild.ts
+++ b/src/types/guilds/guild.ts
@@ -2,7 +2,7 @@ import { Channel } from "../channels/channel.ts";
 import { Emoji } from "../emojis/emoji.ts";
 import { PresenceUpdate } from "../misc/presence_update.ts";
 import { Role } from "../permissions/role.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { VoiceState } from "../voice/voice_state.ts";
 import { DiscordDefaultMessageNotificationLevels } from "./default_message_notification_levels.ts";
 import { DiscordExplicitContentFilterLevels } from "./explicit_content_filter_levels.ts";
@@ -110,4 +110,4 @@ export interface Guild {
 }
 
 /** https://discord.com/developers/docs/resources/guild#guild-object */
-export type DiscordGuild = SnakeCaseProps<Guild>;
+export type DiscordGuild = SnakeCasedPropertiesDeep<Guild>;
diff --git a/src/types/guilds/guild_ban_add_remove.ts b/src/types/guilds/guild_ban_add_remove.ts
index fecb00a97..4cd453246 100644
--- a/src/types/guilds/guild_ban_add_remove.ts
+++ b/src/types/guilds/guild_ban_add_remove.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GuildBanAddRemove {
   /** id of the guild */
@@ -9,4 +9,4 @@ export interface GuildBanAddRemove {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#guild-ban-add */
-export type DiscordGuildBanAddRemove = SnakeCaseProps<GuildBanAddRemove>;
+export type DiscordGuildBanAddRemove = SnakeCasedPropertiesDeep<GuildBanAddRemove>;
diff --git a/src/types/guilds/guild_ban_remove.ts b/src/types/guilds/guild_ban_remove.ts
index ee75953c3..c88a16207 100644
--- a/src/types/guilds/guild_ban_remove.ts
+++ b/src/types/guilds/guild_ban_remove.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GuildBanRemove {
   /** id of the guild */
@@ -9,4 +9,4 @@ export interface GuildBanRemove {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#guild-ban-remove */
-export type DiscordGuildBanRemove = SnakeCaseProps<GuildBanRemove>;
+export type DiscordGuildBanRemove = SnakeCasedPropertiesDeep<GuildBanRemove>;
diff --git a/src/types/guilds/guild_member.ts b/src/types/guilds/guild_member.ts
index f6e8deb1a..e51a97596 100644
--- a/src/types/guilds/guild_member.ts
+++ b/src/types/guilds/guild_member.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GuildMember {
   /** The user this guild member represents */
@@ -21,4 +21,4 @@ export interface GuildMember {
 }
 
 /** https://discord.com/developers/docs/resources/guild#guild-member-object */
-export type DiscordGuildMember = SnakeCaseProps<GuildMember>;
+export type DiscordGuildMember = SnakeCasedPropertiesDeep<GuildMember>;
diff --git a/src/types/guilds/guild_preview.ts b/src/types/guilds/guild_preview.ts
index 13dfa73c1..0c247d589 100644
--- a/src/types/guilds/guild_preview.ts
+++ b/src/types/guilds/guild_preview.ts
@@ -1,5 +1,5 @@
 import { Emoji } from "../emojis/emoji.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordGuildFeatures } from "./guild_features.ts";
 
 export interface GuildPreview {
@@ -26,4 +26,4 @@ export interface GuildPreview {
 }
 
 /** https://discord.com/developers/docs/resources/guild#guild-preview-object */
-export type DiscordGuildPreview = SnakeCaseProps<GuildPreview>;
+export type DiscordGuildPreview = SnakeCasedPropertiesDeep<GuildPreview>;
diff --git a/src/types/guilds/guild_role_create.ts b/src/types/guilds/guild_role_create.ts
index d3c449ae2..3cb806398 100644
--- a/src/types/guilds/guild_role_create.ts
+++ b/src/types/guilds/guild_role_create.ts
@@ -1,5 +1,5 @@
 import { Role } from "../permissions/role.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GuildRoleCreate {
   /** The id of the guild */
@@ -9,4 +9,4 @@ export interface GuildRoleCreate {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#guild-role-create */
-export type DiscordGuildRoleCreate = SnakeCaseProps<GuildRoleCreate>;
+export type DiscordGuildRoleCreate = SnakeCasedPropertiesDeep<GuildRoleCreate>;
diff --git a/src/types/guilds/guild_role_delete.ts b/src/types/guilds/guild_role_delete.ts
index 6d9e98f20..ed0987640 100644
--- a/src/types/guilds/guild_role_delete.ts
+++ b/src/types/guilds/guild_role_delete.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GuildRoleDelete {
   /** id of the guild */
@@ -8,4 +8,4 @@ export interface GuildRoleDelete {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#guild-role-delete */
-export type DiscordGuildRoleDelete = SnakeCaseProps<GuildRoleDelete>;
+export type DiscordGuildRoleDelete = SnakeCasedPropertiesDeep<GuildRoleDelete>;
diff --git a/src/types/guilds/guild_role_update.ts b/src/types/guilds/guild_role_update.ts
index 94186017e..e306621a8 100644
--- a/src/types/guilds/guild_role_update.ts
+++ b/src/types/guilds/guild_role_update.ts
@@ -1,5 +1,5 @@
 import { Role } from "../permissions/role.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GuildRoleUpdate {
   /** The id of the guild */
@@ -9,4 +9,4 @@ export interface GuildRoleUpdate {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#guild-role-update */
-export type DiscordGuildRoleUpdate = SnakeCaseProps<GuildRoleUpdate>;
+export type DiscordGuildRoleUpdate = SnakeCasedPropertiesDeep<GuildRoleUpdate>;
diff --git a/src/types/guilds/guild_widget.ts b/src/types/guilds/guild_widget.ts
index 180048411..8bb8ffc92 100644
--- a/src/types/guilds/guild_widget.ts
+++ b/src/types/guilds/guild_widget.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GuildWidget {
   /** Whether the widget is enabled */
@@ -8,4 +8,4 @@ export interface GuildWidget {
 }
 
 /** https://discord.com/developers/docs/resources/guild#guild-widget-object-guild-widget-structure */
-export type DiscordGuildWidget = SnakeCaseProps<GuildWidget>;
+export type DiscordGuildWidget = SnakeCasedPropertiesDeep<GuildWidget>;
diff --git a/src/types/guilds/modify_guild.ts b/src/types/guilds/modify_guild.ts
index 2ac942c4b..3b625e6c6 100644
--- a/src/types/guilds/modify_guild.ts
+++ b/src/types/guilds/modify_guild.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordDefaultMessageNotificationLevels } from "./default_message_notification_levels.ts";
 import { DiscordExplicitContentFilterLevels } from "./explicit_content_filter_levels.ts";
 import { DiscordVerificationLevels } from "./verification_levels.ts";
@@ -37,4 +37,4 @@ export interface ModifyGuild {
 }
 
 /** https://discord.com/developers/docs/resources/guild#modify-guild */
-export type DiscordModifyGuild = SnakeCaseProps<ModifyGuild>;
+export type DiscordModifyGuild = SnakeCasedPropertiesDeep<ModifyGuild>;
diff --git a/src/types/guilds/modify_guild_member.ts b/src/types/guilds/modify_guild_member.ts
index 6aaa513b4..096573e6d 100644
--- a/src/types/guilds/modify_guild_member.ts
+++ b/src/types/guilds/modify_guild_member.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface ModifyGuildMember {
   /** Value to set users nickname to. Requires the `MANAGE_NICKNAMES` permission */
@@ -14,4 +14,4 @@ export interface ModifyGuildMember {
 }
 
 /** https://discord.com/developers/docs/resources/guild#modify-guild-member */
-export type DiscordModifyGuildMember = SnakeCaseProps<ModifyGuildMember>;
+export type DiscordModifyGuildMember = SnakeCasedPropertiesDeep<ModifyGuildMember>;
diff --git a/src/types/guilds/request_guild_members.ts b/src/types/guilds/request_guild_members.ts
index 270c810e3..85d7fbd69 100644
--- a/src/types/guilds/request_guild_members.ts
+++ b/src/types/guilds/request_guild_members.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface RequestGuildMembers {
   /** id of the guild to get members for */
@@ -16,4 +16,4 @@ export interface RequestGuildMembers {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#request-guild-members */
-export type DiscordRequestGuildMembers = SnakeCaseProps<RequestGuildMembers>;
+export type DiscordRequestGuildMembers = SnakeCasedPropertiesDeep<RequestGuildMembers>;
diff --git a/src/types/guilds/unavailable_guild.ts b/src/types/guilds/unavailable_guild.ts
index e9ee38dc5..4a939c120 100644
--- a/src/types/guilds/unavailable_guild.ts
+++ b/src/types/guilds/unavailable_guild.ts
@@ -1,7 +1,7 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { Guild } from "./guild.ts";
 
 export type UnavailableGuild = Pick<Guild, "id" | "unavailable">;
 
 /** https://discord.com/developers/docs/resources/guild#unavailable-guild-object */
-export type DiscordUnavailableGuild = SnakeCaseProps<UnavailableGuild>;
+export type DiscordUnavailableGuild = SnakeCasedPropertiesDeep<UnavailableGuild>;
diff --git a/src/types/guilds/welcome_screen.ts b/src/types/guilds/welcome_screen.ts
index 54542539e..092b35ebb 100644
--- a/src/types/guilds/welcome_screen.ts
+++ b/src/types/guilds/welcome_screen.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { WelcomeScreenChannel } from "./welcome_screen_channel.ts";
 
 export interface WelcomeScreen {
@@ -9,4 +9,4 @@ export interface WelcomeScreen {
 }
 
 /** https://discord.com/developers/docs/resources/guild#welcome-screen-object-welcome-screen-structure */
-export type DiscordWelcomeScreen = SnakeCaseProps<WelcomeScreen>;
+export type DiscordWelcomeScreen = SnakeCasedPropertiesDeep<WelcomeScreen>;
diff --git a/src/types/guilds/welcome_screen_channel.ts b/src/types/guilds/welcome_screen_channel.ts
index 16274a3c6..1d63a32f2 100644
--- a/src/types/guilds/welcome_screen_channel.ts
+++ b/src/types/guilds/welcome_screen_channel.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface WelcomeScreenChannel {
   /** The channel's id */
@@ -12,4 +12,4 @@ export interface WelcomeScreenChannel {
 }
 
 /** https://discord.com/developers/docs/resources/guild#welcome-screen-object-welcome-screen-channel-structure */
-export type DiscordWelcomeScreenChannel = SnakeCaseProps<WelcomeScreenChannel>;
+export type DiscordWelcomeScreenChannel = SnakeCasedPropertiesDeep<WelcomeScreenChannel>;
diff --git a/src/types/integration/guild_integrations_update.ts b/src/types/integration/guild_integrations_update.ts
index 70659cb77..d460e1207 100644
--- a/src/types/integration/guild_integrations_update.ts
+++ b/src/types/integration/guild_integrations_update.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GuildIntegrationsUpdate {
   /** id of the guild whose integrations were updated */
@@ -6,6 +6,4 @@ export interface GuildIntegrationsUpdate {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#guild-integrations-update */
-export type DiscordGuildIntegrationsUpdate = SnakeCaseProps<
-  GuildIntegrationsUpdate
->;
+export type DiscordGuildIntegrationsUpdate = SnakeCasedPropertiesDeep<GuildIntegrationsUpdate>;
diff --git a/src/types/integration/integration.ts b/src/types/integration/integration.ts
index 4c46d9acd..0ddb7e7aa 100644
--- a/src/types/integration/integration.ts
+++ b/src/types/integration/integration.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { IntegrationAccount } from "./integration_account.ts";
 import { IntegrationApplication } from "./integration_application.ts";
 import { DiscordIntegrationExpireBehaviors } from "./integration_expire_behaviors.ts";
@@ -38,4 +38,4 @@ export interface Integration {
 }
 
 /** https://discord.com/developers/docs/resources/guild#integration-object-integration-structure */
-export type DiscordIntegration = SnakeCaseProps<Integration>;
+export type DiscordIntegration = SnakeCasedPropertiesDeep<Integration>;
diff --git a/src/types/integration/integration_application.ts b/src/types/integration/integration_application.ts
index 6fa8a8a76..d4da00b90 100644
--- a/src/types/integration/integration_application.ts
+++ b/src/types/integration/integration_application.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface IntegrationApplication {
   /** The id of the app */
@@ -17,6 +17,4 @@ export interface IntegrationApplication {
 }
 
 /** https://discord.com/developers/docs/resources/guild#integration-application-object-integration-application-structure */
-export type DiscordIntegrationApplication = SnakeCaseProps<
-  IntegrationApplication
->;
+export type DiscordIntegrationApplication = SnakeCasedPropertiesDeep<IntegrationApplication>;
diff --git a/src/types/integration/integration_create_update.ts b/src/types/integration/integration_create_update.ts
index 022e879f3..f15cd60da 100644
--- a/src/types/integration/integration_create_update.ts
+++ b/src/types/integration/integration_create_update.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { Integration } from "./integration.ts";
 
 export interface IntegrationCreateUpdate extends Integration {
@@ -7,6 +7,4 @@ export interface IntegrationCreateUpdate extends Integration {
 }
 
 /** https://github.com/discord/discord-api-docs/blob/master/docs/topics/Gateway.md#integration-create-event-additional-fields */
-export type DiscordIntegrationCreateUpdate = SnakeCaseProps<
-  IntegrationCreateUpdate
->;
+export type DiscordIntegrationCreateUpdate = SnakeCasedPropertiesDeep<IntegrationCreateUpdate>;
diff --git a/src/types/integration/integration_delete.ts b/src/types/integration/integration_delete.ts
index 34fca4f61..2217fb855 100644
--- a/src/types/integration/integration_delete.ts
+++ b/src/types/integration/integration_delete.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface IntegrationDelete {
   /** Integration id */
@@ -10,4 +10,4 @@ export interface IntegrationDelete {
 }
 
 /** https://github.com/discord/discord-api-docs/blob/master/docs/topics/Gateway.md#integration-delete-event-fields */
-export type DiscordIntegrationDelete = SnakeCaseProps<IntegrationDelete>;
+export type DiscordIntegrationDelete = SnakeCasedPropertiesDeep<IntegrationDelete>;
diff --git a/src/types/integration/modify_guild_integration.ts b/src/types/integration/modify_guild_integration.ts
index a1998a59c..62c7a4256 100644
--- a/src/types/integration/modify_guild_integration.ts
+++ b/src/types/integration/modify_guild_integration.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface ModifyGuildIntegration {
   /** The behavior when an integration subscription lapses (see the [integration expire behaviors](https://discord.com/developers/docs/resources/guild#integration-object-integration-expire-behaviors) documentation) */
@@ -10,6 +10,4 @@ export interface ModifyGuildIntegration {
 }
 
 /** https://discord.com/developers/docs/resources/guild#modify-guild-integration-json-params */
-export type DiscordModifyGuildIntegration = SnakeCaseProps<
-  ModifyGuildIntegration
->;
+export type DiscordModifyGuildIntegration = SnakeCasedPropertiesDeep<ModifyGuildIntegration>;
diff --git a/src/types/interactions/application_command.ts b/src/types/interactions/application_command.ts
index af0b75710..270dd7e04 100644
--- a/src/types/interactions/application_command.ts
+++ b/src/types/interactions/application_command.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { ApplicationCommandOption } from "./application_command_option.ts";
 
 export interface ApplicationCommand {
@@ -15,4 +15,4 @@ export interface ApplicationCommand {
 }
 
 /** https://discord.com/developers/docs/interactions/slash-commands#applicationcommand */
-export type DiscordApplicationCommand = SnakeCaseProps<ApplicationCommand>;
+export type DiscordApplicationCommand = SnakeCasedPropertiesDeep<ApplicationCommand>;
diff --git a/src/types/interactions/application_command_callback_data.ts b/src/types/interactions/application_command_callback_data.ts
index c8c20fbc5..f3c073f33 100644
--- a/src/types/interactions/application_command_callback_data.ts
+++ b/src/types/interactions/application_command_callback_data.ts
@@ -1,6 +1,6 @@
 import { Embed } from "../embeds/embed.ts";
 import { AllowedMentions } from "../messages/allowed_mentions.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface InteractionApplicationCommandCallbackData {
   /** Is the response TTS */
@@ -16,6 +16,4 @@ export interface InteractionApplicationCommandCallbackData {
 }
 
 /** https://discord.com/developers/docs/interactions/slash-commands#interaction-response-interactionapplicationcommandcallbackdata */
-export type DiscordInteractionApplicationCommandCallbackData = SnakeCaseProps<
-  InteractionApplicationCommandCallbackData
->;
+export type DiscordInteractionApplicationCommandCallbackData = SnakeCasedPropertiesDeep<InteractionApplicationCommandCallbackData>;
diff --git a/src/types/interactions/application_command_create_update_delete.ts b/src/types/interactions/application_command_create_update_delete.ts
index e831daaba..74a7d7b03 100644
--- a/src/types/interactions/application_command_create_update_delete.ts
+++ b/src/types/interactions/application_command_create_update_delete.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { ApplicationCommand } from "./application_command.ts";
 
 export interface ApplicationCommandCreateUpdateDelete
@@ -8,6 +8,4 @@ export interface ApplicationCommandCreateUpdateDelete
 }
 
 /** https://discord.com/developers/docs/topics/gateway#application-command-delete-application-command-extra-fields */
-export type DiscordApplicationCommandCreateUpdateDelete = SnakeCaseProps<
-  ApplicationCommandCreateUpdateDelete
->;
+export type DiscordApplicationCommandCreateUpdateDelete = SnakeCasedPropertiesDeep<ApplicationCommandCreateUpdateDelete>;
diff --git a/src/types/interactions/application_command_interaction_data.ts b/src/types/interactions/application_command_interaction_data.ts
index 2f61e7c2a..5550c1664 100644
--- a/src/types/interactions/application_command_interaction_data.ts
+++ b/src/types/interactions/application_command_interaction_data.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { ApplicationCommandInteractionDataOption } from "./application_command_interaction_data_option.ts";
 
 export interface ApplicationCommandInteractionData {
@@ -11,6 +11,4 @@ export interface ApplicationCommandInteractionData {
 }
 
 /** https://discord.com/developers/docs/interactions/slash-commands#interaction-applicationcommandinteractiondata */
-export type DiscordApplicationCommandInteractionData = SnakeCaseProps<
-  ApplicationCommandInteractionData
->;
+export type DiscordApplicationCommandInteractionData = SnakeCasedPropertiesDeep<ApplicationCommandInteractionData>;
diff --git a/src/types/interactions/application_command_interaction_data_option.ts b/src/types/interactions/application_command_interaction_data_option.ts
index 89cb32421..a1f62647e 100644
--- a/src/types/interactions/application_command_interaction_data_option.ts
+++ b/src/types/interactions/application_command_interaction_data_option.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordApplicationCommandOptionTypes } from "./application_command_option_types.ts";
 
 export interface ApplicationCommandInteractionDataOption {
@@ -11,6 +11,4 @@ export interface ApplicationCommandInteractionDataOption {
 }
 
 /** https://discord.com/developers/docs/interactions/slash-commands#interaction-applicationcommandinteractiondataoption */
-export type DiscordApplicationCommandInteractionDataOption = SnakeCaseProps<
-  ApplicationCommandInteractionDataOption
->;
+export type DiscordApplicationCommandInteractionDataOption = SnakeCasedPropertiesDeep<ApplicationCommandInteractionDataOption>;
diff --git a/src/types/interactions/application_command_option.ts b/src/types/interactions/application_command_option.ts
index 8547df0c0..337724617 100644
--- a/src/types/interactions/application_command_option.ts
+++ b/src/types/interactions/application_command_option.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { ApplicationCommandOptionChoice } from "./application_command_option_choice.ts";
 import { DiscordApplicationCommandOptionTypes } from "./application_command_option_types.ts";
 
@@ -18,6 +18,4 @@ export interface ApplicationCommandOption {
 }
 
 /** https://discord.com/developers/docs/interactions/slash-commands#applicationcommandoption */
-export type DiscordApplicationCommandOption = SnakeCaseProps<
-  ApplicationCommandOption
->;
+export type DiscordApplicationCommandOption = SnakeCasedPropertiesDeep<ApplicationCommandOption>;
diff --git a/src/types/interactions/create_global_application_command.ts b/src/types/interactions/create_global_application_command.ts
index b7392566f..307354cc6 100644
--- a/src/types/interactions/create_global_application_command.ts
+++ b/src/types/interactions/create_global_application_command.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { ApplicationCommandOption } from "./application_command_option.ts";
 
 export interface CreateGlobalApplicationCommand {
@@ -11,6 +11,4 @@ export interface CreateGlobalApplicationCommand {
 }
 
 /** https://discord.com/developers/docs/interactions/slash-commands#create-global-application-command-json-params */
-export type DiscordCreateGlobalApplicationCommand = SnakeCaseProps<
-  CreateGlobalApplicationCommand
->;
+export type DiscordCreateGlobalApplicationCommand = SnakeCasedPropertiesDeep<CreateGlobalApplicationCommand>;
diff --git a/src/types/interactions/create_guild_application_command.ts b/src/types/interactions/create_guild_application_command.ts
index 2e4bbbc50..a298d5c7e 100644
--- a/src/types/interactions/create_guild_application_command.ts
+++ b/src/types/interactions/create_guild_application_command.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { ApplicationCommandOption } from "./application_command_option.ts";
 
 export interface CreateGuildApplicationCommand {
@@ -11,6 +11,4 @@ export interface CreateGuildApplicationCommand {
 }
 
 /** https://discord.com/developers/docs/interactions/slash-commands#create-guild-application-command-json-params */
-export type DiscordCreateGuildApplicationCommand = SnakeCaseProps<
-  CreateGuildApplicationCommand
->;
+export type DiscordCreateGuildApplicationCommand = SnakeCasedPropertiesDeep<CreateGuildApplicationCommand>;
diff --git a/src/types/interactions/edit_global_application_command.ts b/src/types/interactions/edit_global_application_command.ts
index e8c239c70..7880a651f 100644
--- a/src/types/interactions/edit_global_application_command.ts
+++ b/src/types/interactions/edit_global_application_command.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { ApplicationCommandOption } from "./application_command_option.ts";
 
 export interface EditGlobalApplicationCommand {
@@ -11,6 +11,4 @@ export interface EditGlobalApplicationCommand {
 }
 
 /** https://discord.com/developers/docs/interactions/slash-commands#edit-global-application-command-json-params */
-export type DiscordEditGlobalApplicationCommand = SnakeCaseProps<
-  EditGlobalApplicationCommand
->;
+export type DiscordEditGlobalApplicationCommand = SnakeCasedPropertiesDeep<EditGlobalApplicationCommand>;
diff --git a/src/types/interactions/edit_guild_application_command.ts b/src/types/interactions/edit_guild_application_command.ts
index 79abd7c82..ca956121e 100644
--- a/src/types/interactions/edit_guild_application_command.ts
+++ b/src/types/interactions/edit_guild_application_command.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { ApplicationCommandOption } from "./application_command_option.ts";
 
 export interface EditGuildApplicationCommand {
@@ -11,6 +11,4 @@ export interface EditGuildApplicationCommand {
 }
 
 /** https://discord.com/developers/docs/interactions/slash-commands#edit-guild-application-command-json-params */
-export type DiscordEditGuildApplicationCommand = SnakeCaseProps<
-  EditGuildApplicationCommand
->;
+export type DiscordEditGuildApplicationCommand = SnakeCasedPropertiesDeep<EditGuildApplicationCommand>;
diff --git a/src/types/interactions/interaction.ts b/src/types/interactions/interaction.ts
index 83980f33d..b8aed2254 100644
--- a/src/types/interactions/interaction.ts
+++ b/src/types/interactions/interaction.ts
@@ -1,6 +1,6 @@
 import { GuildMember } from "../guilds/guild_member.ts";
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { InteractionApplicationCommandCallbackData } from "./application_command_callback_data.ts";
 import { DiscordInteractionTypes } from "./interaction_types.ts";
 
@@ -26,4 +26,4 @@ export interface Interaction {
 }
 
 /** https://discord.com/developers/docs/interactions/slash-commands#interaction */
-export type DiscordInteraction = SnakeCaseProps<Interaction>;
+export type DiscordInteraction = SnakeCasedPropertiesDeep<Interaction>;
diff --git a/src/types/interactions/interaction_guild_member.ts b/src/types/interactions/interaction_guild_member.ts
index 48b03782d..584b2f74f 100644
--- a/src/types/interactions/interaction_guild_member.ts
+++ b/src/types/interactions/interaction_guild_member.ts
@@ -1,5 +1,5 @@
 import { GuildMember } from "../guilds/guild_member.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface InteractionGuildMember extends GuildMember {
   /** Total permissions of the member in the channel, including overrides, returned when in the interaction object */
@@ -7,6 +7,4 @@ export interface InteractionGuildMember extends GuildMember {
 }
 
 /** https://discord.com/developers/docs/resources/guild#guild-member-object */
-export type DiscordInteractionGuildMember = SnakeCaseProps<
-  InteractionGuildMember
->;
+export type DiscordInteractionGuildMember = SnakeCasedPropertiesDeep<InteractionGuildMember>;
diff --git a/src/types/interactions/interaction_response.ts b/src/types/interactions/interaction_response.ts
index fa7acec0a..596e3520e 100644
--- a/src/types/interactions/interaction_response.ts
+++ b/src/types/interactions/interaction_response.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { InteractionApplicationCommandCallbackData } from "./application_command_callback_data.ts";
 import { InteractionResponseTypes } from "./interaction_response_types.ts";
 
@@ -10,4 +10,4 @@ export interface InteractionResponse {
 }
 
 /** https://discord.com/developers/docs/interactions/slash-commands#interaction-response */
-export type DiscordInteractionResponse = SnakeCaseProps<InteractionResponse>;
+export type DiscordInteractionResponse = SnakeCasedPropertiesDeep<InteractionResponse>;
diff --git a/src/types/interactions/message_interaction.ts b/src/types/interactions/message_interaction.ts
index 6abb12fdd..19f857eee 100644
--- a/src/types/interactions/message_interaction.ts
+++ b/src/types/interactions/message_interaction.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordInteractionTypes } from "./interaction_types.ts";
 
 export interface MessageInteraction {
@@ -14,4 +14,4 @@ export interface MessageInteraction {
 }
 
 /** https://discord.com/developers/docs/interactions/slash-commands#messageinteraction */
-export type DiscordMessageInteraction = SnakeCaseProps<MessageInteraction>;
+export type DiscordMessageInteraction = SnakeCasedPropertiesDeep<MessageInteraction>;
diff --git a/src/types/invites/get_invite.ts b/src/types/invites/get_invite.ts
index 0578d8320..a7b9a4411 100644
--- a/src/types/invites/get_invite.ts
+++ b/src/types/invites/get_invite.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GetInvite {
   /** Whether the invite should contain approximate member counts */
@@ -6,4 +6,4 @@ export interface GetInvite {
 }
 
 /** https://discord.com/developers/docs/resources/invite#get-invite */
-export type DiscordGetInvite = SnakeCaseProps<GetInvite>;
+export type DiscordGetInvite = SnakeCasedPropertiesDeep<GetInvite>;
diff --git a/src/types/invites/invite.ts b/src/types/invites/invite.ts
index d97c4b7ad..46a1d4aa8 100644
--- a/src/types/invites/invite.ts
+++ b/src/types/invites/invite.ts
@@ -1,7 +1,7 @@
 import { Channel } from "../channels/channel.ts";
 import { Guild } from "../guilds/guild.ts";
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordTargetUserTypes } from "./target_user_types.ts";
 
 export interface Invite {
@@ -24,4 +24,4 @@ export interface Invite {
 }
 
 /** https://discord.com/developers/docs/resources/invite#invite-object */
-export type DiscordInvite = SnakeCaseProps<Invite>;
+export type DiscordInvite = SnakeCasedPropertiesDeep<Invite>;
diff --git a/src/types/invites/invite_create.ts b/src/types/invites/invite_create.ts
index 4a440baa3..a20fbbd81 100644
--- a/src/types/invites/invite_create.ts
+++ b/src/types/invites/invite_create.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface InviteCreate {
   /** The channel the invite is for */
@@ -27,4 +27,4 @@ export interface InviteCreate {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#invite-create */
-export type DiscordInviteCreate = SnakeCaseProps<InviteCreate>;
+export type DiscordInviteCreate = SnakeCasedPropertiesDeep<InviteCreate>;
diff --git a/src/types/invites/invite_delete.ts b/src/types/invites/invite_delete.ts
index fda25e041..df324bdd3 100644
--- a/src/types/invites/invite_delete.ts
+++ b/src/types/invites/invite_delete.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 /** https://discord.com/developers/docs/topics/gateway#invite-delete */
 export interface InviteDelete {
@@ -10,4 +10,4 @@ export interface InviteDelete {
   code: string;
 }
 
-export type DiscordInviteDelete = SnakeCaseProps<InviteDelete>;
+export type DiscordInviteDelete = SnakeCasedPropertiesDeep<InviteDelete>;
diff --git a/src/types/invites/invite_metadata.ts b/src/types/invites/invite_metadata.ts
index e897bdc3c..ec43a2414 100644
--- a/src/types/invites/invite_metadata.ts
+++ b/src/types/invites/invite_metadata.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { Invite } from "./invite.ts";
 
 export interface InviteMetadata extends Invite {
@@ -15,4 +15,4 @@ export interface InviteMetadata extends Invite {
 }
 
 /** https://discord.com/developers/docs/resources/invite#invite-metadata-object */
-export type DiscordInviteMetadata = SnakeCaseProps<InviteMetadata>;
+export type DiscordInviteMetadata = SnakeCasedPropertiesDeep<InviteMetadata>;
diff --git a/src/types/members/guild_member_add.ts b/src/types/members/guild_member_add.ts
index 192ea525a..90e710a6a 100644
--- a/src/types/members/guild_member_add.ts
+++ b/src/types/members/guild_member_add.ts
@@ -1,5 +1,5 @@
 import { GuildMember } from "../guilds/guild_member.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GuildMemberAdd extends GuildMember {
   /** id of the guild */
@@ -7,4 +7,4 @@ export interface GuildMemberAdd extends GuildMember {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#guild-member-add */
-export type DiscordGuildMemberAdd = SnakeCaseProps<GuildMemberAdd>;
+export type DiscordGuildMemberAdd = SnakeCasedPropertiesDeep<GuildMemberAdd>;
diff --git a/src/types/members/guild_member_remove.ts b/src/types/members/guild_member_remove.ts
index 6f62ec900..2d44b5c66 100644
--- a/src/types/members/guild_member_remove.ts
+++ b/src/types/members/guild_member_remove.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GuildMemberRemove {
   /** The id of the guild */
@@ -9,4 +9,4 @@ export interface GuildMemberRemove {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#guild-member-remove */
-export type DiscordGuildMemberRemove = SnakeCaseProps<GuildMemberRemove>;
+export type DiscordGuildMemberRemove = SnakeCasedPropertiesDeep<GuildMemberRemove>;
diff --git a/src/types/members/guild_member_update.ts b/src/types/members/guild_member_update.ts
index 4a744450d..36241a94d 100644
--- a/src/types/members/guild_member_update.ts
+++ b/src/types/members/guild_member_update.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GuildMemberUpdate {
   /** The id of the guild */
@@ -19,4 +19,4 @@ export interface GuildMemberUpdate {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#guild-member-update */
-export type DiscordGuildMemberUpdate = SnakeCaseProps<GuildMemberUpdate>;
+export type DiscordGuildMemberUpdate = SnakeCasedPropertiesDeep<GuildMemberUpdate>;
diff --git a/src/types/members/guild_members_chunk.ts b/src/types/members/guild_members_chunk.ts
index 4af80c1c0..3c78feed0 100644
--- a/src/types/members/guild_members_chunk.ts
+++ b/src/types/members/guild_members_chunk.ts
@@ -1,6 +1,6 @@
 import { GuildMember } from "../guilds/guild_member.ts";
 import { PresenceUpdate } from "../misc/presence_update.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface GuildMembersChunk {
   /** The id of the guild */
@@ -20,4 +20,4 @@ export interface GuildMembersChunk {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#guild-members-chunk */
-export type DiscordGuildMembersChunk = SnakeCaseProps<GuildMembersChunk>;
+export type DiscordGuildMembersChunk = SnakeCasedPropertiesDeep<GuildMembersChunk>;
diff --git a/src/types/messages/allowed_mentions.ts b/src/types/messages/allowed_mentions.ts
index c77d6208f..f0e8ba6af 100644
--- a/src/types/messages/allowed_mentions.ts
+++ b/src/types/messages/allowed_mentions.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordAllowedMentionsTypes } from "./allowed_mentions_types.ts";
 
 export interface AllowedMentions {
@@ -13,4 +13,4 @@ export interface AllowedMentions {
 }
 
 /** https://discord.com/developers/docs/resources/channel#allowed-mentions-object */
-export type DiscordAllowedMentions = SnakeCaseProps<AllowedMentions>;
+export type DiscordAllowedMentions = SnakeCasedPropertiesDeep<AllowedMentions>;
diff --git a/src/types/messages/attachment.ts b/src/types/messages/attachment.ts
index 173293351..f9950266e 100644
--- a/src/types/messages/attachment.ts
+++ b/src/types/messages/attachment.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface Attachment {
   /** Attachment id */
@@ -18,4 +18,4 @@ export interface Attachment {
 }
 
 /** https://discord.com/developers/docs/resources/channel#attachment-object */
-export type DiscordAttachment = SnakeCaseProps<Attachment>;
+export type DiscordAttachment = SnakeCasedPropertiesDeep<Attachment>;
diff --git a/src/types/messages/create_message.ts b/src/types/messages/create_message.ts
index b66a94ad8..1ec41fc32 100644
--- a/src/types/messages/create_message.ts
+++ b/src/types/messages/create_message.ts
@@ -2,7 +2,7 @@ import { Embed } from "../embeds/embed.ts";
 import { AllowedMentions } from "../messages/allowed_mentions.ts";
 import { MessageReference } from "../messages/message_reference.ts";
 import { FileContent } from "../misc/file_content.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface CreateMessage {
   /** The message contents (up to 2000 characters) */
@@ -22,4 +22,6 @@ export interface CreateMessage {
 }
 
 /** https://discord.com/developers/docs/resources/channel#create-message */
-export type DiscordCreateMessage = SnakeCaseProps<Omit<CreateMessage, "file">>;
+export type DiscordCreateMessage = SnakeCasedPropertiesDeep<
+  Omit<CreateMessage, "file">
+>;
diff --git a/src/types/messages/edit_message.ts b/src/types/messages/edit_message.ts
index d640625da..fc586dab8 100644
--- a/src/types/messages/edit_message.ts
+++ b/src/types/messages/edit_message.ts
@@ -1,5 +1,5 @@
 import { Embed } from "../embeds/embed.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { AllowedMentions } from "./allowed_mentions.ts";
 
 export interface EditMessage {
@@ -14,4 +14,4 @@ export interface EditMessage {
 }
 
 /** https://discord.com/developers/docs/resources/channel#edit-message-json-params */
-export type DiscordEditMessage = SnakeCaseProps<EditMessage>;
+export type DiscordEditMessage = SnakeCasedPropertiesDeep<EditMessage>;
diff --git a/src/types/messages/message.ts b/src/types/messages/message.ts
index ef0b8ca28..897858a79 100644
--- a/src/types/messages/message.ts
+++ b/src/types/messages/message.ts
@@ -3,7 +3,7 @@ import { Embed } from "../embeds/embed.ts";
 import { GuildMember } from "../guilds/guild_member.ts";
 import { MessageInteraction } from "../interactions/message_interaction.ts";
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { Attachment } from "./attachment.ts";
 import { MessageActivity } from "./message_activity.ts";
 import { MessageApplication } from "./message_application.ts";
@@ -85,4 +85,4 @@ export interface Message {
 }
 
 /** https://discord.com/developers/docs/resources/channel#message-object */
-export type DiscordMessage = SnakeCaseProps<Message>;
+export type DiscordMessage = SnakeCasedPropertiesDeep<Message>;
diff --git a/src/types/messages/message_activity.ts b/src/types/messages/message_activity.ts
index 4031aad92..6cadebd28 100644
--- a/src/types/messages/message_activity.ts
+++ b/src/types/messages/message_activity.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordMessageActivityTypes } from "./message_activity_types.ts";
 
 export interface MessageActivity {
@@ -9,4 +9,4 @@ export interface MessageActivity {
 }
 
 /** https://discord.com/developers/docs/resources/channel#message-object-message-activity-structure */
-export type DiscordMessageActivity = SnakeCaseProps<MessageActivity>;
+export type DiscordMessageActivity = SnakeCasedPropertiesDeep<MessageActivity>;
diff --git a/src/types/messages/message_application.ts b/src/types/messages/message_application.ts
index c58e34e48..19d301cd4 100644
--- a/src/types/messages/message_application.ts
+++ b/src/types/messages/message_application.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface MessageApplication {
   /** id of the application */
@@ -13,4 +13,4 @@ export interface MessageApplication {
   name: string;
 }
 
-export type DiscordMessageApplication = SnakeCaseProps<MessageApplication>;
+export type DiscordMessageApplication = SnakeCasedPropertiesDeep<MessageApplication>;
diff --git a/src/types/messages/message_delete.ts b/src/types/messages/message_delete.ts
index 31ff5c711..d292e9e62 100644
--- a/src/types/messages/message_delete.ts
+++ b/src/types/messages/message_delete.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface MessageDelete {
   /** The id of the message */
@@ -10,4 +10,4 @@ export interface MessageDelete {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#message-delete */
-export type DiscordMessageDelete = SnakeCaseProps<MessageDelete>;
+export type DiscordMessageDelete = SnakeCasedPropertiesDeep<MessageDelete>;
diff --git a/src/types/messages/message_delete_bulk.ts b/src/types/messages/message_delete_bulk.ts
index 2d82d8ab1..8474f65b6 100644
--- a/src/types/messages/message_delete_bulk.ts
+++ b/src/types/messages/message_delete_bulk.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface MessageDeleteBulk {
   /** The ids of the messages */
@@ -10,4 +10,4 @@ export interface MessageDeleteBulk {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#message-delete-bulk */
-export type DiscordMessageDeleteBulk = SnakeCaseProps<MessageDeleteBulk>;
+export type DiscordMessageDeleteBulk = SnakeCasedPropertiesDeep<MessageDeleteBulk>;
diff --git a/src/types/messages/message_reaction_add.ts b/src/types/messages/message_reaction_add.ts
index f8fbcb930..8d50ebd70 100644
--- a/src/types/messages/message_reaction_add.ts
+++ b/src/types/messages/message_reaction_add.ts
@@ -1,6 +1,6 @@
 import { Emoji } from "../emojis/emoji.ts";
 import { GuildMember } from "../guilds/guild_member.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface MessageReactionAdd {
   /** The id of the user */
@@ -18,4 +18,4 @@ export interface MessageReactionAdd {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#message-reaction-add */
-export type DiscordMessageReactionAdd = SnakeCaseProps<MessageReactionAdd>;
+export type DiscordMessageReactionAdd = SnakeCasedPropertiesDeep<MessageReactionAdd>;
diff --git a/src/types/messages/message_reaction_remove.ts b/src/types/messages/message_reaction_remove.ts
index 4f8d34a89..439022a88 100644
--- a/src/types/messages/message_reaction_remove.ts
+++ b/src/types/messages/message_reaction_remove.ts
@@ -1,12 +1,7 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { MessageReactionAdd } from "./message_reaction_add.ts";
 
-export type MessageReactionRemove = Omit<
-  MessageReactionAdd,
-  "member"
->;
+export type MessageReactionRemove = Omit<MessageReactionAdd, "member">;
 
 /** https://discord.com/developers/docs/topics/gateway#message-reaction-remove */
-export type DiscordMessageReactionRemove = SnakeCaseProps<
-  MessageReactionRemove
->;
+export type DiscordMessageReactionRemove = SnakeCasedPropertiesDeep<MessageReactionRemove>;
diff --git a/src/types/messages/message_reaction_remove_all.ts b/src/types/messages/message_reaction_remove_all.ts
index 487c8985a..d046bce40 100644
--- a/src/types/messages/message_reaction_remove_all.ts
+++ b/src/types/messages/message_reaction_remove_all.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { MessageReactionAdd } from "./message_reaction_add.ts";
 
 export type MessageReactionRemoveAll = Pick<
@@ -7,6 +7,4 @@ export type MessageReactionRemoveAll = Pick<
 >;
 
 /** https://discord.com/developers/docs/topics/gateway#message-reaction-remove-all */
-export type DiscordMessageReactionRemoveAll = SnakeCaseProps<
-  MessageReactionRemoveAll
->;
+export type DiscordMessageReactionRemoveAll = SnakeCasedPropertiesDeep<MessageReactionRemoveAll>;
diff --git a/src/types/messages/message_reaction_remove_emoji.ts b/src/types/messages/message_reaction_remove_emoji.ts
index fb7018f66..09e5edcd0 100644
--- a/src/types/messages/message_reaction_remove_emoji.ts
+++ b/src/types/messages/message_reaction_remove_emoji.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { MessageReactionAdd } from "./message_reaction_add.ts";
 
 export type MessageReactionRemoveEmoji = Pick<
@@ -7,6 +7,4 @@ export type MessageReactionRemoveEmoji = Pick<
 >;
 
 /** https://discord.com/developers/docs/topics/gateway#message-reaction-remove-emoji */
-export type DiscordMessageReactionRemoveEmoji = SnakeCaseProps<
-  MessageReactionRemoveEmoji
->;
+export type DiscordMessageReactionRemoveEmoji = SnakeCasedPropertiesDeep<MessageReactionRemoveEmoji>;
diff --git a/src/types/messages/message_reference.ts b/src/types/messages/message_reference.ts
index cd40c42f8..d6b6acd48 100644
--- a/src/types/messages/message_reference.ts
+++ b/src/types/messages/message_reference.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface MessageReference {
   /** id of the originating message */
@@ -15,4 +15,4 @@ export interface MessageReference {
 }
 
 /** https://discord.com/developers/docs/resources/channel#message-object-message-reference-structure */
-export type DiscordMessageReference = SnakeCaseProps<MessageReference>;
+export type DiscordMessageReference = SnakeCasedPropertiesDeep<MessageReference>;
diff --git a/src/types/messages/message_sticker.ts b/src/types/messages/message_sticker.ts
index 9eb48b575..e7f3b2ff1 100644
--- a/src/types/messages/message_sticker.ts
+++ b/src/types/messages/message_sticker.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordMessageStickerFormatTypes } from "./message_sticker_format_types.ts";
 
 export interface MessageSticker {
@@ -27,4 +27,4 @@ export interface MessageSticker {
 }
 
 /** https://discord.com/developers/docs/resources/channel#message-object-message-sticker-structure */
-export type DiscordMessageSticker = SnakeCaseProps<MessageSticker>;
+export type DiscordMessageSticker = SnakeCasedPropertiesDeep<MessageSticker>;
diff --git a/src/types/misc/activity.ts b/src/types/misc/activity.ts
index 89b05d355..91ba32f7f 100644
--- a/src/types/misc/activity.ts
+++ b/src/types/misc/activity.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { ActivityAssets } from "./activity_assets.ts";
 import { ActivityEmoji } from "./activity_emoji.ts";
 import { ActivityParty } from "./activity_party.ts";
@@ -38,4 +38,4 @@ export interface Activity {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#activity-object */
-export type DiscordActivity = SnakeCaseProps<Activity>;
+export type DiscordActivity = SnakeCasedPropertiesDeep<Activity>;
diff --git a/src/types/misc/activity_assets.ts b/src/types/misc/activity_assets.ts
index f2f0658fc..84141aec5 100644
--- a/src/types/misc/activity_assets.ts
+++ b/src/types/misc/activity_assets.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface ActivityAssets {
   /** The id for a large asset of the activity, usually a snowflake */
@@ -12,4 +12,4 @@ export interface ActivityAssets {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#activity-object-activity-assets */
-export type DiscordActivityAssets = SnakeCaseProps<ActivityAssets>;
+export type DiscordActivityAssets = SnakeCasedPropertiesDeep<ActivityAssets>;
diff --git a/src/types/misc/presence_update.ts b/src/types/misc/presence_update.ts
index e1c3f2695..dc7a30b1b 100644
--- a/src/types/misc/presence_update.ts
+++ b/src/types/misc/presence_update.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { Activity } from "./activity.ts";
 import { ClientStatus } from "./client_status.ts";
 
@@ -17,4 +17,4 @@ export interface PresenceUpdate {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#presence-update */
-export type DiscordPresenceUpdate = SnakeCaseProps<PresenceUpdate>;
+export type DiscordPresenceUpdate = SnakeCasedPropertiesDeep<PresenceUpdate>;
diff --git a/src/types/misc/typing_start.ts b/src/types/misc/typing_start.ts
index 207bde4ca..82f34f84d 100644
--- a/src/types/misc/typing_start.ts
+++ b/src/types/misc/typing_start.ts
@@ -1,5 +1,5 @@
 import { GuildMember } from "../guilds/guild_member.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface TypingStart {
   /** id of the channel */
@@ -15,4 +15,4 @@ export interface TypingStart {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#typing-start */
-export type DiscordTypingStart = SnakeCaseProps<TypingStart>;
+export type DiscordTypingStart = SnakeCasedPropertiesDeep<TypingStart>;
diff --git a/src/types/oauth2/application.ts b/src/types/oauth2/application.ts
index 123e090fc..37cf7f44e 100644
--- a/src/types/oauth2/application.ts
+++ b/src/types/oauth2/application.ts
@@ -1,6 +1,6 @@
 import { Team } from "../teams/team.ts";
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface Application {
   /** The id of the app */
@@ -38,4 +38,4 @@ export interface Application {
 }
 
 /** https://discord.com/developers/docs/topics/oauth2#application-object */
-export type DiscordApplication = SnakeCaseProps<Application>;
+export type DiscordApplication = SnakeCasedPropertiesDeep<Application>;
diff --git a/src/types/oauth2/bot_auth_query.ts b/src/types/oauth2/bot_auth_query.ts
index ea1191c9c..bd458284c 100644
--- a/src/types/oauth2/bot_auth_query.ts
+++ b/src/types/oauth2/bot_auth_query.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordOAuth2Scopes } from "./scopes.ts";
 
 export interface BotAuthenticationFlowQuery {
@@ -15,6 +15,4 @@ export interface BotAuthenticationFlowQuery {
 }
 
 /** https://discord.com/developers/docs/topics/oauth2#bot-authorization-flow-bot-auth-parameters */
-export type DiscordBotAuthenticationFlowQuery = SnakeCaseProps<
-  BotAuthenticationFlowQuery
->;
+export type DiscordBotAuthenticationFlowQuery = SnakeCasedPropertiesDeep<BotAuthenticationFlowQuery>;
diff --git a/src/types/oauth2/get_current_authorization_information.ts b/src/types/oauth2/get_current_authorization_information.ts
index 82a9bbe11..60d1ffea8 100644
--- a/src/types/oauth2/get_current_authorization_information.ts
+++ b/src/types/oauth2/get_current_authorization_information.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { Application } from "./application.ts";
 import { DiscordOAuth2Scopes } from "./scopes.ts";
 
@@ -15,6 +15,4 @@ export interface GetCurrentAuthorizationInformation {
 }
 
 /** https://discord.com/developers/docs/topics/oauth2#get-current-authorization-information-response-structure */
-export type DiscordGetCurrentAuthoriationInformation = SnakeCaseProps<
-  GetCurrentAuthorizationInformation
->;
+export type DiscordGetCurrentAuthoriationInformation = SnakeCasedPropertiesDeep<GetCurrentAuthorizationInformation>;
diff --git a/src/types/permissions/role.ts b/src/types/permissions/role.ts
index 6f4bdca8f..7aa92fdb0 100644
--- a/src/types/permissions/role.ts
+++ b/src/types/permissions/role.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { RoleTags } from "./role_tags.ts";
 
 export interface Role {
@@ -23,4 +23,4 @@ export interface Role {
 }
 
 /** https://discord.com/developers/docs/topics/permissions#role-object-role-structure */
-export type DiscordRole = SnakeCaseProps<Role>;
+export type DiscordRole = SnakeCasedPropertiesDeep<Role>;
diff --git a/src/types/permissions/role_tags.ts b/src/types/permissions/role_tags.ts
index 3cc857df3..4b2e31d0d 100644
--- a/src/types/permissions/role_tags.ts
+++ b/src/types/permissions/role_tags.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface RoleTags {
   /** The id of the bot this role belongs to */
@@ -10,4 +10,4 @@ export interface RoleTags {
 }
 
 /** https://discord.com/developers/docs/topics/permissions#role-object-role-tags-structure */
-export type DiscordRoleTags = SnakeCaseProps<RoleTags>;
+export type DiscordRoleTags = SnakeCasedPropertiesDeep<RoleTags>;
diff --git a/src/types/teams/team.ts b/src/types/teams/team.ts
index 7e1bbbf08..1174cfd0a 100644
--- a/src/types/teams/team.ts
+++ b/src/types/teams/team.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { TeamMember } from "./team_member.ts";
 
 export interface Team {
@@ -13,4 +13,4 @@ export interface Team {
 }
 
 /** https://discord.com/developers/docs/topics/teams#data-models-team-object */
-export type DiscordTeam = SnakeCaseProps<Team>;
+export type DiscordTeam = SnakeCasedPropertiesDeep<Team>;
diff --git a/src/types/teams/team_member.ts b/src/types/teams/team_member.ts
index 5baebda92..7f1fb8f8f 100644
--- a/src/types/teams/team_member.ts
+++ b/src/types/teams/team_member.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordTeamMembershipStates } from "./team_membership_states.ts";
 
 export interface TeamMember {
@@ -10,10 +10,9 @@ export interface TeamMember {
   /** The id of the parent team of which they are a member */
   teamId: string;
   /** The avatar, discriminator, id, and username of the user */
-  user:
-    & Partial<User>
-    & Pick<User, "avatar" | "discriminator" | "id" | "username">;
+  user: Partial<User> &
+    Pick<User, "avatar" | "discriminator" | "id" | "username">;
 }
 
 /** https://discord.com/developers/docs/topics/teams#data-models-team-members-object */
-export type DiscordTeamMember = SnakeCaseProps<TeamMember>;
+export type DiscordTeamMember = SnakeCasedPropertiesDeep<TeamMember>;
diff --git a/src/types/templates/template.ts b/src/types/templates/template.ts
index 19a6b231e..2e4920e9a 100644
--- a/src/types/templates/template.ts
+++ b/src/types/templates/template.ts
@@ -1,6 +1,6 @@
 import { Guild } from "../guilds/guild.ts";
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface Template {
   /** The template code (unique Id) */
@@ -28,4 +28,4 @@ export interface Template {
 }
 
 /** https://discord.com/developers/docs/resources/template#template-object-template-structure */
-export type DiscordTemplate = SnakeCaseProps<Template>;
+export type DiscordTemplate = SnakeCasedPropertiesDeep<Template>;
diff --git a/src/types/users/connection.ts b/src/types/users/connection.ts
index b86c6f4fb..73400b6c0 100644
--- a/src/types/users/connection.ts
+++ b/src/types/users/connection.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordVisibilityTypes } from "./visibility_types.ts";
 import { Integration } from "../guilds/integration.ts";
 
@@ -24,4 +24,4 @@ export interface Connection {
 }
 
 /** https://discord.com/developers/docs/resources/user#connection-objecthttps://discord.com/developers/docs/resources/user#user-object-premium-types */
-export type DiscordConnection = SnakeCaseProps<Connection>;
+export type DiscordConnection = SnakeCasedPropertiesDeep<Connection>;
diff --git a/src/types/users/create_dm.ts b/src/types/users/create_dm.ts
index 0239d5ef6..efc5a60f3 100644
--- a/src/types/users/create_dm.ts
+++ b/src/types/users/create_dm.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface CreateDM {
   /** The recipient to open a DM channel with */
@@ -6,4 +6,4 @@ export interface CreateDM {
 }
 
 /** https://discord.com/developers/docs/resources/user#create-dm */
-export type DiscordCreateDM = SnakeCaseProps<CreateDM>;
+export type DiscordCreateDM = SnakeCasedPropertiesDeep<CreateDM>;
diff --git a/src/types/users/create_group_dm.ts b/src/types/users/create_group_dm.ts
index 27f8c833b..7e4b1644d 100644
--- a/src/types/users/create_group_dm.ts
+++ b/src/types/users/create_group_dm.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface CreateGroupDM {
   /** Access tokens of users that have granted your app the `gdm.join` scope */
@@ -8,4 +8,4 @@ export interface CreateGroupDM {
 }
 
 /** https://discord.com/developers/docs/resources/user#create-group-dm */
-export type DiscordCreateGroupDM = SnakeCaseProps<CreateGroupDM>;
+export type DiscordCreateGroupDM = SnakeCasedPropertiesDeep<CreateGroupDM>;
diff --git a/src/types/users/user.ts b/src/types/users/user.ts
index d6b0db122..3f63200be 100644
--- a/src/types/users/user.ts
+++ b/src/types/users/user.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordPremiumTypes } from "./premium_types.ts";
 import { DiscordUserFlags } from "./user_flags.ts";
 
@@ -32,4 +32,4 @@ export interface User {
 }
 
 /** https://discord.com/developers/docs/resources/user#user-object */
-export type DiscordUser = SnakeCaseProps<User>;
+export type DiscordUser = SnakeCasedPropertiesDeep<User>;
diff --git a/src/types/voice/update_voice_state.ts b/src/types/voice/update_voice_state.ts
index 223893f53..1865e00df 100644
--- a/src/types/voice/update_voice_state.ts
+++ b/src/types/voice/update_voice_state.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface UpdateVoiceState {
   /** id of the guild */
@@ -12,4 +12,4 @@ export interface UpdateVoiceState {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#update-voice-state */
-export type DiscordUpdateVoiceState = SnakeCaseProps<UpdateVoiceState>;
+export type DiscordUpdateVoiceState = SnakeCasedPropertiesDeep<UpdateVoiceState>;
diff --git a/src/types/voice/voice_server_update.ts b/src/types/voice/voice_server_update.ts
index 663fa5ec2..8eab8240e 100644
--- a/src/types/voice/voice_server_update.ts
+++ b/src/types/voice/voice_server_update.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface VoiceServerUpdate {
   /** Voice connection token */
@@ -10,4 +10,4 @@ export interface VoiceServerUpdate {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#voice-server-update */
-export type DiscordVoiceServerUpdate = SnakeCaseProps<VoiceServerUpdate>;
+export type DiscordVoiceServerUpdate = SnakeCasedPropertiesDeep<VoiceServerUpdate>;
diff --git a/src/types/voice/voice_state.ts b/src/types/voice/voice_state.ts
index 8af9085f3..cc75e9f21 100644
--- a/src/types/voice/voice_state.ts
+++ b/src/types/voice/voice_state.ts
@@ -1,5 +1,5 @@
 import { GuildMember } from "../guilds/guild_member.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface VoiceState {
   /** The guild id this voice state is for */
@@ -29,4 +29,4 @@ export interface VoiceState {
 }
 
 /** https://discord.com/developers/docs/resources/voice#voice-state-object-voice-state-structure */
-export type DiscordVoiceState = SnakeCaseProps<VoiceState>;
+export type DiscordVoiceState = SnakeCasedPropertiesDeep<VoiceState>;
diff --git a/src/types/webhooks/edit_webhook_message.ts b/src/types/webhooks/edit_webhook_message.ts
index d4b91e234..b8c247832 100644
--- a/src/types/webhooks/edit_webhook_message.ts
+++ b/src/types/webhooks/edit_webhook_message.ts
@@ -1,6 +1,6 @@
 import { Embed } from "../embeds/embed.ts";
 import { AllowedMentions } from "../messages/allowed_mentions.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface EditWebhookMessage {
   /** The message contents (up to 2000 characters) */
@@ -12,4 +12,4 @@ export interface EditWebhookMessage {
 }
 
 /** https://discord.com/developers/docs/resources/webhook#edit-webhook-message-jsonform-params */
-export type DiscordEditWebhookMessage = SnakeCaseProps<EditWebhookMessage>;
+export type DiscordEditWebhookMessage = SnakeCasedPropertiesDeep<EditWebhookMessage>;
diff --git a/src/types/webhooks/execute_webhook.ts b/src/types/webhooks/execute_webhook.ts
index d1d2086bf..0794210a5 100644
--- a/src/types/webhooks/execute_webhook.ts
+++ b/src/types/webhooks/execute_webhook.ts
@@ -1,7 +1,7 @@
 import { Embed } from "../embeds/embed.ts";
 import { AllowedMentions } from "../messages/allowed_mentions.ts";
 import { FileContent } from "../misc/file_content.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface ExecuteWebhook {
   /** Waits for server confirmation of message send before response, and returns the created message body (defaults to `false`; when `false` a message that is not saved does not return an error) */
@@ -23,6 +23,6 @@ export interface ExecuteWebhook {
 }
 
 /** https://discord.com/developers/docs/resources/webhook#execute-webhook */
-export type DiscordExecuteWebhook = SnakeCaseProps<
+export type DiscordExecuteWebhook = SnakeCasedPropertiesDeep<
   Omit<ExecuteWebhook, "wait">
 >;
diff --git a/src/types/webhooks/modify_webhook.ts b/src/types/webhooks/modify_webhook.ts
index ecc567dcd..9be1eed03 100644
--- a/src/types/webhooks/modify_webhook.ts
+++ b/src/types/webhooks/modify_webhook.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface ModifyWebhook {
   /** The default name of the webhook */
@@ -10,4 +10,4 @@ export interface ModifyWebhook {
 }
 
 /** https://discord.com/developers/docs/resources/webhook#modify-webhook-json-params */
-export type DiscordModifyWebhook = SnakeCaseProps<ModifyWebhook>;
+export type DiscordModifyWebhook = SnakeCasedPropertiesDeep<ModifyWebhook>;
diff --git a/src/types/webhooks/webhook.ts b/src/types/webhooks/webhook.ts
index 11fd45f24..8c922c8b8 100644
--- a/src/types/webhooks/webhook.ts
+++ b/src/types/webhooks/webhook.ts
@@ -1,5 +1,5 @@
 import { User } from "../users/user.ts";
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 import { DiscordWebhookTypes } from "./discord_webhook_types.ts";
 
 export interface Webhook {
@@ -24,4 +24,4 @@ export interface Webhook {
 }
 
 /** https://discord.com/developers/docs/resources/webhook#webhook-object-webhook-structure */
-export type DiscordWebhook = SnakeCaseProps<Webhook>;
+export type DiscordWebhook = SnakeCasedPropertiesDeep<Webhook>;
diff --git a/src/types/webhooks/webhooks_update.ts b/src/types/webhooks/webhooks_update.ts
index 73407b963..6338c37ef 100644
--- a/src/types/webhooks/webhooks_update.ts
+++ b/src/types/webhooks/webhooks_update.ts
@@ -1,4 +1,4 @@
-import { SnakeCaseProps } from "../util.ts";
+import { SnakeCasedPropertiesDeep } from "../util.ts";
 
 export interface WebhookUpdate {
   /** id of the guild */
@@ -8,4 +8,4 @@ export interface WebhookUpdate {
 }
 
 /** https://discord.com/developers/docs/topics/gateway#webhooks-update-webhook-update-event-fields */
-export type DiscordWebhookUpdate = SnakeCaseProps<WebhookUpdate>;
+export type DiscordWebhookUpdate = SnakeCasedPropertiesDeep<WebhookUpdate>;
diff --git a/src/util/utils.ts b/src/util/utils.ts
index 5c012433e..b9bf09551 100644
--- a/src/util/utils.ts
+++ b/src/util/utils.ts
@@ -11,17 +11,19 @@ export const sleep = (timeout: number) => {
 };
 
 export function editBotStatus(
-  data: Pick<GatewayStatusUpdatePayload, "activities" | "status">,
+  data: Pick<GatewayStatusUpdatePayload, "activities" | "status">
 ) {
   ws.shards.forEach((shard) => {
-    sendWS({
-      op: DiscordGatewayOpcodes.StatusUpdate,
-      d: {
-        since: null,
-        afk: false,
-        ...data,
-      },
-    }, shard.id);
+    shard.ws.send(
+      JSON.stringify({
+        op: DiscordGatewayOpcodes.StatusUpdate,
+        d: {
+          since: null,
+          afk: false,
+          ...data,
+        },
+      })
+    );
   });
 }
 
@@ -49,10 +51,11 @@ export function delay(ms: number): Promise<void> {
 export const formatImageURL = (
   url: string,
   size: DiscordImageSize = 128,
-  format?: DiscordImageFormat,
+  format?: DiscordImageFormat
 ) => {
-  return `${url}.${format ||
-    (url.includes("/a_") ? "gif" : "jpg")}?size=${size}`;
+  return `${url}.${
+    format || (url.includes("/a_") ? "gif" : "jpg")
+  }?size=${size}`;
 };
 
 function camelToSnakeCase(text: string) {
@@ -60,31 +63,30 @@ function camelToSnakeCase(text: string) {
 }
 
 function snakeToCamelCase(text: string) {
-  return text.replace(
-    /_id|([-_][a-z])/ig,
-    ($1) => $1.toUpperCase().replace("_", ""),
+  return text.replace(/_id|([-_][a-z])/gi, ($1) =>
+    $1.toUpperCase().replace("_", "")
   );
 }
 
 function isObject(obj: unknown) {
-  return obj === Object(obj) && !Array.isArray(obj) &&
-    typeof obj !== "function";
+  return (
+    obj === Object(obj) && !Array.isArray(obj) && typeof obj !== "function"
+  );
 }
 
 // deno-lint-ignore no-explicit-any
 export function camelKeysToSnakeCase<T>(
-  obj: Record<string, any> | Record<string, any>[],
+  obj: Record<string, any> | Record<string, any>[]
 ): T {
   if (isObject(obj)) {
     // deno-lint-ignore no-explicit-any
     const convertedObject: Record<string, any> = {};
 
-    Object.keys(obj)
-      .forEach((key) => {
-        convertedObject[camelToSnakeCase(key)] = camelKeysToSnakeCase(
-          (obj as Record<string, any>)[key],
-        );
-      });
+    Object.keys(obj).forEach((key) => {
+      convertedObject[camelToSnakeCase(key)] = camelKeysToSnakeCase(
+        (obj as Record<string, any>)[key]
+      );
+    });
 
     return convertedObject as T;
   } else if (Array.isArray(obj)) {
@@ -96,18 +98,17 @@ export function camelKeysToSnakeCase<T>(
 
 // deno-lint-ignore no-explicit-any
 export function snakeKeysToCamelCase<T>(
-  obj: Record<string, any> | Record<string, any>[],
+  obj: Record<string, any> | Record<string, any>[]
 ): T {
   if (isObject(obj)) {
     // deno-lint-ignore no-explicit-any
     const convertedObject: Record<string, any> = {};
 
-    Object.keys(obj)
-      .forEach((key) => {
-        convertedObject[snakeToCamelCase(key)] = snakeKeysToCamelCase(
-          (obj as Record<string, any>)[key],
-        );
-      });
+    Object.keys(obj).forEach((key) => {
+      convertedObject[snakeToCamelCase(key)] = snakeKeysToCamelCase(
+        (obj as Record<string, any>)[key]
+      );
+    });
 
     return convertedObject as T;
   } else if (Array.isArray(obj)) {
@@ -120,7 +121,7 @@ export function snakeKeysToCamelCase<T>(
 /** @private */
 function validateSlashOptionChoices(
   choices: SlashCommandOptionChoice[],
-  optionType: SlashCommandOptionType,
+  optionType: SlashCommandOptionType
 ) {
   for (const choice of choices) {
     if ([...choice.name].length < 1 || [...choice.name].length > 100) {
@@ -129,7 +130,8 @@ function validateSlashOptionChoices(
 
     if (
       (optionType === SlashCommandOptionType.STRING &&
-        (typeof choice.value !== "string" || choice.value.length < 1 ||
+        (typeof choice.value !== "string" ||
+          choice.value.length < 1 ||
           choice.value.length > 100)) ||
       (optionType === SlashCommandOptionType.INTEGER &&
         typeof choice.value !== "number")
@@ -152,9 +154,10 @@ function validateSlashOptions(options: SlashCommandOption[]) {
     }
 
     if (
-      ([...option.name].length < 1 || [...option.name].length > 32) ||
-      ([...option.description].length < 1 ||
-        [...option.description].length > 100)
+      [...option.name].length < 1 ||
+      [...option.name].length > 32 ||
+      [...option.description].length < 1 ||
+      [...option.description].length > 100
     ) {
       throw new Error(Errors.INVALID_SLASH_OPTIONS_CHOICES);
     }
@@ -168,7 +171,7 @@ function validateSlashOptions(options: SlashCommandOption[]) {
 /** @private */
 export function validateSlashCommands(
   commands: UpsertSlashCommandOptions[],
-  create = false,
+  create = false
 ) {
   for (const command of commands) {
     if (