diff --git a/api/Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.html b/api/Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.html
index 1a2cfa0..b0f8819 100644
--- a/api/Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.html
+++ b/api/Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.html
@@ -2846,7 +2846,7 @@
       </tr>
       <tr>
         <td>
-          <a class="xref" href="Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.html#Cysharp_Threading_Tasks_Linq_UniTaskAsyncEnumerable_ToUniTaskAsyncEnumerable__1_System_Threading_Tasks_Task___0__">ToUniTaskAsyncEnumerable&lt;TSource&gt;(Task&lt;TSource&gt;)</a>
+          <a class="xref" href="Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.html#Cysharp_Threading_Tasks_Linq_UniTaskAsyncEnumerable_ToUniTaskAsyncEnumerable__1_Task___0__">ToUniTaskAsyncEnumerable&lt;TSource&gt;(Task&lt;TSource&gt;)</a>
         </td>
         <td class="markdown level1 summary"></td>
       </tr>
@@ -25024,7 +25024,7 @@
   </section>
   <section>
   <a id="Cysharp_Threading_Tasks_Linq_UniTaskAsyncEnumerable_ToUniTaskAsyncEnumerable_" data-uid="Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable*"></a>
-  <h4 id="Cysharp_Threading_Tasks_Linq_UniTaskAsyncEnumerable_ToUniTaskAsyncEnumerable__1_System_Threading_Tasks_Task___0__" data-uid="Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable``1(System.Threading.Tasks.Task{``0})">ToUniTaskAsyncEnumerable&lt;TSource&gt;(Task&lt;TSource&gt;)</h4>
+  <h4 id="Cysharp_Threading_Tasks_Linq_UniTaskAsyncEnumerable_ToUniTaskAsyncEnumerable__1_Task___0__" data-uid="Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable``1(Task{``0})">ToUniTaskAsyncEnumerable&lt;TSource&gt;(Task&lt;TSource&gt;)</h4>
   <div class="markdown level1 summary"></div>
   <div class="markdown level1 conceptual"></div>
   
@@ -25035,7 +25035,7 @@
   <section>
   <h5 class="parameters">Parameters</h5>
   <dl class="cysharpdocfx-valuedefinition">
-    <dt><span class="parametername"><code>source</code></span> <span class="xref">System.Threading.Tasks.Task</span>&lt;TSource&gt;</dt>
+    <dt><span class="parametername"><code>source</code></span> <span class="xref">Task</span>&lt;TSource&gt;</dt>
     <dd></dd>
   </dl>
   </section>
diff --git a/api/Cysharp.Threading.Tasks.Triggers.AsyncTriggerHandler-1.html b/api/Cysharp.Threading.Tasks.Triggers.AsyncTriggerHandler-1.html
index d687ee4..97b1fd7 100644
--- a/api/Cysharp.Threading.Tasks.Triggers.AsyncTriggerHandler-1.html
+++ b/api/Cysharp.Threading.Tasks.Triggers.AsyncTriggerHandler-1.html
@@ -82,7 +82,7 @@
   <div class="markdown level0 conceptual"></div>
   
   <div class="codewrapper">
-    <pre><code class="lang-csharp hljs">public sealed class AsyncTriggerHandler&lt;T&gt; : IAsyncOneShotTrigger, IUniTaskSource&lt;T&gt;, IUniTaskSource, IValueTaskSource, IValueTaskSource&lt;T&gt;, ITriggerHandler&lt;T&gt;, IDisposable, IAsyncFixedUpdateHandler, IAsyncLateUpdateHandler, IAsyncOnAnimatorIKHandler, IAsyncOnAnimatorMoveHandler, IAsyncOnApplicationFocusHandler, IAsyncOnApplicationPauseHandler, IAsyncOnApplicationQuitHandler, IAsyncOnAudioFilterReadHandler, IAsyncOnBecameInvisibleHandler, IAsyncOnBecameVisibleHandler, IAsyncOnBeforeTransformParentChangedHandler, IAsyncOnCanvasGroupChangedHandler, IAsyncOnCollisionEnterHandler, IAsyncOnCollisionEnter2DHandler, IAsyncOnCollisionExitHandler, IAsyncOnCollisionExit2DHandler, IAsyncOnCollisionStayHandler, IAsyncOnCollisionStay2DHandler, IAsyncOnControllerColliderHitHandler, IAsyncOnDisableHandler, IAsyncOnDrawGizmosHandler, IAsyncOnDrawGizmosSelectedHandler, IAsyncOnEnableHandler, IAsyncOnGUIHandler, IAsyncOnJointBreakHandler, IAsyncOnJointBreak2DHandler, IAsyncOnMouseDownHandler, IAsyncOnMouseDragHandler, IAsyncOnMouseEnterHandler, IAsyncOnMouseExitHandler, IAsyncOnMouseOverHandler, IAsyncOnMouseUpHandler, IAsyncOnMouseUpAsButtonHandler, IAsyncOnParticleCollisionHandler, IAsyncOnParticleSystemStoppedHandler, IAsyncOnParticleTriggerHandler, IAsyncOnPostRenderHandler, IAsyncOnPreCullHandler, IAsyncOnPreRenderHandler, IAsyncOnRectTransformDimensionsChangeHandler, IAsyncOnRectTransformRemovedHandler, IAsyncOnRenderImageHandler, IAsyncOnRenderObjectHandler, IAsyncOnServerInitializedHandler, IAsyncOnTransformChildrenChangedHandler, IAsyncOnTransformParentChangedHandler, IAsyncOnTriggerEnterHandler, IAsyncOnTriggerEnter2DHandler, IAsyncOnTriggerExitHandler, IAsyncOnTriggerExit2DHandler, IAsyncOnTriggerStayHandler, IAsyncOnTriggerStay2DHandler, IAsyncOnValidateHandler, IAsyncOnWillRenderObjectHandler, IAsyncResetHandler, IAsyncUpdateHandler, IAsyncOnBeginDragHandler, IAsyncOnCancelHandler, IAsyncOnDeselectHandler, IAsyncOnDragHandler, IAsyncOnDropHandler, IAsyncOnEndDragHandler, IAsyncOnInitializePotentialDragHandler, IAsyncOnMoveHandler, IAsyncOnPointerClickHandler, IAsyncOnPointerDownHandler, IAsyncOnPointerEnterHandler, IAsyncOnPointerExitHandler, IAsyncOnPointerUpHandler, IAsyncOnScrollHandler, IAsyncOnSelectHandler, IAsyncOnSubmitHandler, IAsyncOnUpdateSelectedHandler</code></pre>
+    <pre><code class="lang-csharp hljs">public sealed class AsyncTriggerHandler&lt;T&gt; : IAsyncFixedUpdateHandler, IAsyncLateUpdateHandler, IAsyncOnAnimatorIKHandler, IAsyncOnAnimatorMoveHandler, IAsyncOnApplicationFocusHandler, IAsyncOnApplicationPauseHandler, IAsyncOnApplicationQuitHandler, IAsyncOnAudioFilterReadHandler, IAsyncOnBecameInvisibleHandler, IAsyncOnBecameVisibleHandler, IAsyncOnBeforeTransformParentChangedHandler, IAsyncOnCanvasGroupChangedHandler, IAsyncOnCollisionEnterHandler, IAsyncOnCollisionEnter2DHandler, IAsyncOnCollisionExitHandler, IAsyncOnCollisionExit2DHandler, IAsyncOnCollisionStayHandler, IAsyncOnCollisionStay2DHandler, IAsyncOnControllerColliderHitHandler, IAsyncOnDisableHandler, IAsyncOnDrawGizmosHandler, IAsyncOnDrawGizmosSelectedHandler, IAsyncOnEnableHandler, IAsyncOnGUIHandler, IAsyncOnJointBreakHandler, IAsyncOnJointBreak2DHandler, IAsyncOnMouseDownHandler, IAsyncOnMouseDragHandler, IAsyncOnMouseEnterHandler, IAsyncOnMouseExitHandler, IAsyncOnMouseOverHandler, IAsyncOnMouseUpHandler, IAsyncOnMouseUpAsButtonHandler, IAsyncOnParticleCollisionHandler, IAsyncOnParticleSystemStoppedHandler, IAsyncOnParticleTriggerHandler, IAsyncOnPostRenderHandler, IAsyncOnPreCullHandler, IAsyncOnPreRenderHandler, IAsyncOnRectTransformDimensionsChangeHandler, IAsyncOnRectTransformRemovedHandler, IAsyncOnRenderImageHandler, IAsyncOnRenderObjectHandler, IAsyncOnServerInitializedHandler, IAsyncOnTransformChildrenChangedHandler, IAsyncOnTransformParentChangedHandler, IAsyncOnTriggerEnterHandler, IAsyncOnTriggerEnter2DHandler, IAsyncOnTriggerExitHandler, IAsyncOnTriggerExit2DHandler, IAsyncOnTriggerStayHandler, IAsyncOnTriggerStay2DHandler, IAsyncOnValidateHandler, IAsyncOnWillRenderObjectHandler, IAsyncResetHandler, IAsyncUpdateHandler, IAsyncOnBeginDragHandler, IAsyncOnCancelHandler, IAsyncOnDeselectHandler, IAsyncOnDragHandler, IAsyncOnDropHandler, IAsyncOnEndDragHandler, IAsyncOnInitializePotentialDragHandler, IAsyncOnMoveHandler, IAsyncOnPointerClickHandler, IAsyncOnPointerDownHandler, IAsyncOnPointerEnterHandler, IAsyncOnPointerExitHandler, IAsyncOnPointerUpHandler, IAsyncOnScrollHandler, IAsyncOnSelectHandler, IAsyncOnSubmitHandler, IAsyncOnUpdateSelectedHandler, IAsyncOneShotTrigger, IUniTaskSource&lt;T&gt;, IUniTaskSource, IValueTaskSource, IValueTaskSource&lt;T&gt;, ITriggerHandler&lt;T&gt;, IDisposable</code></pre>
   </div>
 
   <div class="inheritance">
