diff --git a/src/grom/guild.gleam b/src/grom/guild.gleam
index bc2f24e..6980843 100644
--- a/src/grom/guild.gleam
+++ b/src/grom/guild.gleam
@@ -2,7 +2,6 @@ import gleam/bool
 import gleam/dynamic/decode
 import gleam/http
 import gleam/http/request
-import gleam/http/response
 import gleam/int
 import gleam/json.{type Json}
 import gleam/list
diff --git a/src/grom/interaction.gleam b/src/grom/interaction.gleam
index 60625cb..a2ee3f5 100644
--- a/src/grom/interaction.gleam
+++ b/src/grom/interaction.gleam
@@ -4,6 +4,7 @@ import grom/application
 import grom/channel.{type Channel}
 import grom/entitlement.{type Entitlement}
 import grom/guild.{type Guild}
+import grom/guild_member.{type GuildMember}
 import grom/interaction/application_command
 import grom/interaction/context_type.{type ContextType}
 import grom/interaction/resolved.{type Resolved}
@@ -22,7 +23,7 @@ pub type Interaction {
     guild_id: Option(String),
     channel: Option(Channel),
     channel_id: Option(String),
-    member: Option(guild.Member),
+    member: Option(GuildMember),
     user: Option(User),
     token: String,
     version: Int,
diff --git a/src/grom/interaction/resolved.gleam b/src/grom/interaction/resolved.gleam
index ad81955..f9fd063 100644
--- a/src/grom/interaction/resolved.gleam
+++ b/src/grom/interaction/resolved.gleam
@@ -1,7 +1,7 @@
 import gleam/option.{type Option}
 import grom/channel/thread
-import grom/guild
 import grom/guild/role.{type Role}
+import grom/guild_member.{type GuildMember}
 import grom/message.{type Message}
 import grom/message/attachment.{type Attachment}
 import grom/permission.{type Permission}
@@ -10,7 +10,7 @@ import grom/user.{type User}
 pub type Resolved {
   Resolved(
     users: Option(List(#(String, User))),
-    members: Option(List(#(String, guild.Member))),
+    members: Option(List(#(String, GuildMember))),
     roles: Option(List(#(String, Role))),
     channels: Option(List(#(String, Channel))),
     messages: Option(List(#(String, Message))),
diff --git a/src/grom/message.gleam b/src/grom/message.gleam
index 911d954..a48e53a 100644
--- a/src/grom/message.gleam
+++ b/src/grom/message.gleam
@@ -9,8 +9,8 @@ import grom/application.{type Application}
 import grom/channel/thread.{type Thread}
 import grom/client.{type Client}
 import grom/error.{type Error}
-import grom/guild
 import grom/guild/role.{type Role}
+import grom/guild_member.{type GuildMember}
 import grom/internal/flags
 import grom/internal/rest
 import grom/internal/time_rfc3339
@@ -158,7 +158,7 @@ pub type Snapshot {
 pub type Resolved {
   Resolved(
     users: Option(Dict(String, User)),
-    members: Option(Dict(String, guild.Member)),
+    members: Option(Dict(String, GuildMember)),
     roles: Option(Dict(String, Role)),
     channels: Option(Dict(String, ResolvedChannel)),
     messages: Option(Dict(String, Message)),
@@ -717,7 +717,7 @@ pub fn resolved_decoder() -> decode.Decoder(Resolved) {
   use members <- decode.optional_field(
     "members",
     None,
-    decode.optional(decode.dict(decode.string, guild.member_decoder())),
+    decode.optional(decode.dict(decode.string, guild_member.decoder())),
   )
   use roles <- decode.optional_field(
     "roles",
diff --git a/src/grom/user/current_user.gleam b/src/grom/user/current_user.gleam
index 2f5d73f..3232aa5 100644
--- a/src/grom/user/current_user.gleam
+++ b/src/grom/user/current_user.gleam
@@ -9,7 +9,7 @@ import gleam/result
 import gleam/string
 import grom/client.{type Client}
 import grom/error.{type Error}
-import grom/guild
+import grom/guild_member.{type GuildMember}
 import grom/image
 import grom/internal/rest
 import grom/user.{type User}
@@ -134,7 +134,7 @@ pub fn get_guilds(
 pub fn get_as_member(
   client: Client,
   guild_id: String,
-) -> Result(guild.Member, Error) {
+) -> Result(GuildMember, Error) {
   use response <- result.try(
     client
     |> rest.new_request(http.Get, "/users/@me/guilds/" <> guild_id <> "/member")
@@ -142,6 +142,6 @@ pub fn get_as_member(
   )
 
   response.body
-  |> json.parse(using: guild.member_decoder())
+  |> json.parse(using: guild_member.decoder())
   |> result.map_error(error.CouldNotDecode)
 }