diff --git a/common/tool/tool_manager.cpp b/common/tool/tool_manager.cpp
index 28b9957efe..db0fcc4323 100644
--- a/common/tool/tool_manager.cpp
+++ b/common/tool/tool_manager.cpp
@@ -491,7 +491,7 @@ optional<TOOL_EVENT> TOOL_MANAGER::ScheduleWait( TOOL_BASE* aTool,
 {
     TOOL_STATE* st = m_toolState[aTool];
 
-    assert( !st->pendingWait ); // everything collapses on two Yield() in a row
+    assert( !st->pendingWait ); // everything collapses on two KiYield() in a row
 
     // indicate to the manager that we are going to sleep and we shall be
     // woken up when an event matching aConditions arrive
diff --git a/include/tool/coroutine.h b/include/tool/coroutine.h
index 6421734c34..5d4debc9bc 100644
--- a/include/tool/coroutine.h
+++ b/include/tool/coroutine.h
@@ -326,7 +326,7 @@ public:
     /**
      * Function ReturnValue()
      *
-     * Returns the yielded value (the argument Yield() was called with)
+     * Returns the yielded value (the argument KiYield() was called with)
      */
     const ReturnType& ReturnValue() const
     {