diff --git a/src/sections/create-collection/CreateCollection.tsx b/src/sections/create-collection/CreateCollection.tsx
index 0c573b7d8..9db15db0c 100644
--- a/src/sections/create-collection/CreateCollection.tsx
+++ b/src/sections/create-collection/CreateCollection.tsx
@@ -6,7 +6,7 @@ import { useLoading } from '../loading/LoadingContext'
 import { useSession } from '../session/SessionContext'
 import { RequiredFieldText } from '../shared/form/RequiredFieldText/RequiredFieldText'
 import { BreadcrumbsGenerator } from '../shared/hierarchy/BreadcrumbsGenerator'
-import { CollectionForm, CollectionFormData } from './collection-form'
+import { CollectionForm, CollectionFormData } from './collection-form/CollectionForm'
 import { SeparationLine } from '../shared/layout/SeparationLine/SeparationLine'
 import { PageNotFound } from '../page-not-found/PageNotFound'
 import { CreateCollectionSkeleton } from './CreateCollectionSkeleton'
diff --git a/src/sections/create-collection/collection-form/index.tsx b/src/sections/create-collection/collection-form/CollectionForm.tsx
similarity index 97%
rename from src/sections/create-collection/collection-form/index.tsx
rename to src/sections/create-collection/collection-form/CollectionForm.tsx
index b080475bd..151372002 100644
--- a/src/sections/create-collection/collection-form/index.tsx
+++ b/src/sections/create-collection/collection-form/CollectionForm.tsx
@@ -10,9 +10,9 @@ import {
 } from '../../../collection/domain/useCases/DTOs/CollectionDTO'
 import { SeparationLine } from '../../shared/layout/SeparationLine/SeparationLine'
 import { SubmissionStatus, useSubmitCollection } from './useSubmitCollection'
-import { TopFieldsSection } from './top-fields-section'
-import { MetadataFieldsSection } from './metadata-fields-section'
-import { BrowseSearchFacetsSection } from './browse-search-facets-section'
+import { TopFieldsSection } from './top-fields-section/TopFieldsSection'
+import { MetadataFieldsSection } from './metadata-fields-section/MetadataFieldsSection'
+import { BrowseSearchFacetsSection } from './browse-search-facets-section/BrowseSearchFacetsSection'
 import styles from './CollectionForm.module.scss'
 
 export interface CollectionFormProps {
diff --git a/src/sections/create-collection/collection-form/browse-search-facets-section/index.tsx b/src/sections/create-collection/collection-form/browse-search-facets-section/BrowseSearchFacetsSection.tsx
similarity index 100%
rename from src/sections/create-collection/collection-form/browse-search-facets-section/index.tsx
rename to src/sections/create-collection/collection-form/browse-search-facets-section/BrowseSearchFacetsSection.tsx
diff --git a/src/sections/create-collection/collection-form/metadata-fields-section/index.tsx b/src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
similarity index 100%
rename from src/sections/create-collection/collection-form/metadata-fields-section/index.tsx
rename to src/sections/create-collection/collection-form/metadata-fields-section/MetadataFieldsSection.tsx
diff --git a/src/sections/create-collection/collection-form/top-fields-section/index.tsx b/src/sections/create-collection/collection-form/top-fields-section/TopFieldsSection.tsx
similarity index 100%
rename from src/sections/create-collection/collection-form/top-fields-section/index.tsx
rename to src/sections/create-collection/collection-form/top-fields-section/TopFieldsSection.tsx
diff --git a/src/sections/create-collection/collection-form/useSubmitCollection.ts b/src/sections/create-collection/collection-form/useSubmitCollection.ts
index d28935696..41c6a183c 100644
--- a/src/sections/create-collection/collection-form/useSubmitCollection.ts
+++ b/src/sections/create-collection/collection-form/useSubmitCollection.ts
@@ -4,7 +4,7 @@ import { WriteError } from '@iqss/dataverse-client-javascript'
 import { createCollection } from '../../../collection/domain/useCases/createCollection'
 import { CollectionRepository } from '../../../collection/domain/repositories/CollectionRepository'
 import { CollectionDTO } from '../../../collection/domain/useCases/DTOs/CollectionDTO'
-import { CollectionFormData, CollectionFormValuesOnSubmit } from '.'
+import { CollectionFormData, CollectionFormValuesOnSubmit } from './CollectionForm'
 import { Route } from '../../Route.enum'
 import { JSDataverseWriteErrorHandler } from '../../../shared/helpers/JSDataverseWriteErrorHandler'