diff --git a/loritta-bot-discord/src/main/kotlin/net/perfectdreams/loritta/morenitta/utils/MessageUtils.kt b/loritta-bot-discord/src/main/kotlin/net/perfectdreams/loritta/morenitta/utils/MessageUtils.kt
index 31e9d29d8c..14219dc6f7 100644
--- a/loritta-bot-discord/src/main/kotlin/net/perfectdreams/loritta/morenitta/utils/MessageUtils.kt
+++ b/loritta-bot-discord/src/main/kotlin/net/perfectdreams/loritta/morenitta/utils/MessageUtils.kt
@@ -332,7 +332,14 @@ object MessageUtils {
 					val guildSize = source.memberCount.toString()
 					val mentionOwner = source.owner?.asMention ?: "???"
 					val owner = source.owner?.effectiveName ?: "???"
-					tokens["guild"] = source.name
+
+
+					tokens[Placeholders.GUILD_NAME_SHORT.name] = source.name
+					tokens[Placeholders.GUILD_NAME.name] = source.name
+					tokens[Placeholders.GUILD_SIZE.name] = guildSize
+					tokens[Placeholders.GUILD_ICON_URL.name] = source.iconUrl?.replace("jpg", "png")
+
+					// Deprecated stuff
 					tokens["guildsize"] = guildSize
 					tokens["guild-size"] = guildSize
 					tokens["@owner"] = mentionOwner