diff --git a/mirai-core-api/compatibility-validation/android/api/android.api b/mirai-core-api/compatibility-validation/android/api/android.api
index a19deaf66..baa913bad 100644
--- a/mirai-core-api/compatibility-validation/android/api/android.api
+++ b/mirai-core-api/compatibility-validation/android/api/android.api
@@ -4577,7 +4577,7 @@ public final class net/mamoe/mirai/message/data/MessageOriginKind$Companion {
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
-public abstract class net/mamoe/mirai/message/data/MessageSource : net/mamoe/mirai/message/data/ConstrainSingle, net/mamoe/mirai/message/data/Message, net/mamoe/mirai/message/data/MessageMetadata, net/mamoe/mirai/message/source/FullyMessageIdentity {
+public abstract class net/mamoe/mirai/message/data/MessageSource : net/mamoe/mirai/message/data/ConstrainSingle, net/mamoe/mirai/message/data/Message, net/mamoe/mirai/message/data/MessageMetadata, net/mamoe/mirai/message/source/identity/FullMessageIdentity {
 	public static final field Key Lnet/mamoe/mirai/message/data/MessageSource$Key;
 	public static final field SERIAL_NAME Ljava/lang/String;
 	public abstract fun getBotId ()J
@@ -5411,43 +5411,43 @@ public final class net/mamoe/mirai/message/data/XmlMessageBuilder$ItemBuilder {
 public final class net/mamoe/mirai/message/data/visitor/MessageVisitorKt {
 }
 
-public abstract interface class net/mamoe/mirai/message/source/FullyMessageIdentity : net/mamoe/mirai/message/source/MessageIdentity {
-	public fun convertToRawFullyMessageIdentity ()Lnet/mamoe/mirai/message/source/RawFullyMessageIdentity;
+public abstract interface class net/mamoe/mirai/message/source/identity/FullMessageIdentity : net/mamoe/mirai/message/source/identity/MessageIdentity {
+	public fun convertToRawFullMessageIdentity ()Lnet/mamoe/mirai/message/source/identity/RawFullMessageIdentity;
 	public abstract fun getFromId ()J
 	public abstract fun getKind ()Lnet/mamoe/mirai/message/data/MessageSourceKind;
 	public abstract fun getTargetId ()J
 }
 
-public final class net/mamoe/mirai/message/source/FullyMessageIdentitySerializer : kotlinx/serialization/KSerializer {
-	public static final field INSTANCE Lnet/mamoe/mirai/message/source/FullyMessageIdentitySerializer;
+public final class net/mamoe/mirai/message/source/identity/FullyMessageIdentitySerializer : kotlinx/serialization/KSerializer {
+	public static final field INSTANCE Lnet/mamoe/mirai/message/source/identity/FullyMessageIdentitySerializer;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/FullyMessageIdentity;
+	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/identity/FullMessageIdentity;
 	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/FullyMessageIdentity;)V
+	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/identity/FullMessageIdentity;)V
 }
 
-public abstract interface class net/mamoe/mirai/message/source/MessageIdentity {
-	public fun convertToRawMessageIdentity ()Lnet/mamoe/mirai/message/source/RawMessageIdentity;
+public abstract interface class net/mamoe/mirai/message/source/identity/MessageIdentity {
+	public fun convertToRawMessageIdentity ()Lnet/mamoe/mirai/message/source/identity/RawMessageIdentity;
 	public abstract fun getIds ()[I
 	public abstract fun getInternalIds ()[I
 	public abstract fun getTime ()I
 }
 
-public final class net/mamoe/mirai/message/source/MessageIdentitySerializer : kotlinx/serialization/KSerializer {
-	public static final field INSTANCE Lnet/mamoe/mirai/message/source/MessageIdentitySerializer;
+public final class net/mamoe/mirai/message/source/identity/MessageIdentitySerializer : kotlinx/serialization/KSerializer {
+	public static final field INSTANCE Lnet/mamoe/mirai/message/source/identity/MessageIdentitySerializer;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/MessageIdentity;
+	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/identity/MessageIdentity;
 	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/MessageIdentity;)V
+	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/identity/MessageIdentity;)V
 }
 
-public final class net/mamoe/mirai/message/source/RawFullyMessageIdentity : net/mamoe/mirai/message/source/FullyMessageIdentity {
-	public static final field Companion Lnet/mamoe/mirai/message/source/RawFullyMessageIdentity$Companion;
+public final class net/mamoe/mirai/message/source/identity/RawFullMessageIdentity : net/mamoe/mirai/message/source/identity/FullMessageIdentity {
+	public static final field Companion Lnet/mamoe/mirai/message/source/identity/RawFullMessageIdentity$Companion;
 	public synthetic fun <init> (I[I[IIJJLnet/mamoe/mirai/message/data/MessageSourceKind;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> ([I[IIJJLnet/mamoe/mirai/message/data/MessageSourceKind;)V
-	public fun convertToRawFullyMessageIdentity ()Lnet/mamoe/mirai/message/source/RawFullyMessageIdentity;
+	public fun convertToRawFullMessageIdentity ()Lnet/mamoe/mirai/message/source/identity/RawFullMessageIdentity;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getFromId ()J
 	public fun getIds ()[I
@@ -5457,50 +5457,50 @@ public final class net/mamoe/mirai/message/source/RawFullyMessageIdentity : net/
 	public fun getTime ()I
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public static final fun write$Self (Lnet/mamoe/mirai/message/source/RawFullyMessageIdentity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+	public static final fun write$Self (Lnet/mamoe/mirai/message/source/identity/RawFullMessageIdentity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
-public final class net/mamoe/mirai/message/source/RawFullyMessageIdentity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lnet/mamoe/mirai/message/source/RawFullyMessageIdentity$$serializer;
+public final class net/mamoe/mirai/message/source/identity/RawFullMessageIdentity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
+	public static final field INSTANCE Lnet/mamoe/mirai/message/source/identity/RawFullMessageIdentity$$serializer;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/RawFullyMessageIdentity;
+	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/identity/RawFullMessageIdentity;
 	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/RawFullyMessageIdentity;)V
+	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/identity/RawFullMessageIdentity;)V
 	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
 }
 
-public final class net/mamoe/mirai/message/source/RawFullyMessageIdentity$Companion {
+public final class net/mamoe/mirai/message/source/identity/RawFullMessageIdentity$Companion {
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
-public final class net/mamoe/mirai/message/source/RawMessageIdentity : net/mamoe/mirai/message/source/MessageIdentity {
-	public static final field Companion Lnet/mamoe/mirai/message/source/RawMessageIdentity$Companion;
+public final class net/mamoe/mirai/message/source/identity/RawMessageIdentity : net/mamoe/mirai/message/source/identity/MessageIdentity {
+	public static final field Companion Lnet/mamoe/mirai/message/source/identity/RawMessageIdentity$Companion;
 	public synthetic fun <init> (I[I[IILkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> ([I[II)V
-	public fun convertToRawMessageIdentity ()Lnet/mamoe/mirai/message/source/RawMessageIdentity;
+	public fun convertToRawMessageIdentity ()Lnet/mamoe/mirai/message/source/identity/RawMessageIdentity;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getIds ()[I
 	public fun getInternalIds ()[I
 	public fun getTime ()I
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public static final fun write$Self (Lnet/mamoe/mirai/message/source/RawMessageIdentity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+	public static final fun write$Self (Lnet/mamoe/mirai/message/source/identity/RawMessageIdentity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
-public final class net/mamoe/mirai/message/source/RawMessageIdentity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lnet/mamoe/mirai/message/source/RawMessageIdentity$$serializer;
+public final class net/mamoe/mirai/message/source/identity/RawMessageIdentity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
+	public static final field INSTANCE Lnet/mamoe/mirai/message/source/identity/RawMessageIdentity$$serializer;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/RawMessageIdentity;
+	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/identity/RawMessageIdentity;
 	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/RawMessageIdentity;)V
+	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/identity/RawMessageIdentity;)V
 	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
 }
 
-public final class net/mamoe/mirai/message/source/RawMessageIdentity$Companion {
+public final class net/mamoe/mirai/message/source/identity/RawMessageIdentity$Companion {
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
diff --git a/mirai-core-api/compatibility-validation/jvm/api/jvm.api b/mirai-core-api/compatibility-validation/jvm/api/jvm.api
index 74f924e50..90a824eaf 100644
--- a/mirai-core-api/compatibility-validation/jvm/api/jvm.api
+++ b/mirai-core-api/compatibility-validation/jvm/api/jvm.api
@@ -4577,7 +4577,7 @@ public final class net/mamoe/mirai/message/data/MessageOriginKind$Companion {
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
-public abstract class net/mamoe/mirai/message/data/MessageSource : net/mamoe/mirai/message/data/ConstrainSingle, net/mamoe/mirai/message/data/Message, net/mamoe/mirai/message/data/MessageMetadata, net/mamoe/mirai/message/source/FullyMessageIdentity {
+public abstract class net/mamoe/mirai/message/data/MessageSource : net/mamoe/mirai/message/data/ConstrainSingle, net/mamoe/mirai/message/data/Message, net/mamoe/mirai/message/data/MessageMetadata, net/mamoe/mirai/message/source/identity/FullMessageIdentity {
 	public static final field Key Lnet/mamoe/mirai/message/data/MessageSource$Key;
 	public static final field SERIAL_NAME Ljava/lang/String;
 	public abstract fun getBotId ()J
@@ -5411,43 +5411,43 @@ public final class net/mamoe/mirai/message/data/XmlMessageBuilder$ItemBuilder {
 public final class net/mamoe/mirai/message/data/visitor/MessageVisitorKt {
 }
 
-public abstract interface class net/mamoe/mirai/message/source/FullyMessageIdentity : net/mamoe/mirai/message/source/MessageIdentity {
-	public fun convertToRawFullyMessageIdentity ()Lnet/mamoe/mirai/message/source/RawFullyMessageIdentity;
+public abstract interface class net/mamoe/mirai/message/source/identity/FullMessageIdentity : net/mamoe/mirai/message/source/identity/MessageIdentity {
+	public fun convertToRawFullMessageIdentity ()Lnet/mamoe/mirai/message/source/identity/RawFullMessageIdentity;
 	public abstract fun getFromId ()J
 	public abstract fun getKind ()Lnet/mamoe/mirai/message/data/MessageSourceKind;
 	public abstract fun getTargetId ()J
 }
 
-public final class net/mamoe/mirai/message/source/FullyMessageIdentitySerializer : kotlinx/serialization/KSerializer {
-	public static final field INSTANCE Lnet/mamoe/mirai/message/source/FullyMessageIdentitySerializer;
+public final class net/mamoe/mirai/message/source/identity/FullyMessageIdentitySerializer : kotlinx/serialization/KSerializer {
+	public static final field INSTANCE Lnet/mamoe/mirai/message/source/identity/FullyMessageIdentitySerializer;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/FullyMessageIdentity;
+	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/identity/FullMessageIdentity;
 	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/FullyMessageIdentity;)V
+	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/identity/FullMessageIdentity;)V
 }
 
-public abstract interface class net/mamoe/mirai/message/source/MessageIdentity {
-	public fun convertToRawMessageIdentity ()Lnet/mamoe/mirai/message/source/RawMessageIdentity;
+public abstract interface class net/mamoe/mirai/message/source/identity/MessageIdentity {
+	public fun convertToRawMessageIdentity ()Lnet/mamoe/mirai/message/source/identity/RawMessageIdentity;
 	public abstract fun getIds ()[I
 	public abstract fun getInternalIds ()[I
 	public abstract fun getTime ()I
 }
 
-public final class net/mamoe/mirai/message/source/MessageIdentitySerializer : kotlinx/serialization/KSerializer {
-	public static final field INSTANCE Lnet/mamoe/mirai/message/source/MessageIdentitySerializer;
+public final class net/mamoe/mirai/message/source/identity/MessageIdentitySerializer : kotlinx/serialization/KSerializer {
+	public static final field INSTANCE Lnet/mamoe/mirai/message/source/identity/MessageIdentitySerializer;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/MessageIdentity;
+	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/identity/MessageIdentity;
 	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/MessageIdentity;)V
+	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/identity/MessageIdentity;)V
 }
 
-public final class net/mamoe/mirai/message/source/RawFullyMessageIdentity : net/mamoe/mirai/message/source/FullyMessageIdentity {
-	public static final field Companion Lnet/mamoe/mirai/message/source/RawFullyMessageIdentity$Companion;
+public final class net/mamoe/mirai/message/source/identity/RawFullMessageIdentity : net/mamoe/mirai/message/source/identity/FullMessageIdentity {
+	public static final field Companion Lnet/mamoe/mirai/message/source/identity/RawFullMessageIdentity$Companion;
 	public synthetic fun <init> (I[I[IIJJLnet/mamoe/mirai/message/data/MessageSourceKind;Lkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> ([I[IIJJLnet/mamoe/mirai/message/data/MessageSourceKind;)V
-	public fun convertToRawFullyMessageIdentity ()Lnet/mamoe/mirai/message/source/RawFullyMessageIdentity;
+	public fun convertToRawFullMessageIdentity ()Lnet/mamoe/mirai/message/source/identity/RawFullMessageIdentity;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getFromId ()J
 	public fun getIds ()[I
@@ -5457,50 +5457,50 @@ public final class net/mamoe/mirai/message/source/RawFullyMessageIdentity : net/
 	public fun getTime ()I
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public static final fun write$Self (Lnet/mamoe/mirai/message/source/RawFullyMessageIdentity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+	public static final fun write$Self (Lnet/mamoe/mirai/message/source/identity/RawFullMessageIdentity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
-public final class net/mamoe/mirai/message/source/RawFullyMessageIdentity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lnet/mamoe/mirai/message/source/RawFullyMessageIdentity$$serializer;
+public final class net/mamoe/mirai/message/source/identity/RawFullMessageIdentity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
+	public static final field INSTANCE Lnet/mamoe/mirai/message/source/identity/RawFullMessageIdentity$$serializer;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/RawFullyMessageIdentity;
+	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/identity/RawFullMessageIdentity;
 	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/RawFullyMessageIdentity;)V
+	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/identity/RawFullMessageIdentity;)V
 	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
 }
 
-public final class net/mamoe/mirai/message/source/RawFullyMessageIdentity$Companion {
+public final class net/mamoe/mirai/message/source/identity/RawFullMessageIdentity$Companion {
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
-public final class net/mamoe/mirai/message/source/RawMessageIdentity : net/mamoe/mirai/message/source/MessageIdentity {
-	public static final field Companion Lnet/mamoe/mirai/message/source/RawMessageIdentity$Companion;
+public final class net/mamoe/mirai/message/source/identity/RawMessageIdentity : net/mamoe/mirai/message/source/identity/MessageIdentity {
+	public static final field Companion Lnet/mamoe/mirai/message/source/identity/RawMessageIdentity$Companion;
 	public synthetic fun <init> (I[I[IILkotlinx/serialization/internal/SerializationConstructorMarker;)V
 	public fun <init> ([I[II)V
-	public fun convertToRawMessageIdentity ()Lnet/mamoe/mirai/message/source/RawMessageIdentity;
+	public fun convertToRawMessageIdentity ()Lnet/mamoe/mirai/message/source/identity/RawMessageIdentity;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun getIds ()[I
 	public fun getInternalIds ()[I
 	public fun getTime ()I
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public static final fun write$Self (Lnet/mamoe/mirai/message/source/RawMessageIdentity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
+	public static final fun write$Self (Lnet/mamoe/mirai/message/source/identity/RawMessageIdentity;Lkotlinx/serialization/encoding/CompositeEncoder;Lkotlinx/serialization/descriptors/SerialDescriptor;)V
 }
 
-public final class net/mamoe/mirai/message/source/RawMessageIdentity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field INSTANCE Lnet/mamoe/mirai/message/source/RawMessageIdentity$$serializer;
+public final class net/mamoe/mirai/message/source/identity/RawMessageIdentity$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
+	public static final field INSTANCE Lnet/mamoe/mirai/message/source/identity/RawMessageIdentity$$serializer;
 	public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/RawMessageIdentity;
+	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lnet/mamoe/mirai/message/source/identity/RawMessageIdentity;
 	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
 	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/RawMessageIdentity;)V
+	public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lnet/mamoe/mirai/message/source/identity/RawMessageIdentity;)V
 	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
 }
 
-public final class net/mamoe/mirai/message/source/RawMessageIdentity$Companion {
+public final class net/mamoe/mirai/message/source/identity/RawMessageIdentity$Companion {
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
diff --git a/mirai-core-api/src/commonMain/kotlin/message/data/MessageSource.kt b/mirai-core-api/src/commonMain/kotlin/message/data/MessageSource.kt
index 90200994b..e35371aa1 100644
--- a/mirai-core-api/src/commonMain/kotlin/message/data/MessageSource.kt
+++ b/mirai-core-api/src/commonMain/kotlin/message/data/MessageSource.kt
@@ -34,7 +34,7 @@ import net.mamoe.mirai.message.action.AsyncRecallResult
 import net.mamoe.mirai.message.data.MessageSource.Key.quote
 import net.mamoe.mirai.message.data.MessageSource.Key.recall
 import net.mamoe.mirai.message.data.visitor.MessageVisitor
-import net.mamoe.mirai.message.source.FullyMessageIdentity
+import net.mamoe.mirai.message.source.identity.FullMessageIdentity
 import net.mamoe.mirai.utils.DeprecatedSinceMirai
 import net.mamoe.mirai.utils.MiraiInternalApi
 import net.mamoe.mirai.utils.safeCast
@@ -125,7 +125,7 @@ import net.mamoe.mirai.utils.safeCast
  */
 @Suppress("DEPRECATION")
 @Serializable(MessageSource.Serializer::class)
-public sealed class MessageSource : Message, MessageMetadata, ConstrainSingle, FullyMessageIdentity {
+public sealed class MessageSource : Message, MessageMetadata, ConstrainSingle, FullMessageIdentity {
     public final override val key: MessageKey<MessageSource>
         get() = Key
 
diff --git a/mirai-core-api/src/commonMain/kotlin/message/source/MessageIdentity.data.kt b/mirai-core-api/src/commonMain/kotlin/message/source/identity/MessageIdentity.data.kt
similarity index 90%
rename from mirai-core-api/src/commonMain/kotlin/message/source/MessageIdentity.data.kt
rename to mirai-core-api/src/commonMain/kotlin/message/source/identity/MessageIdentity.data.kt
index 44df5cdb0..4d5aba129 100644
--- a/mirai-core-api/src/commonMain/kotlin/message/source/MessageIdentity.data.kt
+++ b/mirai-core-api/src/commonMain/kotlin/message/source/identity/MessageIdentity.data.kt
@@ -7,7 +7,7 @@
  * https://github.com/mamoe/mirai/blob/dev/LICENSE
  */
 
-package net.mamoe.mirai.message.source
+package net.mamoe.mirai.message.source.identity
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -46,18 +46,18 @@ public class RawMessageIdentity(
 }
 
 @Serializable
-@SerialName("FullyMessageIdentity")
-public class RawFullyMessageIdentity(
+@SerialName("FullMessageIdentity")
+public class RawFullMessageIdentity(
     override val ids: IntArray,
     override val internalIds: IntArray,
     override val time: Int,
     override val fromId: Long,
     override val targetId: Long,
     override val kind: MessageSourceKind,
-) : FullyMessageIdentity {
+) : FullMessageIdentity {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other !is RawFullyMessageIdentity) return false
+        if (other !is RawFullMessageIdentity) return false
 
         if (!ids.contentEquals(other.ids)) return false
         if (!internalIds.contentEquals(other.internalIds)) return false
@@ -77,7 +77,7 @@ public class RawFullyMessageIdentity(
         return result
     }
 
-    override fun convertToRawFullyMessageIdentity(): RawFullyMessageIdentity {
+    override fun convertToRawFullMessageIdentity(): RawFullMessageIdentity {
         return this
     }
 
diff --git a/mirai-core-api/src/commonMain/kotlin/message/source/MessageIdentity.kt b/mirai-core-api/src/commonMain/kotlin/message/source/identity/MessageIdentity.kt
similarity index 92%
rename from mirai-core-api/src/commonMain/kotlin/message/source/MessageIdentity.kt
rename to mirai-core-api/src/commonMain/kotlin/message/source/identity/MessageIdentity.kt
index bb16cc2c9..afd1b7740 100644
--- a/mirai-core-api/src/commonMain/kotlin/message/source/MessageIdentity.kt
+++ b/mirai-core-api/src/commonMain/kotlin/message/source/identity/MessageIdentity.kt
@@ -7,7 +7,7 @@
  * https://github.com/mamoe/mirai/blob/dev/LICENSE
  */
 
-package net.mamoe.mirai.message.source
+package net.mamoe.mirai.message.source.identity
 
 import kotlinx.serialization.Serializable
 import net.mamoe.mirai.message.data.MessageSourceKind
@@ -78,7 +78,7 @@ public interface MessageIdentity {
 @NotStableForInheritance
 @ApiStatus.NonExtendable
 @Serializable(FullyMessageIdentitySerializer::class)
-public interface FullyMessageIdentity : MessageIdentity {
+public interface FullMessageIdentity : MessageIdentity {
 
     /**
      * 发送人用户 ID.
@@ -95,8 +95,8 @@ public interface FullyMessageIdentity : MessageIdentity {
      */
     public val kind: MessageSourceKind
 
-    public fun convertToRawFullyMessageIdentity(): RawFullyMessageIdentity {
-        return RawFullyMessageIdentity(
+    public fun convertToRawFullMessageIdentity(): RawFullMessageIdentity {
+        return RawFullMessageIdentity(
             ids = ids,
             internalIds = internalIds,
             time = time,
diff --git a/mirai-core-api/src/commonMain/kotlin/message/source/MessageIdentity.serializer.kt b/mirai-core-api/src/commonMain/kotlin/message/source/identity/MessageIdentity.serializer.kt
similarity index 74%
rename from mirai-core-api/src/commonMain/kotlin/message/source/MessageIdentity.serializer.kt
rename to mirai-core-api/src/commonMain/kotlin/message/source/identity/MessageIdentity.serializer.kt
index 7ecf71ec0..a62f54e9c 100644
--- a/mirai-core-api/src/commonMain/kotlin/message/source/MessageIdentity.serializer.kt
+++ b/mirai-core-api/src/commonMain/kotlin/message/source/identity/MessageIdentity.serializer.kt
@@ -7,7 +7,7 @@
  * https://github.com/mamoe/mirai/blob/dev/LICENSE
  */
 
-package net.mamoe.mirai.message.source
+package net.mamoe.mirai.message.source.identity
 
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.SerialDescriptor
@@ -29,17 +29,17 @@ public object MessageIdentitySerializer : KSerializer<MessageIdentity> {
     }
 }
 
-public object FullyMessageIdentitySerializer : KSerializer<FullyMessageIdentity> {
-    private val delegate = RawFullyMessageIdentity.serializer()
+public object FullyMessageIdentitySerializer : KSerializer<FullMessageIdentity> {
+    private val delegate = RawFullMessageIdentity.serializer()
 
     override val descriptor: SerialDescriptor
         get() = delegate.descriptor
 
-    override fun deserialize(decoder: Decoder): FullyMessageIdentity {
+    override fun deserialize(decoder: Decoder): FullMessageIdentity {
         return delegate.deserialize(decoder)
     }
 
-    override fun serialize(encoder: Encoder, value: FullyMessageIdentity) {
-        delegate.serialize(encoder, value.convertToRawFullyMessageIdentity())
+    override fun serialize(encoder: Encoder, value: FullMessageIdentity) {
+        delegate.serialize(encoder, value.convertToRawFullMessageIdentity())
     }
 }
\ No newline at end of file