diff --git a/harness/memory.org b/harness/memory.org
index 677ee5b..36ed7a4 100644
--- a/harness/memory.org
+++ b/harness/memory.org
@@ -402,7 +402,7 @@ Utility functions for AST traversal and path resolution.
     ;; We'll use a manual check here since automatic validation is in the Loop
     (let ((obj (lookup-object id)))
       (let ((current-hash (org-object-hash obj))
-            (computed-hash (compute-merkle-hash (org-object-id obj) 
+            (computed-hash (opencortex:compute-merkle-hash (org-object-id obj) 
                                                (org-object-type obj)
                                                (org-object-attributes obj)
                                                (org-object-content obj)
diff --git a/harness/tui-client.org b/harness/tui-client.org
index 0eefa7c..e777154 100644
--- a/harness/tui-client.org
+++ b/harness/tui-client.org
@@ -44,14 +44,14 @@ A simple MVP console is insufficient for a Lisp Machine. To reach v0.2.0, the TU
 #+begin_src lisp :tangle (expand-file-name "tui-tests.lisp" (concat (or (getenv "INSTALL_DIR") ".") "/tests"))
 (test test-tui-connection-drop
   "Tier 2 Chaos: Verify that handle-return degrades gracefully when the daemon connection is lost."
-  (let ((opencortex.tui::*chat-history* nil)
+  (let ((opencortex.tui::*incoming-msgs* nil)
         (opencortex.tui::*input-buffer* (make-array 5 :element-type 'char :initial-contents "hello" :fill-pointer 5 :adjustable t))
         ;; Create a closed stream to simulate connection drop
         (mock-stream (make-string-output-stream)))
     (close mock-stream)
     (opencortex.tui::handle-return mock-stream)
     ;; Check if the error was enqueued to history instead of crashing
-    (is (member "ERROR: Connection to daemon lost." opencortex.tui::*chat-history* :test #'string=))))
+    (is (member "ERROR: Connection to daemon lost." opencortex.tui::*incoming-msgs* :test #'string=))))
 #+end_src
 
 * Phase C: Implementation (Build)
diff --git a/skills/org-skill-llm-gateway.org b/skills/org-skill-llm-gateway.org
index 45d3c1b..eb5f830 100644
--- a/skills/org-skill-llm-gateway.org
+++ b/skills/org-skill-llm-gateway.org
@@ -28,7 +28,7 @@ The *LLM Gateway* skill provides a unified interface for interacting with multip
     (unwind-protect
          (progn
            (setf (uiop:getenv "OLLAMA_HOST") "localhost:1")
-           (let ((result (opencortex::execute-llm-request :prompt "hello" :provider :ollama)))
+           (let ((result (opencortex.skills.org-skill-llm-gateway::execute-llm-request :prompt "hello" :provider :ollama)))
              (is (eq (getf result :status) :error))
              (is (uiop:string-prefix-p "Ollama Failure" (getf result :message)))))
       (setf (uiop:getenv "OLLAMA_HOST") old-host))))