diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ResolvedContext.kt b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ResolvedContext.kt
index 5d7510dc..57b8c813 100644
--- a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ResolvedContext.kt
+++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ResolvedContext.kt
@@ -13,7 +13,7 @@ data class ResolvedContext(
     val blocks: List<BlockContent>
 ) {
 
-    fun encodeToContextMessage(): Message {
+    fun encodeToMessage(): Message {
         val content = if (blocks.isEmpty()) {
             "<no_context></no_context>"
         } else {
diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/ActionEvaluator.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/ActionEvaluator.java
index b69e1546..f0009f1f 100644
--- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/ActionEvaluator.java
+++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/ActionEvaluator.java
@@ -57,7 +57,7 @@ public class ActionEvaluator extends AbstractAgentModule.Sub<EvaluatorInput, Lis
                                 ContextBlock.VisibleDomain.ACTION,
                                 ContextBlock.VisibleDomain.COGNITION,
                                 ContextBlock.VisibleDomain.MEMORY
-                        )).encodeToContextMessage(),
+                        )).encodeToMessage(),
                         availableMetaActionContext(),
                         new Message(Message.Character.USER, tendency)
                 );
@@ -90,7 +90,7 @@ public class ActionEvaluator extends AbstractAgentModule.Sub<EvaluatorInput, Lis
                 );
             }
         };
-        return new ResolvedContext(List.of(content)).encodeToContextMessage();
+        return new ResolvedContext(List.of(content)).encodeToMessage();
     }
 
     @NotNull
diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/ActionExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/ActionExtractor.java
index 01c3eb84..125b4045 100644
--- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/ActionExtractor.java
+++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/ActionExtractor.java
@@ -32,7 +32,7 @@ public class ActionExtractor extends AbstractAgentModule.Sub<String, ExtractorRe
                         cognitionCapability.contextWorkspace().resolve(List.of(
                                 ContextBlock.VisibleDomain.ACTION,
                                 ContextBlock.VisibleDomain.COGNITION
-                        )).encodeToContextMessage(),
+                        )).encodeToMessage(),
                         new Message(Message.Character.USER, input)
                 );
                 return formattedChat(
diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/core/CommunicationProducer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/core/CommunicationProducer.java
index d1b3ff9d..ed22669f 100644
--- a/Partner-Core/src/main/java/work/slhaf/partner/module/core/CommunicationProducer.java
+++ b/Partner-Core/src/main/java/work/slhaf/partner/module/core/CommunicationProducer.java
@@ -155,7 +155,7 @@ public class CommunicationProducer extends AbstractAgentModule.Running<PartnerRu
         List<BlockContent> contextBlocks = communicationBlocks.stream()
                 .filter(this::belongsToContextSection)
                 .toList();
-        return new ResolvedContext(contextBlocks).encodeToContextMessage();
+        return new ResolvedContext(contextBlocks).encodeToMessage();
     }
 
     private Message buildInputMessage(PartnerRunningFlowContext runningFlowContext, List<BlockContent> communicationBlocks) {