diff --git a/src/modules/boat-charging/alerts.ts b/src/modules/boat-charging/alerts.ts
index d52d0a9aa..d375a111f 100644
--- a/src/modules/boat-charging/alerts.ts
+++ b/src/modules/boat-charging/alerts.ts
@@ -98,44 +98,44 @@ export const alerts = {
     title: 'Inloggen lukt niet',
     testID: 'BoatChargingLoginFailedAlert',
   },
-  vignetInvalidFailed: {
+  vignetteInvalidFailed: {
     variant: AlertVariant.negative,
     text: 'Dit vignet is niet geldig.',
     title: 'Niet geldig',
-    testID: 'BoatChargingVignetInvalidAlert',
+    testID: 'BoatChargingVignetteInvalidAlert',
   },
-  vignetDeleteFailed: {
+  vignetteDeleteFailed: {
     variant: AlertVariant.negative,
     text: 'Het vignet is niet verwijderd. Probeer het later nog eens.',
     title: 'Er ging iets mis',
-    testID: 'BoatChargingVignetDeleteAlert',
+    testID: 'BoatChargingVignetteDeleteAlert',
   },
-  vignetExpiredFailed: {
+  vignetteExpiredFailed: {
     variant: AlertVariant.negative,
     text: 'Dit vignet is niet meer geldig.',
     title: 'Dit vignet is verlopen',
-    testID: 'BoatChargingVignetExpiredAlert',
+    testID: 'BoatChargingVignetteExpiredAlert',
   },
-  vignetNotApplicableFailed: {
+  vignetteNotApplicableFailed: {
     variant: AlertVariant.negative,
     externalLink: {
       label: 'Bekijk welk vignet u nodig heeft',
-      redirectKey: RedirectKey.boatChargingVignetInfo,
+      redirectKey: RedirectKey.boatChargingVignetteInfo,
     },
     title: 'Met dit vignet kunt u niet laden',
-    testID: 'BoatChargingVignetNotApplicableAlert',
+    testID: 'BoatChargingVignetteNotApplicableAlert',
   },
-  vignetAlreadyInUseFailed: {
+  vignetteAlreadyInUseFailed: {
     variant: AlertVariant.negative,
     text: 'Er is al een actieve laadsessie met dit vignet. Controleer uw actieve laadsessies.',
     title: 'Vignet is al in gebruik',
-    testID: 'BoatChargingVignetAlreadyInUseAlert',
+    testID: 'BoatChargingVignetteAlreadyInUseAlert',
   },
-  vignetVerificationErrorFailed: {
+  vignetteVerificationErrorFailed: {
     variant: AlertVariant.negative,
     title: 'Vignet controleren is niet gelukt',
     text: 'Probeer het opnieuw.',
-    testID: 'BoatChargingVignetVerificationFailedAlert',
+    testID: 'BoatChargingVignetteVerificationFailedAlert',
   },
 } as const satisfies AlertsRecord
 
diff --git a/src/modules/boat-charging/components/BoatChargingConfirmSessionDetails.tsx b/src/modules/boat-charging/components/BoatChargingConfirmSessionDetails.tsx
index c340305e3..27b607399 100644
--- a/src/modules/boat-charging/components/BoatChargingConfirmSessionDetails.tsx
+++ b/src/modules/boat-charging/components/BoatChargingConfirmSessionDetails.tsx
@@ -20,22 +20,23 @@ import {
   useBoatChargingVignettesQuery,
 } from '@/modules/boat-charging/service'
 import type {
-  BaseVignet,
+  BaseVignette,
   NewSessionFormValues,
-  Vignet,
+  Vignette,
 } from '@/modules/boat-charging/types'
 import {RedirectKey} from '@/modules/redirects/exports/RedirectKey'
 import {formatNumber} from '@/utils/formatNumber'
 
-const isVignet = (vignet?: BaseVignet | Vignet | null): vignet is Vignet =>
-  !!vignet && 'id' in vignet
+const isVignette = (
+  vignette?: BaseVignette | Vignette | null,
+): vignette is Vignette => !!vignette && 'id' in vignette
 
 export const BoatChargingConfirmSessionDetails = () => {
   const form = useFormContext<NewSessionFormValues>()
   const navigation = useNavigation()
   const {isLoggedIn} = useIsLoggedIn()
 
-  const {selectedSocket, vignet, email} = form.getValues()
+  const {selectedSocket, vignette, email} = form.getValues()
 
   const {data: vignettes} = useBoatChargingVignettesQuery(undefined, {
     skip: !isLoggedIn,
@@ -55,24 +56,24 @@ export const BoatChargingConfirmSessionDetails = () => {
     selectedSocket?.locationId ? selectedSocket.locationId : skipToken,
   )
 
-  const onNavigateToChangeVignet = useCallback(() => {
-    const selectedVignet = form.getValues('vignet')
+  const onNavigateToChangeVignette = useCallback(() => {
+    const selectedVignette = form.getValues('vignette')
 
-    form.setValue('vignet', null)
+    form.setValue('vignette', null)
 
     if (!vignettes?.length) {
-      navigation.popTo(BoatChargingRouteName.verifyVignet)
+      navigation.popTo(BoatChargingRouteName.verifyVignette)
 
       return
     }
 
     if (
       vignettes.length === 1 &&
-      vignettes[0].vignette_number === selectedVignet?.vignette_number
+      vignettes[0].vignette_number === selectedVignette?.vignette_number
     ) {
-      navigation.popTo(BoatChargingRouteName.verifyVignet)
+      navigation.popTo(BoatChargingRouteName.verifyVignette)
     } else {
-      navigation.popTo(BoatChargingRouteName.chooseVignet)
+      navigation.popTo(BoatChargingRouteName.chooseVignette)
     }
   }, [vignettes, navigation, form])
 
@@ -125,16 +126,16 @@ export const BoatChargingConfirmSessionDetails = () => {
 
       <Column>
         <MetaDataCard
-          testID="BoatChargingConfirmSessionVignetMetaDataCard"
+          testID="BoatChargingConfirmSessionVignetteMetaDataCard"
           title="Vignet">
-          <Phrase>{vignet?.vignette_number}</Phrase>
-          {isVignet(vignet) && !!vignet.boat_name && (
-            <Phrase color="secondary">{vignet?.boat_name}</Phrase>
+          <Phrase>{vignette?.vignette_number}</Phrase>
+          {isVignette(vignette) && !!vignette.boat_name && (
+            <Phrase color="secondary">{vignette?.boat_name}</Phrase>
           )}
         </MetaDataCard>
         <InlineLink
-          onPress={onNavigateToChangeVignet}
-          testID="BoatChargingConfirmSessionVignetNavigationButton"
+          onPress={onNavigateToChangeVignette}
+          testID="BoatChargingConfirmSessionVignetteNavigationButton"
           variant="internal">
           Wijzigen
         </InlineLink>
diff --git a/src/modules/boat-charging/components/BoatChargingConfirmSessionSubmitButton.tsx b/src/modules/boat-charging/components/BoatChargingConfirmSessionSubmitButton.tsx
index 025cedb80..bc14f1863 100644
--- a/src/modules/boat-charging/components/BoatChargingConfirmSessionSubmitButton.tsx
+++ b/src/modules/boat-charging/components/BoatChargingConfirmSessionSubmitButton.tsx
@@ -1,10 +1,10 @@
 import {useCallback} from 'react'
 import {Button} from '@/components/ui/buttons/Button'
 import {alerts} from '@/modules/boat-charging/alerts'
-import {vignetInvalidReasonToAlertMap} from '@/modules/boat-charging/constants/vignetInvalidReasonToAlertMap'
+import {vignetteInvalidReasonToAlertMap} from '@/modules/boat-charging/constants/vignetteInvalidReasonToAlertMap'
 import {useInitSession} from '@/modules/boat-charging/hooks/useInitSession'
 import {BoatChargingRouteName} from '@/modules/boat-charging/routes'
-import {useBoatChargingVerifyVignetMutation} from '@/modules/boat-charging/service'
+import {useBoatChargingVerifyVignetteMutation} from '@/modules/boat-charging/service'
 import {type NewSessionFormValues} from '@/modules/boat-charging/types'
 import {devError} from '@/processes/development'
 import {useAlert} from '@/store/slices/alert'
@@ -17,39 +17,39 @@ export const BoatChargingConfirmSessionSubmitButton = () => {
   )
 
   const [
-    verifyVignet,
-    {isLoading: isLoadingVerifyVignet, isError: isErrorVerifyVignet},
-  ] = useBoatChargingVerifyVignetMutation()
+    verifyVignette,
+    {isLoading: isLoadingVerifyVignette, isError: isErrorVerifyVignette},
+  ] = useBoatChargingVerifyVignetteMutation()
 
   const onSubmit = useCallback(
-    async ({vignet, ...values}: NewSessionFormValues) => {
-      if (!vignet) {
+    async ({vignette, ...values}: NewSessionFormValues) => {
+      if (!vignette) {
         return
       }
 
-      if (!vignet.verified) {
+      if (!vignette.verified) {
         try {
-          const {status, reason} = await verifyVignet(vignet).unwrap()
+          const {status, reason} = await verifyVignette(vignette).unwrap()
 
           if (status === 'invalid') {
-            setAlert(alerts[vignetInvalidReasonToAlertMap[reason]])
+            setAlert(alerts[vignetteInvalidReasonToAlertMap[reason]])
 
             return
           }
 
-          form.setValue('vignet.verified', true)
+          form.setValue('vignette.verified', true)
         } catch (error) {
           devError(error)
 
-          setAlert(alerts.vignetVerificationErrorFailed)
+          setAlert(alerts.vignetteVerificationErrorFailed)
 
           return
         }
       }
 
-      return onPress({...values, vignet})
+      return onPress({...values, vignette})
     },
-    [verifyVignet, onPress, setAlert, form],
+    [onPress, setAlert, form, verifyVignette],
   )
 
   return (
@@ -60,9 +60,9 @@ export const BoatChargingConfirmSessionSubmitButton = () => {
         size: 'ml',
         isFilled: true,
       }}
-      isError={isError || isErrorVerifyVignet}
+      isError={isError || isErrorVerifyVignette}
       isLoading={
-        isLoading || isLoadingVerifyVignet || form.formState.isSubmitting
+        isLoading || isLoadingVerifyVignette || form.formState.isSubmitting
       }
       label="Betalen en laden"
       onPress={form.handleSubmit(onSubmit)}
diff --git a/src/modules/boat-charging/components/BoatChargingGuestEmailForm.tsx b/src/modules/boat-charging/components/BoatChargingGuestEmailForm.tsx
index 37c9560e2..5f76c2ec1 100644
--- a/src/modules/boat-charging/components/BoatChargingGuestEmailForm.tsx
+++ b/src/modules/boat-charging/components/BoatChargingGuestEmailForm.tsx
@@ -44,7 +44,7 @@ export const BoatChargingGuestEmailForm = () => {
           <Paragraph>Heeft u al een account?</Paragraph>
           <InlineLink
             onPress={() => {
-              setPendingScreen([BoatChargingRouteName.chooseVignet])
+              setPendingScreen([BoatChargingRouteName.chooseVignette])
               navigation.navigate(BoatChargingRouteName.login)
             }}
             testID="BoatChargingGuestEmailFormLoginNavigationButton"
@@ -74,7 +74,7 @@ export const BoatChargingGuestEmailForm = () => {
         <Button
           label="Account aanmaken"
           onPress={() => {
-            setPendingScreen([BoatChargingRouteName.verifyVignet])
+            setPendingScreen([BoatChargingRouteName.verifyVignette])
             navigation.navigate(BoatChargingRouteName.createAccount)
           }}
           testID="BoatChargingGuestEmailFormCreateAccountButton"
diff --git a/src/modules/boat-charging/components/BoatChargingHistorySessionDetails.tsx b/src/modules/boat-charging/components/BoatChargingHistorySessionDetails.tsx
index 734f9a520..3bb020e95 100644
--- a/src/modules/boat-charging/components/BoatChargingHistorySessionDetails.tsx
+++ b/src/modules/boat-charging/components/BoatChargingHistorySessionDetails.tsx
@@ -112,7 +112,7 @@ export const BoatChargingHistorySessionDetails = () => {
         {!!vignette_number && (
           <MetaDataCard
             iconName="boat"
-            testID="BoatChargingHistorySessionDetailsVignetCard"
+            testID="BoatChargingHistorySessionDetailsVignetteCard"
             title="Vignet">
             <Phrase>{vignette_number}</Phrase>
             <Phrase color="secondary">{boat_name}</Phrase>
diff --git a/src/modules/boat-charging/components/session/BoatChargingSession.tsx b/src/modules/boat-charging/components/session/BoatChargingSession.tsx
index a9da0f9d1..3ea5f95ff 100644
--- a/src/modules/boat-charging/components/session/BoatChargingSession.tsx
+++ b/src/modules/boat-charging/components/session/BoatChargingSession.tsx
@@ -115,7 +115,7 @@ export const BoatChargingSession = () => {
           <Divider />
 
           <MetaDataCard
-            testID="BoatChargingSessionVignetMetaDataCard"
+            testID="BoatChargingSessionVignetteMetaDataCard"
             title="Vignet">
             <Phrase>{session.vignette_number}</Phrase>
             {!!session.boat_name && (
diff --git a/src/modules/boat-charging/components/vignettes/BoatChargingAddVignetHeaderButton.tsx b/src/modules/boat-charging/components/vignettes/BoatChargingAddVignetteHeaderButton.tsx
similarity index 81%
rename from src/modules/boat-charging/components/vignettes/BoatChargingAddVignetHeaderButton.tsx
rename to src/modules/boat-charging/components/vignettes/BoatChargingAddVignetteHeaderButton.tsx
index 039f1344f..8e2d9566a 100644
--- a/src/modules/boat-charging/components/vignettes/BoatChargingAddVignetHeaderButton.tsx
+++ b/src/modules/boat-charging/components/vignettes/BoatChargingAddVignetteHeaderButton.tsx
@@ -6,7 +6,7 @@ import {useIsLoggedIn} from '@/modules/boat-charging/hooks/useIsLoggedIn'
 import {BoatChargingRouteName} from '@/modules/boat-charging/routes'
 import {useBoatChargingVignettesQuery} from '@/modules/boat-charging/service'
 
-export const BoatChargingAddVignetHeaderButton = () => {
+export const BoatChargingAddVignetteHeaderButton = () => {
   const {navigate} = useNavigation()
   const {isLoggedIn} = useIsLoggedIn()
 
@@ -28,13 +28,13 @@ export const BoatChargingAddVignetHeaderButton = () => {
           isFilled
           name="plus-circle"
           size="lgx"
-          testID="BoatChargingAddVignetHeaderButtonIcon"
+          testID="BoatChargingAddVignetteHeaderButtonIcon"
         />
       }
       onPress={() => {
-        navigate(BoatChargingRouteName.vignet)
+        navigate(BoatChargingRouteName.vignette)
       }}
-      testID="BoatChargingAddVignetHeaderButton"
+      testID="BoatChargingAddVignetteHeaderButton"
     />
   )
 }
diff --git a/src/modules/boat-charging/components/vignettes/BoatChargingMyVignettes.tsx b/src/modules/boat-charging/components/vignettes/BoatChargingMyVignettes.tsx
index ca3c59a37..b9569b420 100644
--- a/src/modules/boat-charging/components/vignettes/BoatChargingMyVignettes.tsx
+++ b/src/modules/boat-charging/components/vignettes/BoatChargingMyVignettes.tsx
@@ -6,7 +6,7 @@ import {SomethingWentWrong} from '@/components/ui/feedback/SomethingWentWrong'
 import {Column} from '@/components/ui/layout/Column'
 import {useNavigation} from '@/hooks/navigation/useNavigation'
 import {BoatChargingMyVignettesLogin} from '@/modules/boat-charging/components/vignettes/BoatChargingMyVignettesLogin'
-import {BoatChargingVignetListItem} from '@/modules/boat-charging/components/vignettes/BoatChargingVignetListItem'
+import {BoatChargingVignetteListItem} from '@/modules/boat-charging/components/vignettes/BoatChargingVignetteListItem'
 import {useIsLoggedIn} from '@/modules/boat-charging/hooks/useIsLoggedIn'
 import {BoatChargingRouteName} from '@/modules/boat-charging/routes'
 import {useBoatChargingVignettesQuery} from '@/modules/boat-charging/service'
@@ -47,9 +47,9 @@ export const BoatChargingMyVignettes = () => {
           icon={{name: 'plus-circle', isFilled: true}}
           label="Vignet toevoegen"
           onPress={() => {
-            navigate(BoatChargingRouteName.vignet)
+            navigate(BoatChargingRouteName.vignette)
           }}
-          testID="BoatChargingMyVignettesEmptyListAddVignetButton"
+          testID="BoatChargingMyVignettesEmptyListAddVignetteButton"
         />
       </>
     )
@@ -57,10 +57,10 @@ export const BoatChargingMyVignettes = () => {
 
   return (
     <Column gutter="md">
-      {vignettes.map(vignet => (
-        <BoatChargingVignetListItem
-          key={vignet.id}
-          vignet={vignet}
+      {vignettes.map(vignette => (
+        <BoatChargingVignetteListItem
+          key={vignette.id}
+          vignette={vignette}
         />
       ))}
     </Column>
diff --git a/src/modules/boat-charging/components/vignettes/BoatChargingVignetListItem.tsx b/src/modules/boat-charging/components/vignettes/BoatChargingVignetteListItem.tsx
similarity index 77%
rename from src/modules/boat-charging/components/vignettes/BoatChargingVignetListItem.tsx
rename to src/modules/boat-charging/components/vignettes/BoatChargingVignetteListItem.tsx
index 9cf8bcde8..04283b2ac 100644
--- a/src/modules/boat-charging/components/vignettes/BoatChargingVignetListItem.tsx
+++ b/src/modules/boat-charging/components/vignettes/BoatChargingVignetteListItem.tsx
@@ -1,15 +1,15 @@
 import {TopTaskButton} from '@/components/ui/buttons/TopTaskButton'
 import {useNavigation} from '@/hooks/navigation/useNavigation'
 import {BoatChargingRouteName} from '@/modules/boat-charging/routes'
-import type {Vignet} from '@/modules/boat-charging/types'
+import type {Vignette} from '@/modules/boat-charging/types'
 import {formatDateToDisplay} from '@/utils/datetime/formatDateToDisplay'
 
 type Props = {
-  vignet: Vignet
+  vignette: Vignette
 }
 
-export const BoatChargingVignetListItem = ({
-  vignet: {boat_name, vignette_number, expiration_date, id},
+export const BoatChargingVignetteListItem = ({
+  vignette: {boat_name, vignette_number, expiration_date, id},
 }: Props) => {
   const {navigate} = useNavigation()
 
@@ -30,8 +30,8 @@ export const BoatChargingVignetListItem = ({
         color: 'secondary',
       }}
       insetHorizontal="no"
-      onPress={() => navigate(BoatChargingRouteName.vignet, {vignetId: id})}
-      testID="VignetListItemTopTaskButton"
+      onPress={() => navigate(BoatChargingRouteName.vignette, {vignetteId: id})}
+      testID="VignetteListItemTopTaskButton"
       text={boat_name}
       textAdditional={`Geldig tot ${formatDateToDisplay(expiration_date)}`}
       title={vignette_number}
diff --git a/src/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetForm.tsx b/src/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetteForm.tsx
similarity index 75%
rename from src/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetForm.tsx
rename to src/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetteForm.tsx
index 9aeeb6a05..94b2a1ef2 100644
--- a/src/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetForm.tsx
+++ b/src/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetteForm.tsx
@@ -11,28 +11,28 @@ import {useInitSession} from '@/modules/boat-charging/hooks/useInitSession'
 import {BoatChargingRouteName} from '@/modules/boat-charging/routes'
 import {useBoatChargingVignettesQuery} from '@/modules/boat-charging/service'
 
-export const BoatChargingChooseVignetForm = () => {
+export const BoatChargingChooseVignetteForm = () => {
   const navigation = useNavigation()
   const {
     data: vignettes = [],
     isLoading,
     isError,
   } = useBoatChargingVignettesQuery()
-  const {form} = useInitSession(BoatChargingRouteName.chooseVignet)
+  const {form} = useInitSession(BoatChargingRouteName.chooseVignette)
 
   const options: ComponentProps<typeof RadioGroupControlled>['options'] =
     useMemo(
       () =>
-        vignettes.map(vignet => ({
+        vignettes.map(vignette => ({
           label: (
-            <Phrase key={vignet.id}>
-              {[vignet.vignette_number, vignet.boat_name]
+            <Phrase key={vignette.id}>
+              {[vignette.vignette_number, vignette.boat_name]
                 .filter(Boolean)
                 .join(' - ')}
             </Phrase>
           ),
 
-          value: vignet,
+          value: vignette,
         })),
       [vignettes],
     )
@@ -41,19 +41,19 @@ export const BoatChargingChooseVignetForm = () => {
     if (!isLoading && !isError && vignettes && !vignettes.length) {
       /**
        * When a user does not have vignettes connected to their account and they arrive on this route
-       * from the pendingScreen set in @see BoatChargingGuestEmailForm we forward and replace to verifyVignet screen.
+       * from the pendingScreen set in @see BoatChargingGuestEmailForm we forward and replace to verifyVignette screen.
        * */
-      navigation.replace(BoatChargingRouteName.verifyVignet)
+      navigation.replace(BoatChargingRouteName.verifyVignette)
     }
   }, [isLoading, isError, vignettes, navigation])
 
   if (isLoading) {
-    return <PleaseWait testID="BoatChargingChooseVignetFormPleaseWait" />
+    return <PleaseWait testID="BoatChargingChooseVignetteFormPleaseWait" />
   }
 
   if (isError) {
     return (
-      <SomethingWentWrong testID="BoatChargingChooseVignetFormSomethingWentWrong" />
+      <SomethingWentWrong testID="BoatChargingChooseVignetteFormSomethingWentWrong" />
     )
   }
 
@@ -62,10 +62,10 @@ export const BoatChargingChooseVignetForm = () => {
       <RadioGroupControlled
         {...form}
         label="Met welk vignet wilt u laden?"
-        name="vignet"
+        name="vignette"
         options={options}
         rules={{required: true}}
-        testID="BoatChargingDetailsChooseSocketRadioGroup"
+        testID="BoatChargingDetailsChooseVignetteRadioGroup"
       />
       <NavigationButton
         chevronSize="ml"
@@ -73,10 +73,10 @@ export const BoatChargingChooseVignetForm = () => {
         horizontallyAlign="start"
         insetHorizontal="no"
         onPress={() => {
-          form.setValue('vignet', null)
-          navigation.navigate(BoatChargingRouteName.verifyVignet)
+          form.setValue('vignette', null)
+          navigation.navigate(BoatChargingRouteName.verifyVignette)
         }}
-        testID="BoatChargingChooseVignetFormVerifyVignetNavigationButton"
+        testID="BoatChargingChooseVignetteFormVerifyVignetteNavigationButton"
         title="Ander vignet invullen"
       />
     </Column>
diff --git a/src/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetFormSubmitButton.tsx b/src/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetteFormSubmitButton.tsx
similarity index 65%
rename from src/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetFormSubmitButton.tsx
rename to src/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetteFormSubmitButton.tsx
index 9717f8394..a632b026b 100644
--- a/src/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetFormSubmitButton.tsx
+++ b/src/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetteFormSubmitButton.tsx
@@ -4,20 +4,20 @@ import {useInitSession} from '@/modules/boat-charging/hooks/useInitSession'
 import {BoatChargingRouteName} from '@/modules/boat-charging/routes'
 import type {NewSessionFormValues} from '@/modules/boat-charging/types'
 
-export const BoatChargingChooseVignetFormSubmitButton = () => {
-  const {onPress, form} = useInitSession(BoatChargingRouteName.chooseVignet)
+export const BoatChargingChooseVignetteFormSubmitButton = () => {
+  const {onPress, form} = useInitSession(BoatChargingRouteName.chooseVignette)
 
   const onSubmit = useCallback(
-    ({vignet, ...values}: NewSessionFormValues) => {
-      form.clearErrors('vignet')
+    ({vignette, ...values}: NewSessionFormValues) => {
+      form.clearErrors('vignette')
 
-      if (!vignet) {
-        return form.setError('vignet', {
+      if (!vignette) {
+        return form.setError('vignette', {
           message: 'Kies een vignet om verder te gaan.',
         })
       }
 
-      void onPress({...values, vignet})
+      void onPress({...values, vignette})
     },
     [form, onPress],
   )
@@ -26,7 +26,7 @@ export const BoatChargingChooseVignetFormSubmitButton = () => {
     <Button
       label="Kies vignet"
       onPress={() => onSubmit(form.getValues())}
-      testID="BoatChargingChooseVignetSubmitButton"
+      testID="BoatChargingChooseVignetteSubmitButton"
     />
   )
 }
diff --git a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormAddVignetButton.tsx b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormAddVignetButton.tsx
deleted file mode 100644
index 43f626c15..000000000
--- a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormAddVignetButton.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import {useCallback} from 'react'
-import {useFormContext} from 'react-hook-form'
-import {Button} from '@/components/ui/buttons/Button'
-import type {Alerts} from '@/modules/boat-charging/alerts'
-import type {BoatChargingVignetFormValues} from '@/modules/boat-charging/providers/BoatChargingVignetForm.provider'
-import {useBoatChargingAddVignetMutation} from '@/modules/boat-charging/service'
-import type {Vignet} from '@/modules/boat-charging/types'
-import {isSameStringValue} from '@/modules/boat-charging/utils/isSameStringValue'
-
-type Props = {
-  onError: (error?: unknown[], alert?: Alerts) => void
-  onSuccess: () => void
-  vignettes?: Vignet[]
-}
-
-export const BoatChargingVignetFormAddVignetButton = ({
-  vignettes,
-  onError,
-  onSuccess,
-}: Props) => {
-  const [addVignet, state] = useBoatChargingAddVignetMutation()
-  const {handleSubmit} = useFormContext<BoatChargingVignetFormValues>()
-
-  const onAddVignet = useCallback(
-    ({postalCode, vignetNumber}: BoatChargingVignetFormValues) => {
-      if (
-        vignettes?.some(
-          vignet =>
-            isSameStringValue(vignet.vignette_number, vignetNumber) &&
-            isSameStringValue(vignet.postal_code, postalCode),
-        )
-      ) {
-        // Simply return when vignet already is connected
-        return onSuccess()
-      }
-
-      return addVignet({
-        postal_code: postalCode,
-        vignette_number: vignetNumber,
-      })
-        .unwrap()
-        .then(onSuccess, onError)
-    },
-    [addVignet, onSuccess, onError, vignettes],
-  )
-
-  return (
-    <Button
-      {...state}
-      label="Vignet toevoegen"
-      onPress={handleSubmit(onAddVignet)}
-      testID="BoatChargingVignetFormAddButton"
-    />
-  )
-}
diff --git a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormDeleteVignetButton.tsx b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormDeleteVignetButton.tsx
deleted file mode 100644
index c91953b22..000000000
--- a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormDeleteVignetButton.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import {useCallback} from 'react'
-import {Button} from '@/components/ui/buttons/Button'
-import type {Alerts} from '@/modules/boat-charging/alerts'
-import {useBoatChargingDeleteVignetMutation} from '@/modules/boat-charging/service'
-import type {Vignet} from '@/modules/boat-charging/types'
-import {useAlert} from '@/store/slices/alert'
-
-type Props = {
-  onError: (error: unknown[], alert: Alerts) => void
-  onSuccess: () => void
-  vignetId: Vignet['id']
-}
-
-export const BoatChargingVignetFormDeleteVignetButton = ({
-  vignetId,
-  onError,
-  onSuccess,
-}: Props) => {
-  const [deleteVignet, state] = useBoatChargingDeleteVignetMutation()
-  const {resetAlert} = useAlert()
-
-  const onDeleteVignet = useCallback(() => {
-    resetAlert()
-    void deleteVignet(vignetId)
-      .unwrap()
-      .then(onSuccess, (...error: unknown[]) =>
-        onError(error, 'vignetDeleteFailed'),
-      )
-  }, [deleteVignet, onSuccess, onError, vignetId, resetAlert])
-
-  return (
-    <Button
-      {...state}
-      icon={{name: 'trash-bin'}}
-      label="Vignet verwijderen"
-      onPress={onDeleteVignet}
-      testID="BoatChargingVignetFormDeleteButton"
-      variant="tertiaryDestructive"
-    />
-  )
-}
diff --git a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormEditVignetButton.tsx b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormEditVignetButton.tsx
deleted file mode 100644
index 9dbb4810d..000000000
--- a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormEditVignetButton.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import {useCallback} from 'react'
-import {useFormContext} from 'react-hook-form'
-import {Button} from '@/components/ui/buttons/Button'
-import type {Alerts} from '@/modules/boat-charging/alerts'
-import type {BoatChargingVignetFormValues} from '@/modules/boat-charging/providers/BoatChargingVignetForm.provider'
-import {useBoatChargingEditVignetMutation} from '@/modules/boat-charging/service'
-import type {Vignet} from '@/modules/boat-charging/types'
-import {isSameStringValue} from '@/modules/boat-charging/utils/isSameStringValue'
-
-type Props = {
-  onError: (error?: unknown[], alert?: Alerts) => void
-  onSuccess: () => void
-  vignet: Vignet
-}
-
-export const BoatChargingVignetFormEditVignetButton = ({
-  vignet,
-  onError,
-  onSuccess,
-}: Props) => {
-  const [editVignet, state] = useBoatChargingEditVignetMutation()
-  const {handleSubmit} = useFormContext<BoatChargingVignetFormValues>()
-
-  const onEditVignet = useCallback(
-    ({postalCode, vignetNumber}: BoatChargingVignetFormValues) => {
-      if (
-        isSameStringValue(postalCode, vignet.postal_code) &&
-        isSameStringValue(vignetNumber, vignet.vignette_number)
-      ) {
-        // Simply return when values are unchanged
-        return Promise.resolve().then(onSuccess)
-      }
-
-      return editVignet({
-        vignetId: vignet.id,
-        postal_code: postalCode,
-        vignette_number: vignetNumber,
-      })
-        .unwrap()
-        .then(onSuccess, onError)
-    },
-    [editVignet, onSuccess, onError, vignet],
-  )
-
-  return (
-    <Button
-      {...state}
-      label="Wijzigingen opslaan"
-      onPress={handleSubmit(onEditVignet)}
-      testID="BoatChargingVignetFormEditButton"
-    />
-  )
-}
diff --git a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormVerifyVignetButton.tsx b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormVerifyVignetButton.tsx
deleted file mode 100644
index b93dcf949..000000000
--- a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormVerifyVignetButton.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import {skipToken} from '@reduxjs/toolkit/query'
-import {useCallback} from 'react'
-import {useFormContext} from 'react-hook-form'
-import {Button} from '@/components/ui/buttons/Button'
-import {alerts} from '@/modules/boat-charging/alerts'
-import {vignetInvalidReasonToAlertMap} from '@/modules/boat-charging/constants/vignetInvalidReasonToAlertMap'
-import {useIsLoggedIn} from '@/modules/boat-charging/hooks/useIsLoggedIn'
-import {type BoatChargingVignetFormValues} from '@/modules/boat-charging/providers/BoatChargingVignetForm.provider'
-import {
-  useBoatChargingAddVignetMutation,
-  useBoatChargingVerifyVignetMutation,
-  useBoatChargingVignettesQuery,
-} from '@/modules/boat-charging/service'
-import {
-  type BaseVignet,
-  VignetInvalidReasons,
-} from '@/modules/boat-charging/types'
-import {devError} from '@/processes/development'
-import {useAlert} from '@/store/slices/alert'
-
-type Props = {
-  onVerified: (vignet: BaseVignet) => void
-}
-
-export const BoatChargingVignetFormVerifyVignetButton = ({
-  onVerified,
-}: Props) => {
-  const {isLoggedIn} = useIsLoggedIn()
-
-  const [addVignet, {isLoading: isLoadingAddVignet}] =
-    useBoatChargingAddVignetMutation()
-  const [
-    verifyVignet,
-    {isLoading: isLoadingVerifyVignet, isError: isErrorVerifyVignet},
-  ] = useBoatChargingVerifyVignetMutation()
-
-  const {data: myVignettes, isLoading: isLoadingMyVignettes} =
-    useBoatChargingVignettesQuery(isLoggedIn ? undefined : skipToken)
-
-  const {setAlert} = useAlert()
-  const {handleSubmit, setError} =
-    useFormContext<BoatChargingVignetFormValues>()
-
-  const onVerifyVignet = useCallback(
-    ({
-      postalCode,
-      vignetNumber,
-      saveToMyVignettes,
-    }: BoatChargingVignetFormValues) => {
-      const vignet = {
-        postal_code: postalCode,
-        vignette_number: vignetNumber,
-      }
-
-      void verifyVignet(vignet)
-        .unwrap()
-        .then(
-          ({status, reason}) => {
-            if (status === 'invalid') {
-              if (reason === VignetInvalidReasons.mismatch) {
-                setError('postalCode', {
-                  message: 'Vignetnummer en postcode komen niet overeen.',
-                })
-
-                return
-              }
-
-              const alertKey = vignetInvalidReasonToAlertMap[reason]
-
-              setAlert(alerts[alertKey])
-
-              return
-            }
-
-            const alreadySaved = myVignettes?.some(
-              myVignet => myVignet.vignette_number === vignetNumber,
-            )
-
-            if (saveToMyVignettes && !alreadySaved) {
-              void addVignet(vignet).unwrap().catch(devError) // This call should not block the flow and only fail silently
-            }
-
-            onVerified(vignet)
-          },
-          error => {
-            devError(error)
-
-            setAlert(alerts.vignetVerificationErrorFailed)
-          },
-        )
-    },
-
-    [addVignet, verifyVignet, setAlert, onVerified, setError, myVignettes],
-  )
-
-  return (
-    <Button
-      isError={isErrorVerifyVignet}
-      isLoading={
-        isLoadingVerifyVignet || isLoadingAddVignet || isLoadingMyVignettes
-      }
-      label="Controleer vignet"
-      onPress={handleSubmit(onVerifyVignet)}
-      testID="BoatChargingVignetFormVerifyButton"
-    />
-  )
-}
diff --git a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetForm.tsx b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteForm.tsx
similarity index 53%
rename from src/modules/boat-charging/components/vignettes/form/BoatChargingVignetForm.tsx
rename to src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteForm.tsx
index 2c2380ffa..0b500396c 100644
--- a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetForm.tsx
+++ b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteForm.tsx
@@ -9,31 +9,31 @@ import {ExternalInlineLink} from '@/components/ui/text/ExternalInlineLink'
 import {Paragraph} from '@/components/ui/text/Paragraph'
 import {useNavigation} from '@/hooks/navigation/useNavigation'
 import {alerts, type Alerts} from '@/modules/boat-charging/alerts'
-import {BoatChargingVignetFormAddToMyVignettesSwitch} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormAddToMyVignettesSwitch'
-import {BoatChargingVignetFormAddVignetButton} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormAddVignetButton'
-import {BoatChargingVignetFormDeleteVignetButton} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormDeleteVignetButton'
-import {BoatChargingVignetFormEditVignetButton} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormEditVignetButton'
-import {BoatChargingVignetFormVerifyVignetButton} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormVerifyVignetButton'
-import {BoatChargingVignetNumberFormInput} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetNumberFormInput'
-import {BoatChargingVignetPostalCodeFormInput} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetPostalCodeFormInput'
+import {BoatChargingVignetteFormAddToMyVignettesSwitch} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormAddToMyVignettesSwitch'
+import {BoatChargingVignetteFormAddVignetteButton} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormAddVignetteButton'
+import {BoatChargingVignetteFormDeleteVignetteButton} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormDeleteVignetteButton'
+import {BoatChargingVignetteFormEditVignetteButton} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormEditVignetteButton'
+import {BoatChargingVignetteFormVerifyVignetteButton} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormVerifyVignetteButton'
+import {BoatChargingVignetteNumberFormInput} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetteNumberFormInput'
+import {BoatChargingVignettePostalCodeFormInput} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignettePostalCodeFormInput'
 import {useIsLoggedIn} from '@/modules/boat-charging/hooks/useIsLoggedIn'
-import {BoatChargingVignetFormProvider} from '@/modules/boat-charging/providers/BoatChargingVignetForm.provider'
+import {BoatChargingVignetteFormProvider} from '@/modules/boat-charging/providers/BoatChargingVignetteForm.provider'
 import {useBoatChargingVignettesQuery} from '@/modules/boat-charging/service'
 import type {
-  BaseVignet,
+  BaseVignette,
   NewSessionFormValues,
-  Vignet,
+  Vignette,
 } from '@/modules/boat-charging/types'
 import {RedirectKey} from '@/modules/redirects/exports/RedirectKey'
 import {devError} from '@/processes/development'
 import {useAlert} from '@/store/slices/alert'
 
 type Props = {
-  onVerified?: (vignet: BaseVignet) => void
-  vignetId?: Vignet['id']
+  onVerified?: (vignette: BaseVignette) => void
+  vignetteId?: Vignette['id']
 }
 
-export const BoatChargingVignetForm = ({vignetId, onVerified}: Props) => {
+export const BoatChargingVignetteForm = ({vignetteId, onVerified}: Props) => {
   const navigation = useNavigation()
   const {setAlert} = useAlert()
   const {isLoggedIn} = useIsLoggedIn()
@@ -45,15 +45,15 @@ export const BoatChargingVignetForm = ({vignetId, onVerified}: Props) => {
     isError: isErrorVignettes,
   } = useBoatChargingVignettesQuery(isLoggedIn ? undefined : skipToken)
 
-  const existingVignet = useMemo(
-    () => vignettes?.find(vignet => vignet.id === vignetId),
-    [vignettes, vignetId],
+  const existingVignette = useMemo(
+    () => vignettes?.find(vignette => vignette.id === vignetteId),
+    [vignettes, vignetteId],
   )
 
   const onError = useCallback(
     (error?: unknown, alert?: Alerts) => {
       devError(error)
-      setAlert(alerts[alert ?? 'vignetInvalidFailed'])
+      setAlert(alerts[alert ?? 'vignetteInvalidFailed'])
     },
     [setAlert],
   )
@@ -61,71 +61,73 @@ export const BoatChargingVignetForm = ({vignetId, onVerified}: Props) => {
   const onSuccess = useCallback(() => navigation.goBack(), [navigation])
 
   if (isLoadingVignettes) {
-    return <PleaseWait testID="BoatChargingVignetFormPleaseWait" />
+    return <PleaseWait testID="BoatChargingVignetteFormPleaseWait" />
   }
 
   if (isErrorVignettes) {
     return (
-      <SomethingWentWrong testID="BoatChargingVignetFormSomethingWentWrong" />
+      <SomethingWentWrong testID="BoatChargingVignetteFormSomethingWentWrong" />
     )
   }
 
-  const defaultValues = existingVignet ?? getValues?.('vignet')
+  const defaultValues = existingVignette ?? getValues?.('vignette')
 
   return (
-    <BoatChargingVignetFormProvider
+    <BoatChargingVignetteFormProvider
       defaultValues={{
         postalCode: defaultValues?.postal_code,
-        vignetNumber: defaultValues?.vignette_number,
+        vignetteNumber: defaultValues?.vignette_number,
       }}>
       <Column gutter="xl">
         <Column gutter="lg">
-          {!existingVignet && (
+          {!existingVignette && (
             <Paragraph>
               Om te kunnen laden, heeft uw boot een geldig vignet nodig.
             </Paragraph>
           )}
           <Column gutter="md">
-            <BoatChargingVignetNumberFormInput />
+            <BoatChargingVignetteNumberFormInput />
 
-            {!existingVignet && (
+            {!existingVignette && (
               <Row gutter="sm">
                 <Paragraph>Nog geen vignet?</Paragraph>
 
                 <ExternalInlineLink
-                  redirectKey={RedirectKey.boatChargingRequestVignet}
-                  testID="BoatChargingVignetFormExternalLink">
+                  redirectKey={RedirectKey.boatChargingRequestVignette}
+                  testID="BoatChargingVignetteFormExternalLink">
                   Vignet aanvragen
                 </ExternalInlineLink>
               </Row>
             )}
           </Column>
 
-          <BoatChargingVignetPostalCodeFormInput />
+          <BoatChargingVignettePostalCodeFormInput />
         </Column>
         {!!isLoggedIn && !!onVerified && (
-          <BoatChargingVignetFormAddToMyVignettesSwitch />
+          <BoatChargingVignetteFormAddToMyVignettesSwitch />
         )}
 
         {onVerified ? (
-          <BoatChargingVignetFormVerifyVignetButton onVerified={onVerified} />
+          <BoatChargingVignetteFormVerifyVignetteButton
+            onVerified={onVerified}
+          />
         ) : (
           <>
-            {existingVignet ? (
+            {existingVignette ? (
               <>
-                <BoatChargingVignetFormEditVignetButton
+                <BoatChargingVignetteFormEditVignetteButton
                   onError={onError}
                   onSuccess={onSuccess}
-                  vignet={existingVignet}
+                  vignette={existingVignette}
                 />
-                <BoatChargingVignetFormDeleteVignetButton
+                <BoatChargingVignetteFormDeleteVignetteButton
                   onError={onError}
                   onSuccess={onSuccess}
-                  vignetId={existingVignet.id}
+                  vignetteId={existingVignette.id}
                 />
               </>
             ) : (
-              <BoatChargingVignetFormAddVignetButton
+              <BoatChargingVignetteFormAddVignetteButton
                 onError={onError}
                 onSuccess={onSuccess}
                 vignettes={vignettes}
@@ -134,6 +136,6 @@ export const BoatChargingVignetForm = ({vignetId, onVerified}: Props) => {
           </>
         )}
       </Column>
-    </BoatChargingVignetFormProvider>
+    </BoatChargingVignetteFormProvider>
   )
 }
diff --git a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormAddToMyVignettesSwitch.tsx b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormAddToMyVignettesSwitch.tsx
similarity index 56%
rename from src/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormAddToMyVignettesSwitch.tsx
rename to src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormAddToMyVignettesSwitch.tsx
index 351393b96..c30ffedd8 100644
--- a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetFormAddToMyVignettesSwitch.tsx
+++ b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormAddToMyVignettesSwitch.tsx
@@ -1,17 +1,17 @@
 import {useFormContext} from 'react-hook-form'
 import {SwitchField} from '@/components/ui/forms/SwitchField'
 import {Phrase} from '@/components/ui/text/Phrase'
-import type {BoatChargingVignetFormValues} from '@/modules/boat-charging/providers/BoatChargingVignetForm.provider'
+import type {BoatChargingVignetteFormValues} from '@/modules/boat-charging/providers/BoatChargingVignetteForm.provider'
 
-export const BoatChargingVignetFormAddToMyVignettesSwitch = () => {
-  const {watch} = useFormContext<BoatChargingVignetFormValues>()
+export const BoatChargingVignetteFormAddToMyVignettesSwitch = () => {
+  const {watch} = useFormContext<BoatChargingVignetteFormValues>()
 
   return (
     <SwitchField
       accessibilityLabel={`Opslaan in Mijn vignetten staat ${watch('saveToMyVignettes') ? 'aan' : 'uit'}`}
       label={<Phrase>Opslaan in Mijn vignetten</Phrase>}
       name="saveToMyVignettes"
-      testID="BoatChargingVignetFormSwitchField"
+      testID="BoatChargingVignetteFormSwitchField"
     />
   )
 }
diff --git a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormAddVignetteButton.tsx b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormAddVignetteButton.tsx
new file mode 100644
index 000000000..751680ed7
--- /dev/null
+++ b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormAddVignetteButton.tsx
@@ -0,0 +1,55 @@
+import {useCallback} from 'react'
+import {useFormContext} from 'react-hook-form'
+import {Button} from '@/components/ui/buttons/Button'
+import type {Alerts} from '@/modules/boat-charging/alerts'
+import type {BoatChargingVignetteFormValues} from '@/modules/boat-charging/providers/BoatChargingVignetteForm.provider'
+import {useBoatChargingAddVignetteMutation} from '@/modules/boat-charging/service'
+import type {Vignette} from '@/modules/boat-charging/types'
+import {isSameStringValue} from '@/modules/boat-charging/utils/isSameStringValue'
+
+type Props = {
+  onError: (error?: unknown[], alert?: Alerts) => void
+  onSuccess: () => void
+  vignettes?: Vignette[]
+}
+
+export const BoatChargingVignetteFormAddVignetteButton = ({
+  vignettes,
+  onError,
+  onSuccess,
+}: Props) => {
+  const [addVignette, state] = useBoatChargingAddVignetteMutation()
+  const {handleSubmit} = useFormContext<BoatChargingVignetteFormValues>()
+
+  const onAddVignette = useCallback(
+    ({postalCode, vignetteNumber}: BoatChargingVignetteFormValues) => {
+      if (
+        vignettes?.some(
+          vignette =>
+            isSameStringValue(vignette.vignette_number, vignetteNumber) &&
+            isSameStringValue(vignette.postal_code, postalCode),
+        )
+      ) {
+        // Simply return when vignette already is connected
+        return onSuccess()
+      }
+
+      return addVignette({
+        postal_code: postalCode,
+        vignette_number: vignetteNumber,
+      })
+        .unwrap()
+        .then(onSuccess, onError)
+    },
+    [addVignette, onSuccess, onError, vignettes],
+  )
+
+  return (
+    <Button
+      {...state}
+      label="Vignet toevoegen"
+      onPress={handleSubmit(onAddVignette)}
+      testID="BoatChargingVignetteFormAddButton"
+    />
+  )
+}
diff --git a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormDeleteVignetteButton.tsx b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormDeleteVignetteButton.tsx
new file mode 100644
index 000000000..4c91f9ec3
--- /dev/null
+++ b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormDeleteVignetteButton.tsx
@@ -0,0 +1,41 @@
+import {useCallback} from 'react'
+import {Button} from '@/components/ui/buttons/Button'
+import type {Alerts} from '@/modules/boat-charging/alerts'
+import {useBoatChargingDeleteVignetteMutation} from '@/modules/boat-charging/service'
+import type {Vignette} from '@/modules/boat-charging/types'
+import {useAlert} from '@/store/slices/alert'
+
+type Props = {
+  onError: (error: unknown[], alert: Alerts) => void
+  onSuccess: () => void
+  vignetteId: Vignette['id']
+}
+
+export const BoatChargingVignetteFormDeleteVignetteButton = ({
+  vignetteId,
+  onError,
+  onSuccess,
+}: Props) => {
+  const [deleteVignette, state] = useBoatChargingDeleteVignetteMutation()
+  const {resetAlert} = useAlert()
+
+  const onDeleteVignette = useCallback(() => {
+    resetAlert()
+    void deleteVignette(vignetteId)
+      .unwrap()
+      .then(onSuccess, (...error: unknown[]) =>
+        onError(error, 'vignetteDeleteFailed'),
+      )
+  }, [deleteVignette, onSuccess, onError, vignetteId, resetAlert])
+
+  return (
+    <Button
+      {...state}
+      icon={{name: 'trash-bin'}}
+      label="Vignet verwijderen"
+      onPress={onDeleteVignette}
+      testID="BoatChargingVignetteFormDeleteButton"
+      variant="tertiaryDestructive"
+    />
+  )
+}
diff --git a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormEditVignetteButton.tsx b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormEditVignetteButton.tsx
new file mode 100644
index 000000000..efadb736c
--- /dev/null
+++ b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormEditVignetteButton.tsx
@@ -0,0 +1,53 @@
+import {useCallback} from 'react'
+import {useFormContext} from 'react-hook-form'
+import {Button} from '@/components/ui/buttons/Button'
+import type {Alerts} from '@/modules/boat-charging/alerts'
+import type {BoatChargingVignetteFormValues} from '@/modules/boat-charging/providers/BoatChargingVignetteForm.provider'
+import {useBoatChargingEditVignetteMutation} from '@/modules/boat-charging/service'
+import type {Vignette} from '@/modules/boat-charging/types'
+import {isSameStringValue} from '@/modules/boat-charging/utils/isSameStringValue'
+
+type Props = {
+  onError: (error?: unknown[], alert?: Alerts) => void
+  onSuccess: () => void
+  vignette: Vignette
+}
+
+export const BoatChargingVignetteFormEditVignetteButton = ({
+  vignette,
+  onError,
+  onSuccess,
+}: Props) => {
+  const [editVignette, state] = useBoatChargingEditVignetteMutation()
+  const {handleSubmit} = useFormContext<BoatChargingVignetteFormValues>()
+
+  const onEditVignette = useCallback(
+    ({postalCode, vignetteNumber}: BoatChargingVignetteFormValues) => {
+      if (
+        isSameStringValue(postalCode, vignette.postal_code) &&
+        isSameStringValue(vignetteNumber, vignette.vignette_number)
+      ) {
+        // Simply return when values are unchanged
+        return Promise.resolve().then(onSuccess)
+      }
+
+      return editVignette({
+        vignetteId: vignette.id,
+        postal_code: postalCode,
+        vignette_number: vignetteNumber,
+      })
+        .unwrap()
+        .then(onSuccess, onError)
+    },
+    [editVignette, onSuccess, onError, vignette],
+  )
+
+  return (
+    <Button
+      {...state}
+      label="Wijzigingen opslaan"
+      onPress={handleSubmit(onEditVignette)}
+      testID="BoatChargingVignetteFormEditButton"
+    />
+  )
+}
diff --git a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormVerifyVignetteButton.tsx b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormVerifyVignetteButton.tsx
new file mode 100644
index 000000000..d0e5082a3
--- /dev/null
+++ b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteFormVerifyVignetteButton.tsx
@@ -0,0 +1,107 @@
+import {skipToken} from '@reduxjs/toolkit/query'
+import {useCallback} from 'react'
+import {useFormContext} from 'react-hook-form'
+import {Button} from '@/components/ui/buttons/Button'
+import {alerts} from '@/modules/boat-charging/alerts'
+import {vignetteInvalidReasonToAlertMap} from '@/modules/boat-charging/constants/vignetteInvalidReasonToAlertMap'
+import {useIsLoggedIn} from '@/modules/boat-charging/hooks/useIsLoggedIn'
+import {type BoatChargingVignetteFormValues} from '@/modules/boat-charging/providers/BoatChargingVignetteForm.provider'
+import {
+  useBoatChargingAddVignetteMutation,
+  useBoatChargingVerifyVignetteMutation,
+  useBoatChargingVignettesQuery,
+} from '@/modules/boat-charging/service'
+import {
+  type BaseVignette,
+  VignetteInvalidReasons,
+} from '@/modules/boat-charging/types'
+import {devError} from '@/processes/development'
+import {useAlert} from '@/store/slices/alert'
+
+type Props = {
+  onVerified: (vignette: BaseVignette) => void
+}
+
+export const BoatChargingVignetteFormVerifyVignetteButton = ({
+  onVerified,
+}: Props) => {
+  const {isLoggedIn} = useIsLoggedIn()
+
+  const [addVignette, {isLoading: isLoadingAddVignette}] =
+    useBoatChargingAddVignetteMutation()
+  const [
+    verifyVignette,
+    {isLoading: isLoadingVerifyVignette, isError: isErrorVerifyVignette},
+  ] = useBoatChargingVerifyVignetteMutation()
+
+  const {data: myVignettes, isLoading: isLoadingMyVignettes} =
+    useBoatChargingVignettesQuery(isLoggedIn ? undefined : skipToken)
+
+  const {setAlert} = useAlert()
+  const {handleSubmit, setError} =
+    useFormContext<BoatChargingVignetteFormValues>()
+
+  const onVerifyVignette = useCallback(
+    ({
+      postalCode,
+      vignetteNumber,
+      saveToMyVignettes,
+    }: BoatChargingVignetteFormValues) => {
+      const vignette = {
+        postal_code: postalCode,
+        vignette_number: vignetteNumber,
+      }
+
+      void verifyVignette(vignette)
+        .unwrap()
+        .then(
+          ({status, reason}) => {
+            if (status === 'invalid') {
+              if (reason === VignetteInvalidReasons.mismatch) {
+                setError('postalCode', {
+                  message: 'Vignetnummer en postcode komen niet overeen.',
+                })
+
+                return
+              }
+
+              const alertKey = vignetteInvalidReasonToAlertMap[reason]
+
+              setAlert(alerts[alertKey])
+
+              return
+            }
+
+            const alreadySaved = myVignettes?.some(
+              myVignette => myVignette.vignette_number === vignetteNumber,
+            )
+
+            if (saveToMyVignettes && !alreadySaved) {
+              void addVignette(vignette).unwrap().catch(devError) // This call should not block the flow and only fail silently
+            }
+
+            onVerified(vignette)
+          },
+          error => {
+            devError(error)
+
+            setAlert(alerts.vignetteVerificationErrorFailed)
+          },
+        )
+    },
+
+    [addVignette, verifyVignette, setAlert, onVerified, setError, myVignettes],
+  )
+
+  return (
+    <Button
+      isError={isErrorVerifyVignette}
+      isLoading={
+        isLoadingVerifyVignette || isLoadingAddVignette || isLoadingMyVignettes
+      }
+      label="Controleer vignet"
+      onPress={handleSubmit(onVerifyVignette)}
+      testID="BoatChargingVignetteFormVerifyButton"
+    />
+  )
+}
diff --git a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetNumberFormInput.tsx b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteNumberFormInput.tsx
similarity index 82%
rename from src/modules/boat-charging/components/vignettes/form/BoatChargingVignetNumberFormInput.tsx
rename to src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteNumberFormInput.tsx
index 1c33a87cb..03f905aff 100644
--- a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetNumberFormInput.tsx
+++ b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetteNumberFormInput.tsx
@@ -5,7 +5,7 @@ const lengthValidation = {
   message: 'Vul een vignetnummer in van 8 tekens.',
 }
 
-export const BoatChargingVignetNumberFormInput = () => (
+export const BoatChargingVignetteNumberFormInput = () => (
   <TextInputField
     autoCapitalize="characters"
     autoComplete="off"
@@ -13,7 +13,7 @@ export const BoatChargingVignetNumberFormInput = () => (
     hasClearButton={false}
     inputInstructions="Bijvoorbeeld: AM123456"
     label="Vignetnummer"
-    name="vignetNumber"
+    name="vignetteNumber"
     required
     rules={{
       required: 'Vul een vignetnummer in.',
@@ -24,6 +24,6 @@ export const BoatChargingVignetNumberFormInput = () => (
       maxLength: lengthValidation,
       minLength: lengthValidation,
     }}
-    testID="BoatChargingVignetNumberFormInputField"
+    testID="BoatChargingVignetteNumberFormInputField"
   />
 )
diff --git a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetPostalCodeFormInput.tsx b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignettePostalCodeFormInput.tsx
similarity index 81%
rename from src/modules/boat-charging/components/vignettes/form/BoatChargingVignetPostalCodeFormInput.tsx
rename to src/modules/boat-charging/components/vignettes/form/BoatChargingVignettePostalCodeFormInput.tsx
index e7d60402f..12c4d46f8 100644
--- a/src/modules/boat-charging/components/vignettes/form/BoatChargingVignetPostalCodeFormInput.tsx
+++ b/src/modules/boat-charging/components/vignettes/form/BoatChargingVignettePostalCodeFormInput.tsx
@@ -1,6 +1,6 @@
 import {TextInputField} from '@/components/ui/forms/input/TextInputField'
 
-export const BoatChargingVignetPostalCodeFormInput = () => (
+export const BoatChargingVignettePostalCodeFormInput = () => (
   <TextInputField
     autoCapitalize="characters"
     autoComplete="off"
@@ -16,6 +16,6 @@ export const BoatChargingVignetPostalCodeFormInput = () => (
         new RegExp(/^[1-9]\d{3}\s?[a-zA-Z]{2}$/).test(value) ||
         'Vul een geldige postcode in, bijvoorbeeld 1234AB.',
     }}
-    testID="BoatChargingVignetPostalCodeFormInputField"
+    testID="BoatChargingVignettePostalCodeFormInputField"
   />
 )
diff --git a/src/modules/boat-charging/constants/vignetInvalidReasonToAlertMap.ts b/src/modules/boat-charging/constants/vignetInvalidReasonToAlertMap.ts
deleted file mode 100644
index ded018db3..000000000
--- a/src/modules/boat-charging/constants/vignetInvalidReasonToAlertMap.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type {Alerts} from '@/modules/boat-charging/alerts'
-import {VignetInvalidReasons} from '@/modules/boat-charging/types'
-
-export const vignetInvalidReasonToAlertMap: Record<
-  VignetInvalidReasons,
-  Alerts
-> = {
-  [VignetInvalidReasons.notFound]: 'vignetInvalidFailed',
-  [VignetInvalidReasons.cancelled]: 'vignetInvalidFailed',
-  [VignetInvalidReasons.expired]: 'vignetExpiredFailed',
-  [VignetInvalidReasons.onlyEnvironmentTypeAllowed]:
-    'vignetNotApplicableFailed',
-  [VignetInvalidReasons.mismatch]: 'vignetInvalidFailed',
-}
diff --git a/src/modules/boat-charging/constants/vignetteInvalidReasonToAlertMap.ts b/src/modules/boat-charging/constants/vignetteInvalidReasonToAlertMap.ts
new file mode 100644
index 000000000..8395ccbe6
--- /dev/null
+++ b/src/modules/boat-charging/constants/vignetteInvalidReasonToAlertMap.ts
@@ -0,0 +1,14 @@
+import type {Alerts} from '@/modules/boat-charging/alerts'
+import {VignetteInvalidReasons} from '@/modules/boat-charging/types'
+
+export const vignetteInvalidReasonToAlertMap: Record<
+  VignetteInvalidReasons,
+  Alerts
+> = {
+  [VignetteInvalidReasons.notFound]: 'vignetteInvalidFailed',
+  [VignetteInvalidReasons.cancelled]: 'vignetteInvalidFailed',
+  [VignetteInvalidReasons.expired]: 'vignetteExpiredFailed',
+  [VignetteInvalidReasons.onlyEnvironmentTypeAllowed]:
+    'vignetteNotApplicableFailed',
+  [VignetteInvalidReasons.mismatch]: 'vignetteInvalidFailed',
+}
diff --git a/src/modules/boat-charging/hooks/useInitSession.ts b/src/modules/boat-charging/hooks/useInitSession.ts
index 982b6d80f..06494bd04 100644
--- a/src/modules/boat-charging/hooks/useInitSession.ts
+++ b/src/modules/boat-charging/hooks/useInitSession.ts
@@ -29,7 +29,7 @@ export const useInitSession = (step: BoatChargingInitSessionStep) => {
 
   const onPress = useCallback(
     (params: NewSessionFormValues) => {
-      const {vignet, selectedSocket} = params
+      const {vignette, selectedSocket} = params
       const email = isLoggedIn ? loggedInUsername : params.email
       const {socketNumber, stationId} = selectedSocket || {}
 
@@ -42,12 +42,12 @@ export const useInitSession = (step: BoatChargingInitSessionStep) => {
         return Promise.resolve()
       }
 
-      if (!email || !socketNumber || !stationId || !vignet) {
+      if (!email || !socketNumber || !stationId || !vignette) {
         devError('Missing params in session initialization request', {
           email,
           socketNumber,
           stationId,
-          vignet,
+          vignette,
         })
 
         navigation.replace(BoatChargingRouteName.map)
@@ -61,11 +61,11 @@ export const useInitSession = (step: BoatChargingInitSessionStep) => {
         email,
         name: email,
         return_url: 'amsterdam://boat-charging/payment',
-        ...('id' in vignet && vignet.id
-          ? {vignette_id: vignet.id}
+        ...('id' in vignette && vignette.id
+          ? {vignette_id: vignette.id}
           : {
-              vignette_number: vignet.vignette_number,
-              postal_code: vignet.postal_code,
+              vignette_number: vignette.vignette_number,
+              postal_code: vignette.postal_code,
             }),
       })
         .unwrap()
diff --git a/src/modules/boat-charging/hooks/useInitSessionNextStep.test.ts b/src/modules/boat-charging/hooks/useInitSessionNextStep.test.ts
index 2a4b623ff..f9525f222 100644
--- a/src/modules/boat-charging/hooks/useInitSessionNextStep.test.ts
+++ b/src/modules/boat-charging/hooks/useInitSessionNextStep.test.ts
@@ -12,7 +12,7 @@ import {selectLastApprovedTermsVersionWhileLoggedIn} from '@/modules/boat-chargi
 import {
   type BoatChargingInitSessionStep,
   type NewSessionFormValues,
-  type Vignet,
+  type Vignette,
 } from '@/modules/boat-charging/types'
 
 jest.mock('@/modules/boat-charging/hooks/useNewSessionForm', () => ({
@@ -54,7 +54,7 @@ const params: NewSessionFormValues = {
   email: 'test@example.com',
 }
 
-const vignet: Vignet = {
+const vignette: Vignette = {
   vignette_number: 'AM123456',
   postal_code: '1234AB',
   id: 1,
@@ -64,7 +64,7 @@ const vignet: Vignet = {
 describe('useInitSessionNextStep/loggedIn', () => {
   let terms: {version: number} | null | undefined
   let lastApprovedTermsVersion: number | null | undefined
-  let vignettes: Array<Vignet> | undefined
+  let vignettes: Array<Vignette> | undefined
 
   beforeEach(() => {
     jest.clearAllMocks()
@@ -98,7 +98,7 @@ describe('useInitSessionNextStep/loggedIn', () => {
       const {getNextStep} = result.current
 
       expect(getNextStep({email: email as never})).toBe(
-        BoatChargingRouteName.verifyVignet,
+        BoatChargingRouteName.verifyVignette,
       )
     },
   )
@@ -109,15 +109,15 @@ describe('useInitSessionNextStep/loggedIn', () => {
       BoatChargingRouteName.guestEmail,
       BoatChargingRouteName.termsAndConditions,
       BoatChargingRouteName.confirmSession,
-      BoatChargingRouteName.chooseVignet,
+      BoatChargingRouteName.chooseVignette,
     ]),
   )(
-    'routes logged-in users at step %s to vignette verification when no vignet has been selected',
+    'routes logged-in users at step %s to vignette verification when no vignette has been selected',
     step => {
       const {result} = renderHook(() => useInitSessionNextStep(step))
 
       expect(result.current.getNextStep(params)).toBe(
-        BoatChargingRouteName.verifyVignet,
+        BoatChargingRouteName.verifyVignette,
       )
     },
   )
@@ -128,13 +128,13 @@ describe('useInitSessionNextStep/loggedIn', () => {
       BoatChargingRouteName.guestEmail,
       BoatChargingRouteName.termsAndConditions,
       BoatChargingRouteName.confirmSession,
-      BoatChargingRouteName.verifyVignet,
+      BoatChargingRouteName.verifyVignette,
     ]),
   )(
     'routes logged-in users at step %s to vignette selection, when they have 2 or more vignettes connected to their account',
     step => {
       vignettes = [
-        vignet,
+        vignette,
         {
           vignette_number: 'MA123456',
           postal_code: '1234AB',
@@ -145,7 +145,7 @@ describe('useInitSessionNextStep/loggedIn', () => {
       const {result} = renderHook(() => useInitSessionNextStep(step))
 
       expect(result.current.getNextStep(params)).toBe(
-        BoatChargingRouteName.chooseVignet,
+        BoatChargingRouteName.chooseVignette,
       )
     },
   )
@@ -156,24 +156,24 @@ describe('useInitSessionNextStep/loggedIn', () => {
       BoatChargingRouteName.guestEmail,
       BoatChargingRouteName.termsAndConditions,
       BoatChargingRouteName.confirmSession,
-      BoatChargingRouteName.verifyVignet,
+      BoatChargingRouteName.verifyVignette,
     ]),
   )(
-    'routes logged-in users at step %s to confirm session, when they have only 1 vignet connected to their account and all other params are set.',
+    'routes logged-in users at step %s to confirm session, when they have only 1 vignette connected to their account and all other params are set.',
     step => {
-      vignettes = [vignet]
+      vignettes = [vignette]
       const {result} = renderHook(() => useInitSessionNextStep(step))
 
       expect(result.current.getNextStep(params)).toBe(
         BoatChargingRouteName.confirmSession,
       )
       expect(setValueMock).toHaveBeenCalledTimes(1)
-      expect(setValueMock).toHaveBeenCalledWith('vignet', vignet)
+      expect(setValueMock).toHaveBeenCalledWith('vignette', vignette)
     },
   )
 
   it('routes to terms before confirmation when auto-selecting the only vignette and no terms version is approved', () => {
-    vignettes = [vignet]
+    vignettes = [vignette]
     lastApprovedTermsVersion = undefined
     const {result} = renderHook(() =>
       useInitSessionNextStep(BoatChargingRouteName.locationDetails),
@@ -182,7 +182,7 @@ describe('useInitSessionNextStep/loggedIn', () => {
     expect(result.current.getNextStep(params)).toBe(
       BoatChargingRouteName.termsAndConditions,
     )
-    expect(setValueMock).toHaveBeenCalledWith('vignet', vignet)
+    expect(setValueMock).toHaveBeenCalledWith('vignette', vignette)
   })
 
   it.each(
@@ -191,12 +191,12 @@ describe('useInitSessionNextStep/loggedIn', () => {
       BoatChargingRouteName.guestEmail,
       BoatChargingRouteName.termsAndConditions,
       BoatChargingRouteName.confirmSession,
-      BoatChargingRouteName.verifyVignet,
+      BoatChargingRouteName.verifyVignette,
     ]),
   )(
     'routes logged-in users at step %s to session confirmation, when all required params are set',
     step => {
-      vignettes = [vignet]
+      vignettes = [vignette]
       const {result} = renderHook(() => useInitSessionNextStep(step))
 
       expect(result.current.getNextStep(params)).toBe(
@@ -211,7 +211,7 @@ describe('useInitSessionNextStep/loggedIn', () => {
       useInitSessionNextStep(BoatChargingRouteName.confirmSession),
     )
 
-    expect(result.current.getNextStep({...params, vignet})).toBe(
+    expect(result.current.getNextStep({...params, vignette})).toBe(
       BoatChargingRouteName.termsAndConditions,
     )
   })
@@ -221,7 +221,7 @@ describe('useInitSessionNextStep/loggedIn', () => {
       useInitSessionNextStep(BoatChargingRouteName.termsAndConditions),
     )
 
-    expect(result.current.getNextStep({...params, vignet})).toBe(
+    expect(result.current.getNextStep({...params, vignette})).toBe(
       BoatChargingRouteName.confirmSession,
     )
   })
@@ -231,7 +231,7 @@ describe('useInitSessionNextStep/loggedIn', () => {
       useInitSessionNextStep(BoatChargingRouteName.confirmSession),
     )
 
-    expect(result.current.getNextStep({...params, vignet})).toBeUndefined()
+    expect(result.current.getNextStep({...params, vignette})).toBeUndefined()
   })
 
   it.each(
@@ -239,8 +239,8 @@ describe('useInitSessionNextStep/loggedIn', () => {
       BoatChargingRouteName.locationDetails,
       BoatChargingRouteName.guestEmail,
       BoatChargingRouteName.termsAndConditions,
-      BoatChargingRouteName.verifyVignet,
-      BoatChargingRouteName.chooseVignet,
+      BoatChargingRouteName.verifyVignette,
+      BoatChargingRouteName.chooseVignette,
     ]),
   )(
     'treats matching absent terms versions as invalid and returns current route',
@@ -249,7 +249,7 @@ describe('useInitSessionNextStep/loggedIn', () => {
       lastApprovedTermsVersion = undefined
       const {result} = renderHook(() => useInitSessionNextStep(step))
 
-      expect(result.current.getNextStep({...params, vignet})).toBe(step)
+      expect(result.current.getNextStep({...params, vignette})).toBe(step)
     },
   )
 
@@ -260,7 +260,7 @@ describe('useInitSessionNextStep/loggedIn', () => {
       useInitSessionNextStep(BoatChargingRouteName.locationDetails),
     )
 
-    expect(result.current.getNextStep({...params, vignet})).toBe(
+    expect(result.current.getNextStep({...params, vignette})).toBe(
       BoatChargingRouteName.termsAndConditions,
     )
   })
@@ -305,7 +305,7 @@ describe('useInitSessionNextStep/guest', () => {
 
   it('routes guests with an empty or invalid email to email entry', () => {
     const {result} = renderHook(() =>
-      useInitSessionNextStep(BoatChargingRouteName.verifyVignet),
+      useInitSessionNextStep(BoatChargingRouteName.verifyVignette),
     )
 
     expect(result.current.getNextStep({...params, email: ''})).toBe(
@@ -321,7 +321,7 @@ describe('useInitSessionNextStep/guest', () => {
       useInitSessionNextStep(BoatChargingRouteName.locationDetails),
     )
 
-    expect(result.current.getNextStep({...params, vignet})).toBe(
+    expect(result.current.getNextStep({...params, vignette})).toBe(
       BoatChargingRouteName.confirmSession,
     )
   })
@@ -332,23 +332,23 @@ describe('useInitSessionNextStep/guest', () => {
     )
 
     expect(result.current.getNextStep(params)).toBe(
-      BoatChargingRouteName.verifyVignet,
+      BoatChargingRouteName.verifyVignette,
     )
     expect(
       result.current.getNextStep({...params, approvedTerms: undefined}),
-    ).toBe(BoatChargingRouteName.verifyVignet)
+    ).toBe(BoatChargingRouteName.verifyVignette)
     expect(
       result.current.getNextStep({...params, approvedTerms: null as never}),
-    ).toBe(BoatChargingRouteName.verifyVignet)
+    ).toBe(BoatChargingRouteName.verifyVignette)
   })
 
   it('routes guests from vignette verification to terms when not yet approved', () => {
     const {result} = renderHook(() =>
-      useInitSessionNextStep(BoatChargingRouteName.verifyVignet),
+      useInitSessionNextStep(BoatChargingRouteName.verifyVignette),
     )
 
     expect(
-      result.current.getNextStep({...params, approvedTerms: false, vignet}),
+      result.current.getNextStep({...params, approvedTerms: false, vignette}),
     ).toBe(BoatChargingRouteName.termsAndConditions)
   })
 
@@ -362,7 +362,7 @@ describe('useInitSessionNextStep/guest', () => {
       expect(
         result.current.getNextStep({
           ...params,
-          vignet,
+          vignette,
           approvedTerms: approvedTerms as never,
         }),
       ).toBe(BoatChargingRouteName.termsAndConditions)
@@ -374,7 +374,7 @@ describe('useInitSessionNextStep/guest', () => {
       useInitSessionNextStep(BoatChargingRouteName.termsAndConditions),
     )
 
-    expect(result.current.getNextStep({...params, vignet})).toBe(
+    expect(result.current.getNextStep({...params, vignette})).toBe(
       BoatChargingRouteName.confirmSession,
     )
   })
@@ -384,6 +384,6 @@ describe('useInitSessionNextStep/guest', () => {
       useInitSessionNextStep(BoatChargingRouteName.confirmSession),
     )
 
-    expect(result.current.getNextStep({...params, vignet})).toBeUndefined()
+    expect(result.current.getNextStep({...params, vignette})).toBeUndefined()
   })
 })
diff --git a/src/modules/boat-charging/hooks/useInitSessionNextStep.ts b/src/modules/boat-charging/hooks/useInitSessionNextStep.ts
index 81100bb52..f7d41b6a7 100644
--- a/src/modules/boat-charging/hooks/useInitSessionNextStep.ts
+++ b/src/modules/boat-charging/hooks/useInitSessionNextStep.ts
@@ -11,7 +11,7 @@ import {selectLastApprovedTermsVersionWhileLoggedIn} from '@/modules/boat-chargi
 import {
   type BoatChargingInitSessionStep,
   type NewSessionFormValues,
-  type Vignet,
+  type Vignette,
 } from '@/modules/boat-charging/types'
 import {validateEmail} from '@/utils/validate'
 
@@ -36,7 +36,7 @@ export const useInitSessionNextStep = (step: BoatChargingInitSessionStep) => {
     (
       params: NewSessionFormValues,
       terms: {version: number},
-      vignettes: Vignet[] = [],
+      vignettes: Vignette[] = [],
     ) => {
       const state = store.getState()
       const lastApprovedTermsVersionFromState =
@@ -45,19 +45,19 @@ export const useInitSessionNextStep = (step: BoatChargingInitSessionStep) => {
         lastApprovedTermsVersionFromState === undefined ||
         terms.version > lastApprovedTermsVersionFromState
 
-      const {vignet} = params
+      const {vignette} = params
 
-      if (!vignet) {
+      if (!vignette) {
         if (!vignettes?.length) {
-          return BoatChargingRouteName.verifyVignet
+          return BoatChargingRouteName.verifyVignette
         } else if (vignettes.length === 1) {
-          form.setValue('vignet', vignettes[0])
+          form.setValue('vignette', vignettes[0])
 
           return needsTermsApproval
             ? BoatChargingRouteName.termsAndConditions
             : BoatChargingRouteName.confirmSession
         } else {
-          return BoatChargingRouteName.chooseVignet
+          return BoatChargingRouteName.chooseVignette
         }
       }
 
@@ -74,14 +74,14 @@ export const useInitSessionNextStep = (step: BoatChargingInitSessionStep) => {
 
   const guestNextStep = useCallback(
     (params: NewSessionFormValues) => {
-      const {approvedTerms, email, vignet} = params
+      const {approvedTerms, email, vignette} = params
 
       if (!email || validateEmail(email) !== true) {
         return BoatChargingRouteName.guestEmail
       }
 
-      if (!vignet) {
-        return BoatChargingRouteName.verifyVignet
+      if (!vignette) {
+        return BoatChargingRouteName.verifyVignette
       }
 
       if (!approvedTerms) {
diff --git a/src/modules/boat-charging/providers/BoatChargingVignetForm.provider.tsx b/src/modules/boat-charging/providers/BoatChargingVignetteForm.provider.tsx
similarity index 61%
rename from src/modules/boat-charging/providers/BoatChargingVignetForm.provider.tsx
rename to src/modules/boat-charging/providers/BoatChargingVignetteForm.provider.tsx
index 37d546931..67fe63ce4 100644
--- a/src/modules/boat-charging/providers/BoatChargingVignetForm.provider.tsx
+++ b/src/modules/boat-charging/providers/BoatChargingVignetteForm.provider.tsx
@@ -1,24 +1,24 @@
 import {useEffect, type PropsWithChildren} from 'react'
 import {FormProvider, useForm} from 'react-hook-form'
-import type {BaseVignet} from '@/modules/boat-charging/types'
+import type {BaseVignette} from '@/modules/boat-charging/types'
 import {useAlert} from '@/store/slices/alert'
 
-export type BoatChargingVignetFormValues = {
-  postalCode: BaseVignet['postal_code']
+export type BoatChargingVignetteFormValues = {
+  postalCode: BaseVignette['postal_code']
   saveToMyVignettes?: boolean
-  vignetNumber: BaseVignet['vignette_number']
+  vignetteNumber: BaseVignette['vignette_number']
 }
 
 type Props = PropsWithChildren<{
-  defaultValues: Partial<BoatChargingVignetFormValues>
+  defaultValues: Partial<BoatChargingVignetteFormValues>
 }>
 
-export const BoatChargingVignetFormProvider = ({
+export const BoatChargingVignetteFormProvider = ({
   defaultValues,
   children,
 }: Props) => {
   const {resetAlert} = useAlert()
-  const form = useForm<BoatChargingVignetFormValues>({
+  const form = useForm<BoatChargingVignetteFormValues>({
     defaultValues,
     resetOptions: {
       keepIsSubmitted: false,
diff --git a/src/modules/boat-charging/routes.ts b/src/modules/boat-charging/routes.ts
index 54ac2fab7..89ac149e4 100644
--- a/src/modules/boat-charging/routes.ts
+++ b/src/modules/boat-charging/routes.ts
@@ -2,13 +2,13 @@ import type {
   BoatChargingLocation,
   BoatChargingSession,
   BoatChargingPaymentResultStatus,
-  Vignet,
+  Vignette,
 } from '@/modules/boat-charging/types'
 
 export enum BoatChargingRouteName {
   activeSessionDetails = 'BoatChargingActiveSessionDetails',
   activeSessions = 'BoatChargingActiveSessions',
-  chooseVignet = 'BoatChargingChooseVignet',
+  chooseVignette = 'BoatChargingChooseVignette',
   confirmSession = 'BoatChargingConfirmSession',
   createAccount = 'BoatChargingCreateAccount',
   createAccountConfirm = 'BoatChargingCreateAccountConfirm',
@@ -26,8 +26,8 @@ export enum BoatChargingRouteName {
   myVignettes = 'BoatChargingMyVignettes',
   paymentResult = 'BoatChargingPaymentResult',
   termsAndConditions = 'BoatChargingTermsAndConditions',
-  verifyVignet = 'BoatChargingVerifyVignet',
-  vignet = 'BoatChargingVignet',
+  verifyVignette = 'BoatChargingVerifyVignette',
+  vignette = 'BoatChargingVignette',
 }
 
 export type ModuleStackParams = {
@@ -53,9 +53,9 @@ export type ModuleStackParams = {
   }
   [BoatChargingRouteName.confirmSession]: undefined
   [BoatChargingRouteName.myVignettes]: undefined
-  [BoatChargingRouteName.vignet]: undefined | {vignetId: Vignet['id']}
-  [BoatChargingRouteName.verifyVignet]: undefined
-  [BoatChargingRouteName.chooseVignet]: undefined
+  [BoatChargingRouteName.vignette]: undefined | {vignetteId: Vignette['id']}
+  [BoatChargingRouteName.verifyVignette]: undefined
+  [BoatChargingRouteName.chooseVignette]: undefined
   [BoatChargingRouteName.createAccount]: undefined
   [BoatChargingRouteName.createAccountConfirm]: undefined
   [BoatChargingRouteName.forgotPassword]: undefined
diff --git a/src/modules/boat-charging/screenConfig.ts b/src/modules/boat-charging/screenConfig.ts
index 970511eae..883c77e71 100644
--- a/src/modules/boat-charging/screenConfig.ts
+++ b/src/modules/boat-charging/screenConfig.ts
@@ -1,5 +1,5 @@
 import {StackNavigationRoutes} from '@/app/navigation/types'
-import {BoatChargingAddVignetHeaderButton} from '@/modules/boat-charging/components/vignettes/BoatChargingAddVignetHeaderButton'
+import {BoatChargingAddVignetteHeaderButton} from '@/modules/boat-charging/components/vignettes/BoatChargingAddVignetteHeaderButton'
 import {
   BoatChargingRouteName,
   type ModuleStackParams,
@@ -7,7 +7,7 @@ import {
 import {BoatChargingScreen} from '@/modules/boat-charging/screens/BoatCharging.screen'
 import {BoatChargingActiveSessionScreen} from '@/modules/boat-charging/screens/BoatChargingActiveSession.screen'
 import {BoatChargingActiveSessionsScreen} from '@/modules/boat-charging/screens/BoatChargingActiveSessions.screen'
-import {BoatChargingChooseVignetScreen} from '@/modules/boat-charging/screens/BoatChargingChooseVignet.screen'
+import {BoatChargingChooseVignetteScreen} from '@/modules/boat-charging/screens/BoatChargingChooseVignette.screen'
 import {BoatChargingConfirmSession} from '@/modules/boat-charging/screens/BoatChargingConfirmSession.screen'
 import {BoatChargingCreateAccountScreen} from '@/modules/boat-charging/screens/BoatChargingCreateAccount.screen'
 import {BoatChargingCreateAccountConfirmScreen} from '@/modules/boat-charging/screens/BoatChargingCreateAccountConfirm.screen'
@@ -22,8 +22,8 @@ import {BoatChargingLoginScreen} from '@/modules/boat-charging/screens/BoatCharg
 import {BoatChargingMyVignettesScreen} from '@/modules/boat-charging/screens/BoatChargingMyVignettes.screen'
 import {BoatChargingPaymentResultScreen} from '@/modules/boat-charging/screens/BoatChargingPaymentResult.screen'
 import {BoatChargingTermsAndConditionsScreen} from '@/modules/boat-charging/screens/BoatChargingTermsAndConditions.screen'
-import {BoatChargingVerifyVignetScreen} from '@/modules/boat-charging/screens/BoatChargingVerifyVignet.screen'
-import {BoatChargingVignetScreen} from '@/modules/boat-charging/screens/BoatChargingVignet.screen'
+import {BoatChargingVerifyVignetteScreen} from '@/modules/boat-charging/screens/BoatChargingVerifyVignette.screen'
+import {BoatChargingVignetteScreen} from '@/modules/boat-charging/screens/BoatChargingVignette.screen'
 
 export const screenConfig: StackNavigationRoutes<
   ModuleStackParams,
@@ -53,16 +53,16 @@ export const screenConfig: StackNavigationRoutes<
       headerTitle: 'Laden zonder account',
     },
   },
-  [BoatChargingRouteName.verifyVignet]: {
-    component: BoatChargingVerifyVignetScreen,
-    name: BoatChargingRouteName.verifyVignet,
+  [BoatChargingRouteName.verifyVignette]: {
+    component: BoatChargingVerifyVignetteScreen,
+    name: BoatChargingRouteName.verifyVignette,
     options: {
       headerTitle: 'Vignet controleren',
     },
   },
-  [BoatChargingRouteName.chooseVignet]: {
-    component: BoatChargingChooseVignetScreen,
-    name: BoatChargingRouteName.chooseVignet,
+  [BoatChargingRouteName.chooseVignette]: {
+    component: BoatChargingChooseVignetteScreen,
+    name: BoatChargingRouteName.chooseVignette,
     options: {
       headerTitle: 'Vignet kiezen',
     },
@@ -137,12 +137,12 @@ export const screenConfig: StackNavigationRoutes<
     name: BoatChargingRouteName.myVignettes,
     options: {
       headerTitle: 'Mijn vignetten',
-      SideComponent: BoatChargingAddVignetHeaderButton,
+      SideComponent: BoatChargingAddVignetteHeaderButton,
     },
   },
-  [BoatChargingRouteName.vignet]: {
-    component: BoatChargingVignetScreen,
-    name: BoatChargingRouteName.vignet,
+  [BoatChargingRouteName.vignette]: {
+    component: BoatChargingVignetteScreen,
+    name: BoatChargingRouteName.vignette,
     options: {
       headerShown: false,
     },
diff --git a/src/modules/boat-charging/screens/BoatChargingChooseVignet.screen.tsx b/src/modules/boat-charging/screens/BoatChargingChooseVignet.screen.tsx
deleted file mode 100644
index aa3e00695..000000000
--- a/src/modules/boat-charging/screens/BoatChargingChooseVignet.screen.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import {Screen} from '@/components/features/screen/Screen'
-import {Box} from '@/components/ui/containers/Box'
-import {BoatChargingChooseVignetForm} from '@/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetForm'
-import {BoatChargingChooseVignetFormSubmitButton} from '@/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetFormSubmitButton'
-
-export const BoatChargingChooseVignetScreen = () => (
-  <Screen
-    hasStickyAlert
-    scroll
-    stickyFooter={
-      <Box>
-        <BoatChargingChooseVignetFormSubmitButton />
-      </Box>
-    }
-    testID="BoatChargingVerifyVignetScreen">
-    <Box grow>
-      <BoatChargingChooseVignetForm />
-    </Box>
-  </Screen>
-)
diff --git a/src/modules/boat-charging/screens/BoatChargingChooseVignette.screen.tsx b/src/modules/boat-charging/screens/BoatChargingChooseVignette.screen.tsx
new file mode 100644
index 000000000..54ad3d1f9
--- /dev/null
+++ b/src/modules/boat-charging/screens/BoatChargingChooseVignette.screen.tsx
@@ -0,0 +1,20 @@
+import {Screen} from '@/components/features/screen/Screen'
+import {Box} from '@/components/ui/containers/Box'
+import {BoatChargingChooseVignetteForm} from '@/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetteForm'
+import {BoatChargingChooseVignetteFormSubmitButton} from '@/modules/boat-charging/components/vignettes/form/BoatChargingChooseVignetteFormSubmitButton'
+
+export const BoatChargingChooseVignetteScreen = () => (
+  <Screen
+    hasStickyAlert
+    scroll
+    stickyFooter={
+      <Box>
+        <BoatChargingChooseVignetteFormSubmitButton />
+      </Box>
+    }
+    testID="BoatChargingVerifyVignetteScreen">
+    <Box grow>
+      <BoatChargingChooseVignetteForm />
+    </Box>
+  </Screen>
+)
diff --git a/src/modules/boat-charging/screens/BoatChargingVerifyVignet.screen.tsx b/src/modules/boat-charging/screens/BoatChargingVerifyVignet.screen.tsx
deleted file mode 100644
index 01453a449..000000000
--- a/src/modules/boat-charging/screens/BoatChargingVerifyVignet.screen.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import {useCallback} from 'react'
-import {Screen} from '@/components/features/screen/Screen'
-import {Box} from '@/components/ui/containers/Box'
-import {BoatChargingVignetForm} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetForm'
-import {useInitSession} from '@/modules/boat-charging/hooks/useInitSession'
-import {BoatChargingRouteName} from '@/modules/boat-charging/routes'
-import type {BaseVignet} from '@/modules/boat-charging/types'
-
-export const BoatChargingVerifyVignetScreen = () => {
-  const {
-    onPress,
-    form: {getValues, setValue},
-  } = useInitSession(BoatChargingRouteName.verifyVignet)
-
-  const onVerified = useCallback(
-    (vignet: BaseVignet) => {
-      const verifiedVignet = {...vignet, verified: true}
-
-      setValue('vignet', verifiedVignet)
-      void onPress({...getValues(), vignet: verifiedVignet})
-    },
-    [onPress, getValues, setValue],
-  )
-
-  return (
-    <Screen
-      hasStickyAlert
-      keyboardAware
-      scroll
-      testID="BoatChargingVerifyVignetScreen">
-      <Box grow>
-        <BoatChargingVignetForm onVerified={onVerified} />
-      </Box>
-    </Screen>
-  )
-}
diff --git a/src/modules/boat-charging/screens/BoatChargingVerifyVignette.screen.tsx b/src/modules/boat-charging/screens/BoatChargingVerifyVignette.screen.tsx
new file mode 100644
index 000000000..19f9cba59
--- /dev/null
+++ b/src/modules/boat-charging/screens/BoatChargingVerifyVignette.screen.tsx
@@ -0,0 +1,36 @@
+import {useCallback} from 'react'
+import {Screen} from '@/components/features/screen/Screen'
+import {Box} from '@/components/ui/containers/Box'
+import {BoatChargingVignetteForm} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetteForm'
+import {useInitSession} from '@/modules/boat-charging/hooks/useInitSession'
+import {BoatChargingRouteName} from '@/modules/boat-charging/routes'
+import type {BaseVignette} from '@/modules/boat-charging/types'
+
+export const BoatChargingVerifyVignetteScreen = () => {
+  const {
+    onPress,
+    form: {getValues, setValue},
+  } = useInitSession(BoatChargingRouteName.verifyVignette)
+
+  const onVerified = useCallback(
+    (vignette: BaseVignette) => {
+      const verifiedVignette = {...vignette, verified: true}
+
+      setValue('vignette', verifiedVignette)
+      void onPress({...getValues(), vignette: verifiedVignette})
+    },
+    [onPress, getValues, setValue],
+  )
+
+  return (
+    <Screen
+      hasStickyAlert
+      keyboardAware
+      scroll
+      testID="BoatChargingVerifyVignetteScreen">
+      <Box grow>
+        <BoatChargingVignetteForm onVerified={onVerified} />
+      </Box>
+    </Screen>
+  )
+}
diff --git a/src/modules/boat-charging/screens/BoatChargingVignet.screen.tsx b/src/modules/boat-charging/screens/BoatChargingVignette.screen.tsx
similarity index 51%
rename from src/modules/boat-charging/screens/BoatChargingVignet.screen.tsx
rename to src/modules/boat-charging/screens/BoatChargingVignette.screen.tsx
index fd5d4175f..e5587d935 100644
--- a/src/modules/boat-charging/screens/BoatChargingVignet.screen.tsx
+++ b/src/modules/boat-charging/screens/BoatChargingVignette.screen.tsx
@@ -1,24 +1,24 @@
 import type {NavigationProps} from '@/app/navigation/types'
 import {Screen} from '@/components/features/screen/Screen'
 import {Box} from '@/components/ui/containers/Box'
-import {BoatChargingVignetForm} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetForm'
+import {BoatChargingVignetteForm} from '@/modules/boat-charging/components/vignettes/form/BoatChargingVignetteForm'
 import type {BoatChargingRouteName} from '@/modules/boat-charging/routes'
 
-type Props = NavigationProps<BoatChargingRouteName.vignet>
+type Props = NavigationProps<BoatChargingRouteName.vignette>
 
-export const BoatChargingVignetScreen = ({route}: Props) => (
+export const BoatChargingVignetteScreen = ({route}: Props) => (
   <Screen
     hasStickyAlert
     headerOptions={{
-      headerTitle: route.params?.vignetId
+      headerTitle: route.params?.vignetteId
         ? 'Vignet wijzigen'
         : 'Vignet toevoegen',
     }}
     keyboardAware
     scroll
-    testID="BoatChargingVignetScreen">
+    testID="BoatChargingVignetteScreen">
     <Box grow>
-      <BoatChargingVignetForm vignetId={route.params?.vignetId} />
+      <BoatChargingVignetteForm vignetteId={route.params?.vignetteId} />
     </Box>
   </Screen>
 )
diff --git a/src/modules/boat-charging/service.ts b/src/modules/boat-charging/service.ts
index 8a20f67c0..1b7064cee 100644
--- a/src/modules/boat-charging/service.ts
+++ b/src/modules/boat-charging/service.ts
@@ -6,7 +6,7 @@ import type {
 import {setBoatChargingOpenIdConnectConfig} from '@/modules/boat-charging/slice'
 import {
   BoatChargingEndpointName,
-  type BaseVignet,
+  type BaseVignette,
   type BoatChargingGeoJSON,
   type BoatChargingLocationDetailsResponse,
   type BoatChargingOIDCConfigResponse,
@@ -18,8 +18,8 @@ import {
   type BoatChargingSettings,
   type BoatChargingSocketStatusResponse,
   type BoatChargingTerms,
-  type BoatChargingVerifyVignetResponse,
-  type Vignet,
+  type BoatChargingVerifyVignetteResponse,
+  type Vignette,
 } from '@/modules/boat-charging/types'
 import {prepareHeaders} from '@/modules/boat-charging/utils/prepareHeaders'
 import {ModuleSlug} from '@/modules/generated/slugs.generated'
@@ -201,7 +201,7 @@ export const boatChargingApi = baseApi.injectEndpoints({
       }),
       invalidatesTags: ['BoatChargingSessions', 'BoatChargingLocations'],
     }),
-    [BoatChargingEndpointName.vignettes]: builder.query<Array<Vignet>, void>({
+    [BoatChargingEndpointName.vignettes]: builder.query<Array<Vignette>, void>({
       query: () => ({
         prepareHeaders,
         slug: ModuleSlug['boat-charging'],
@@ -210,7 +210,10 @@ export const boatChargingApi = baseApi.injectEndpoints({
       }),
       providesTags: ['BoatChargingVignettes'],
     }),
-    [BoatChargingEndpointName.addVignet]: builder.mutation<Vignet, BaseVignet>({
+    [BoatChargingEndpointName.addVignette]: builder.mutation<
+      Vignette,
+      BaseVignette
+    >({
       query: body => ({
         prepareHeaders,
         slug: ModuleSlug['boat-charging'],
@@ -220,34 +223,34 @@ export const boatChargingApi = baseApi.injectEndpoints({
       }),
       invalidatesTags: ['BoatChargingVignettes'],
     }),
-    [BoatChargingEndpointName.deleteVignet]: builder.mutation<
+    [BoatChargingEndpointName.deleteVignette]: builder.mutation<
       void,
-      Vignet['id']
+      Vignette['id']
     >({
-      query: vignetId => ({
+      query: vignetteId => ({
         prepareHeaders,
         slug: ModuleSlug['boat-charging'],
-        url: `/vignettes/${vignetId}`,
+        url: `/vignettes/${vignetteId}`,
         method: 'DELETE',
       }),
       invalidatesTags: ['BoatChargingVignettes'],
     }),
-    [BoatChargingEndpointName.editVignet]: builder.mutation<
+    [BoatChargingEndpointName.editVignette]: builder.mutation<
       void,
-      BaseVignet & {vignetId: Vignet['id']}
+      BaseVignette & {vignetteId: Vignette['id']}
     >({
-      query: ({vignetId, ...body}) => ({
+      query: ({vignetteId, ...body}) => ({
         prepareHeaders,
         slug: ModuleSlug['boat-charging'],
-        url: `/vignettes/${vignetId}`,
+        url: `/vignettes/${vignetteId}`,
         method: 'PUT',
         body,
       }),
       invalidatesTags: ['BoatChargingVignettes'],
     }),
-    [BoatChargingEndpointName.verifyVignet]: builder.mutation<
-      BoatChargingVerifyVignetResponse,
-      BaseVignet
+    [BoatChargingEndpointName.verifyVignette]: builder.mutation<
+      BoatChargingVerifyVignetteResponse,
+      BaseVignette
     >({
       query: body => ({
         prepareHeaders,
@@ -276,8 +279,8 @@ export const {
   useBoatChargingStopSessionMutation,
   useBoatChargingSessionCostBreakdownQuery,
   useBoatChargingVignettesQuery,
-  useBoatChargingAddVignetMutation,
-  useBoatChargingDeleteVignetMutation,
-  useBoatChargingEditVignetMutation,
-  useBoatChargingVerifyVignetMutation,
+  useBoatChargingAddVignetteMutation,
+  useBoatChargingDeleteVignetteMutation,
+  useBoatChargingEditVignetteMutation,
+  useBoatChargingVerifyVignetteMutation,
 } = boatChargingApi
diff --git a/src/modules/boat-charging/types.ts b/src/modules/boat-charging/types.ts
index 0e8db6a67..c706b693e 100644
--- a/src/modules/boat-charging/types.ts
+++ b/src/modules/boat-charging/types.ts
@@ -5,7 +5,7 @@ import type {WithDummyAndPage} from '@/services/types'
 import type {PaginationQueryArgs} from '@/types/api'
 
 export enum BoatChargingEndpointName {
-  addVignet = 'boatChargingAddVignet',
+  addVignette = 'boatChargingAddVignette',
   boatChargingCancelSession = 'boatChargingCancelSession',
   boatChargingInitSession = 'boatChargingInitSession',
   boatChargingLocationDetails = 'boatChargingLocationDetails',
@@ -19,9 +19,9 @@ export enum BoatChargingEndpointName {
   boatChargingStartSession = 'boatChargingStartSession',
   boatChargingStopSession = 'boatChargingStopSession',
   boatChargingTerms = 'boatChargingTerms',
-  deleteVignet = 'boatChargingDeleteVignet',
-  editVignet = 'boatChargingEditVignet',
-  verifyVignet = 'boatChargingVerifyVignet',
+  deleteVignette = 'boatChargingDeleteVignette',
+  editVignette = 'boatChargingEditVignette',
+  verifyVignette = 'boatChargingVerifyVignette',
   vignettes = 'boatChargingVignettes',
 }
 
@@ -129,7 +129,7 @@ export type BoatChargingOIDCConfigResponse = {
 }
 
 export type BoatChargingSession = {
-  boat_name?: Vignet['boat_name']
+  boat_name?: Vignette['boat_name']
   created_date_time: string
   currency: 'EUR'
   email?: string
@@ -148,7 +148,7 @@ export type BoatChargingSession = {
    * Is 0 when session is not COMPLETED, otherwise contains the final costs including VAT
    */
   total_cost_incl_vat: number
-  vignette_number?: Vignet['vignette_number']
+  vignette_number?: Vignette['vignette_number']
 }
 
 export type BoatChargingSessionsEndpointRequest = {
@@ -166,7 +166,7 @@ export type BoatChargingSessionInitRequest = {
   return_url: string
   socket_number: string
   station_id: string
-} & Or<BaseVignet, {vignette_id: Vignet['id']}>
+} & Or<BaseVignette, {vignette_id: Vignette['id']}>
 
 export type BoatChargingSessionInitResponse = {
   checkout_url: string
@@ -267,26 +267,26 @@ export type NewSessionFormValues = {
   approvedTerms?: boolean
   email?: string
   selectedSocket?: BoatChargingSelectSocketFormSelectedSocket
-  vignet?:
-    | ((BaseVignet | Vignet) & {
+  vignette?:
+    | ((BaseVignette | Vignette) & {
         /**
-         * Depending on how the vignet is selected during session initialization, verification needs to happen at a different moment during the flow.
+         * Depending on how the vignette is selected during session initialization, verification needs to happen at a different moment during the flow.
          * This property is used at session confirmation to check if verification has been done already, and if so, is skipped.
          */
         verified?: boolean
       })
-    | null // null is required to allow proper 'reset' using form.setValue('vignet', null). `undefined` Is not supported as a cleared value for a controlled field.
+    | null // null is required to allow proper 'reset' using form.setValue('vignette', null). `undefined` Is not supported as a cleared value for a controlled field.
 }
 
-export type BaseVignet = {postal_code: string; vignette_number: string}
+export type BaseVignette = {postal_code: string; vignette_number: string}
 
-export type Vignet = BaseVignet & {
+export type Vignette = BaseVignette & {
   boat_name?: string
   expiration_date: string
   id: number
 }
 
-export enum VignetInvalidReasons {
+export enum VignetteInvalidReasons {
   /**
    * The vignette has been signed off / cancelled.
    */
@@ -309,20 +309,20 @@ export enum VignetInvalidReasons {
   onlyEnvironmentTypeAllowed = 'ONLY_ENVIRONMENT_TYPE_ALLOWED',
 }
 
-export type BoatChargingVerifyVignetResponse = Or<
+export type BoatChargingVerifyVignetteResponse = Or<
   {
     expiration_date: string
     status: 'valid'
   },
-  {reason: VignetInvalidReasons; status: 'invalid'}
+  {reason: VignetteInvalidReasons; status: 'invalid'}
 >
 
 export type BoatChargingInitSessionStep = Extract<
   BoatChargingRouteName,
   | BoatChargingRouteName.confirmSession
   | BoatChargingRouteName.guestEmail
-  | BoatChargingRouteName.verifyVignet
-  | BoatChargingRouteName.chooseVignet
+  | BoatChargingRouteName.verifyVignette
+  | BoatChargingRouteName.chooseVignette
   | BoatChargingRouteName.locationDetails
   | BoatChargingRouteName.termsAndConditions
 >
diff --git a/src/modules/redirects/exports/RedirectKey.ts b/src/modules/redirects/exports/RedirectKey.ts
index 6caac3e73..21214910b 100644
--- a/src/modules/redirects/exports/RedirectKey.ts
+++ b/src/modules/redirects/exports/RedirectKey.ts
@@ -2,9 +2,9 @@ export enum RedirectKey {
   acknowledgeChild = 'acknowledgeChild',
   birth = 'birth',
   boatChargingInfo = 'boatChargingInfo',
-  boatChargingRequestVignet = 'boatChargingRequestVignet',
+  boatChargingRequestVignette = 'boatChargingRequestVignette',
   boatChargingTermsAndConditions = 'boatChargingTermsAndConditions',
-  boatChargingVignetInfo = 'boatChargingVignetInfo',
+  boatChargingVignetteInfo = 'boatChargingVignetteInfo',
   chatPrivacy = 'chatPrivacy',
   cityPassChildBudget = 'cityPassChildBudget',
   cityPassLowIncomeSupport = 'cityPassLowIncomeSupport',