diff --git a/services/data/src/react/hooks/useDataQuery.ts b/services/data/src/react/hooks/useDataQuery.ts
index cc1dadfd9..9b81a145d 100644
--- a/services/data/src/react/hooks/useDataQuery.ts
+++ b/services/data/src/react/hooks/useDataQuery.ts
@@ -33,7 +33,7 @@ type QueryState = {
     refetchCallback?: (data: any) => void
 }
 
-export const useDataQuery = <T = QueryResult>(
+export const useDataQuery = <TQueryResult = QueryResult>(
     query: Query,
     {
         onComplete: userOnSuccess,
@@ -41,7 +41,7 @@ export const useDataQuery = <T = QueryResult>(
         variables: initialVariables = {},
         lazy: initialLazy = false,
     }: QueryOptions = {}
-): QueryRenderInput<T> => {
+): QueryRenderInput<TQueryResult> => {
     const [staticQuery] = useStaticInput<Query>(query, {
         warn: true,
         name: 'query',
diff --git a/services/data/src/types.ts b/services/data/src/types.ts
index df2038aaf..fa90af0dd 100644
--- a/services/data/src/types.ts
+++ b/services/data/src/types.ts
@@ -40,15 +40,15 @@ export interface ExecuteHookResult<ReturnType> {
     data?: ReturnType
 }
 
-export interface QueryState<T> {
+export interface QueryState<TQueryResult> {
     called: boolean
     loading: boolean
     fetching: boolean
     error?: FetchError
-    data?: T
+    data?: TQueryResult
 }
 
-export interface QueryRenderInput<T = QueryResult> extends QueryState<T> {
+export interface QueryRenderInput<TQueryResult = QueryResult> extends QueryState<TQueryResult> {
     engine: DataEngine
     refetch: QueryRefetchFunction
 }