diff --git a/site/source/components/conversation/EntrepriseInput.tsx b/site/source/components/conversation/EntrepriseInput.tsx
index 3273d07a7..294288e40 100644
--- a/site/source/components/conversation/EntrepriseInput.tsx
+++ b/site/source/components/conversation/EntrepriseInput.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from 'react'
 import { useDispatch } from 'react-redux'
 
-import { EntrepriseSearchField } from '@/components/company/SearchField'
+import { EntrepriseSearchField } from '@/components/entreprise/EntrepriseSearchField'
 import { useEngine } from '@/components/utils/EngineContext'
 import { Spacing } from '@/design-system/layout'
 import { Entreprise } from '@/domain/Entreprise'
@@ -10,7 +10,7 @@ import { useSetEntreprise } from '@/hooks/useSetEntreprise'
 import { getCookieValue } from '@/storage/readCookie'
 import { resetCompany } from '@/store/actions/companyActions'
 
-import SelectedEntrepriseDetails from '../company/SelectedEntrepriseDetails'
+import SelectedEntrepriseDetails from '../entreprise/SelectedEntrepriseDetails'
 
 export default function EntrepriseInput() {
 	const companySIREN = useEngine().evaluate('entreprise . SIREN').nodeValue
diff --git a/site/source/components/company/Details.tsx b/site/source/components/entreprise/EntrepriseDetails.tsx
similarity index 98%
rename from site/source/components/company/Details.tsx
rename to site/source/components/entreprise/EntrepriseDetails.tsx
index e9beff78f..3a1a2eaaf 100644
--- a/site/source/components/company/Details.tsx
+++ b/site/source/components/entreprise/EntrepriseDetails.tsx
@@ -19,7 +19,7 @@ const StyledH4 = styled(H4)`
 	}
 `
 
-export function CompanyDetails({
+export function EntrepriseDetails({
 	showSituation = false,
 	headingTag = 'h3',
 }: {
diff --git a/site/source/components/company/SearchDetails.tsx b/site/source/components/entreprise/EntrepriseSearchDetails.tsx
similarity index 100%
rename from site/source/components/company/SearchDetails.tsx
rename to site/source/components/entreprise/EntrepriseSearchDetails.tsx
diff --git a/site/source/components/company/SearchField.tsx b/site/source/components/entreprise/EntrepriseSearchField.tsx
similarity index 93%
rename from site/source/components/company/SearchField.tsx
rename to site/source/components/entreprise/EntrepriseSearchField.tsx
index 17892da5e..388c3ec87 100644
--- a/site/source/components/company/SearchField.tsx
+++ b/site/source/components/entreprise/EntrepriseSearchField.tsx
@@ -24,11 +24,11 @@ export function EntrepriseSearchField(props: {
 		...props,
 		label:
 			!props.selectedValue &&
-			t('CompanySearchField.label', "Nom de l'entreprise, SIREN ou SIRET"),
+			t('EntrepriseSearchField.label', "Nom de l'entreprise, SIREN ou SIRET"),
 		description:
 			!props.selectedValue &&
 			t(
-				'CompanySearchField.description',
+				'EntrepriseSearchField.description',
 				'Le numéro Siret est un numéro de 14 chiffres unique pour chaque entreprise. Exemple : 40123778000127'
 			),
 		onSubmit() {
@@ -39,7 +39,7 @@ export function EntrepriseSearchField(props: {
 			props.onClear?.()
 		},
 		placeholder: t(
-			'CompanySearchField.placeholder',
+			'EntrepriseSearchField.placeholder',
 			'Exemple : Café de la gare ou 40123778000127'
 		),
 	}
diff --git a/site/source/components/company/EntrepriseSearchResults.tsx b/site/source/components/entreprise/EntrepriseSearchResults.tsx
similarity index 97%
rename from site/source/components/company/EntrepriseSearchResults.tsx
rename to site/source/components/entreprise/EntrepriseSearchResults.tsx
index e04807978..9d051bb4e 100644
--- a/site/source/components/company/EntrepriseSearchResults.tsx
+++ b/site/source/components/entreprise/EntrepriseSearchResults.tsx
@@ -13,7 +13,7 @@ import { Body } from '@/design-system/typography/paragraphs'
 import { Entreprise } from '@/domain/Entreprise'
 
 import { FromTop } from '../ui/animate'
-import EntrepriseSearchDetails from './SearchDetails'
+import EntrepriseSearchDetails from './EntrepriseSearchDetails'
 
 const StyledCard = styled(Card)`
 	flex-direction: row; // for Safari <= 13
diff --git a/site/source/components/company/SelectedEntrepriseDetails.tsx b/site/source/components/entreprise/SelectedEntrepriseDetails.tsx
similarity index 100%
rename from site/source/components/company/SelectedEntrepriseDetails.tsx
rename to site/source/components/entreprise/SelectedEntrepriseDetails.tsx
diff --git a/site/source/locales/ui-en.yaml b/site/source/locales/ui-en.yaml
index 3a911c080..7aa0b9fc6 100644
--- a/site/source/locales/ui-en.yaml
+++ b/site/source/locales/ui-en.yaml
@@ -72,7 +72,7 @@ Comment ça marche ? Voir la page explicative sur la page du dépôt github, nou
   How does it work? See the explanatory page on the github repository page, new
   window
 Commune ou code postal: Town or zip code
-CompanySearchField:
+EntrepriseSearchField:
   description: "The Siret number is a 14-digit number unique to each company.
     Example: 40123778000127"
   label: Company name, SIREN or SIRET
diff --git a/site/source/locales/ui-fr.yaml b/site/source/locales/ui-fr.yaml
index df056204a..a6230ef86 100644
--- a/site/source/locales/ui-fr.yaml
+++ b/site/source/locales/ui-fr.yaml
@@ -77,7 +77,7 @@ Comment ça marche ? Voir la page explicative sur la page du dépôt github, nou
   Comment ça marche ? Voir la page explicative sur la page du dépôt github,
   nouvelle fenêtre
 Commune ou code postal: Commune ou code postal
-CompanySearchField:
+EntrepriseSearchField:
   description: "Le numéro Siret est un numéro de 14 chiffres unique pour chaque
     entreprise. Exemple : 40123778000127"
   label: Nom de l'entreprise, SIREN ou SIRET
diff --git a/site/source/pages/_landing/SearchOrCreate.tsx b/site/source/pages/_landing/SearchOrCreate.tsx
index c0206d694..c3fef7582 100644
--- a/site/source/pages/_landing/SearchOrCreate.tsx
+++ b/site/source/pages/_landing/SearchOrCreate.tsx
@@ -3,8 +3,8 @@ import { Trans, useTranslation } from 'react-i18next'
 import { useDispatch } from 'react-redux'
 import { generatePath, useNavigate } from 'react-router-dom'
 
-import { CompanyDetails } from '@/components/company/Details'
-import { EntrepriseSearchField } from '@/components/company/SearchField'
+import { EntrepriseDetails } from '@/components/entreprise/EntrepriseDetails'
+import { EntrepriseSearchField } from '@/components/entreprise/EntrepriseSearchField'
 import { useEngine } from '@/components/utils/EngineContext'
 import AnswerGroup from '@/design-system/answer-group'
 import { Button } from '@/design-system/buttons'
@@ -39,7 +39,7 @@ export default function SearchOrCreate() {
 				{companySIREN ? (
 					<>
 						<H3 as="h2">{t('Votre entreprise')}</H3>
-						<CompanyDetails />
+						<EntrepriseDetails />
 						<Spacing md />
 						<AnswerGroup role="list">
 							<Button
diff --git a/site/source/pages/assistants/choix-du-statut/home.tsx b/site/source/pages/assistants/choix-du-statut/home.tsx
index ca2ee28ce..fed24b009 100644
--- a/site/source/pages/assistants/choix-du-statut/home.tsx
+++ b/site/source/pages/assistants/choix-du-statut/home.tsx
@@ -2,7 +2,7 @@ import { Trans, useTranslation } from 'react-i18next'
 import { useDispatch } from 'react-redux'
 
 import { TrackPage } from '@/components/ATInternetTracking'
-import { CompanyDetails } from '@/components/company/Details'
+import { EntrepriseDetails } from '@/components/entreprise/EntrepriseDetails'
 import PageHeader from '@/components/PageHeader'
 import { useEngine } from '@/components/utils/EngineContext'
 import { Message } from '@/design-system'
@@ -79,7 +79,7 @@ export default function AccueilChoixStatut() {
 								</Body>
 							</Trans>
 						</Message>
-						<CompanyDetails />
+						<EntrepriseDetails />
 						<PopoverConfirm
 							trigger={(buttonProps) => (
 								<Button
diff --git a/site/source/pages/assistants/pour-mon-entreprise/index.tsx b/site/source/pages/assistants/pour-mon-entreprise/index.tsx
index 79c71ea0a..83696ff7c 100644
--- a/site/source/pages/assistants/pour-mon-entreprise/index.tsx
+++ b/site/source/pages/assistants/pour-mon-entreprise/index.tsx
@@ -15,11 +15,11 @@ import {
 import { styled } from 'styled-components'
 
 import { TrackPage } from '@/components/ATInternetTracking'
-import { CompanyDetails } from '@/components/company/Details'
 import { ConseillersEntreprisesButton } from '@/components/ConseillersEntreprisesButton'
 import RuleInput from '@/components/conversation/RuleInput'
 import { CurrentSimulatorCard } from '@/components/CurrentSimulatorCard'
 import { Condition } from '@/components/EngineValue/Condition'
+import { EntrepriseDetails } from '@/components/entreprise/EntrepriseDetails'
 import PageHeader from '@/components/PageHeader'
 import { SimulateurCard } from '@/components/SimulateurCard'
 import { FromTop } from '@/components/ui/animate'
@@ -242,7 +242,7 @@ function PourMonEntreprise() {
 	)
 }
 
-const configCompanyDetails: SimulationConfig = {
+const configEntrepriseDetails: SimulationConfig = {
 	questions: {
 		'liste noire': ['entreprise . imposition . régime'] as DottedName[],
 	},
@@ -269,7 +269,7 @@ const AskCompanyMissingDetails = () => {
 	const { absoluteSitePaths } = useSitePaths()
 	useSimulationConfig({
 		key: absoluteSitePaths.assistants.index,
-		config: configCompanyDetails,
+		config: configEntrepriseDetails,
 	})
 
 	const [questions, onQuestionAnswered] = useQuestionList()
@@ -277,7 +277,7 @@ const AskCompanyMissingDetails = () => {
 
 	return (
 		<>
-			<CompanyDetails showSituation headingTag="h2" />
+			<EntrepriseDetails showSituation headingTag="h2" />
 			{!!questions.length && (
 				<>
 					<Body