diff --git a/libs/ngrx-toolkit/src/lib/with-call-state.ts b/libs/ngrx-toolkit/src/lib/with-call-state.ts
index 1a9cb84..7b27959 100644
--- a/libs/ngrx-toolkit/src/lib/with-call-state.ts
+++ b/libs/ngrx-toolkit/src/lib/with-call-state.ts
@@ -9,21 +9,13 @@ import { Emtpy } from './shared/empty';
 
 export type CallState = 'init' | 'loading' | 'loaded' | { error: string };
 
-export type NamedCallStateSlice<Collection extends string> = {
-  [K in Collection as `${K}CallState`]: CallState;
-};
-
 export type CallStateSlice = {
   callState: CallState
 }
 
-export type NamedCallStateSignals<Prop extends string> = {
-  [K in Prop as `${K}Loading`]: Signal<boolean>;
-} & {
-    [K in Prop as `${K}Loaded`]: Signal<boolean>;
-  } & {
-    [K in Prop as `${K}Error`]: Signal<string | null>;
-  }
+export type NamedCallStateSlice<Collection extends string> = {
+  [K in keyof CallStateSlice as `${Collection}${Capitalize<K>}`]: CallStateSlice[K];
+}
 
 export type CallStateSignals = {
   loading: Signal<boolean>;
@@ -31,6 +23,10 @@ export type CallStateSignals = {
   error: Signal<string | null>
 }
 
+export type NamedCallStateSignals<Prop extends string> = {
+  [K in keyof CallStateSignals as `${Prop}${Capitalize<K>}`]: CallStateSignals[K];
+}
+
 export type SetCallState<Prop extends string | undefined> = Prop extends string
   ? NamedCallStateSlice<Prop>
   : CallStateSlice;