diff --git a/packages/effect-fc/src/hooks/Hooks/useCallbackPromise.ts b/packages/effect-fc/src/hooks/Hooks/useCallbackPromise.ts
index be075ea..51b99ec 100644
--- a/packages/effect-fc/src/hooks/Hooks/useCallbackPromise.ts
+++ b/packages/effect-fc/src/hooks/Hooks/useCallbackPromise.ts
@@ -7,7 +7,7 @@ export const useCallbackPromise: {
callback: (...args: Args) => Effect.Effect,
deps: React.DependencyList,
): Effect.Effect<(...args: Args) => Promise, never, R>
-} = Effect.fn("useCallbackPromise")(function* (
+} = Effect.fnUntraced(function* (
callback: (...args: Args) => Effect.Effect,
deps: React.DependencyList,
) {
diff --git a/packages/effect-fc/src/hooks/Hooks/useCallbackSync.ts b/packages/effect-fc/src/hooks/Hooks/useCallbackSync.ts
index 44a41cc..d3ae332 100644
--- a/packages/effect-fc/src/hooks/Hooks/useCallbackSync.ts
+++ b/packages/effect-fc/src/hooks/Hooks/useCallbackSync.ts
@@ -7,7 +7,7 @@ export const useCallbackSync: {
callback: (...args: Args) => Effect.Effect,
deps: React.DependencyList,
): Effect.Effect<(...args: Args) => A, never, R>
-} = Effect.fn("useCallbackSync")(function* (
+} = Effect.fnUntraced(function* (
callback: (...args: Args) => Effect.Effect,
deps: React.DependencyList,
) {
diff --git a/packages/effect-fc/src/hooks/Hooks/useContext.ts b/packages/effect-fc/src/hooks/Hooks/useContext.ts
index fbb9d85..e334b5d 100644
--- a/packages/effect-fc/src/hooks/Hooks/useContext.ts
+++ b/packages/effect-fc/src/hooks/Hooks/useContext.ts
@@ -9,7 +9,7 @@ export const useContext: {
layer: Layer.Layer,
options?: ScopeOptions,
): Effect.Effect, E, Exclude>
-} = Effect.fn("useContext")(function* (
+} = Effect.fnUntraced(function* (
layer: Layer.Layer,
options?: ScopeOptions,
) {
diff --git a/packages/effect-fc/src/hooks/Hooks/useEffect.ts b/packages/effect-fc/src/hooks/Hooks/useEffect.ts
index 798d39f..b2de7e3 100644
--- a/packages/effect-fc/src/hooks/Hooks/useEffect.ts
+++ b/packages/effect-fc/src/hooks/Hooks/useEffect.ts
@@ -10,7 +10,7 @@ export const useEffect: {
deps?: React.DependencyList,
options?: ScopeOptions,
): Effect.Effect>
-} = Effect.fn("useEffect")(function* (
+} = Effect.fnUntraced(function* (
effect: () => Effect.Effect,
deps?: React.DependencyList,
options?: ScopeOptions,
diff --git a/packages/effect-fc/src/hooks/Hooks/useFork.ts b/packages/effect-fc/src/hooks/Hooks/useFork.ts
index ec17db6..3365c0b 100644
--- a/packages/effect-fc/src/hooks/Hooks/useFork.ts
+++ b/packages/effect-fc/src/hooks/Hooks/useFork.ts
@@ -10,7 +10,7 @@ export const useFork: {
deps?: React.DependencyList,
options?: Runtime.RunForkOptions & ScopeOptions,
): Effect.Effect>
-} = Effect.fn("useFork")(function* (
+} = Effect.fnUntraced(function* (
effect: () => Effect.Effect,
deps?: React.DependencyList,
options?: Runtime.RunForkOptions & ScopeOptions,
diff --git a/packages/effect-fc/src/hooks/Hooks/useLayoutEffect.ts b/packages/effect-fc/src/hooks/Hooks/useLayoutEffect.ts
index 988fd14..93f0302 100644
--- a/packages/effect-fc/src/hooks/Hooks/useLayoutEffect.ts
+++ b/packages/effect-fc/src/hooks/Hooks/useLayoutEffect.ts
@@ -10,7 +10,7 @@ export const useLayoutEffect: {
deps?: React.DependencyList,
options?: ScopeOptions,
): Effect.Effect>
-} = Effect.fn("useLayoutEffect")(function* (
+} = Effect.fnUntraced(function* (
effect: () => Effect.Effect,
deps?: React.DependencyList,
options?: ScopeOptions,
diff --git a/packages/effect-fc/src/hooks/Hooks/useMemo.ts b/packages/effect-fc/src/hooks/Hooks/useMemo.ts
index 53b1aa8..c12dd02 100644
--- a/packages/effect-fc/src/hooks/Hooks/useMemo.ts
+++ b/packages/effect-fc/src/hooks/Hooks/useMemo.ts
@@ -7,7 +7,7 @@ export const useMemo: {
factory: () => Effect.Effect,
deps: React.DependencyList,
): Effect.Effect
-} = Effect.fn("useMemo")(function* (
+} = Effect.fnUntraced(function* (
factory: () => Effect.Effect,
deps: React.DependencyList,
) {
diff --git a/packages/effect-fc/src/hooks/Hooks/useOnce.ts b/packages/effect-fc/src/hooks/Hooks/useOnce.ts
index 3598d56..f617611 100644
--- a/packages/effect-fc/src/hooks/Hooks/useOnce.ts
+++ b/packages/effect-fc/src/hooks/Hooks/useOnce.ts
@@ -4,7 +4,7 @@ import { useMemo } from "./useMemo.js"
export const useOnce: {
(factory: () => Effect.Effect): Effect.Effect
-} = Effect.fn("useOnce")(function* (
+} = Effect.fnUntraced(function* (
factory: () => Effect.Effect
) {
return yield* useMemo(factory, [])
diff --git a/packages/effect-fc/src/hooks/Hooks/useRefFromReactiveValue.ts b/packages/effect-fc/src/hooks/Hooks/useRefFromReactiveValue.ts
index 9ff1e6f..d3e0f39 100644
--- a/packages/effect-fc/src/hooks/Hooks/useRefFromReactiveValue.ts
+++ b/packages/effect-fc/src/hooks/Hooks/useRefFromReactiveValue.ts
@@ -5,7 +5,7 @@ import { useOnce } from "./useOnce.js"
export const useRefFromReactiveValue: {
(value: A): Effect.Effect>
-} = Effect.fn("useRefFromReactiveValue")(function*(value) {
+} = Effect.fnUntraced(function*(value) {
const ref = yield* useOnce(() => SubscriptionRef.make(value))
yield* useEffect(() => Ref.set(ref, value), [value])
return ref
diff --git a/packages/effect-fc/src/hooks/Hooks/useRefState.ts b/packages/effect-fc/src/hooks/Hooks/useRefState.ts
index 9698a73..ad9efb0 100644
--- a/packages/effect-fc/src/hooks/Hooks/useRefState.ts
+++ b/packages/effect-fc/src/hooks/Hooks/useRefState.ts
@@ -10,7 +10,7 @@ export const useRefState: {
(
ref: SubscriptionRef.SubscriptionRef
): Effect.Effect>]>
-} = Effect.fn("useRefState")(function* (ref: SubscriptionRef.SubscriptionRef) {
+} = Effect.fnUntraced(function* (ref: SubscriptionRef.SubscriptionRef) {
const [reactStateValue, setReactStateValue] = React.useState(yield* useOnce(() => ref))
yield* useFork(() => Stream.runForEach(
diff --git a/packages/effect-fc/src/hooks/Hooks/useScope.ts b/packages/effect-fc/src/hooks/Hooks/useScope.ts
index aae4a49..f475885 100644
--- a/packages/effect-fc/src/hooks/Hooks/useScope.ts
+++ b/packages/effect-fc/src/hooks/Hooks/useScope.ts
@@ -9,7 +9,7 @@ export const useScope: {
deps: React.DependencyList,
options?: ScopeOptions,
): Effect.Effect
-} = Effect.fn("useScope")(function*(deps, options) {
+} = Effect.fnUntraced(function*(deps, options) {
const runtime = yield* Effect.runtime()
const [isInitialRun, initialScope] = React.useMemo(() => Runtime.runSync(runtime)(Effect.all([
diff --git a/packages/effect-fc/src/hooks/Hooks/useStreamFromReactiveValues.ts b/packages/effect-fc/src/hooks/Hooks/useStreamFromReactiveValues.ts
index 58e3840..44c3dc5 100644
--- a/packages/effect-fc/src/hooks/Hooks/useStreamFromReactiveValues.ts
+++ b/packages/effect-fc/src/hooks/Hooks/useStreamFromReactiveValues.ts
@@ -8,7 +8,7 @@ export const useStreamFromReactiveValues: {
(
values: A
): Effect.Effect, never, Scope.Scope>
-} = Effect.fn("useStreamFromReactiveValues")(function* (values: A) {
+} = Effect.fnUntraced(function* (values: A) {
const { latest, pubsub, stream } = yield* useOnce(() => Effect.Do.pipe(
Effect.bind("latest", () => Ref.make(values)),
Effect.bind("pubsub", () => Effect.acquireRelease(PubSub.unbounded(), PubSub.shutdown)),
diff --git a/packages/effect-fc/src/hooks/Hooks/useSubscribeRefs.ts b/packages/effect-fc/src/hooks/Hooks/useSubscribeRefs.ts
index 4f18976..b6346c4 100644
--- a/packages/effect-fc/src/hooks/Hooks/useSubscribeRefs.ts
+++ b/packages/effect-fc/src/hooks/Hooks/useSubscribeRefs.ts
@@ -8,7 +8,7 @@ export const useSubscribeRefs: {
[]>(
...refs: Refs
): Effect.Effect<{ [K in keyof Refs]: Effect.Effect.Success }>
-} = Effect.fn("useSubscribeRefs")(function* []>(
+} = Effect.fnUntraced(function* []>(
...refs: Refs
) {
const [reactStateValue, setReactStateValue] = React.useState(yield* useOnce(() =>
diff --git a/packages/effect-fc/src/hooks/Hooks/useSubscribeStream.ts b/packages/effect-fc/src/hooks/Hooks/useSubscribeStream.ts
index d157111..d84b4ab 100644
--- a/packages/effect-fc/src/hooks/Hooks/useSubscribeStream.ts
+++ b/packages/effect-fc/src/hooks/Hooks/useSubscribeStream.ts
@@ -11,7 +11,7 @@ export const useSubscribeStream: {
stream: Stream.Stream,
initialValue: A,
): Effect.Effect, never, R>
-} = Effect.fn("useSubscribeStream")(function* , E, R>(
+} = Effect.fnUntraced(function* , E, R>(
stream: Stream.Stream,
initialValue?: A,
) {