diff --git a/e2e/react-start/basic-auth/src/components/Login.tsx b/e2e/react-start/basic-auth/src/components/Login.tsx
index b6b6da0c37f..9d10ea37373 100644
--- a/e2e/react-start/basic-auth/src/components/Login.tsx
+++ b/e2e/react-start/basic-auth/src/components/Login.tsx
@@ -38,10 +38,10 @@ export function Login() {
         })
       }}
       afterSubmit={
-        loginMutation.data ? (
+        loginMutation.stateData ? (
           <>
-            <div className="text-red-400">{loginMutation.data.message}</div>
-            {loginMutation.data.userNotFound ? (
+            <div className="text-red-400">{loginMutation.stateData.message}</div>
+            {loginMutation.stateData.userNotFound ? (
               <div>
                 <button
                   className="text-blue-500"
diff --git a/e2e/react-start/basic-auth/src/hooks/useMutation.ts b/e2e/react-start/basic-auth/src/hooks/useMutation.ts
index 1ff7a4653bd..2a15b88260d 100644
--- a/e2e/react-start/basic-auth/src/hooks/useMutation.ts
+++ b/e2e/react-start/basic-auth/src/hooks/useMutation.ts
@@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
   onSuccess?: (ctx: { data: TData }) => void | Promise<void>
 }) {
   const [submittedAt, setSubmittedAt] = React.useState<number | undefined>()
-  const [variables, setVariables] = React.useState<TVariables | undefined>()
+  const [stateVariables, setVariables] = React.useState<TVariables | undefined>()
   const [error, setError] = React.useState<TError | undefined>()
-  const [data, setData] = React.useState<TData | undefined>()
+  const [stateData, setData] = React.useState<TData | undefined>()
   const [status, setStatus] = React.useState<
     'idle' | 'pending' | 'success' | 'error'
   >('idle')
@@ -35,10 +35,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
 
   return {
     status,
-    variables,
+    stateVariables,
     submittedAt,
     mutate,
     error,
-    data,
+    stateData,
   }
 }
diff --git a/e2e/react-start/basic-auth/src/routes/signup.tsx b/e2e/react-start/basic-auth/src/routes/signup.tsx
index d6ef1537861..969f79c94ae 100644
--- a/e2e/react-start/basic-auth/src/routes/signup.tsx
+++ b/e2e/react-start/basic-auth/src/routes/signup.tsx
@@ -89,9 +89,9 @@ function SignupComp() {
         })
       }}
       afterSubmit={
-        signupMutation.data?.error ? (
+        signupMutation.stateData?.error ? (
           <>
-            <div className="text-red-400">{signupMutation.data.message}</div>
+            <div className="text-red-400">{signupMutation.stateData?.message ?? 'an error occurred'}</div>
           </>
         ) : null
       }
diff --git a/e2e/solid-start/basic-auth/src/components/Login.tsx b/e2e/solid-start/basic-auth/src/components/Login.tsx
index 328149bf318..b109d18a08d 100644
--- a/e2e/solid-start/basic-auth/src/components/Login.tsx
+++ b/e2e/solid-start/basic-auth/src/components/Login.tsx
@@ -38,10 +38,10 @@ export function Login() {
         })
       }}
       afterSubmit={
-        loginMutation.data() ? (
+        loginMutation.signalData() ? (
           <>
-            <div class="text-red-400">{loginMutation.data()?.message}</div>
-            {loginMutation.data()?.userNotFound ? (
+            <div class="text-red-400">{loginMutation.signalData()?.message}</div>
+            {loginMutation.signalData()?.userNotFound ? (
               <div>
                 <button
                   class="text-blue-500"
diff --git a/e2e/solid-start/basic-auth/src/hooks/useMutation.ts b/e2e/solid-start/basic-auth/src/hooks/useMutation.ts
index 102ecf87fc8..c53da179c99 100644
--- a/e2e/solid-start/basic-auth/src/hooks/useMutation.ts
+++ b/e2e/solid-start/basic-auth/src/hooks/useMutation.ts
@@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
   onSuccess?: (ctx: { data: TData }) => void | Promise<void>
 }) {
   const [submittedAt, setSubmittedAt] = Solid.createSignal<number | undefined>()
-  const [variables, setVariables] = Solid.createSignal<TVariables | undefined>()
+  const [signalVariables, setVariables] = Solid.createSignal<TVariables | undefined>()
   const [error, setError] = Solid.createSignal<TError | undefined>()
-  const [data, setData] = Solid.createSignal<TData | undefined>()
+  const [signalData, setData] = Solid.createSignal<TData | undefined>()
   const [status, setStatus] = Solid.createSignal<
     'idle' | 'pending' | 'success' | 'error'
   >('idle')
@@ -32,10 +32,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
 
   return {
     status,
-    variables,
+    signalVariables,
     submittedAt,
     mutate,
     error,
-    data,
+    signalData,
   }
 }
diff --git a/e2e/solid-start/basic-auth/src/routes/signup.tsx b/e2e/solid-start/basic-auth/src/routes/signup.tsx
index 48ee2981f5e..2b00ef7ebbd 100644
--- a/e2e/solid-start/basic-auth/src/routes/signup.tsx
+++ b/e2e/solid-start/basic-auth/src/routes/signup.tsx
@@ -89,9 +89,9 @@ function SignupComp() {
         })
       }}
       afterSubmit={
-        signupMutation.data()?.error ? (
+        signupMutation.signalData()?.error ? (
           <>
-            <div class="text-red-400">{signupMutation.data()?.message}</div>
+            <div class="text-red-400">{signupMutation.signalData()?.message}</div>
           </>
         ) : null
       }
diff --git a/examples/react/kitchen-sink-file-based/src/hooks/useMutation.tsx b/examples/react/kitchen-sink-file-based/src/hooks/useMutation.tsx
index 1ff7a4653bd..2a15b88260d 100644
--- a/examples/react/kitchen-sink-file-based/src/hooks/useMutation.tsx
+++ b/examples/react/kitchen-sink-file-based/src/hooks/useMutation.tsx
@@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
   onSuccess?: (ctx: { data: TData }) => void | Promise<void>
 }) {
   const [submittedAt, setSubmittedAt] = React.useState<number | undefined>()
-  const [variables, setVariables] = React.useState<TVariables | undefined>()
+  const [stateVariables, setVariables] = React.useState<TVariables | undefined>()
   const [error, setError] = React.useState<TError | undefined>()
-  const [data, setData] = React.useState<TData | undefined>()
+  const [stateData, setData] = React.useState<TData | undefined>()
   const [status, setStatus] = React.useState<
     'idle' | 'pending' | 'success' | 'error'
   >('idle')
@@ -35,10 +35,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
 
   return {
     status,
-    variables,
+    stateVariables,
     submittedAt,
     mutate,
     error,
-    data,
+    stateData,
   }
 }
diff --git a/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx b/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx
index 9d6eff562cc..ecf89723724 100644
--- a/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx
+++ b/examples/react/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx
@@ -105,7 +105,7 @@ function InvoiceComponent() {
           Save
         </button>
       </div>
-      {updateInvoiceMutation.variables?.id === invoice.id ? (
+      {updateInvoiceMutation.stateVariables?.id === invoice.id ? (
         <div key={updateInvoiceMutation.submittedAt}>
           {updateInvoiceMutation.status === 'success' ? (
             <div className="inline-block px-2 py-1 rounded-sm bg-green-500 text-white animate-bounce [animation-iteration-count:2.5] [animation-duration:.3s]">
diff --git a/examples/react/kitchen-sink/src/main.tsx b/examples/react/kitchen-sink/src/main.tsx
index ce7687c6669..5c4ba33dc86 100644
--- a/examples/react/kitchen-sink/src/main.tsx
+++ b/examples/react/kitchen-sink/src/main.tsx
@@ -446,7 +446,7 @@ function InvoiceComponent() {
           Save
         </button>
       </div>
-      {updateInvoiceMutation.variables?.id === invoice.id ? (
+      {updateInvoiceMutation.stateVariables?.id === invoice.id ? (
         <div key={updateInvoiceMutation.submittedAt}>
           {updateInvoiceMutation.status === 'success' ? (
             <div className="inline-block px-2 py-1 rounded-sm bg-green-500 text-white animate-bounce [animation-iteration-count:2.5] [animation-duration:.3s]">
diff --git a/examples/react/kitchen-sink/src/useMutation.tsx b/examples/react/kitchen-sink/src/useMutation.tsx
index 1ff7a4653bd..2a15b88260d 100644
--- a/examples/react/kitchen-sink/src/useMutation.tsx
+++ b/examples/react/kitchen-sink/src/useMutation.tsx
@@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
   onSuccess?: (ctx: { data: TData }) => void | Promise<void>
 }) {
   const [submittedAt, setSubmittedAt] = React.useState<number | undefined>()
-  const [variables, setVariables] = React.useState<TVariables | undefined>()
+  const [stateVariables, setVariables] = React.useState<TVariables | undefined>()
   const [error, setError] = React.useState<TError | undefined>()
-  const [data, setData] = React.useState<TData | undefined>()
+  const [stateData, setData] = React.useState<TData | undefined>()
   const [status, setStatus] = React.useState<
     'idle' | 'pending' | 'success' | 'error'
   >('idle')
@@ -35,10 +35,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
 
   return {
     status,
-    variables,
+    stateVariables,
     submittedAt,
     mutate,
     error,
-    data,
+    stateData,
   }
 }
diff --git a/examples/react/start-basic-auth/src/components/Login.tsx b/examples/react/start-basic-auth/src/components/Login.tsx
index b6b6da0c37f..9d10ea37373 100644
--- a/examples/react/start-basic-auth/src/components/Login.tsx
+++ b/examples/react/start-basic-auth/src/components/Login.tsx
@@ -38,10 +38,10 @@ export function Login() {
         })
       }}
       afterSubmit={
-        loginMutation.data ? (
+        loginMutation.stateData ? (
           <>
-            <div className="text-red-400">{loginMutation.data.message}</div>
-            {loginMutation.data.userNotFound ? (
+            <div className="text-red-400">{loginMutation.stateData.message}</div>
+            {loginMutation.stateData.userNotFound ? (
               <div>
                 <button
                   className="text-blue-500"
diff --git a/examples/react/start-basic-auth/src/hooks/useMutation.ts b/examples/react/start-basic-auth/src/hooks/useMutation.ts
index 1ff7a4653bd..2a15b88260d 100644
--- a/examples/react/start-basic-auth/src/hooks/useMutation.ts
+++ b/examples/react/start-basic-auth/src/hooks/useMutation.ts
@@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
   onSuccess?: (ctx: { data: TData }) => void | Promise<void>
 }) {
   const [submittedAt, setSubmittedAt] = React.useState<number | undefined>()
-  const [variables, setVariables] = React.useState<TVariables | undefined>()
+  const [stateVariables, setVariables] = React.useState<TVariables | undefined>()
   const [error, setError] = React.useState<TError | undefined>()
-  const [data, setData] = React.useState<TData | undefined>()
+  const [stateData, setData] = React.useState<TData | undefined>()
   const [status, setStatus] = React.useState<
     'idle' | 'pending' | 'success' | 'error'
   >('idle')
@@ -35,10 +35,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
 
   return {
     status,
-    variables,
+    stateVariables,
     submittedAt,
     mutate,
     error,
-    data,
+    stateData,
   }
 }
diff --git a/examples/react/start-basic-auth/src/routes/signup.tsx b/examples/react/start-basic-auth/src/routes/signup.tsx
index 7b64265840b..c5f92a37861 100644
--- a/examples/react/start-basic-auth/src/routes/signup.tsx
+++ b/examples/react/start-basic-auth/src/routes/signup.tsx
@@ -86,9 +86,9 @@ function SignupComp() {
         })
       }}
       afterSubmit={
-        signupMutation.data?.error ? (
+        signupMutation.stateData?.error ? (
           <>
-            <div className="text-red-400">{signupMutation.data.message}</div>
+            <div className="text-red-400">{signupMutation.stateData?.message ?? 'an error occurred'}</div>
           </>
         ) : null
       }
diff --git a/examples/react/start-supabase-basic/src/components/Login.tsx b/examples/react/start-supabase-basic/src/components/Login.tsx
index 926f6910d08..b5eda067aeb 100644
--- a/examples/react/start-supabase-basic/src/components/Login.tsx
+++ b/examples/react/start-supabase-basic/src/components/Login.tsx
@@ -38,11 +38,11 @@ export function Login() {
         })
       }}
       afterSubmit={
-        loginMutation.data ? (
+        loginMutation.stateData ? (
           <>
-            <div className="text-red-400">{loginMutation.data.message}</div>
-            {loginMutation.data.error &&
-            loginMutation.data.message === 'Invalid login credentials' ? (
+            <div className="text-red-400">{loginMutation.stateData.message}</div>
+            {loginMutation.stateData.error &&
+            loginMutation.stateData.message === 'Invalid login credentials' ? (
               <div>
                 <button
                   className="text-blue-500"
diff --git a/examples/react/start-supabase-basic/src/hooks/useMutation.ts b/examples/react/start-supabase-basic/src/hooks/useMutation.ts
index afe59694d43..82ad611bb7a 100644
--- a/examples/react/start-supabase-basic/src/hooks/useMutation.ts
+++ b/examples/react/start-supabase-basic/src/hooks/useMutation.ts
@@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
   onSuccess?: (ctx: { data: TData }) => void | Promise<void>
 }) {
   const [submittedAt, setSubmittedAt] = React.useState<number | undefined>()
-  const [variables, setVariables] = React.useState<TVariables | undefined>()
+  const [stateVariables, setVariables] = React.useState<TVariables | undefined>()
   const [error, setError] = React.useState<TError | undefined>()
-  const [data, setData] = React.useState<TData | undefined>()
+  const [stateData, setData] = React.useState<TData | undefined>()
   const [status, setStatus] = React.useState<
     'idle' | 'pending' | 'success' | 'error'
   >('idle')
@@ -35,10 +35,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
 
   return {
     status,
-    variables,
+    stateVariables,
     submittedAt,
     mutate,
     error,
-    data,
+    stateData,
   }
 }
diff --git a/examples/react/start-supabase-basic/src/routes/signup.tsx b/examples/react/start-supabase-basic/src/routes/signup.tsx
index 908d8ffcb3a..6c3c886ada7 100644
--- a/examples/react/start-supabase-basic/src/routes/signup.tsx
+++ b/examples/react/start-supabase-basic/src/routes/signup.tsx
@@ -51,9 +51,9 @@ function SignupComp() {
         })
       }}
       afterSubmit={
-        signupMutation.data?.error ? (
+        signupMutation.stateData?.error ? (
           <>
-            <div className="text-red-400">{signupMutation.data.message}</div>
+            <div className="text-red-400">{signupMutation.stateData?.message ?? 'an error occurred'}</div>
           </>
         ) : null
       }
diff --git a/examples/solid/kitchen-sink-file-based/src/hooks/useMutation.tsx b/examples/solid/kitchen-sink-file-based/src/hooks/useMutation.tsx
index a63b9cd3671..6a0014c13f3 100644
--- a/examples/solid/kitchen-sink-file-based/src/hooks/useMutation.tsx
+++ b/examples/solid/kitchen-sink-file-based/src/hooks/useMutation.tsx
@@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
   onSuccess?: (ctx: { data: TData }) => void | Promise<void>
 }) {
   const [submittedAt, setSubmittedAt] = Solid.createSignal<number | undefined>()
-  const [variables, setVariables] = Solid.createSignal<TVariables | undefined>()
+  const [signalVariables, setVariables] = Solid.createSignal<TVariables | undefined>()
   const [error, setError] = Solid.createSignal<TError | undefined>()
-  const [data, setData] = Solid.createSignal<TData | undefined>()
+  const [signalData, setData] = Solid.createSignal<TData | undefined>()
   const [status, setStatus] = Solid.createSignal<
     'idle' | 'pending' | 'success' | 'error'
   >('idle')
@@ -32,10 +32,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
 
   return {
     status,
-    variables,
+    signalVariables,
     submittedAt,
     mutate,
     error,
-    data,
+    signalData,
   }
 }
diff --git a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx
index 333a4fff2c2..f2b63d3f1af 100644
--- a/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx
+++ b/examples/solid/kitchen-sink-file-based/src/routes/dashboard.invoices.$invoiceId.tsx
@@ -104,7 +104,7 @@ function InvoiceComponent() {
           Save
         </button>
       </div>
-      {updateInvoiceMutation.variables()?.id === invoice()?.id ? (
+      {updateInvoiceMutation.signalVariables()?.id === invoice()?.id ? (
         <div>
           {updateInvoiceMutation.status() === 'success' ? (
             <div class="inline-block px-2 py-1 rounded-sm bg-green-500 text-white animate-bounce [animation-iteration-count:2.5] [animation-duration:.3s]">
diff --git a/examples/solid/kitchen-sink/src/useMutation.tsx b/examples/solid/kitchen-sink/src/useMutation.tsx
index 077b7167793..f32293c53c0 100644
--- a/examples/solid/kitchen-sink/src/useMutation.tsx
+++ b/examples/solid/kitchen-sink/src/useMutation.tsx
@@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
   onSuccess?: (ctx: { data: TData }) => void | Promise<void>
 }) {
   const [submittedAt, setSubmittedAt] = createSignal<number | undefined>()
-  const [variables, setVariables] = createSignal<TVariables | undefined>()
+  const [signalVariables, setVariables] = createSignal<TVariables | undefined>()
   const [error, setError] = createSignal<TError | undefined>()
-  const [data, setData] = createSignal<TData | undefined>()
+  const [signalData, setData] = createSignal<TData | undefined>()
   const [status, setStatus] = createSignal<
     'idle' | 'pending' | 'success' | 'error'
   >('idle')
@@ -35,7 +35,7 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
       return status()
     },
     get variables() {
-      return variables()
+      return signalVariables()
     },
     get submittedAt() {
       return submittedAt()
@@ -45,7 +45,7 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
       return error()
     },
     get data() {
-      return data()
+      return signalData()
     },
   }
 }
diff --git a/examples/solid/start-basic-auth/src/components/Login.tsx b/examples/solid/start-basic-auth/src/components/Login.tsx
index ae2b270393a..4b29cb2cb86 100644
--- a/examples/solid/start-basic-auth/src/components/Login.tsx
+++ b/examples/solid/start-basic-auth/src/components/Login.tsx
@@ -38,10 +38,10 @@ export function Login() {
         })
       }}
       afterSubmit={
-        loginMutation.data() ? (
+        loginMutation.signalData() ? (
           <>
-            <div class="text-red-400">{loginMutation.data()?.message}</div>
-            {loginMutation.data()?.userNotFound ? (
+            <div class="text-red-400">{loginMutation.signalData()?.message}</div>
+            {loginMutation.signalData()?.userNotFound ? (
               <div>
                 <button
                   class="text-blue-500"
diff --git a/examples/solid/start-basic-auth/src/hooks/useMutation.ts b/examples/solid/start-basic-auth/src/hooks/useMutation.ts
index 102ecf87fc8..c53da179c99 100644
--- a/examples/solid/start-basic-auth/src/hooks/useMutation.ts
+++ b/examples/solid/start-basic-auth/src/hooks/useMutation.ts
@@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
   onSuccess?: (ctx: { data: TData }) => void | Promise<void>
 }) {
   const [submittedAt, setSubmittedAt] = Solid.createSignal<number | undefined>()
-  const [variables, setVariables] = Solid.createSignal<TVariables | undefined>()
+  const [signalVariables, setVariables] = Solid.createSignal<TVariables | undefined>()
   const [error, setError] = Solid.createSignal<TError | undefined>()
-  const [data, setData] = Solid.createSignal<TData | undefined>()
+  const [signalData, setData] = Solid.createSignal<TData | undefined>()
   const [status, setStatus] = Solid.createSignal<
     'idle' | 'pending' | 'success' | 'error'
   >('idle')
@@ -32,10 +32,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
 
   return {
     status,
-    variables,
+    signalVariables,
     submittedAt,
     mutate,
     error,
-    data,
+    signalData,
   }
 }
diff --git a/examples/solid/start-basic-auth/src/routes/signup.tsx b/examples/solid/start-basic-auth/src/routes/signup.tsx
index 020e07c029b..44c9c0580d9 100644
--- a/examples/solid/start-basic-auth/src/routes/signup.tsx
+++ b/examples/solid/start-basic-auth/src/routes/signup.tsx
@@ -86,9 +86,9 @@ function SignupComp() {
         })
       }}
       afterSubmit={
-        signupMutation.data()?.error ? (
+        signupMutation.signalData()?.error ? (
           <>
-            <div class="text-red-400">{signupMutation.data()?.message}</div>
+            <div class="text-red-400">{signupMutation.signalData()?.message}</div>
           </>
         ) : null
       }
diff --git a/examples/solid/start-supabase-basic/src/components/Login.tsx b/examples/solid/start-supabase-basic/src/components/Login.tsx
index 4b781aa6bb2..f496f7a4b52 100644
--- a/examples/solid/start-supabase-basic/src/components/Login.tsx
+++ b/examples/solid/start-supabase-basic/src/components/Login.tsx
@@ -38,11 +38,11 @@ export function Login() {
         })
       }}
       afterSubmit={
-        loginMutation.data() ? (
+        loginMutation.signalData() ? (
           <>
-            <div class="text-red-400">{loginMutation.data()?.message}</div>
-            {loginMutation.data()?.error &&
-            loginMutation.data()?.message === 'Invalid login credentials' ? (
+            <div class="text-red-400">{loginMutation.signalData()?.message}</div>
+            {loginMutation.signalData()?.error &&
+            loginMutation.signalData()?.message === 'Invalid login credentials' ? (
               <div>
                 <button
                   class="text-blue-500"
diff --git a/examples/solid/start-supabase-basic/src/hooks/useMutation.ts b/examples/solid/start-supabase-basic/src/hooks/useMutation.ts
index d1c3f48759f..ca5721ed8c3 100644
--- a/examples/solid/start-supabase-basic/src/hooks/useMutation.ts
+++ b/examples/solid/start-supabase-basic/src/hooks/useMutation.ts
@@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
   onSuccess?: (ctx: { data: TData }) => void | Promise<void>
 }) {
   const [submittedAt, setSubmittedAt] = createSignal<number | undefined>()
-  const [variables, setVariables] = createSignal<TVariables | undefined>()
+  const [signalVariables, setVariables] = createSignal<TVariables | undefined>()
   const [error, setError] = createSignal<TError | undefined>()
-  const [data, setData] = createSignal<TData | undefined>()
+  const [signalData, setData] = createSignal<TData | undefined>()
   const [status, setStatus] = createSignal<
     'idle' | 'pending' | 'success' | 'error'
   >('idle')
@@ -33,10 +33,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
 
   return {
     status,
-    variables,
+    signalVariables,
     submittedAt,
     mutate,
     error,
-    data,
+    signalData,
   }
 }
diff --git a/examples/solid/start-supabase-basic/src/routes/signup.tsx b/examples/solid/start-supabase-basic/src/routes/signup.tsx
index 129a638c948..d32b9d1dd0d 100644
--- a/examples/solid/start-supabase-basic/src/routes/signup.tsx
+++ b/examples/solid/start-supabase-basic/src/routes/signup.tsx
@@ -51,9 +51,9 @@ function SignupComp() {
         })
       }}
       afterSubmit={
-        signupMutation.data()?.error ? (
+        signupMutation.signalData()?.error ? (
           <>
-            <div class="text-red-400">{signupMutation.data()?.message}</div>
+            <div class="text-red-400">{signupMutation.signalData()?.message}</div>
           </>
         ) : null
       }