@@ -93,13 +93,6 @@
   
   <div classs="implements">
     <h5>Implements</h5>
-    <div><a class="xref" href="Cysharp.Threading.Tasks.Triggers.IAsyncOneShotTrigger.html">IAsyncOneShotTrigger</a></div>
-    <div><a class="xref" href="Cysharp.Threading.Tasks.IUniTaskSource-1.html">IUniTaskSource</a>&lt;T&gt;</div>
-    <div><a class="xref" href="Cysharp.Threading.Tasks.IUniTaskSource.html">IUniTaskSource</a></div>
-    <div><span class="xref">System.Threading.Tasks.Sources.IValueTaskSource</span></div>
-    <div><span class="xref">System.Threading.Tasks.Sources.IValueTaskSource</span>&lt;T&gt;</div>
-    <div><a class="xref" href="Cysharp.Threading.Tasks.ITriggerHandler-1.html">ITriggerHandler</a>&lt;T&gt;</div>
-    <div><span class="xref">System.IDisposable</span></div>
     <div><a class="xref" href="Cysharp.Threading.Tasks.Triggers.IAsyncFixedUpdateHandler.html">IAsyncFixedUpdateHandler</a></div>
     <div><a class="xref" href="Cysharp.Threading.Tasks.Triggers.IAsyncLateUpdateHandler.html">IAsyncLateUpdateHandler</a></div>
     <div><a class="xref" href="Cysharp.Threading.Tasks.Triggers.IAsyncOnAnimatorIKHandler.html">IAsyncOnAnimatorIKHandler</a></div>
@@ -173,6 +166,13 @@
     <div><a class="xref" href="Cysharp.Threading.Tasks.Triggers.IAsyncOnSelectHandler.html">IAsyncOnSelectHandler</a></div>
     <div><a class="xref" href="Cysharp.Threading.Tasks.Triggers.IAsyncOnSubmitHandler.html">IAsyncOnSubmitHandler</a></div>
     <div><a class="xref" href="Cysharp.Threading.Tasks.Triggers.IAsyncOnUpdateSelectedHandler.html">IAsyncOnUpdateSelectedHandler</a></div>
+    <div><a class="xref" href="Cysharp.Threading.Tasks.Triggers.IAsyncOneShotTrigger.html">IAsyncOneShotTrigger</a></div>
+    <div><a class="xref" href="Cysharp.Threading.Tasks.IUniTaskSource-1.html">IUniTaskSource</a>&lt;T&gt;</div>
+    <div><a class="xref" href="Cysharp.Threading.Tasks.IUniTaskSource.html">IUniTaskSource</a></div>
+    <div><span class="xref">System.Threading.Tasks.Sources.IValueTaskSource</span></div>
+    <div><span class="xref">System.Threading.Tasks.Sources.IValueTaskSource</span>&lt;T&gt;</div>
+    <div><a class="xref" href="Cysharp.Threading.Tasks.ITriggerHandler-1.html">ITriggerHandler</a>&lt;T&gt;</div>
+    <div><span class="xref">System.IDisposable</span></div>
   </div>
   
   
@@ -3319,27 +3319,6 @@
   </section>
   
   <h3 id="implements">Implements</h3>
