diff --git a/src/containers/source-modal/index.tsx b/src/containers/source-modal/index.tsx
index 76acd8a..e0e2a4c 100644
--- a/src/containers/source-modal/index.tsx
+++ b/src/containers/source-modal/index.tsx
@@ -3,7 +3,7 @@ import { useModalStore } from '../../store'
 import { ENTITY_TYPES, useKeyDown } from '@odigos/ui-utils'
 import type { Namespace, PersistSources } from '../../@types'
 import { Modal, NavigationButtons } from '@odigos/ui-components'
-import { FormRef, SourceSelectionForm, type SourceSelectionFormProps } from '../source-selection-form'
+import { SourceSelectionForm, type SourceSelectionFormRef, type SourceSelectionFormProps } from '../source-selection-form'
 
 interface SourceModalProps {
   componentType?: SourceSelectionFormProps['componentType']
@@ -44,7 +44,7 @@ const SourceModal: FC<SourceModalProps> = ({
     }
   }
 
-  const formRef = useRef<FormRef>(null)
+  const formRef = useRef<SourceSelectionFormRef>(null)
   useKeyDown({ key: 'Enter', active: isOpen }, handleSubmit)
 
   return (
diff --git a/src/containers/source-selection-form/index.tsx b/src/containers/source-selection-form/index.tsx
index 66c68a5..63908c8 100644
--- a/src/containers/source-selection-form/index.tsx
+++ b/src/containers/source-selection-form/index.tsx
@@ -16,7 +16,7 @@ interface SourceSelectionFormProps {
   onSelectNamespace: (namespace: string) => void
 }
 
-interface FormRef {
+interface SourceSelectionFormRef {
   getFormValues: () => {
     initial: AvailableSourcesByNamespace
     apps: SourceSelectionFormData
@@ -24,7 +24,7 @@ interface FormRef {
   }
 }
 
-const SourceSelectionForm = forwardRef<FormRef, SourceSelectionFormProps>(
+const SourceSelectionForm = forwardRef<SourceSelectionFormRef, SourceSelectionFormProps>(
   ({ componentType, isModal, namespaces, namespace, namespacesLoading, selectedNamespace, onSelectNamespace }, ref) => {
     const formState = useSourceSelectionFormData({ namespaces, namespace, selectedNamespace, onSelectNamespace })
     const { recordedInitialSources, getApiSourcesPayload, getApiFutureAppsPayload } = formState
@@ -67,4 +67,4 @@ const SourceSelectionForm = forwardRef<FormRef, SourceSelectionFormProps>(
   }
 )
 
-export { SourceSelectionForm, type SourceSelectionFormProps, type FormRef }
+export { SourceSelectionForm, type SourceSelectionFormProps, type SourceSelectionFormRef }