diff --git a/packages/react/src/data-connect/index.ts b/packages/react/src/data-connect/index.ts
index 44cd316..c3d3ce8 100644
--- a/packages/react/src/data-connect/index.ts
+++ b/packages/react/src/data-connect/index.ts
@@ -1,4 +1,3 @@
-import { ReservedQueryKeys } from "./types";
 
 export {
   DataConnectQueryClient,
@@ -12,4 +11,4 @@ export {
   useDataConnectMutation,
   type useDataConnectMutationOptions,
 } from "./useDataConnectMutation";
-export type { FlattenedQueryResult, FlattenedMutationResult } from "./types";
+export type { QueryResultRequiredRef, UseDataConnectMutationResult, UseDataConnectQueryResult } from "./types";
diff --git a/packages/react/src/data-connect/query-client.ts b/packages/react/src/data-connect/query-client.ts
index b5d2561..433d44a 100644
--- a/packages/react/src/data-connect/query-client.ts
+++ b/packages/react/src/data-connect/query-client.ts
@@ -9,13 +9,12 @@ import {
   type QueryResult,
   executeQuery,
 } from "firebase/data-connect";
-import type { FlattenedQueryResult } from "./types";
 
 export type DataConnectQueryOptions<Data, Variables> = Omit<
   FetchQueryOptions<
-    FlattenedQueryResult<Data, Variables>,
+    Data,
     FirebaseError,
-    FlattenedQueryResult<Data, Variables>,
+    Data,
     QueryKey
   >,
   "queryFn" | "queryKey"
@@ -30,7 +29,7 @@ export class DataConnectQueryClient extends QueryClient {
     options?: DataConnectQueryOptions<Data, Variables>,
   ) {
     let queryRef: QueryRef<Data, Variables>;
-    let initialData: FlattenedQueryResult<Data, Variables> | undefined;
+    let initialData: Data | undefined;
 
     if ("ref" in refOrResult) {
       queryRef = refOrResult.ref;
@@ -45,9 +44,9 @@ export class DataConnectQueryClient extends QueryClient {
     }
 
     return this.prefetchQuery<
-      FlattenedQueryResult<Data, Variables>,
+      Data,
       FirebaseError,
-      FlattenedQueryResult<Data, Variables>,
+      Data,
       QueryKey
     >({
       ...options,
diff --git a/packages/react/src/data-connect/useDataConnectQuery.ts b/packages/react/src/data-connect/useDataConnectQuery.ts
index 65d95de..27c169c 100644
--- a/packages/react/src/data-connect/useDataConnectQuery.ts
+++ b/packages/react/src/data-connect/useDataConnectQuery.ts
@@ -10,7 +10,7 @@ import {
 import type { PartialBy } from "../../utils";
 import {
   QueryResultRequiredRef,
-  UseDataConnectQuery,
+  UseDataConnectQueryResult,
 } from "./types";
 import { useState } from "react";
 
@@ -26,7 +26,7 @@ export function useDataConnectQuery<Data = unknown, Variables = unknown>(
     FirebaseError
   >,
   _callerSdkType: CallerSdkType = CallerSdkTypeEnum.TanstackReactCore
-): UseDataConnectQuery<Data, Variables> {
+): UseDataConnectQueryResult<Data, Variables> {
   const [dataConnectResult, setDataConnectResult] = useState<QueryResultRequiredRef<Data, Variables>>('ref' in refOrResult ? refOrResult : { ref: refOrResult });
   let initialData: Data | undefined;
   const { ref } = dataConnectResult;