-  <div>
-      <a class="xref" href="Cysharp.Threading.Tasks.Triggers.IAsyncOneShotTrigger.html">IAsyncOneShotTrigger</a>
-  </div>
-  <div>
-      <a class="xref" href="Cysharp.Threading.Tasks.IUniTaskSource-1.html">IUniTaskSource&lt;T&gt;</a>
-  </div>
-  <div>
-      <a class="xref" href="Cysharp.Threading.Tasks.IUniTaskSource.html">IUniTaskSource</a>
-  </div>
-  <div>
-      <span class="xref">System.Threading.Tasks.Sources.IValueTaskSource</span>
-  </div>
-  <div>
-      <span class="xref">System.Threading.Tasks.Sources.IValueTaskSource&lt;TResult&gt;</span>
-  </div>
-  <div>
-      <a class="xref" href="Cysharp.Threading.Tasks.ITriggerHandler-1.html">ITriggerHandler&lt;T&gt;</a>
-  </div>
-  <div>
-      <span class="xref">System.IDisposable</span>
-  </div>
   <div>
       <a class="xref" href="Cysharp.Threading.Tasks.Triggers.IAsyncFixedUpdateHandler.html">IAsyncFixedUpdateHandler</a>
   </div>
@@ -3559,6 +3538,27 @@
   <div>
       <a class="xref" href="Cysharp.Threading.Tasks.Triggers.IAsyncOnUpdateSelectedHandler.html">IAsyncOnUpdateSelectedHandler</a>
   </div>
+  <div>
+      <a class="xref" href="Cysharp.Threading.Tasks.Triggers.IAsyncOneShotTrigger.html">IAsyncOneShotTrigger</a>
+  </div>
+  <div>
+      <a class="xref" href="Cysharp.Threading.Tasks.IUniTaskSource-1.html">IUniTaskSource&lt;T&gt;</a>
+  </div>
+  <div>
+      <a class="xref" href="Cysharp.Threading.Tasks.IUniTaskSource.html">IUniTaskSource</a>
+  </div>
+  <div>
+      <span class="xref">System.Threading.Tasks.Sources.IValueTaskSource</span>
+  </div>
+  <div>
+      <span class="xref">System.Threading.Tasks.Sources.IValueTaskSource&lt;TResult&gt;</span>
+  </div>
+  <div>
+      <a class="xref" href="Cysharp.Threading.Tasks.ITriggerHandler-1.html">ITriggerHandler&lt;T&gt;</a>
+  </div>
+  <div>
+      <span class="xref">System.IDisposable</span>
+  </div>
   
   
 </article>
diff --git a/api/Cysharp.Threading.Tasks.UniTaskExtensions.html b/api/Cysharp.Threading.Tasks.UniTaskExtensions.html
index 2bf9679..c2fa9ac 100644
--- a/api/Cysharp.Threading.Tasks.UniTaskExtensions.html
+++ b/api/Cysharp.Threading.Tasks.UniTaskExtensions.html
@@ -122,14 +122,14 @@
       </tr>
       <tr>
         <td>
-          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_AsUniTask_System_Threading_Tasks_Task_System_Boolean_">AsUniTask(Task, Boolean)</a>
+          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_AsUniTask_Task_System_Boolean_">AsUniTask(Task, Boolean)</a>
         </td>
         <td class="markdown level1 summary"><p>Convert Task -&gt; UniTask.</p>
 </td>
       </tr>
       <tr>
         <td>
-          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_AsUniTask__1_System_Threading_Tasks_Task___0__System_Boolean_">AsUniTask&lt;T&gt;(Task&lt;T&gt;, Boolean)</a>
+          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_AsUniTask__1_Task___0__System_Boolean_">AsUniTask&lt;T&gt;(Task&lt;T&gt;, Boolean)</a>
         </td>
         <td class="markdown level1 summary"><p>Convert Task[T] -&gt; UniTask[T].</p>
 </td>
@@ -432,25 +432,25 @@
       </tr>
       <tr>
         <td>
-          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Cysharp_Threading_Tasks_UniTask_System_Threading_Tasks_Task__">Unwrap(UniTask&lt;Task&gt;)</a>
+          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Cysharp_Threading_Tasks_UniTask_Task__">Unwrap(UniTask&lt;Task&gt;)</a>
         </td>
         <td class="markdown level1 summary"></td>
       </tr>
       <tr>
         <td>
-          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Cysharp_Threading_Tasks_UniTask_System_Threading_Tasks_Task__System_Boolean_">Unwrap(UniTask&lt;Task&gt;, Boolean)</a>
+          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Cysharp_Threading_Tasks_UniTask_Task__System_Boolean_">Unwrap(UniTask&lt;Task&gt;, Boolean)</a>
         </td>
         <td class="markdown level1 summary"></td>
       </tr>
       <tr>
         <td>
-          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_System_Threading_Tasks_Task_Cysharp_Threading_Tasks_UniTask__">Unwrap(Task&lt;UniTask&gt;)</a>
+          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Task_Cysharp_Threading_Tasks_UniTask__">Unwrap(Task&lt;UniTask&gt;)</a>
         </td>
         <td class="markdown level1 summary"></td>
       </tr>
       <tr>
         <td>
-          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_System_Threading_Tasks_Task_Cysharp_Threading_Tasks_UniTask__System_Boolean_">Unwrap(Task&lt;UniTask&gt;, Boolean)</a>
+          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Task_Cysharp_Threading_Tasks_UniTask__System_Boolean_">Unwrap(Task&lt;UniTask&gt;, Boolean)</a>
         </td>
         <td class="markdown level1 summary"></td>
       </tr>
@@ -462,25 +462,25 @@
       </tr>
       <tr>
         <td>
-          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Cysharp_Threading_Tasks_UniTask_System_Threading_Tasks_Task___0___">Unwrap&lt;T&gt;(UniTask&lt;Task&lt;T&gt;&gt;)</a>
+          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Cysharp_Threading_Tasks_UniTask_Task___0___">Unwrap&lt;T&gt;(UniTask&lt;Task&lt;T&gt;&gt;)</a>
         </td>
         <td class="markdown level1 summary"></td>
       </tr>
       <tr>
         <td>
-          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Cysharp_Threading_Tasks_UniTask_System_Threading_Tasks_Task___0___System_Boolean_">Unwrap&lt;T&gt;(UniTask&lt;Task&lt;T&gt;&gt;, Boolean)</a>
+          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Cysharp_Threading_Tasks_UniTask_Task___0___System_Boolean_">Unwrap&lt;T&gt;(UniTask&lt;Task&lt;T&gt;&gt;, Boolean)</a>
         </td>
         <td class="markdown level1 summary"></td>
       </tr>
       <tr>
         <td>
