26 files changed, 70 insertions, 70 deletions
diff --git a/LibMatrix.LegacyEvents.EventTypes/Common/MjolnirShortcodeEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Common/MjolnirShortcodeLegacyEventContent.cs
index be8c154..25c53a6 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Common/MjolnirShortcodeEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Common/MjolnirShortcodeLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Common;
 
-[MatrixEvent(EventName = EventId)]
-public class MjolnirShortcodeEventContent : TimelineEventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class MjolnirShortcodeLegacyEventContent : TimelineLegacyEventContent {
     public const string EventId = "org.matrix.mjolnir.shortcode";
 
     [JsonPropertyName("shortcode")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Common/RoomEmotesEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Common/RoomEmotesLegacyEventContent.cs
index ee268d9..a884359 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Common/RoomEmotesEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Common/RoomEmotesLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Common;
 
-[MatrixEvent(EventName = EventId)]
-public class RoomEmotesEventContent : TimelineEventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomEmotesLegacyEventContent : TimelineLegacyEventContent {
     public const string EventId = "im.ponies.room_emotes";
 
     [JsonPropertyName("emoticons")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/EventContent.cs b/LibMatrix.LegacyEvents.EventTypes/LegacyEventContent.cs
index 3e76459..002a85f 100644
--- a/LibMatrix.LegacyEvents.EventTypes/EventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/LegacyEventContent.cs
@@ -4,18 +4,18 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes;
 
-public abstract class EventContent;
+public abstract class LegacyEventContent;
 
-public class UnknownEventContent : TimelineEventContent;
+public class UnknownLegacyEventContent : TimelineLegacyEventContent;
 
-public abstract class TimelineEventContent : EventContent {
+public abstract class TimelineLegacyEventContent : LegacyEventContent {
     [JsonPropertyName("m.relates_to")]
     public MessageRelatesTo? RelatesTo { get; set; }
 
     [JsonPropertyName("m.new_content")]
     public JsonObject? NewContent { get; set; }
 
-    public TimelineEventContent SetReplaceRelation(string eventId) {
+    public TimelineLegacyEventContent SetReplaceRelation(string eventId) {
         NewContent = JsonSerializer.SerializeToNode(this, GetType())!.AsObject();
         // NewContent = JsonSerializer.Deserialize(jsonText, GetType());
         RelatesTo = new MessageRelatesTo {
@@ -25,7 +25,7 @@ public abstract class TimelineEventContent : EventContent {
         return this;
     }
 
-    public T SetReplaceRelation<T>(string eventId) where T : TimelineEventContent => SetReplaceRelation(eventId) as T ?? throw new InvalidOperationException();
+    public T SetReplaceRelation<T>(string eventId) where T : TimelineLegacyEventContent => SetReplaceRelation(eventId) as T ?? throw new InvalidOperationException();
 
     public class MessageRelatesTo {
         [JsonPropertyName("m.in_reply_to")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/MatrixEventAttribute.cs b/LibMatrix.LegacyEvents.EventTypes/LegacyMatrixEventAttribute.cs
index 708dad1..bfcc6f8 100644
--- a/LibMatrix.LegacyEvents.EventTypes/MatrixEventAttribute.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/LegacyMatrixEventAttribute.cs
@@ -1,7 +1,7 @@
 namespace LibMatrix.LegacyEvents.EventTypes;
 
 [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-public class MatrixEventAttribute : Attribute {
+public class LegacyMatrixEventAttribute : Attribute {
     public required string EventName { get; set; }
     public bool Legacy { get; set; }
 }
\ No newline at end of file
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/Ephemeral/PresenceStateEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/Ephemeral/PresenceLegacyEventContent.cs
index 676f36d..136b69a 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/Ephemeral/PresenceStateEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/Ephemeral/PresenceLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.Ephemeral;
 
-[MatrixEvent(EventName = EventId)]
-public class PresenceEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class PresenceLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.presence";
 
     [JsonPropertyName("presence")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/Ephemeral/RoomTypingEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/Ephemeral/RoomTypingLegacyEventContent.cs
index 97b86fc..a44b6a5 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/Ephemeral/RoomTypingEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/Ephemeral/RoomTypingLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State;
 
-[MatrixEvent(EventName = EventId)]
-public class RoomTypingEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomTypingLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.typing";
 
     [JsonPropertyName("user_ids")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/RoomMessageEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/RoomMessageLegacyEventContent.cs
index ef26ab0..a4de54e 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/RoomMessageEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/RoomMessageLegacyEventContent.cs
@@ -2,11 +2,11 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec;
 
-[MatrixEvent(EventName = EventId)]
-public class RoomMessageEventContent : TimelineEventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomMessageLegacyEventContent : TimelineLegacyEventContent {
     public const string EventId = "m.room.message";
 
-    public RoomMessageEventContent(string messageType = "m.notice", string? body = null) {
+    public RoomMessageLegacyEventContent(string messageType = "m.notice", string? body = null) {
         MessageType = messageType;
         Body = body ?? "";
     }
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/RoomMessageReactionEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/RoomMessageReactionEventContent.cs
deleted file mode 100644
index 3649a6b..0000000
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/RoomMessageReactionEventContent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace LibMatrix.LegacyEvents.EventTypes.Spec;
-
-[MatrixEvent(EventName = EventId)]
-public class RoomMessageReactionEventContent : TimelineEventContent {
-    public const string EventId = "m.reaction";
-}
\ No newline at end of file
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/RoomMessageReactionLegacyEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/RoomMessageReactionLegacyEventContent.cs
new file mode 100644
index 0000000..185f2db
--- /dev/null
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/RoomMessageReactionLegacyEventContent.cs
@@ -0,0 +1,6 @@
+namespace LibMatrix.LegacyEvents.EventTypes.Spec;
+
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomMessageReactionLegacyEventContent : TimelineLegacyEventContent {
+    public const string EventId = "m.reaction";
+}
\ No newline at end of file
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/Policy/PolicyRuleStateEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/Policy/PolicyRuleStateEventContent.cs
index c61f2bf..60b1dff 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/Policy/PolicyRuleStateEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/Policy/PolicyRuleStateEventContent.cs
@@ -4,32 +4,32 @@ using ArcaneLibs.Attributes;
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State.Policy;
 
 //spec
-[MatrixEvent(EventName = EventId)]                                         //spec
-[MatrixEvent(EventName = "m.room.rule.server", Legacy = true)]             //???
-[MatrixEvent(EventName = "org.matrix.mjolnir.rule.server", Legacy = true)] //legacy
+[LegacyMatrixEvent(EventName = EventId)]                                         //spec
+[LegacyMatrixEvent(EventName = "m.room.rule.server", Legacy = true)]             //???
+[LegacyMatrixEvent(EventName = "org.matrix.mjolnir.rule.server", Legacy = true)] //legacy
 [FriendlyName(Name = "Server policy", NamePlural = "Server policies")]
-public class ServerPolicyRuleEventContent : PolicyRuleEventContent {
+public class ServerPolicyRuleLegacyEventContent : PolicyRuleLegacyEventContent {
     public const string EventId = "m.policy.rule.server";
 }
 
-[MatrixEvent(EventName = EventId)]                                       //spec
-[MatrixEvent(EventName = "m.room.rule.user", Legacy = true)]             //???
-[MatrixEvent(EventName = "org.matrix.mjolnir.rule.user", Legacy = true)] //legacy
+[LegacyMatrixEvent(EventName = EventId)]                                       //spec
+[LegacyMatrixEvent(EventName = "m.room.rule.user", Legacy = true)]             //???
+[LegacyMatrixEvent(EventName = "org.matrix.mjolnir.rule.user", Legacy = true)] //legacy
 [FriendlyName(Name = "User policy", NamePlural = "User policies")]
-public class UserPolicyRuleEventContent : PolicyRuleEventContent {
+public class UserPolicyRuleLegacyEventContent : PolicyRuleLegacyEventContent {
     public const string EventId = "m.policy.rule.user";
 }
 
-[MatrixEvent(EventName = EventId)]                                       //spec
-[MatrixEvent(EventName = "m.room.rule.room", Legacy = true)]             //???
-[MatrixEvent(EventName = "org.matrix.mjolnir.rule.room", Legacy = true)] //legacy
+[LegacyMatrixEvent(EventName = EventId)]                                       //spec
+[LegacyMatrixEvent(EventName = "m.room.rule.room", Legacy = true)]             //???
+[LegacyMatrixEvent(EventName = "org.matrix.mjolnir.rule.room", Legacy = true)] //legacy
 [FriendlyName(Name = "Room policy", NamePlural = "Room policies")]
-public class RoomPolicyRuleEventContent : PolicyRuleEventContent {
+public class RoomPolicyRuleLegacyEventContent : PolicyRuleLegacyEventContent {
     public const string EventId = "m.policy.rule.room";
 }
 
-public abstract class PolicyRuleEventContent : EventContent {
-    public PolicyRuleEventContent() => Console.WriteLine($"init policy {GetType().Name}");
+public abstract class PolicyRuleLegacyEventContent : LegacyEventContent {
+    public PolicyRuleLegacyEventContent() => Console.WriteLine($"init policy {GetType().Name}");
     private string? _reason;
 
     /// <summary>
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomAliasEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomAliasLegacyEventContent.cs
index 197fe4b..34ff49e 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomAliasEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomAliasLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State.RoomInfo;
 
-[MatrixEvent(EventName = EventId)]
-public class RoomAliasEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomAliasLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.room.alias";
 
     [JsonPropertyName("aliases")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomAvatarEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomAvatarLegacyEventContent.cs
index bc70d65..99d8b39 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomAvatarEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomAvatarLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State.RoomInfo;
 
-[MatrixEvent(EventName = EventId)]
-public class RoomAvatarEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomAvatarLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.room.avatar";
 
     [JsonPropertyName("url")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomCanonicalAliasEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomCanonicalAliasLegacyEventContent.cs
index 790f80b..9d27079 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomCanonicalAliasEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomCanonicalAliasLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State;
 
-[MatrixEvent(EventName = EventId)]
-public class RoomCanonicalAliasEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomCanonicalAliasLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.room.canonical_alias";
 
     [JsonPropertyName("alias")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomCreateEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomCreateLegacyEventContent.cs
index c6d259d..9f0a693 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomCreateEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomCreateLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State;
 
-[MatrixEvent(EventName = EventId)]
-public class RoomCreateEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomCreateLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.room.create";
 
     [JsonPropertyName("room_version")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomEncryptionEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomEncryptionLegacyEventContent.cs
index 2fed1f3..34bd4fe 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomEncryptionEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomEncryptionLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State;
 
-[MatrixEvent(EventName = EventId)]
-public class RoomEncryptionEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomEncryptionLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.room.encryption";
 
     [JsonPropertyName("algorithm")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomGuestAccessEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomGuestAccessLegacyEventContent.cs
index be66dbf..923b8ee 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomGuestAccessEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomGuestAccessLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State;
 
-[MatrixEvent(EventName = EventId)]
-public class RoomGuestAccessEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomGuestAccessLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.room.guest_access";
 
     [JsonPropertyName("guest_access")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomHistoryVisibilityEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomHistoryVisibilityLegacyEventContent.cs
index 0be42d6..ab11dfc 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomHistoryVisibilityEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomHistoryVisibilityLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State;
 
-[MatrixEvent(EventName = EventId)]
-public class RoomHistoryVisibilityEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomHistoryVisibilityLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.room.history_visibility";
 
     [JsonPropertyName("history_visibility")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomJoinRulesEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomJoinRulesLegacyEventContent.cs
index 48202a5..4330697 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomJoinRulesEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomJoinRulesLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State;
 
-[MatrixEvent(EventName = EventId)]
-public class RoomJoinRulesEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomJoinRulesLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.room.join_rules";
 
     /// <summary>
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomMemberEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomMemberLegacyEventContent.cs
index 1926417..d716425 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomMemberEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomMemberLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State;
 
-[MatrixEvent(EventName = EventId)]
-public class RoomMemberEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomMemberLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.room.member";
 
     [JsonPropertyName("reason")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomNameEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomNameLegacyEventContent.cs
index 165a1a3..29646fe 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomNameEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomNameLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State;
 
-[MatrixEvent(EventName = EventId)]
-public class RoomNameEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomNameLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.room.name";
 
     [JsonPropertyName("name")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomPinnedEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomPinnedLegacyEventContent.cs
index 4c08396..bbef3de 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomPinnedEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomPinnedLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State;
 
-[MatrixEvent(EventName = EventId)]
-public class RoomPinnedEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomPinnedLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.room.pinned_events";
 
     [JsonPropertyName("pinned")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomPowerLevelEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomPowerLevelLegacyEventContent.cs
index e7b58ee..cf41b6d 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomPowerLevelEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomPowerLevelLegacyEventContent.cs
@@ -2,9 +2,9 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State;
 
-[MatrixEvent(EventName = EventId)]
+[LegacyMatrixEvent(EventName = EventId)]
 [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)]
-public class RoomPowerLevelEventContent : EventContent {
+public class RoomPowerLevelLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.room.power_levels";
 
     [JsonPropertyName("ban")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomServerACLEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomServerAclLegacyEventContent.cs
index 506203f..d9cedd4 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomServerACLEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomServerAclLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State;
 
-[MatrixEvent(EventName = EventId)]
-public class RoomServerACLEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class RoomServerAclLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.room.server_acl";
 
     [JsonPropertyName("allow")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomTopicEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomTopicLegacyEventContent.cs
index d9e1ba9..fbd5124 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomTopicEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/RoomInfo/RoomTopicLegacyEventContent.cs
@@ -2,9 +2,9 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State;
 
-[MatrixEvent(EventName = EventId)]
-[MatrixEvent(EventName = "org.matrix.msc3765.topic", Legacy = true)]
-public class RoomTopicEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+[LegacyMatrixEvent(EventName = "org.matrix.msc3765.topic", Legacy = true)]
+public class RoomTopicLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.room.topic";
 
     [JsonPropertyName("topic")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/Space/SpaceChildEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/Space/SpaceChildLegacyEventContent.cs
index bd8ff64..75440e5 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/Space/SpaceChildEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/Space/SpaceChildLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State;
 
-[MatrixEvent(EventName = EventId)]
-public class SpaceChildEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class SpaceChildLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.space.child";
 
     [JsonPropertyName("auto_join")]
diff --git a/LibMatrix.LegacyEvents.EventTypes/Spec/State/Space/SpaceParentEventContent.cs b/LibMatrix.LegacyEvents.EventTypes/Spec/State/Space/SpaceParentLegacyEventContent.cs
index 4e9903f..f58143a 100644
--- a/LibMatrix.LegacyEvents.EventTypes/Spec/State/Space/SpaceParentEventContent.cs
+++ b/LibMatrix.LegacyEvents.EventTypes/Spec/State/Space/SpaceParentLegacyEventContent.cs
@@ -2,8 +2,8 @@ using System.Text.Json.Serialization;
 
 namespace LibMatrix.LegacyEvents.EventTypes.Spec.State;
 
-[MatrixEvent(EventName = EventId)]
-public class SpaceParentEventContent : EventContent {
+[LegacyMatrixEvent(EventName = EventId)]
+public class SpaceParentLegacyEventContent : LegacyEventContent {
     public const string EventId = "m.space.parent";
 
     [JsonPropertyName("via")]