diff --git a/packages/example/src/main.tsx b/packages/example/src/main.tsx
index a5da407..44742b5 100644
--- a/packages/example/src/main.tsx
+++ b/packages/example/src/main.tsx
@@ -11,8 +11,8 @@ import { routeTree } from "./routeTree.gen"
 
 
 const layer = Layer.empty.pipe(
-    Layer.provideMerge(AppQueryClient.Live),
-    Layer.provideMerge(AppQueryErrorHandler.Live),
+    Layer.provideMerge(AppQueryClient.Default),
+    Layer.provideMerge(AppQueryErrorHandler.Default),
     Layer.provideMerge(Clipboard.layer),
     Layer.provideMerge(Geolocation.layer),
     Layer.provideMerge(Permissions.layer),
diff --git a/packages/extension-query/src/QueryClient.ts b/packages/extension-query/src/QueryClient.ts
index 2b9b003..1e638f6 100644
--- a/packages/extension-query/src/QueryClient.ts
+++ b/packages/extension-query/src/QueryClient.ts
@@ -28,7 +28,7 @@ export interface ServiceResult<Self, EH, FallbackA, HandledE> extends Context.Ta
     typeof id,
     QueryClient<FallbackA, HandledE>
 > {
-    readonly Live: Layer.Layer<
+    readonly Default: Layer.Layer<
         Self | (EH extends QueryErrorHandler.DefaultQueryErrorHandler ? EH : never),
         never,
         EH extends QueryErrorHandler.DefaultQueryErrorHandler ? never : EH
@@ -45,7 +45,7 @@ export const Service = <Self>() => (
     ): ServiceResult<Self, EH, FallbackA, HandledE> => {
         const TagClass = Context.Tag(id)() as ServiceResult<Self, EH, FallbackA, HandledE>
 
-        (TagClass as Mutable<typeof TagClass>).Live = Layer.effect(TagClass, Effect.Do.pipe(
+        (TagClass as Mutable<typeof TagClass>).Default = Layer.effect(TagClass, Effect.Do.pipe(
             Effect.bind("errorHandler", () =>
                 (props?.ErrorHandler ?? QueryErrorHandler.DefaultQueryErrorHandler) as Effect.Effect<
                     QueryErrorHandler.QueryErrorHandler<FallbackA, HandledE>,
@@ -56,7 +56,7 @@ export const Service = <Self>() => (
         )).pipe(
             Layer.provideMerge((props?.ErrorHandler
                 ? Layer.empty
-                : QueryErrorHandler.DefaultQueryErrorHandler.Live
+                : QueryErrorHandler.DefaultQueryErrorHandler.Default
             ) as Layer.Layer<EH>)
         )
 
diff --git a/packages/extension-query/src/QueryErrorHandler.ts b/packages/extension-query/src/QueryErrorHandler.ts
index da64787..ebfa750 100644
--- a/packages/extension-query/src/QueryErrorHandler.ts
+++ b/packages/extension-query/src/QueryErrorHandler.ts
@@ -21,7 +21,7 @@ export interface ServiceResult<
     Id,
     QueryErrorHandler<FallbackA, HandledE>
 > {
-    readonly Live: Layer.Layer<Self>
+    readonly Default: Layer.Layer<Self>
 }
 
 export const Service = <Self, HandledE = never>() => (
@@ -35,7 +35,7 @@ export const Service = <Self, HandledE = never>() => (
     ): ServiceResult<Self, Id, FallbackA, HandledE> => {
         const TagClass = Context.Tag(id)() as ServiceResult<Self, Id, FallbackA, HandledE>
 
-        (TagClass as Mutable<typeof TagClass>).Live = Layer.effect(TagClass, Effect.gen(function*() {
+        (TagClass as Mutable<typeof TagClass>).Default = Layer.effect(TagClass, Effect.gen(function*() {
             const pubsub = yield* PubSub.unbounded<Cause.Cause<HandledE>>()
             const errors = Stream.fromPubSub(pubsub)