-          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_System_Threading_Tasks_Task_Cysharp_Threading_Tasks_UniTask___0___">Unwrap&lt;T&gt;(Task&lt;UniTask&lt;T&gt;&gt;)</a>
+          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Task_Cysharp_Threading_Tasks_UniTask___0___">Unwrap&lt;T&gt;(Task&lt;UniTask&lt;T&gt;&gt;)</a>
         </td>
         <td class="markdown level1 summary"></td>
       </tr>
       <tr>
         <td>
-          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_System_Threading_Tasks_Task_Cysharp_Threading_Tasks_UniTask___0___System_Boolean_">Unwrap&lt;T&gt;(Task&lt;UniTask&lt;T&gt;&gt;, Boolean)</a>
+          <a class="xref" href="Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Task_Cysharp_Threading_Tasks_UniTask___0___System_Boolean_">Unwrap&lt;T&gt;(Task&lt;UniTask&lt;T&gt;&gt;, Boolean)</a>
         </td>
         <td class="markdown level1 summary"></td>
       </tr>
@@ -510,7 +510,7 @@
   <section>
   <h5 class="returns">Returns</h5>
   <dl class="cysharpdocfx-valuedefinition">
-    <dt><span class="xref">System.Threading.Tasks.Task</span></dt>
+    <dt><span class="xref">Task</span></dt>
     <dd></dd>
   </dl>
   </section>
@@ -547,7 +547,7 @@
   <section>
   <h5 class="returns">Returns</h5>
   <dl class="cysharpdocfx-valuedefinition">
-    <dt><span class="xref">System.Threading.Tasks.Task</span>&lt;T&gt;</dt>
+    <dt><span class="xref">Task</span>&lt;T&gt;</dt>
     <dd></dd>
   </dl>
   </section>
@@ -572,7 +572,7 @@
   </section>
   <section>
   <a id="Cysharp_Threading_Tasks_UniTaskExtensions_AsUniTask_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask*"></a>
-  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_AsUniTask_System_Threading_Tasks_Task_System_Boolean_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask(System.Threading.Tasks.Task,System.Boolean)">AsUniTask(Task, Boolean)</h4>
+  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_AsUniTask_Task_System_Boolean_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask(Task,System.Boolean)">AsUniTask(Task, Boolean)</h4>
   <div class="markdown level1 summary"><p>Convert Task -&gt; UniTask.</p>
 </div>
   <div class="markdown level1 conceptual"></div>
@@ -584,7 +584,7 @@
   <section>
   <h5 class="parameters">Parameters</h5>
   <dl class="cysharpdocfx-valuedefinition">
-    <dt><span class="parametername"><code>task</code></span> <span class="xref">System.Threading.Tasks.Task</span></dt>
+    <dt><span class="parametername"><code>task</code></span> <span class="xref">Task</span></dt>
     <dd></dd>
     <dt><span class="parametername"><code>useCurrentSynchronizationContext</code></span> <span class="xref">System.Boolean</span></dt>
     <dd></dd>
@@ -612,7 +612,7 @@
   </section>
   <section>
   <a id="Cysharp_Threading_Tasks_UniTaskExtensions_AsUniTask_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask*"></a>
-  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_AsUniTask__1_System_Threading_Tasks_Task___0__System_Boolean_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask``1(System.Threading.Tasks.Task{``0},System.Boolean)">AsUniTask&lt;T&gt;(Task&lt;T&gt;, Boolean)</h4>
+  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_AsUniTask__1_Task___0__System_Boolean_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask``1(Task{``0},System.Boolean)">AsUniTask&lt;T&gt;(Task&lt;T&gt;, Boolean)</h4>
   <div class="markdown level1 summary"><p>Convert Task[T] -&gt; UniTask[T].</p>
 </div>
   <div class="markdown level1 conceptual"></div>
@@ -624,7 +624,7 @@
   <section>
   <h5 class="parameters">Parameters</h5>
   <dl class="cysharpdocfx-valuedefinition">
-    <dt><span class="parametername"><code>task</code></span> <span class="xref">System.Threading.Tasks.Task</span>&lt;T&gt;</dt>
+    <dt><span class="parametername"><code>task</code></span> <span class="xref">Task</span>&lt;T&gt;</dt>
     <dd></dd>
     <dt><span class="parametername"><code>useCurrentSynchronizationContext</code></span> <span class="xref">System.Boolean</span></dt>
     <dd></dd>
@@ -2870,7 +2870,7 @@
   </section>
   <section>
   <a id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap*"></a>
-  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Cysharp_Threading_Tasks_UniTask_System_Threading_Tasks_Task__" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask{System.Threading.Tasks.Task})">Unwrap(UniTask&lt;Task&gt;)</h4>
+  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Cysharp_Threading_Tasks_UniTask_Task__" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask{Task})">Unwrap(UniTask&lt;Task&gt;)</h4>
   <div class="markdown level1 summary"></div>
   <div class="markdown level1 conceptual"></div>
   
@@ -2881,7 +2881,7 @@
   <section>
   <h5 class="parameters">Parameters</h5>
   <dl class="cysharpdocfx-valuedefinition">
-    <dt><span class="parametername"><code>task</code></span> <a class="xref" href="Cysharp.Threading.Tasks.UniTask-1.html">UniTask</a>&lt;<span class="xref">System.Threading.Tasks.Task</span>&gt;</dt>
+    <dt><span class="parametername"><code>task</code></span> <a class="xref" href="Cysharp.Threading.Tasks.UniTask-1.html">UniTask</a>&lt;<span class="xref">Task</span>&gt;</dt>
     <dd></dd>
   </dl>
   </section>
@@ -2907,7 +2907,7 @@
   </section>
   <section>
   <a id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap*"></a>
-  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Cysharp_Threading_Tasks_UniTask_System_Threading_Tasks_Task__System_Boolean_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask{System.Threading.Tasks.Task},System.Boolean)">Unwrap(UniTask&lt;Task&gt;, Boolean)</h4>
+  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Cysharp_Threading_Tasks_UniTask_Task__System_Boolean_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask{Task},System.Boolean)">Unwrap(UniTask&lt;Task&gt;, Boolean)</h4>
   <div class="markdown level1 summary"></div>
   <div class="markdown level1 conceptual"></div>
   
@@ -2918,7 +2918,7 @@
   <section>
   <h5 class="parameters">Parameters</h5>
   <dl class="cysharpdocfx-valuedefinition">
