diff --git a/app/src/main/java/chat/revolt/api/internals/MessageProcessor.kt b/app/src/main/java/chat/revolt/internals/text/MessageProcessor.kt
similarity index 87%
rename from app/src/main/java/chat/revolt/api/internals/MessageProcessor.kt
rename to app/src/main/java/chat/revolt/internals/text/MessageProcessor.kt
index 5ccb27fe..51b2bf47 100644
--- a/app/src/main/java/chat/revolt/api/internals/MessageProcessor.kt
+++ b/app/src/main/java/chat/revolt/internals/text/MessageProcessor.kt
@@ -1,4 +1,4 @@
-package chat.revolt.api.internals
+package chat.revolt.internals.text
 
 import chat.revolt.api.RevoltAPI
 import chat.revolt.api.schemas.ChannelType
@@ -7,7 +7,7 @@ import chat.revolt.internals.EmojiImpl
 object MessageProcessor {
     private val MentionRegex = Regex("@((?:\\p{L}|[\\d_.-])+)#([0-9]{4})", RegexOption.IGNORE_CASE)
     private val ChannelRegex = Regex("(?:\\s|^)#(.+?)(?:\\s|\$)", RegexOption.IGNORE_CASE)
-    private val EmojiRegex = Regex(":([a-zA-Z0-9_+-]+):", RegexOption.IGNORE_CASE)
+    private val EmoteRegex = Regex(":([a-zA-Z0-9_+-]+):", RegexOption.IGNORE_CASE)
 
     val emoji = EmojiImpl()
 
@@ -46,13 +46,13 @@ object MessageProcessor {
             fetchedChannel.name?.let { acc.replace("#${it}", "<#${fetchedChannel.id}>") } ?: acc
         }
 
-        val emojis = EmojiRegex.findAll(returnable).map { it.value }.toList()
+        val emojis = EmoteRegex.findAll(returnable).map { it.value }.toList()
 
         returnable = emojis.fold(returnable) { acc, emoji ->
-            val emojiName = EmojiRegex.matchEntire(emoji)?.destructured?.component1()
+            val emojiName = EmoteRegex.matchEntire(emoji)?.destructured?.component1()
                 ?: return@fold acc
 
-            val byShortcode = this.emoji.unicodeByShortcode(emojiName)
+            val byShortcode = MessageProcessor.emoji.unicodeByShortcode(emojiName)
                 ?: return@fold acc
 
             acc.replace(":$emojiName:", byShortcode)
diff --git a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt
index d2b6333d..331fbbd4 100644
--- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt
@@ -13,7 +13,7 @@ import chat.revolt.R
 import chat.revolt.api.RevoltAPI
 import chat.revolt.api.RevoltJson
 import chat.revolt.api.internals.ChannelUtils
-import chat.revolt.api.internals.MessageProcessor
+import chat.revolt.internals.text.MessageProcessor
 import chat.revolt.api.internals.PermissionBit
 import chat.revolt.api.internals.Roles
 import chat.revolt.api.internals.SpecialUsers
diff --git a/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt b/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt
index 2222c0f8..c5d2c506 100644
--- a/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/ReactionInfoSheet.kt
@@ -37,7 +37,7 @@ import androidx.compose.ui.unit.sp
 import chat.revolt.R
 import chat.revolt.api.REVOLT_FILES
 import chat.revolt.api.RevoltAPI
-import chat.revolt.api.internals.MessageProcessor
+import chat.revolt.internals.text.MessageProcessor
 import chat.revolt.api.internals.isUlid
 import chat.revolt.api.routes.custom.fetchEmoji
 import chat.revolt.api.routes.user.fetchUser