diff --git a/runelite-api/src/main/java/net/runelite/api/ChatMessageType.java b/runelite-api/src/main/java/net/runelite/api/ChatMessageType.java
index c54283ad74..9863de16d2 100644
--- a/runelite-api/src/main/java/net/runelite/api/ChatMessageType.java
+++ b/runelite-api/src/main/java/net/runelite/api/ChatMessageType.java
@@ -109,21 +109,21 @@ public enum ChatMessageType
 	 */
 	IGNORENOTIFICATION(31),
 	/**
-	 * A chat message in a guest clan chat.
+	 * A chat message in a clan chat.
 	 */
-	CLANCHANNEL_AFFINED(41),
+	CLAN_CHAT(41),
 	/**
-	 * A system message in a guest clan chat.
+	 * A system message in a clan chat.
 	 */
-	CLANCHANNEL_SYSTEM_AFFINED(43),
+	CLAN_MESSAGE(43),
 	/**
-	 * A chat message in the primary clan chat.
+	 * A chat message in the guest clan chat.
 	 */
-	CLANCHANNEL_LISTENED(44),
+	CLAN_GUEST_CHAT(44),
 	/**
-	 * A system message in the primary clan chat.
+	 * A system message in the guest clan chat.
 	 */
-	CLANCHANNEL_SYSTEM_LISTENED(46),
+	CLAN_GUEST_MESSAGE(46),
 	/**
 	 * An autotyper message from a player.
 	 */
@@ -168,6 +168,14 @@ public enum ChatMessageType
 	 * The "Welcome to RuneScape" message
 	 */
 	WELCOME(108),
+	/**
+	 * Clan creation invitation.
+	 */
+	CLAN_CREATION_INVITATION(109),
+	/**
+	 * Clan wars challenge for clans rather than FCs
+	 */
+	CLAN_CLAN_WARS_CHALLENGE(110),
 	/**
 	 * An unknown message type.
 	 */
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java
index 1aa16ee6cc..30b0b740cd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java
@@ -175,8 +175,8 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener
 			case PUBLICCHAT:
 			case MODCHAT:
 			case FRIENDSCHAT:
-			case CLANCHANNEL_LISTENED:
-			case CLANCHANNEL_AFFINED:
+			case CLAN_GUEST_CHAT:
+			case CLAN_CHAT:
 			case CONSOLE:
 				messageQueue.offer(chatMessage.getMessageNode());
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatboxTab.java b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatboxTab.java
index d833e4e131..a0ad48f287 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatboxTab.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatboxTab.java
@@ -58,7 +58,7 @@ enum ChatboxTab
 		ChatMessageType.FRIENDSCHATNOTIFICATION, ChatMessageType.FRIENDSCHAT, ChatMessageType.CHALREQ_FRIENDSCHAT),
 
 	CLAN("Clan", null, WidgetInfo.CHATBOX_TAB_CLAN,
-		ChatMessageType.CLANCHANNEL_AFFINED, ChatMessageType.CLANCHANNEL_SYSTEM_AFFINED, ChatMessageType.CLANCHANNEL_LISTENED, ChatMessageType.CLANCHANNEL_SYSTEM_LISTENED),
+		ChatMessageType.CLAN_CHAT, ChatMessageType.CLAN_MESSAGE, ChatMessageType.CLAN_GUEST_CHAT, ChatMessageType.CLAN_GUEST_MESSAGE),
 
 	TRADE("Trade", "Trade: Show none", WidgetInfo.CHATBOX_TAB_TRADE,
 		ChatMessageType.TRADE_SENT, ChatMessageType.TRADEREQ, ChatMessageType.TRADE, ChatMessageType.CHALREQ_TRADE),