-    <dt><span class="parametername"><code>task</code></span> <a class="xref" href="Cysharp.Threading.Tasks.UniTask-1.html">UniTask</a>&lt;<span class="xref">System.Threading.Tasks.Task</span>&gt;</dt>
+    <dt><span class="parametername"><code>task</code></span> <a class="xref" href="Cysharp.Threading.Tasks.UniTask-1.html">UniTask</a>&lt;<span class="xref">Task</span>&gt;</dt>
     <dd></dd>
     <dt><span class="parametername"><code>continueOnCapturedContext</code></span> <span class="xref">System.Boolean</span></dt>
     <dd></dd>
@@ -2946,7 +2946,7 @@
   </section>
   <section>
   <a id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap*"></a>
-  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_System_Threading_Tasks_Task_Cysharp_Threading_Tasks_UniTask__" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(System.Threading.Tasks.Task{Cysharp.Threading.Tasks.UniTask})">Unwrap(Task&lt;UniTask&gt;)</h4>
+  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Task_Cysharp_Threading_Tasks_UniTask__" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Task{Cysharp.Threading.Tasks.UniTask})">Unwrap(Task&lt;UniTask&gt;)</h4>
   <div class="markdown level1 summary"></div>
   <div class="markdown level1 conceptual"></div>
   
@@ -2957,7 +2957,7 @@
   <section>
   <h5 class="parameters">Parameters</h5>
   <dl class="cysharpdocfx-valuedefinition">
-    <dt><span class="parametername"><code>task</code></span> <span class="xref">System.Threading.Tasks.Task</span>&lt;<a class="xref" href="Cysharp.Threading.Tasks.UniTask.html">UniTask</a>&gt;</dt>
+    <dt><span class="parametername"><code>task</code></span> <span class="xref">Task</span>&lt;<a class="xref" href="Cysharp.Threading.Tasks.UniTask.html">UniTask</a>&gt;</dt>
     <dd></dd>
   </dl>
   </section>
@@ -2983,7 +2983,7 @@
   </section>
   <section>
   <a id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap*"></a>
-  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_System_Threading_Tasks_Task_Cysharp_Threading_Tasks_UniTask__System_Boolean_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(System.Threading.Tasks.Task{Cysharp.Threading.Tasks.UniTask},System.Boolean)">Unwrap(Task&lt;UniTask&gt;, Boolean)</h4>
+  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Task_Cysharp_Threading_Tasks_UniTask__System_Boolean_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Task{Cysharp.Threading.Tasks.UniTask},System.Boolean)">Unwrap(Task&lt;UniTask&gt;, Boolean)</h4>
   <div class="markdown level1 summary"></div>
   <div class="markdown level1 conceptual"></div>
   
@@ -2994,7 +2994,7 @@
   <section>
   <h5 class="parameters">Parameters</h5>
   <dl class="cysharpdocfx-valuedefinition">
-    <dt><span class="parametername"><code>task</code></span> <span class="xref">System.Threading.Tasks.Task</span>&lt;<a class="xref" href="Cysharp.Threading.Tasks.UniTask.html">UniTask</a>&gt;</dt>
+    <dt><span class="parametername"><code>task</code></span> <span class="xref">Task</span>&lt;<a class="xref" href="Cysharp.Threading.Tasks.UniTask.html">UniTask</a>&gt;</dt>
     <dd></dd>
     <dt><span class="parametername"><code>continueOnCapturedContext</code></span> <span class="xref">System.Boolean</span></dt>
     <dd></dd>
@@ -3066,7 +3066,7 @@
   </section>
   <section>
   <a id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap*"></a>
-  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Cysharp_Threading_Tasks_UniTask_System_Threading_Tasks_Task___0___" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Cysharp.Threading.Tasks.UniTask{System.Threading.Tasks.Task{``0}})">Unwrap&lt;T&gt;(UniTask&lt;Task&lt;T&gt;&gt;)</h4>
+  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Cysharp_Threading_Tasks_UniTask_Task___0___" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Cysharp.Threading.Tasks.UniTask{Task{``0}})">Unwrap&lt;T&gt;(UniTask&lt;Task&lt;T&gt;&gt;)</h4>
   <div class="markdown level1 summary"></div>
   <div class="markdown level1 conceptual"></div>
   
@@ -3077,7 +3077,7 @@
   <section>
   <h5 class="parameters">Parameters</h5>
   <dl class="cysharpdocfx-valuedefinition">
-    <dt><span class="parametername"><code>task</code></span> <a class="xref" href="Cysharp.Threading.Tasks.UniTask-1.html">UniTask</a>&lt;<span class="xref">System.Threading.Tasks.Task</span>&lt;T&gt;&gt;</dt>
+    <dt><span class="parametername"><code>task</code></span> <a class="xref" href="Cysharp.Threading.Tasks.UniTask-1.html">UniTask</a>&lt;<span class="xref">Task</span>&lt;T&gt;&gt;</dt>
     <dd></dd>
   </dl>
   </section>
@@ -3110,7 +3110,7 @@
   </section>
   <section>
   <a id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap*"></a>
-  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Cysharp_Threading_Tasks_UniTask_System_Threading_Tasks_Task___0___System_Boolean_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Cysharp.Threading.Tasks.UniTask{System.Threading.Tasks.Task{``0}},System.Boolean)">Unwrap&lt;T&gt;(UniTask&lt;Task&lt;T&gt;&gt;, Boolean)</h4>
+  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Cysharp_Threading_Tasks_UniTask_Task___0___System_Boolean_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Cysharp.Threading.Tasks.UniTask{Task{``0}},System.Boolean)">Unwrap&lt;T&gt;(UniTask&lt;Task&lt;T&gt;&gt;, Boolean)</h4>
   <div class="markdown level1 summary"></div>
   <div class="markdown level1 conceptual"></div>
   
@@ -3121,7 +3121,7 @@
   <section>
   <h5 class="parameters">Parameters</h5>
   <dl class="cysharpdocfx-valuedefinition">
-    <dt><span class="parametername"><code>task</code></span> <a class="xref" href="Cysharp.Threading.Tasks.UniTask-1.html">UniTask</a>&lt;<span class="xref">System.Threading.Tasks.Task</span>&lt;T&gt;&gt;</dt>
+    <dt><span class="parametername"><code>task</code></span> <a class="xref" href="Cysharp.Threading.Tasks.UniTask-1.html">UniTask</a>&lt;<span class="xref">Task</span>&lt;T&gt;&gt;</dt>
     <dd></dd>
     <dt><span class="parametername"><code>continueOnCapturedContext</code></span> <span class="xref">System.Boolean</span></dt>
     <dd></dd>
@@ -3156,7 +3156,7 @@
   </section>
   <section>
   <a id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap*"></a>
