diff --git a/gtd.org b/gtd.org
index c68dda6..63cb76e 100644
--- a/gtd.org
+++ b/gtd.org
@@ -44,7 +44,7 @@ Org-agent: A Neurosymbolic AI Agent.
 :CREATED: [2026-03-22 Sun 17:30]
 :ASSIGNED: Agent
 :END:
-**** DONE Design Deterministic Engine Heuristics (Lisp logic over Object Store)
+**** DONE Design Deterministic Engine Heuristics (Lisp logic over Memory)
 :PROPERTIES:
 :CREATED: [2026-03-22 Sun 17:30]
 :END:
@@ -98,9 +98,9 @@ Slim down the org-agent microharness by moving non-essential cognitive functions
     :ID: harness-communication-integrity-hashing
     :END:
     - Integrated HMAC-SHA256 (`ironclad:make-mac`) in `literate/communication.org`.
-**** DONE Implement Native Lisp Merkle-Tree Versioning (Short-term undo buffer in object-store.lisp)
+**** DONE Implement Native Lisp Merkle-Tree Versioning (Short-term undo buffer in memory.lisp)
     CLOSED: [2026-04-12 Sun 19:15]
-**** DONE Performance: Implement Copy-on-Write (CoW) or Persistent Data Structures for Object Store
+**** DONE Performance: Implement Copy-on-Write (CoW) or Persistent Data Structures for Memory
     CLOSED: [2026-04-12 Sun 19:15]
 **** DONE Feature: Implement Latent Reflection (Proactive Gardening) using heartbeat idle cycles
     CLOSED: [2026-04-12 Sun 19:15]
@@ -189,7 +189,7 @@ Slim down the org-agent microharness by moving non-essential cognitive functions
     :CREATED: [2026-04-01 Wed 17:00]
     :END:
     - Integrated with Org-mode state transitions (`PLAN` -> `APPROVED`).
-    - Leveraged Object Store event bus for asynchronous re-injection.
+    - Leveraged Memory event bus for asynchronous re-injection.
 
 **** DONE Refactor Architecture Terminology (Associative -> Probabilistic, Deliberate -> Deterministic)
     CLOSED: [2026-04-12 Sun 21:00]
@@ -1041,12 +1041,12 @@ A modular manual of different areas to go with different activities. Fits in the
 *** TODO Implement Harness Communication Backpressure Handling (Queue bounds and BUSY frames in communication.lisp)
 *** TODO Implement Cognitive Loop "Rut" Recovery (Dynamic Escalation in org-skill-lisp-validator)
 *** TODO Implement Asynchronous Event Bus for Telemetry (core.lisp)
-*** TODO Implement Memory Eviction and Lazy Loading (LRU Cache in object-store.lisp)
+*** TODO Implement Memory Eviction and Lazy Loading (LRU Cache in memory.lisp)
 *** TODO Implement Two-Speed Reflection (Immediate :post-action + Latent Heartbeat)
 *** TODO Implement Context-Aware Routing (Autonomous Foveal Switching on intent shift)
 *** TODO Implement Intent-Shift Detector (Semantic topic-shift flagging in neuro.lisp)
 *** TODO Implement Cognitive Economics (Dynamic LLM routing based on 2x2 matrix complexity)
-*** TODO Implement Micro-Prolog Logic Engine (Lisp-native unification & pattern matching for Object Store)
+*** TODO Implement Micro-Prolog Logic Engine (Lisp-native unification & pattern matching for Memory)
 *** TODO Implement Sovereign Logic Synthesis (Hybrid SubSys2: Neural pattern detection + Symbolic rule generation)
 *** TODO Implement Continuous Vibe (Sentiment-weighted personality in system-prompt)
 *** TODO Implement Search-Before-Think Bridge (Autonomous target-id population via vector search in perceive-gate)
diff --git a/projects/org-agent b/projects/org-agent
index 5f86bcd..dcd3a31 160000
--- a/projects/org-agent
+++ b/projects/org-agent
@@ -1 +1 @@
-Subproject commit 5f86bcd8dcf79e365201abbdc07ea6a2891cc93b
+Subproject commit dcd3a3111293a43dff6e90215a0f2416bde78846
diff --git a/projects/org-agent-contrib b/projects/org-agent-contrib
index dc90bfd..6608fb5 160000
--- a/projects/org-agent-contrib
+++ b/projects/org-agent-contrib
@@ -1 +1 @@
-Subproject commit dc90bfde20c73d0f47b083f420333281175032ad
+Subproject commit 6608fb5553f35857a5d65cbed1682afdce230b53