-  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_System_Threading_Tasks_Task_Cysharp_Threading_Tasks_UniTask___0___" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(System.Threading.Tasks.Task{Cysharp.Threading.Tasks.UniTask{``0}})">Unwrap&lt;T&gt;(Task&lt;UniTask&lt;T&gt;&gt;)</h4>
+  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Task_Cysharp_Threading_Tasks_UniTask___0___" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Task{Cysharp.Threading.Tasks.UniTask{``0}})">Unwrap&lt;T&gt;(Task&lt;UniTask&lt;T&gt;&gt;)</h4>
   <div class="markdown level1 summary"></div>
   <div class="markdown level1 conceptual"></div>
   
@@ -3167,7 +3167,7 @@
   <section>
   <h5 class="parameters">Parameters</h5>
   <dl class="cysharpdocfx-valuedefinition">
-    <dt><span class="parametername"><code>task</code></span> <span class="xref">System.Threading.Tasks.Task</span>&lt;<a class="xref" href="Cysharp.Threading.Tasks.UniTask-1.html">UniTask</a>&lt;T&gt;&gt;</dt>
+    <dt><span class="parametername"><code>task</code></span> <span class="xref">Task</span>&lt;<a class="xref" href="Cysharp.Threading.Tasks.UniTask-1.html">UniTask</a>&lt;T&gt;&gt;</dt>
     <dd></dd>
   </dl>
   </section>
@@ -3200,7 +3200,7 @@
   </section>
   <section>
   <a id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap*"></a>
-  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_System_Threading_Tasks_Task_Cysharp_Threading_Tasks_UniTask___0___System_Boolean_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(System.Threading.Tasks.Task{Cysharp.Threading.Tasks.UniTask{``0}},System.Boolean)">Unwrap&lt;T&gt;(Task&lt;UniTask&lt;T&gt;&gt;, Boolean)</h4>
+  <h4 id="Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Task_Cysharp_Threading_Tasks_UniTask___0___System_Boolean_" data-uid="Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Task{Cysharp.Threading.Tasks.UniTask{``0}},System.Boolean)">Unwrap&lt;T&gt;(Task&lt;UniTask&lt;T&gt;&gt;, Boolean)</h4>
   <div class="markdown level1 summary"></div>
   <div class="markdown level1 conceptual"></div>
   
@@ -3211,7 +3211,7 @@
   <section>
   <h5 class="parameters">Parameters</h5>
   <dl class="cysharpdocfx-valuedefinition">
-    <dt><span class="parametername"><code>task</code></span> <span class="xref">System.Threading.Tasks.Task</span>&lt;<a class="xref" href="Cysharp.Threading.Tasks.UniTask-1.html">UniTask</a>&lt;T&gt;&gt;</dt>
+    <dt><span class="parametername"><code>task</code></span> <span class="xref">Task</span>&lt;<a class="xref" href="Cysharp.Threading.Tasks.UniTask-1.html">UniTask</a>&lt;T&gt;&gt;</dt>
     <dd></dd>
     <dt><span class="parametername"><code>continueOnCapturedContext</code></span> <span class="xref">System.Boolean</span></dt>
     <dd></dd>
diff --git a/manifest.json b/manifest.json
index 750f9ff..b15682f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -669,7 +669,7 @@
       "output": {
         ".html": {
           "relative_path": "api/Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.html",
-          "hash": "wugqMw6fsK2Q11Weeh/q+w98EPblnz/uTFwjjirEnqk="
+          "hash": "hyg/WEJFdMyJUMUnyRwkDew27Ek3wvJ+ekdVrVbRjO8="
         }
       },
       "is_incremental": false,
@@ -1797,7 +1797,7 @@
       "output": {
         ".html": {
           "relative_path": "api/Cysharp.Threading.Tasks.Triggers.AsyncTriggerHandler-1.html",
-          "hash": "OEOGyIS9KwG0wqc4jAR9ZI8PPWg2rotmZMH7WswOfF0="
+          "hash": "nkDucKlCTV7EQ0MiISJtCevbrAG+N0BoTtD54Q7avoY="
         }
       },
       "is_incremental": false,
@@ -2913,7 +2913,7 @@
       "output": {
         ".html": {
           "relative_path": "api/Cysharp.Threading.Tasks.UniTaskExtensions.html",
-          "hash": "jOqGzslLjeSxC3qTke5bU9LgfJxpRLq5OlzICsv+iAI="
+          "hash": "KgEyo54amTDz7i8GskUe+iasIFLb6p9f9TwDDCOPep8="
         }
       },
       "is_incremental": false,
diff --git a/xrefmap.yml b/xrefmap.yml
index c8243f4..7563018 100644
--- a/xrefmap.yml
+++ b/xrefmap.yml
@@ -8439,13 +8439,13 @@ references:
   fullName.vb: Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable(Of TSource)(System.IObservable(Of TSource))
   nameWithType: UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable<TSource>(IObservable<TSource>)
   nameWithType.vb: UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable(Of TSource)(IObservable(Of TSource))
-- uid: Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable``1(System.Threading.Tasks.Task{``0})
+- uid: Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable``1(Task{``0})
   name: ToUniTaskAsyncEnumerable<TSource>(Task<TSource>)
-  href: api/Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.html#Cysharp_Threading_Tasks_Linq_UniTaskAsyncEnumerable_ToUniTaskAsyncEnumerable__1_System_Threading_Tasks_Task___0__
-  commentId: M:Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable``1(System.Threading.Tasks.Task{``0})
+  href: api/Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.html#Cysharp_Threading_Tasks_Linq_UniTaskAsyncEnumerable_ToUniTaskAsyncEnumerable__1_Task___0__
+  commentId: M:Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable``1(Task{``0})
   name.vb: ToUniTaskAsyncEnumerable(Of TSource)(Task(Of TSource))
-  fullName: Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable<TSource>(System.Threading.Tasks.Task<TSource>)
-  fullName.vb: Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable(Of TSource)(System.Threading.Tasks.Task(Of TSource))
+  fullName: Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable<TSource>(Task<TSource>)
+  fullName.vb: Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable(Of TSource)(Task(Of TSource))
   nameWithType: UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable<TSource>(Task<TSource>)
   nameWithType.vb: UniTaskAsyncEnumerable.ToUniTaskAsyncEnumerable(Of TSource)(Task(Of TSource))
 - uid: Cysharp.Threading.Tasks.Linq.UniTaskAsyncEnumerable.Union*
@@ -20047,11 +20047,11 @@ references:
   fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.AsTask(Of T)(Cysharp.Threading.Tasks.UniTask(Of T))
   nameWithType: UniTaskExtensions.AsTask<T>(UniTask<T>)
   nameWithType.vb: UniTaskExtensions.AsTask(Of T)(UniTask(Of T))
-- uid: Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask(System.Threading.Tasks.Task,System.Boolean)
+- uid: Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask(Task,System.Boolean)
   name: AsUniTask(Task, Boolean)
-  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_AsUniTask_System_Threading_Tasks_Task_System_Boolean_
-  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask(System.Threading.Tasks.Task,System.Boolean)
-  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask(System.Threading.Tasks.Task, System.Boolean)
+  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_AsUniTask_Task_System_Boolean_
+  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask(Task,System.Boolean)
+  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask(Task, System.Boolean)
   nameWithType: UniTaskExtensions.AsUniTask(Task, Boolean)
 - uid: Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask*
   name: AsUniTask
@@ -20060,13 +20060,13 @@ references:
   isSpec: "True"
   fullName: Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask
   nameWithType: UniTaskExtensions.AsUniTask
-- uid: Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask``1(System.Threading.Tasks.Task{``0},System.Boolean)
+- uid: Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask``1(Task{``0},System.Boolean)
   name: AsUniTask<T>(Task<T>, Boolean)
-  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_AsUniTask__1_System_Threading_Tasks_Task___0__System_Boolean_
-  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask``1(System.Threading.Tasks.Task{``0},System.Boolean)
+  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_AsUniTask__1_Task___0__System_Boolean_
+  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask``1(Task{``0},System.Boolean)
   name.vb: AsUniTask(Of T)(Task(Of T), Boolean)
-  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask<T>(System.Threading.Tasks.Task<T>, System.Boolean)
-  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask(Of T)(System.Threading.Tasks.Task(Of T), System.Boolean)
+  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask<T>(Task<T>, System.Boolean)
+  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.AsUniTask(Of T)(Task(Of T), System.Boolean)
   nameWithType: UniTaskExtensions.AsUniTask<T>(Task<T>, Boolean)
   nameWithType.vb: UniTaskExtensions.AsUniTask(Of T)(Task(Of T), Boolean)
 - uid: Cysharp.Threading.Tasks.UniTaskExtensions.AttachExternalCancellation(Cysharp.Threading.Tasks.UniTask,System.Threading.CancellationToken)
@@ -20533,40 +20533,40 @@ references:
   fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask(Of Cysharp.Threading.Tasks.UniTask))
   nameWithType: UniTaskExtensions.Unwrap(UniTask<UniTask>)
   nameWithType.vb: UniTaskExtensions.Unwrap(UniTask(Of UniTask))
-- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask{System.Threading.Tasks.Task})
+- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask{Task})
   name: Unwrap(UniTask<Task>)
-  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Cysharp_Threading_Tasks_UniTask_System_Threading_Tasks_Task__
-  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask{System.Threading.Tasks.Task})
+  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Cysharp_Threading_Tasks_UniTask_Task__
+  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask{Task})
   name.vb: Unwrap(UniTask(Of Task))
-  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask<System.Threading.Tasks.Task>)
-  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask(Of System.Threading.Tasks.Task))
+  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask<Task>)
+  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask(Of Task))
   nameWithType: UniTaskExtensions.Unwrap(UniTask<Task>)
   nameWithType.vb: UniTaskExtensions.Unwrap(UniTask(Of Task))
-- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask{System.Threading.Tasks.Task},System.Boolean)
+- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask{Task},System.Boolean)
   name: Unwrap(UniTask<Task>, Boolean)
-  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Cysharp_Threading_Tasks_UniTask_System_Threading_Tasks_Task__System_Boolean_
-  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask{System.Threading.Tasks.Task},System.Boolean)
+  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Cysharp_Threading_Tasks_UniTask_Task__System_Boolean_
+  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask{Task},System.Boolean)
   name.vb: Unwrap(UniTask(Of Task), Boolean)
-  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask<System.Threading.Tasks.Task>, System.Boolean)
-  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask(Of System.Threading.Tasks.Task), System.Boolean)
+  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask<Task>, System.Boolean)
+  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Cysharp.Threading.Tasks.UniTask(Of Task), System.Boolean)
   nameWithType: UniTaskExtensions.Unwrap(UniTask<Task>, Boolean)
   nameWithType.vb: UniTaskExtensions.Unwrap(UniTask(Of Task), Boolean)
-- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(System.Threading.Tasks.Task{Cysharp.Threading.Tasks.UniTask})
+- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Task{Cysharp.Threading.Tasks.UniTask})
   name: Unwrap(Task<UniTask>)
-  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_System_Threading_Tasks_Task_Cysharp_Threading_Tasks_UniTask__
-  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(System.Threading.Tasks.Task{Cysharp.Threading.Tasks.UniTask})
+  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Task_Cysharp_Threading_Tasks_UniTask__
+  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Task{Cysharp.Threading.Tasks.UniTask})
   name.vb: Unwrap(Task(Of UniTask))
-  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(System.Threading.Tasks.Task<Cysharp.Threading.Tasks.UniTask>)
-  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(System.Threading.Tasks.Task(Of Cysharp.Threading.Tasks.UniTask))
+  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Task<Cysharp.Threading.Tasks.UniTask>)
+  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Task(Of Cysharp.Threading.Tasks.UniTask))
   nameWithType: UniTaskExtensions.Unwrap(Task<UniTask>)
   nameWithType.vb: UniTaskExtensions.Unwrap(Task(Of UniTask))
-- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(System.Threading.Tasks.Task{Cysharp.Threading.Tasks.UniTask},System.Boolean)
+- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Task{Cysharp.Threading.Tasks.UniTask},System.Boolean)
   name: Unwrap(Task<UniTask>, Boolean)
-  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_System_Threading_Tasks_Task_Cysharp_Threading_Tasks_UniTask__System_Boolean_
-  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(System.Threading.Tasks.Task{Cysharp.Threading.Tasks.UniTask},System.Boolean)
+  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap_Task_Cysharp_Threading_Tasks_UniTask__System_Boolean_
+  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Task{Cysharp.Threading.Tasks.UniTask},System.Boolean)
   name.vb: Unwrap(Task(Of UniTask), Boolean)
-  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(System.Threading.Tasks.Task<Cysharp.Threading.Tasks.UniTask>, System.Boolean)
-  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(System.Threading.Tasks.Task(Of Cysharp.Threading.Tasks.UniTask), System.Boolean)
+  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Task<Cysharp.Threading.Tasks.UniTask>, System.Boolean)
+  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Task(Of Cysharp.Threading.Tasks.UniTask), System.Boolean)
   nameWithType: UniTaskExtensions.Unwrap(Task<UniTask>, Boolean)
   nameWithType.vb: UniTaskExtensions.Unwrap(Task(Of UniTask), Boolean)
 - uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap*
@@ -20585,40 +20585,40 @@ references:
   fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Of T)(Cysharp.Threading.Tasks.UniTask(Of Cysharp.Threading.Tasks.UniTask(Of T)))
   nameWithType: UniTaskExtensions.Unwrap<T>(UniTask<UniTask<T>>)
   nameWithType.vb: UniTaskExtensions.Unwrap(Of T)(UniTask(Of UniTask(Of T)))
-- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Cysharp.Threading.Tasks.UniTask{System.Threading.Tasks.Task{``0}})
+- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Cysharp.Threading.Tasks.UniTask{Task{``0}})
   name: Unwrap<T>(UniTask<Task<T>>)
-  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Cysharp_Threading_Tasks_UniTask_System_Threading_Tasks_Task___0___
-  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Cysharp.Threading.Tasks.UniTask{System.Threading.Tasks.Task{``0}})
+  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Cysharp_Threading_Tasks_UniTask_Task___0___
+  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Cysharp.Threading.Tasks.UniTask{Task{``0}})
   name.vb: Unwrap(Of T)(UniTask(Of Task(Of T)))
-  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap<T>(Cysharp.Threading.Tasks.UniTask<System.Threading.Tasks.Task<T>>)
-  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Of T)(Cysharp.Threading.Tasks.UniTask(Of System.Threading.Tasks.Task(Of T)))
+  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap<T>(Cysharp.Threading.Tasks.UniTask<Task<T>>)
+  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Of T)(Cysharp.Threading.Tasks.UniTask(Of Task(Of T)))
   nameWithType: UniTaskExtensions.Unwrap<T>(UniTask<Task<T>>)
   nameWithType.vb: UniTaskExtensions.Unwrap(Of T)(UniTask(Of Task(Of T)))
-- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Cysharp.Threading.Tasks.UniTask{System.Threading.Tasks.Task{``0}},System.Boolean)
+- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Cysharp.Threading.Tasks.UniTask{Task{``0}},System.Boolean)
   name: Unwrap<T>(UniTask<Task<T>>, Boolean)
-  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Cysharp_Threading_Tasks_UniTask_System_Threading_Tasks_Task___0___System_Boolean_
-  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Cysharp.Threading.Tasks.UniTask{System.Threading.Tasks.Task{``0}},System.Boolean)
+  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Cysharp_Threading_Tasks_UniTask_Task___0___System_Boolean_
+  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Cysharp.Threading.Tasks.UniTask{Task{``0}},System.Boolean)
   name.vb: Unwrap(Of T)(UniTask(Of Task(Of T)), Boolean)
-  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap<T>(Cysharp.Threading.Tasks.UniTask<System.Threading.Tasks.Task<T>>, System.Boolean)
-  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Of T)(Cysharp.Threading.Tasks.UniTask(Of System.Threading.Tasks.Task(Of T)), System.Boolean)
+  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap<T>(Cysharp.Threading.Tasks.UniTask<Task<T>>, System.Boolean)
+  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Of T)(Cysharp.Threading.Tasks.UniTask(Of Task(Of T)), System.Boolean)
   nameWithType: UniTaskExtensions.Unwrap<T>(UniTask<Task<T>>, Boolean)
   nameWithType.vb: UniTaskExtensions.Unwrap(Of T)(UniTask(Of Task(Of T)), Boolean)
-- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(System.Threading.Tasks.Task{Cysharp.Threading.Tasks.UniTask{``0}})
+- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Task{Cysharp.Threading.Tasks.UniTask{``0}})
   name: Unwrap<T>(Task<UniTask<T>>)
-  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_System_Threading_Tasks_Task_Cysharp_Threading_Tasks_UniTask___0___
-  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(System.Threading.Tasks.Task{Cysharp.Threading.Tasks.UniTask{``0}})
+  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Task_Cysharp_Threading_Tasks_UniTask___0___
+  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Task{Cysharp.Threading.Tasks.UniTask{``0}})
   name.vb: Unwrap(Of T)(Task(Of UniTask(Of T)))
-  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap<T>(System.Threading.Tasks.Task<Cysharp.Threading.Tasks.UniTask<T>>)
-  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Of T)(System.Threading.Tasks.Task(Of Cysharp.Threading.Tasks.UniTask(Of T)))
+  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap<T>(Task<Cysharp.Threading.Tasks.UniTask<T>>)
+  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Of T)(Task(Of Cysharp.Threading.Tasks.UniTask(Of T)))
   nameWithType: UniTaskExtensions.Unwrap<T>(Task<UniTask<T>>)
   nameWithType.vb: UniTaskExtensions.Unwrap(Of T)(Task(Of UniTask(Of T)))
-- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(System.Threading.Tasks.Task{Cysharp.Threading.Tasks.UniTask{``0}},System.Boolean)
+- uid: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Task{Cysharp.Threading.Tasks.UniTask{``0}},System.Boolean)
   name: Unwrap<T>(Task<UniTask<T>>, Boolean)
-  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_System_Threading_Tasks_Task_Cysharp_Threading_Tasks_UniTask___0___System_Boolean_
-  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(System.Threading.Tasks.Task{Cysharp.Threading.Tasks.UniTask{``0}},System.Boolean)
+  href: api/Cysharp.Threading.Tasks.UniTaskExtensions.html#Cysharp_Threading_Tasks_UniTaskExtensions_Unwrap__1_Task_Cysharp_Threading_Tasks_UniTask___0___System_Boolean_
+  commentId: M:Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap``1(Task{Cysharp.Threading.Tasks.UniTask{``0}},System.Boolean)
   name.vb: Unwrap(Of T)(Task(Of UniTask(Of T)), Boolean)
-  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap<T>(System.Threading.Tasks.Task<Cysharp.Threading.Tasks.UniTask<T>>, System.Boolean)
-  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Of T)(System.Threading.Tasks.Task(Of Cysharp.Threading.Tasks.UniTask(Of T)), System.Boolean)
+  fullName: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap<T>(Task<Cysharp.Threading.Tasks.UniTask<T>>, System.Boolean)
+  fullName.vb: Cysharp.Threading.Tasks.UniTaskExtensions.Unwrap(Of T)(Task(Of Cysharp.Threading.Tasks.UniTask(Of T)), System.Boolean)
   nameWithType: UniTaskExtensions.Unwrap<T>(Task<UniTask<T>>, Boolean)
   nameWithType.vb: UniTaskExtensions.Unwrap(Of T)(Task(Of UniTask(Of T)), Boolean)
 - uid: Cysharp.Threading.Tasks.UniTaskLoopRunners