From bc00cf2de62d7477765fc3841493906ae7cd9974 Mon Sep 17 00:00:00 2001
From: SharglutDev <p.filimon75@gmail.com>
Date: Thu, 5 Sep 2024 22:07:37 +0200
Subject: [PATCH] front: rename v2 components

It does not handle stdcmV2 renaming as it still coexists with stdcm debug

Signed-off-by: SharglutDev <p.filimon75@gmail.com>
---
 .../__tests__/sampleData.ts                   |  6 +-
 .../helpers/formatTrainScheduleSummaries.ts   |  2 +-
 .../hooks/useLazyLoadTrains.ts                |  4 +-
 .../hooks/useSetupItineraryForTrainUpdate.ts  |  5 +-
 .../hooks/useSimulationResults.ts             |  4 +-
 .../applications/operationalStudies/types.ts  | 12 ++--
 .../applications/operationalStudies/utils.ts  |  6 +-
 ...ScheduleV2.tsx => ImportTrainSchedule.tsx} | 12 ++--
 ...ScheduleV2.tsx => ManageTrainSchedule.tsx} | 20 +++---
 .../operationalStudies/views/Project.tsx      |  4 +-
 .../views/{v2/ScenarioV2.tsx => Scenario.tsx} | 22 +++---
 ...ionResultsV2.tsx => SimulationResults.tsx} | 39 ++++++-----
 .../operationalStudies/views/Study.tsx        | 10 +--
 ...tSheetV2.tsx => SimulationReportSheet.tsx} |  8 +--
 .../stdcm/utils/formatStdcmConfV2.ts          |  5 +-
 .../applications/stdcm/views/StdcmConfig.tsx  | 16 ++---
 .../stdcm/views/StdcmResultsV2.tsx            | 10 ++-
 .../stdcmV2/components/StdcmConfig.tsx        | 10 +--
 .../stdcmV2/components/StdcmDestination.tsx   |  4 +-
 .../stdcmV2/components/StdcmOrigin.tsx        |  8 +--
 .../components/StdcmResults/StdcmResults.tsx  |  4 +-
 .../stdcmV2/components/StdcmVias.tsx          |  6 +-
 .../Map/WarpedMap/SimulationWarpedMap.tsx     |  6 +-
 .../Map/components/TrainOnMap/TrainOnMap.tsx  |  2 -
 front/src/common/api/osrdEditoastApi.ts       |  8 +--
 front/src/main/app.jsx                        |  2 +-
 .../{ConflictCardV2.tsx => ConflictCard.tsx}  |  4 +-
 ...{ConflictsListV2.tsx => ConflictsList.tsx} | 14 ++--
 front/src/modules/conflict/utils.ts           |  2 +-
 .../InfraSelectorModalBodyStandard.tsx        |  4 +-
 .../{v2/DestinationV2.tsx => Destination.tsx} | 12 ++--
 .../{v2/OriginV2.tsx => Origin.tsx}           | 13 ++--
 .../{v2 => }/ViaStopDurationSelector.tsx      |  4 +-
 .../{v2/ViasV2.tsx => Vias.tsx}               | 14 ++--
 .../{ItineraryV2.tsx => Itinerary.tsx}        | 37 +++++-----
 .../Itinerary/ModalSuggestedVias.tsx          | 10 +--
 .../{PathfindingV2.tsx => Pathfinding.tsx}    | 10 +--
 .../{TypeAndPathV2.tsx => TypeAndPath.tsx}    |  6 +-
 ...hfindingV2.spec.ts => Pathfinding.spec.ts} | 16 ++---
 .../pathfinding/hooks/usePathfinding.ts       | 24 +++----
 front/src/modules/pathfinding/types.ts        |  2 +-
 ...orV2.tsx => PowerRestrictionsSelector.tsx} |  4 +-
 .../helpers/formatPowerRestrictions.ts        |  6 +-
 .../helpers/getRestrictionsToResize.ts        | 14 ++--
 .../helpers/powerRestrictionWarnings.ts       |  8 +--
 .../usePowerRestrictionSelectorBehaviours.ts  | 18 ++---
 .../hooks/usePowerRestrictionSelectorData.ts  |  4 +-
 .../RollingStockCardButtons.tsx               |  8 +--
 .../useStoreDataForRollingStockSelector.ts    |  4 +-
 .../components/AddOrEditScenarioModal.tsx     |  4 +-
 .../ScenarioExplorer/ScenarioExplorer.tsx     |  6 +-
 .../components/ChartHelpers/ChartHelpers.ts   |  9 ++-
 .../ChartHelpers/enableInteractivity.tsx      | 10 +--
 .../ChartHelpers/getScaleDomainFromValues.ts  |  2 +-
 ...SynchronizerV2.ts => ChartSynchronizer.ts} | 14 ++--
 .../components/ChartSynchronizer/index.ts     |  2 +-
 .../components/ChartSynchronizer/utils.ts     |  6 +-
 .../SimulationResultsMap.tsx}                 | 16 ++---
 .../TrainHoverPosition.tsx                    |  2 -
 ...rvesSlopesV2.tsx => SpaceCurvesSlopes.tsx} | 28 ++++----
 .../components/SpaceCurvesSlopes/utils.ts     |  9 +--
 ...artV2.tsx => SpeedSpaceChartContainer.tsx} |  8 +--
 .../SpeedSpaceChart/useSpeedSpaceChart.ts     |  4 +-
 .../components/TimeButtons.tsx                | 11 ++-
 .../{TrainDetailsV2.tsx => TrainDetails.tsx}  | 10 +--
 front/src/modules/simulationResult/types.ts   |  2 +-
 .../modules/timesStops/TimesStopsOutput.tsx   |  2 +-
 .../timesStops/helpers/computeMargins.ts      |  4 +-
 front/src/modules/timesStops/helpers/utils.ts |  2 +-
 .../timesStops/hooks/useOutputTableData.ts    |  2 +-
 .../DriverTrainSchedule.tsx}                  | 16 ++---
 .../DriverTrainScheduleHeader.tsx}            | 12 ++--
 .../DriverTrainScheduleStop.tsx}              |  8 +--
 .../DriverTrainScheduleStopList.tsx}          | 12 ++--
 .../__tests__/utils.spec.ts                   |  0
 .../consts.ts                                 |  0
 .../exportDriverScheduleCSV.ts                |  8 +--
 .../types.ts                                  |  0
 .../utils.ts                                  |  0
 ...igV2.tsx => ImportTrainScheduleConfig.tsx} |  4 +-
 ....tsx => ImportTrainScheduleTrainsList.tsx} | 12 ++--
 .../generateTrainSchedulesPayloads.ts         |  2 +-
 .../components/ImportTrainSchedule/index.ts   |  2 +-
 ...2Button.tsx => AddTrainScheduleButton.tsx} |  8 +--
 .../ManageTrainScheduleMap/ItineraryLayer.tsx |  6 +-
 ...raryMarkersV2.tsx => ItineraryMarkers.tsx} |  0
 .../ManageTrainScheduleMap/RenderPopup.tsx    | 16 ++---
 .../ManageTrainScheduleMap/setPointIti.ts     | 10 +--
 .../components/ManageTrainSchedule/Map.tsx    |  4 +-
 ...2.tsx => TimetableManageTrainSchedule.tsx} |  8 +--
 .../helpers/adjustConfWithTrainToModify.ts    |  6 +-
 .../helpers/checkCurrentConfig.ts             |  9 ++-
 .../FilterPanel.tsx                           |  0
 .../Timetable.tsx}                            | 16 ++---
 .../TimetableToolbar.tsx                      |  0
 .../TimetableTrainCard.tsx}                   |  6 +-
 .../{TimetableV2 => Timetable}/consts.ts      |  0
 .../{TimetableV2 => Timetable}/types.ts       |  0
 .../useFilterTrainSchedules.ts                |  0
 .../{TimetableV2 => Timetable}/utils.ts       |  0
 .../useFormattedOperationalPoints.ts          |  6 +-
 .../powerRestrictionReducer.ts                | 69 +++++++++----------
 .../osrdconf/operationalStudiesConf/utils.ts  | 18 ++---
 .../osrdConfCommon/__tests__/utils.ts         | 44 ++++++------
 .../reducers/osrdconf/osrdConfCommon/index.ts | 46 ++++++-------
 .../osrdconf/osrdConfCommon/selectors.ts      | 14 ++--
 .../stdcmConf/stdcmConfReducers.spec.ts       |  4 +-
 front/src/reducers/osrdconf/types.ts          |  6 +-
 .../operationalStudies/_scenario.scss         |  5 +-
 front/src/utils/date.ts                       | 14 +---
 front/tests/pages/home-page-model.ts          |  3 -
 111 files changed, 486 insertions(+), 534 deletions(-)
 rename front/src/applications/operationalStudies/views/{v2/ImportTrainScheduleV2.tsx => ImportTrainSchedule.tsx} (79%)
 rename front/src/applications/operationalStudies/views/{v2/ManageTrainScheduleV2.tsx => ManageTrainSchedule.tsx} (90%)
 rename front/src/applications/operationalStudies/views/{v2/ScenarioV2.tsx => Scenario.tsx} (94%)
 rename front/src/applications/operationalStudies/views/{v2/SimulationResultsV2.tsx => SimulationResults.tsx} (89%)
 rename front/src/applications/stdcm/components/{SimulationReportSheetV2.tsx => SimulationReportSheet.tsx} (98%)
 rename front/src/modules/conflict/components/{ConflictCardV2.tsx => ConflictCard.tsx} (95%)
 rename front/src/modules/conflict/components/{ConflictsListV2.tsx => ConflictsList.tsx} (87%)
 rename front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/{v2/DestinationV2.tsx => Destination.tsx} (86%)
 rename front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/{v2/OriginV2.tsx => Origin.tsx} (94%)
 rename front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/{v2 => }/ViaStopDurationSelector.tsx (93%)
 rename front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/{v2/ViasV2.tsx => Vias.tsx} (91%)
 rename front/src/modules/pathfinding/components/Itinerary/{ItineraryV2.tsx => Itinerary.tsx} (84%)
 rename front/src/modules/pathfinding/components/Pathfinding/{PathfindingV2.tsx => Pathfinding.tsx} (93%)
 rename front/src/modules/pathfinding/components/Pathfinding/{TypeAndPathV2.tsx => TypeAndPath.tsx} (98%)
 rename front/src/modules/pathfinding/components/Pathfinding/__tests__/{PathfindingV2.spec.ts => Pathfinding.spec.ts} (94%)
 rename front/src/modules/powerRestriction/components/{PowerRestrictionsSelectorV2.tsx => PowerRestrictionsSelector.tsx} (98%)
 rename front/src/modules/simulationResult/components/ChartSynchronizer/{ChartSynchronizerV2.ts => ChartSynchronizer.ts} (89%)
 rename front/src/modules/simulationResult/components/{SimulationResultsMapV2.tsx => SimulationResultsMap/SimulationResultsMap.tsx} (96%)
 rename front/src/modules/simulationResult/components/SpaceCurvesSlopes/{SpaceCurvesSlopesV2.tsx => SpaceCurvesSlopes.tsx} (91%)
 rename front/src/modules/simulationResult/components/SpeedSpaceChart/{SpeedSpaceChartV2.tsx => SpeedSpaceChartContainer.tsx} (96%)
 rename front/src/modules/simulationResult/components/{TrainDetailsV2.tsx => TrainDetails.tsx} (95%)
 rename front/src/modules/trainschedule/components/{DriverTrainScheduleV2/DriverTrainScheduleV2.tsx => DriverTrainSchedule/DriverTrainSchedule.tsx} (84%)
 rename front/src/modules/trainschedule/components/{DriverTrainScheduleV2/DriverTrainScheduleHeaderV2.tsx => DriverTrainSchedule/DriverTrainScheduleHeader.tsx} (94%)
 rename front/src/modules/trainschedule/components/{DriverTrainScheduleV2/DriverTrainScheduleStopV2.tsx => DriverTrainSchedule/DriverTrainScheduleStop.tsx} (95%)
 rename front/src/modules/trainschedule/components/{DriverTrainScheduleV2/DriverTrainScheduleStopListV2.tsx => DriverTrainSchedule/DriverTrainScheduleStopList.tsx} (92%)
 rename front/src/modules/trainschedule/components/{DriverTrainScheduleV2 => DriverTrainSchedule}/__tests__/utils.spec.ts (100%)
 rename front/src/modules/trainschedule/components/{DriverTrainScheduleV2 => DriverTrainSchedule}/consts.ts (100%)
 rename front/src/modules/trainschedule/components/{DriverTrainScheduleV2 => DriverTrainSchedule}/exportDriverScheduleCSV.ts (97%)
 rename front/src/modules/trainschedule/components/{DriverTrainScheduleV2 => DriverTrainSchedule}/types.ts (100%)
 rename front/src/modules/trainschedule/components/{DriverTrainScheduleV2 => DriverTrainSchedule}/utils.ts (100%)
 rename front/src/modules/trainschedule/components/ImportTrainSchedule/{ImportTrainScheduleConfigV2.tsx => ImportTrainScheduleConfig.tsx} (99%)
 rename front/src/modules/trainschedule/components/ImportTrainSchedule/{ImportTrainScheduleTrainsListV2.tsx => ImportTrainScheduleTrainsList.tsx} (92%)
 rename front/src/modules/trainschedule/components/ManageTrainSchedule/{AddTrainScheduleV2Button.tsx => AddTrainScheduleButton.tsx} (95%)
 rename front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/{ItineraryMarkersV2.tsx => ItineraryMarkers.tsx} (100%)
 rename front/src/modules/trainschedule/components/ManageTrainSchedule/{TimetableManageTrainScheduleV2.tsx => TimetableManageTrainSchedule.tsx} (94%)
 rename front/src/modules/trainschedule/components/{TimetableV2 => Timetable}/FilterPanel.tsx (100%)
 rename front/src/modules/trainschedule/components/{TimetableV2/TimetableV2.tsx => Timetable/Timetable.tsx} (95%)
 rename front/src/modules/trainschedule/components/{TimetableV2 => Timetable}/TimetableToolbar.tsx (100%)
 rename front/src/modules/trainschedule/components/{TimetableV2/TimetableTrainCardV2.tsx => Timetable/TimetableTrainCard.tsx} (98%)
 rename front/src/modules/trainschedule/components/{TimetableV2 => Timetable}/consts.ts (100%)
 rename front/src/modules/trainschedule/components/{TimetableV2 => Timetable}/types.ts (100%)
 rename front/src/modules/trainschedule/components/{TimetableV2 => Timetable}/useFilterTrainSchedules.ts (100%)
 rename front/src/modules/trainschedule/components/{TimetableV2 => Timetable}/utils.ts (100%)

diff --git a/front/src/applications/operationalStudies/__tests__/sampleData.ts b/front/src/applications/operationalStudies/__tests__/sampleData.ts
index 8f7558ead1f..c7b890678cc 100644
--- a/front/src/applications/operationalStudies/__tests__/sampleData.ts
+++ b/front/src/applications/operationalStudies/__tests__/sampleData.ts
@@ -3,7 +3,7 @@ import type {
   ElectricalBoundariesData,
   ElectricalProfileValue,
   ElectricalRangesData,
-  ElectrificationRangeV2,
+  ElectrificationRange,
   ElectrificationValue,
   PositionData,
 } from 'applications/operationalStudies/types';
@@ -242,7 +242,7 @@ export const electricalProfileRangesDataShort: ElectricalRangesData<ElectricalPr
   },
 ];
 
-export const electrificationRanges: ElectrificationRangeV2[] = [
+export const electrificationRanges: ElectrificationRange[] = [
   {
     start: 0,
     stop: 1,
@@ -284,7 +284,7 @@ export const electrificationRanges: ElectrificationRangeV2[] = [
   },
 ];
 
-export const electrificationRangesLarge: ElectrificationRangeV2[] = [
+export const electrificationRangesLarge: ElectrificationRange[] = [
   {
     start: 0,
     stop: 1,
diff --git a/front/src/applications/operationalStudies/helpers/formatTrainScheduleSummaries.ts b/front/src/applications/operationalStudies/helpers/formatTrainScheduleSummaries.ts
index 78b6dc13445..066d1b31f73 100644
--- a/front/src/applications/operationalStudies/helpers/formatTrainScheduleSummaries.ts
+++ b/front/src/applications/operationalStudies/helpers/formatTrainScheduleSummaries.ts
@@ -6,7 +6,7 @@ import type {
   SimulationSummaryResult,
   TrainScheduleResult,
 } from 'common/api/osrdEditoastApi';
-import type { TrainScheduleWithDetails } from 'modules/trainschedule/components/TimetableV2/types';
+import type { TrainScheduleWithDetails } from 'modules/trainschedule/components/Timetable/types';
 import { formatToIsoDate, isoDateToMs } from 'utils/date';
 import { jouleToKwh } from 'utils/physics';
 import { formatKmValue } from 'utils/strings';
diff --git a/front/src/applications/operationalStudies/hooks/useLazyLoadTrains.ts b/front/src/applications/operationalStudies/hooks/useLazyLoadTrains.ts
index 4947de86afd..431dadbf234 100644
--- a/front/src/applications/operationalStudies/hooks/useLazyLoadTrains.ts
+++ b/front/src/applications/operationalStudies/hooks/useLazyLoadTrains.ts
@@ -10,7 +10,7 @@ import {
 } from 'common/api/osrdEditoastApi';
 import { useOsrdConfSelectors } from 'common/osrdContext';
 import useLazyProjectTrains from 'modules/simulationResult/components/SpaceTimeChart/useLazyProjectTrains';
-import type { TrainScheduleWithDetails } from 'modules/trainschedule/components/TimetableV2/types';
+import type { TrainScheduleWithDetails } from 'modules/trainschedule/components/Timetable/types';
 import { getBatchPackage } from 'utils/batch';
 import { concatMap, mapBy } from 'utils/types';
 
@@ -82,7 +82,7 @@ const useLazyLoadTrains = ({
           },
         }).unwrap();
 
-        // the two rtk-query calls postV2TrainSchedule & postV2TrainScheduleSimulationSummary
+        // the two rtk-query calls postTrainSchedule & postTrainScheduleSimulationSummary
         // do not happen during the same react cycle.
         // if we update a train, one is going to re-fetch first and the 2 are out of sync during a few cycles.
         // these cycles do not make sense to render.
diff --git a/front/src/applications/operationalStudies/hooks/useSetupItineraryForTrainUpdate.ts b/front/src/applications/operationalStudies/hooks/useSetupItineraryForTrainUpdate.ts
index c49f0a565d1..9c9f682cb78 100644
--- a/front/src/applications/operationalStudies/hooks/useSetupItineraryForTrainUpdate.ts
+++ b/front/src/applications/operationalStudies/hooks/useSetupItineraryForTrainUpdate.ts
@@ -16,7 +16,7 @@ import {
 import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
 import { formatSuggestedOperationalPoints, upsertPathStepsInOPs } from 'modules/pathfinding/utils';
 import { getSupportedElectrification, isThermal } from 'modules/rollingStock/helpers/electric';
-import { adjustConfWithTrainToModifyV2 } from 'modules/trainschedule/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify';
+import { adjustConfWithTrainToModify } from 'modules/trainschedule/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify';
 import type { SuggestedOP } from 'modules/trainschedule/components/ManageTrainSchedule/types';
 import { setFailure } from 'reducers/main';
 import type { OperationalStudiesConfSliceActions } from 'reducers/osrdconf/operationalStudiesConf';
@@ -53,7 +53,6 @@ const computeBasePathSteps = (trainSchedule: TrainScheduleResult) =>
 
     const stepWithoutSecondaryCode = omit(step, ['secondary_code']);
 
-    // TODO DROP V1: we should store the offset in mm in the store
     if ('track' in stepWithoutSecondaryCode) {
       stepWithoutSecondaryCode.offset = mmToM(stepWithoutSecondaryCode.offset!);
     }
@@ -259,7 +258,7 @@ const useSetupItineraryForTrainUpdate = (
         }
       }
 
-      adjustConfWithTrainToModifyV2(
+      adjustConfWithTrainToModify(
         trainSchedule,
         pathSteps || computeBasePathSteps(trainSchedule),
         rollingStock?.id,
diff --git a/front/src/applications/operationalStudies/hooks/useSimulationResults.ts b/front/src/applications/operationalStudies/hooks/useSimulationResults.ts
index fd7005ad22f..960c24a61ab 100644
--- a/front/src/applications/operationalStudies/hooks/useSimulationResults.ts
+++ b/front/src/applications/operationalStudies/hooks/useSimulationResults.ts
@@ -5,12 +5,12 @@ import { useInfraID, useOsrdConfSelectors } from 'common/osrdContext';
 import useSpeedSpaceChart from 'modules/simulationResult/components/SpeedSpaceChart/useSpeedSpaceChart';
 import { getSelectedTrainId } from 'reducers/osrdsimulation/selectors';
 
-import type { SimulationResults } from '../types';
+import type { SimulationResultsData } from '../types';
 
 /**
  * Prepare data to be used in simulation results
  */
-const useSimulationResults = (): SimulationResults => {
+const useSimulationResults = (): SimulationResultsData => {
   const infraId = useInfraID();
   const { getElectricalProfileSetId } = useOsrdConfSelectors();
   const electricalProfileSetId = useSelector(getElectricalProfileSetId);
diff --git a/front/src/applications/operationalStudies/types.ts b/front/src/applications/operationalStudies/types.ts
index d36ba4678fa..77d08859eee 100644
--- a/front/src/applications/operationalStudies/types.ts
+++ b/front/src/applications/operationalStudies/types.ts
@@ -75,13 +75,13 @@ export type PositionData<T extends 'gradient' | 'radius'> = {
 };
 
 /** Start and stop are in meters */
-export type ElectrificationRangeV2 = {
-  electrificationUsage: ElectrificationUsageV2;
+export type ElectrificationRange = {
+  electrificationUsage: ElectrificationUsage;
   start: number;
   stop: number;
 };
 
-type ElectrificationUsageV2 = ElectrificationValue &
+type ElectrificationUsage = ElectrificationValue &
   SimulationResponseSuccess['electrical_profiles']['values'][number];
 
 export type BoundariesData = {
@@ -114,7 +114,7 @@ export type ElectricalProfileValue = Extract<
 
 /** Electrifications start and stop are in meters */
 export type PathPropertiesFormatted = {
-  electrifications: ElectrificationRangeV2[];
+  electrifications: ElectrificationRange[];
   curves: PositionData<'radius'>[];
   slopes: PositionData<'gradient'>[];
   operationalPoints: NonNullable<PathProperties['operational_points']>;
@@ -122,7 +122,7 @@ export type PathPropertiesFormatted = {
   voltages: RangedValue[];
 };
 
-export type PowerRestrictionV2 = ArrayElement<TrainScheduleBase['power_restrictions']>;
+export type PowerRestriction = ArrayElement<TrainScheduleBase['power_restrictions']>;
 
 export type SimulationResponseSuccess = Extract<SimulationResponse, { status: 'success' }>;
 
@@ -131,7 +131,7 @@ export type ElectrificationVoltage = {
   voltage?: string;
 };
 
-export type SimulationResults = {
+export type SimulationResultsData = {
   selectedTrainSchedule?: TrainScheduleResult;
   selectedTrainRollingStock?: RollingStockWithLiveries;
   selectedTrainPowerRestrictions: LayerData<PowerRestrictionValues>[];
diff --git a/front/src/applications/operationalStudies/utils.ts b/front/src/applications/operationalStudies/utils.ts
index 102fab66d09..518c74ead93 100644
--- a/front/src/applications/operationalStudies/utils.ts
+++ b/front/src/applications/operationalStudies/utils.ts
@@ -17,7 +17,7 @@ import type {
   ElectricalBoundariesData,
   ElectricalProfileValue,
   ElectricalRangesData,
-  ElectrificationRangeV2,
+  ElectrificationRange,
   ElectrificationValue,
   PathPropertiesFormatted,
   PositionData,
@@ -77,7 +77,7 @@ export const transformBoundariesDataToRangesData = <
   boundariesData: ElectricalBoundariesData<T>,
   pathLength: number
 ): ElectricalRangesData<T>[] => {
-  // TODO DROP V1 : remove electrical profiles
+  // TODO : remove electrical profiles
   const formatedData = boundariesData.boundaries.map((boundary, index) => ({
     start: index === 0 ? 0 : mmToM(boundariesData.boundaries[index - 1]),
     stop: mmToM(boundary),
@@ -99,7 +99,7 @@ export const transformBoundariesDataToRangesData = <
 export const formatElectrificationRanges = (
   electrifications: ElectricalRangesData<ElectrificationValue>[],
   electricalProfiles: ElectricalRangesData<ElectricalProfileValue>[]
-): ElectrificationRangeV2[] =>
+): ElectrificationRange[] =>
   // Electrifications can be of three types, electricalProfiles only two, so we know electrifications
   // will always be at least as long as electricalProfiles so we can use it as the main array
   electrifications.map((currentElectrification, index) => {
diff --git a/front/src/applications/operationalStudies/views/v2/ImportTrainScheduleV2.tsx b/front/src/applications/operationalStudies/views/ImportTrainSchedule.tsx
similarity index 79%
rename from front/src/applications/operationalStudies/views/v2/ImportTrainScheduleV2.tsx
rename to front/src/applications/operationalStudies/views/ImportTrainSchedule.tsx
index f01a5cecf06..2e86b2cc56c 100644
--- a/front/src/applications/operationalStudies/views/v2/ImportTrainScheduleV2.tsx
+++ b/front/src/applications/operationalStudies/views/ImportTrainSchedule.tsx
@@ -6,12 +6,12 @@ import type { ImportedTrainSchedule } from 'applications/operationalStudies/type
 import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
 import type { TrainScheduleBase } from 'common/api/osrdEditoastApi';
 import { Loader } from 'common/Loaders';
-import { ImportTrainScheduleConfigV2 } from 'modules/trainschedule/components/ImportTrainSchedule';
-import ImportTrainScheduleTrainsListV2 from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainsListV2';
+import { ImportTrainScheduleConfig } from 'modules/trainschedule/components/ImportTrainSchedule';
+import ImportTrainScheduleTrainsList from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainsList';
 import { setFailure } from 'reducers/main';
 import { useAppDispatch } from 'store';
 
-const ImportTrainScheduleV2 = ({ timetableId }: { timetableId: number }) => {
+const ImportTrainSchedule = ({ timetableId }: { timetableId: number }) => {
   const dispatch = useAppDispatch();
   const { t } = useTranslation(['rollingstock']);
   const [trainsList, setTrainsList] = useState<ImportedTrainSchedule[]>([]);
@@ -36,12 +36,12 @@ const ImportTrainScheduleV2 = ({ timetableId }: { timetableId: number }) => {
 
   return rollingStocks ? (
     <main className="import-train-schedule">
-      <ImportTrainScheduleConfigV2
+      <ImportTrainScheduleConfig
         setIsLoading={setIsLoading}
         setTrainsList={setTrainsList}
         setTrainsJsonData={setTrainsJsonData}
       />
-      <ImportTrainScheduleTrainsListV2
+      <ImportTrainScheduleTrainsList
         isLoading={isLoading}
         rollingStocks={rollingStocks}
         timetableId={timetableId}
@@ -54,4 +54,4 @@ const ImportTrainScheduleV2 = ({ timetableId }: { timetableId: number }) => {
   );
 };
 
-export default ImportTrainScheduleV2;
+export default ImportTrainSchedule;
diff --git a/front/src/applications/operationalStudies/views/v2/ManageTrainScheduleV2.tsx b/front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx
similarity index 90%
rename from front/src/applications/operationalStudies/views/v2/ManageTrainScheduleV2.tsx
rename to front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx
index a750a3d5730..2901edc1660 100644
--- a/front/src/applications/operationalStudies/views/v2/ManageTrainScheduleV2.tsx
+++ b/front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx
@@ -14,10 +14,10 @@ import { useOsrdConfSelectors } from 'common/osrdContext';
 import { useStoreDataForSpeedLimitByTagSelector } from 'common/SpeedLimitByTagSelector/useStoreDataForSpeedLimitByTagSelector';
 import Tabs from 'common/Tabs';
 import IncompatibleConstraints from 'modules/pathfinding/components/IncompatibleConstraints';
-import ItineraryV2 from 'modules/pathfinding/components/Itinerary/ItineraryV2';
+import Itinerary from 'modules/pathfinding/components/Itinerary/Itinerary';
 import getPathVoltages from 'modules/pathfinding/helpers/getPathVoltages';
 import { upsertPathStepsInOPs } from 'modules/pathfinding/utils';
-import PowerRestrictionsSelectorV2 from 'modules/powerRestriction/components/PowerRestrictionsSelectorV2';
+import PowerRestrictionsSelector from 'modules/powerRestriction/components/PowerRestrictionsSelector';
 import RollingStock2Img from 'modules/rollingStock/components/RollingStock2Img';
 import { RollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector';
 import { useStoreDataForRollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector/useStoreDataForRollingStockSelector';
@@ -28,16 +28,16 @@ import SimulationSettings from 'modules/trainschedule/components/ManageTrainSche
 import TrainSettings from 'modules/trainschedule/components/ManageTrainSchedule/TrainSettings';
 import { formatKmValue } from 'utils/strings';
 
-type ManageTrainScheduleV2Props = {
+type ManageTrainScheduleProps = {
   trainIdToEdit?: number;
 };
 
-const ManageTrainScheduleV2 = ({ trainIdToEdit }: ManageTrainScheduleV2Props) => {
+const ManageTrainSchedule = ({ trainIdToEdit }: ManageTrainScheduleProps) => {
   const { t } = useTranslation(['operationalStudies/manageTrainSchedule']);
-  const { getOriginV2, getDestinationV2, getPathSteps, getConstraintDistribution, getStartTime } =
+  const { getOrigin, getDestination, getPathSteps, getConstraintDistribution, getStartTime } =
     useOsrdConfSelectors();
-  const origin = useSelector(getOriginV2);
-  const destination = useSelector(getDestinationV2);
+  const origin = useSelector(getOrigin);
+  const destination = useSelector(getDestination);
   const pathSteps = useSelector(getPathSteps);
   const constraintDistribution = useSelector(getConstraintDistribution);
   const startTime = useSelector(getStartTime);
@@ -117,7 +117,7 @@ const ManageTrainScheduleV2 = ({ trainIdToEdit }: ManageTrainScheduleV2Props) =>
     content: (
       <div className="osrd-config-item-container-map" data-testid="map">
         <div className="floating-itinerary">
-          <ItineraryV2 pathProperties={pathProperties} setPathProperties={setPathProperties} />
+          <Itinerary pathProperties={pathProperties} setPathProperties={setPathProperties} />
         </div>
         <Map pathProperties={pathProperties}>
           <IncompatibleConstraints pathProperties={pathProperties} />
@@ -163,7 +163,7 @@ const ManageTrainScheduleV2 = ({ trainIdToEdit }: ManageTrainScheduleV2Props) =>
           constraintDistribution={constraintDistribution}
         />
         {rollingStock && isElectric(rollingStock.effort_curves.modes) && pathProperties && (
-          <PowerRestrictionsSelectorV2
+          <PowerRestrictionsSelector
             rollingStockModes={rollingStock.effort_curves.modes}
             rollingStockPowerRestrictions={rollingStock.power_restrictions}
             voltageRanges={voltageRanges}
@@ -190,4 +190,4 @@ const ManageTrainScheduleV2 = ({ trainIdToEdit }: ManageTrainScheduleV2Props) =>
   );
 };
 
-export default ManageTrainScheduleV2;
+export default ManageTrainSchedule;
diff --git a/front/src/applications/operationalStudies/views/Project.tsx b/front/src/applications/operationalStudies/views/Project.tsx
index 9a46135ff7c..1c9f4953479 100644
--- a/front/src/applications/operationalStudies/views/Project.tsx
+++ b/front/src/applications/operationalStudies/views/Project.tsx
@@ -50,7 +50,7 @@ export default function Project() {
   const [isLoading, setIsLoading] = useState(true);
 
   const { projectId: urlProjectId } = useParams() as ProjectParams;
-  const [deleteStudyV2] =
+  const [deleteStudy] =
     osrdEditoastApi.endpoints.deleteProjectsByProjectIdStudiesAndStudyId.useMutation();
   const [postSearch] = osrdEditoastApi.endpoints.postSearch.useMutation();
 
@@ -69,7 +69,7 @@ export default function Project() {
     toggleSelection: toggleStudySelection,
     deleteItems,
   } = useMultiSelection<StudyWithScenarios>((studyId) => {
-    deleteStudyV2({ projectId: projectId!, studyId });
+    deleteStudy({ projectId: projectId!, studyId });
   });
 
   const handleDeleteStudy = () => {
diff --git a/front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx b/front/src/applications/operationalStudies/views/Scenario.tsx
similarity index 94%
rename from front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx
rename to front/src/applications/operationalStudies/views/Scenario.tsx
index 5971906ae93..9e45c1c06df 100644
--- a/front/src/applications/operationalStudies/views/v2/ScenarioV2.tsx
+++ b/front/src/applications/operationalStudies/views/Scenario.tsx
@@ -20,16 +20,16 @@ import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
 import NavBarSNCF from 'common/BootstrapSNCF/NavBarSNCF';
 import AddAndEditScenarioModal from 'modules/scenario/components/AddOrEditScenarioModal';
 import ScenarioLoaderMessage from 'modules/scenario/components/ScenarioLoaderMessage';
-import TimetableManageTrainScheduleV2 from 'modules/trainschedule/components/ManageTrainSchedule/TimetableManageTrainScheduleV2';
-import TimetableV2 from 'modules/trainschedule/components/TimetableV2/TimetableV2';
+import TimetableManageTrainSchedule from 'modules/trainschedule/components/ManageTrainSchedule/TimetableManageTrainSchedule';
+import Timetable from 'modules/trainschedule/components/Timetable/Timetable';
 import type { RootState } from 'reducers';
 import { useAppDispatch } from 'store';
 import { concatMap, mapBy } from 'utils/types';
 
-import ImportTrainScheduleV2 from './ImportTrainScheduleV2';
-import ManageTrainScheduleV2 from './ManageTrainScheduleV2';
-import SimulationResultsV2 from './SimulationResultsV2';
-import useScenarioData from '../../hooks/useScenarioData';
+import ImportTrainSchedule from './ImportTrainSchedule';
+import ManageTrainSchedule from './ManageTrainSchedule';
+import SimulationResults from './SimulationResults';
+import useScenarioData from '../hooks/useScenarioData';
 
 const Scenario = () => {
   const { t } = useTranslation('operationalStudies/scenario');
@@ -222,7 +222,7 @@ const Scenario = () => {
                   <>
                     {displayTrainScheduleManagement !== MANAGE_TRAIN_SCHEDULE_TYPES.none &&
                       infra && (
-                        <TimetableManageTrainScheduleV2
+                        <TimetableManageTrainSchedule
                           displayTrainScheduleManagement={displayTrainScheduleManagement}
                           setDisplayTrainScheduleManagement={setDisplayTrainScheduleManagement}
                           upsertTrainSchedules={upsertTrainSchedules}
@@ -232,7 +232,7 @@ const Scenario = () => {
                         />
                       )}
                     {infra && (
-                      <TimetableV2
+                      <Timetable
                         setDisplayTrainScheduleManagement={setDisplayTrainScheduleManagement}
                         trainsWithDetails={trainsWithDetails}
                         infraState={infra.state}
@@ -261,12 +261,12 @@ const Scenario = () => {
               {(displayTrainScheduleManagement === MANAGE_TRAIN_SCHEDULE_TYPES.add ||
                 displayTrainScheduleManagement === MANAGE_TRAIN_SCHEDULE_TYPES.edit) && (
                 <div className="scenario-managetrainschedule">
-                  <ManageTrainScheduleV2 trainIdToEdit={trainIdToEdit} />
+                  <ManageTrainSchedule trainIdToEdit={trainIdToEdit} />
                 </div>
               )}
               {displayTrainScheduleManagement === MANAGE_TRAIN_SCHEDULE_TYPES.import && (
                 <div className="scenario-managetrainschedule">
-                  <ImportTrainScheduleV2 timetableId={scenario.timetable_id} />
+                  <ImportTrainSchedule timetableId={scenario.timetable_id} />
                 </div>
               )}
               <div className="scenario-results">
@@ -305,7 +305,7 @@ const Scenario = () => {
                 ) : (
                   isInfraLoaded &&
                   infra && (
-                    <SimulationResultsV2
+                    <SimulationResults
                       collapsedTimetable={collapsedTimetable}
                       spaceTimeData={projectedTrains}
                       simulationResults={simulationResults}
diff --git a/front/src/applications/operationalStudies/views/v2/SimulationResultsV2.tsx b/front/src/applications/operationalStudies/views/SimulationResults.tsx
similarity index 89%
rename from front/src/applications/operationalStudies/views/v2/SimulationResultsV2.tsx
rename to front/src/applications/operationalStudies/views/SimulationResults.tsx
index 3b5ebf0d45d..389b6657163 100644
--- a/front/src/applications/operationalStudies/views/v2/SimulationResultsV2.tsx
+++ b/front/src/applications/operationalStudies/views/SimulationResults.tsx
@@ -7,20 +7,23 @@ import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
 import { Rnd } from 'react-rnd';
 
-import type { SimulationResults, TrainSpaceTimeData } from 'applications/operationalStudies/types';
+import type {
+  SimulationResultsData,
+  TrainSpaceTimeData,
+} from 'applications/operationalStudies/types';
 import type { TrainScheduleResult } from 'common/api/osrdEditoastApi';
 import SimulationWarpedMap from 'common/Map/WarpedMap/SimulationWarpedMap';
-import { getScaleDomainFromValuesV2 } from 'modules/simulationResult/components/ChartHelpers/getScaleDomainFromValues';
-import SimulationResultsMapV2 from 'modules/simulationResult/components/SimulationResultsMapV2';
-import SpaceCurvesSlopesV2 from 'modules/simulationResult/components/SpaceCurvesSlopes/SpaceCurvesSlopesV2';
+import { getScaleDomainFromValues } from 'modules/simulationResult/components/ChartHelpers/getScaleDomainFromValues';
+import SimulationResultsMap from 'modules/simulationResult/components/SimulationResultsMap/SimulationResultsMap';
+import SpaceCurvesSlopes from 'modules/simulationResult/components/SpaceCurvesSlopes/SpaceCurvesSlopes';
 import ProjectionLoadingMessage from 'modules/simulationResult/components/SpaceTimeChart/ProjectionLoadingMessage';
 import useGetProjectedTrainOperationalPoints from 'modules/simulationResult/components/SpaceTimeChart/useGetProjectedTrainOperationalPoints';
-import SpeedSpaceChartV2 from 'modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChartV2';
+import SpeedSpaceChartContainer from 'modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChartContainer';
 import TimeButtons from 'modules/simulationResult/components/TimeButtons';
-import TrainDetailsV2 from 'modules/simulationResult/components/TrainDetailsV2';
+import TrainDetails from 'modules/simulationResult/components/TrainDetails';
 import type { PositionScaleDomain } from 'modules/simulationResult/types';
 import TimesStopsOutput from 'modules/timesStops/TimesStopsOutput';
-import DriverTrainScheduleV2 from 'modules/trainschedule/components/DriverTrainScheduleV2/DriverTrainScheduleV2';
+import DriverTrainSchedule from 'modules/trainschedule/components/DriverTrainSchedule/DriverTrainSchedule';
 import { useFormattedOperationalPoints } from 'modules/trainschedule/useFormattedOperationalPoints';
 import { updateViewport, type Viewport } from 'reducers/map';
 import { getIsUpdating } from 'reducers/osrdsimulation/selectors';
@@ -30,17 +33,17 @@ const MAP_MIN_HEIGHT = 450;
 const SPEED_SPACE_CHART_HEIGHT = 521.5;
 const HANDLE_TAB_RESIZE_HEIGHT = 20;
 
-type SimulationResultsV2Props = {
+type SimulationResultsProps = {
   collapsedTimetable: boolean;
   spaceTimeData?: TrainSpaceTimeData[];
   infraId?: number;
   trainScheduleUsedForProjection?: TrainScheduleResult;
   trainIdUsedForProjection?: number;
-  simulationResults: SimulationResults;
+  simulationResults: SimulationResultsData;
   timetableTrainNb: number;
 };
 
-const SimulationResultsV2 = ({
+const SimulationResults = ({
   collapsedTimetable,
   spaceTimeData,
   infraId,
@@ -55,7 +58,7 @@ const SimulationResultsV2 = ({
     path,
   },
   timetableTrainNb,
-}: SimulationResultsV2Props) => {
+}: SimulationResultsProps) => {
   const { t } = useTranslation('simulation');
   const dispatch = useAppDispatch();
   const isUpdating = useSelector(getIsUpdating);
@@ -117,7 +120,7 @@ const SimulationResultsV2 = ({
   useEffect(() => {
     if (trainSimulation && trainSimulation.status === 'success') {
       const { positions } = trainSimulation.final_output;
-      const newPositionsScaleDomain = getScaleDomainFromValuesV2(positions);
+      const newPositionsScaleDomain = getScaleDomainFromValues(positions);
       setPositionScaleDomain({
         initial: newPositionsScaleDomain,
         current: newPositionsScaleDomain,
@@ -143,7 +146,7 @@ const SimulationResultsV2 = ({
               <TimeButtons departureTime={selectedTrainSchedule.start_time} />
             </div>
             {trainUsedForProjectionSpaceTimeData && (
-              <TrainDetailsV2 projectedTrain={trainUsedForProjectionSpaceTimeData} />
+              <TrainDetails projectedTrain={trainUsedForProjectionSpaceTimeData} />
             )}
           </div>
         </div>
@@ -195,7 +198,7 @@ const SimulationResultsV2 = ({
               height: `${speedSpaceChartContainerHeight + HANDLE_TAB_RESIZE_HEIGHT}px`,
             }}
           >
-            <SpeedSpaceChartV2
+            <SpeedSpaceChartContainer
               trainSimulation={trainSimulation}
               selectedTrainPowerRestrictions={selectedTrainPowerRestrictions}
               pathProperties={pathProperties}
@@ -251,7 +254,7 @@ const SimulationResultsV2 = ({
                 );
               }}
             >
-              <SpaceCurvesSlopesV2
+              <SpaceCurvesSlopes
                 initialHeight={heightOfSpaceCurvesSlopesChart}
                 trainSimulation={trainSimulation}
                 pathProperties={pathProperties}
@@ -268,7 +271,7 @@ const SimulationResultsV2 = ({
       <div ref={timeTableRef}>
         <div className="osrd-simulation-container mb-2">
           <div className="osrd-simulation-map" style={{ height: `${heightOfSimulationMap}px` }}>
-            <SimulationResultsMapV2
+            <SimulationResultsMap
               setExtViewport={setExtViewport}
               geometry={pathProperties?.geometry}
               trainSimulation={
@@ -293,7 +296,7 @@ const SimulationResultsV2 = ({
         operationalPoints &&
         infraId && (
           <div className="osrd-simulation-container mb-2">
-            <DriverTrainScheduleV2
+            <DriverTrainSchedule
               train={selectedTrainSchedule}
               simulatedTrain={trainSimulation}
               pathProperties={pathProperties}
@@ -309,4 +312,4 @@ const SimulationResultsV2 = ({
   );
 };
 
-export default SimulationResultsV2;
+export default SimulationResults;
diff --git a/front/src/applications/operationalStudies/views/Study.tsx b/front/src/applications/operationalStudies/views/Study.tsx
index 477a63985a1..aed12e61327 100644
--- a/front/src/applications/operationalStudies/views/Study.tsx
+++ b/front/src/applications/operationalStudies/views/Study.tsx
@@ -73,12 +73,12 @@ export default function Study() {
   );
 
   const [postSearch] = osrdEditoastApi.endpoints.postSearch.useMutation();
-  const [deleteScenarioV2] =
+  const [deleteScenario] =
     osrdEditoastApi.endpoints.deleteProjectsByProjectIdStudiesAndStudyIdScenariosScenarioId.useMutation(
       {}
     );
 
-  const { data: scenariosV2 } =
+  const { data: scenarios } =
     osrdEditoastApi.endpoints.getProjectsByProjectIdStudiesAndStudyIdScenarios.useQuery(
       {
         projectId: projectId!,
@@ -97,7 +97,7 @@ export default function Study() {
     toggleSelection: toggleScenarioSelection,
     deleteItems,
   } = useMultiSelection<ScenarioWithDetails>((scenarioId) => {
-    deleteScenarioV2({ projectId: projectId!, studyId: studyId!, scenarioId });
+    deleteScenario({ projectId: projectId!, studyId: studyId!, scenarioId });
   });
   const handleDeleteScenario = () => {
     if (selectedScenarioIds.length > 0 && studyId && projectId) {
@@ -161,7 +161,7 @@ export default function Study() {
           console.error(error);
         }
       } else {
-        setScenariosList(scenariosV2?.results || []);
+        setScenariosList(scenarios?.results || []);
       }
       setIsLoading(false);
     }
@@ -197,7 +197,7 @@ export default function Study() {
 
   useEffect(() => {
     getScenarioList();
-  }, [sortOption, filter, scenariosV2]);
+  }, [sortOption, filter, scenarios]);
 
   return (
     <>
diff --git a/front/src/applications/stdcm/components/SimulationReportSheetV2.tsx b/front/src/applications/stdcm/components/SimulationReportSheet.tsx
similarity index 98%
rename from front/src/applications/stdcm/components/SimulationReportSheetV2.tsx
rename to front/src/applications/stdcm/components/SimulationReportSheet.tsx
index 86f218fe58f..d9dcdad3a45 100644
--- a/front/src/applications/stdcm/components/SimulationReportSheetV2.tsx
+++ b/front/src/applications/stdcm/components/SimulationReportSheet.tsx
@@ -4,13 +4,13 @@ import { useTranslation } from 'react-i18next';
 
 import iconAlert from 'assets/simulationReportSheet/icon_alert_fill.png';
 import logoSNCF from 'assets/simulationReportSheet/logo_sncf_reseau.png';
-import { formatDateToString, formatDayV2 } from 'utils/date';
+import { formatDateToString, formatDay } from 'utils/date';
 
 import styles from './SimulationReportStyleSheet';
 import type { SimulationReportSheetProps } from '../types';
 import { extractSpeedLimit, getStopDurationTime } from '../utils/formatSimulationReportSheet';
 
-const SimulationReportSheetV2 = ({
+const SimulationReportSheet = ({
   stdcmData,
   simulationReportSheetNumber,
   mapCanvas,
@@ -70,7 +70,7 @@ const SimulationReportSheetV2 = ({
           <View style={styles.rcInfo.rcBox}>
             <View style={styles.rcInfo.stdcmApplication}>
               <Text style={styles.rcInfo.applicationDate}>{t('applicationDate')}</Text>
-              <Text style={styles.rcInfo.date}>{formatDayV2(departureTime)}</Text>
+              <Text style={styles.rcInfo.date}>{formatDay(departureTime)}</Text>
               <Text style={styles.rcInfo.referencePath}>{t('referencePath')}</Text>
               <Text style={styles.rcInfo.pathNumber}>{fakeInformation.path_number1}</Text>
             </View>
@@ -347,4 +347,4 @@ const SimulationReportSheetV2 = ({
   );
 };
 
-export default SimulationReportSheetV2;
+export default SimulationReportSheet;
diff --git a/front/src/applications/stdcm/utils/formatStdcmConfV2.ts b/front/src/applications/stdcm/utils/formatStdcmConfV2.ts
index 9d974913c5c..4f6132ac349 100644
--- a/front/src/applications/stdcm/utils/formatStdcmConfV2.ts
+++ b/front/src/applications/stdcm/utils/formatStdcmConfV2.ts
@@ -46,7 +46,7 @@ export const checkStdcmConf = (
     pathSteps,
     timetableID,
     speedLimitByTag,
-    rollingStockComfortV2,
+    rollingStockComfort,
     infraID,
     rollingStockID,
     maximumRunTime,
@@ -191,7 +191,6 @@ export const checkStdcmConf = (
     if ('track' in stepLocation) {
       return {
         duration,
-        // TODO DROP V1: we should store the offset in mm in the store
         location: { track: stepLocation.track, offset: mToMm(stepLocation.offset) },
         timing_data: timingData,
       };
@@ -209,7 +208,7 @@ export const checkStdcmConf = (
     infraId: infraID!,
     rollingStockId: rollingStockID!,
     timetableId: timetableID!,
-    rollingStockComfort: rollingStockComfortV2,
+    rollingStockComfort,
     path,
     ...(!stdcmV2Activated && {
       startTime: originTime!,
diff --git a/front/src/applications/stdcm/views/StdcmConfig.tsx b/front/src/applications/stdcm/views/StdcmConfig.tsx
index 2bad84eaea7..5e368e11693 100644
--- a/front/src/applications/stdcm/views/StdcmConfig.tsx
+++ b/front/src/applications/stdcm/views/StdcmConfig.tsx
@@ -12,7 +12,7 @@ import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
 import { useInfraID, useOsrdConfSelectors } from 'common/osrdContext';
 import SpeedLimitByTagSelector from 'common/SpeedLimitByTagSelector/SpeedLimitByTagSelector';
 import { useStoreDataForSpeedLimitByTagSelector } from 'common/SpeedLimitByTagSelector/useStoreDataForSpeedLimitByTagSelector';
-import ItineraryV2 from 'modules/pathfinding/components/Itinerary/ItineraryV2';
+import Itinerary from 'modules/pathfinding/components/Itinerary/Itinerary';
 import { RollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector';
 import { useStoreDataForRollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector/useStoreDataForRollingStockSelector';
 import ScenarioExplorer from 'modules/scenario/components/ScenarioExplorer';
@@ -43,15 +43,15 @@ const StdcmConfig = ({
     getScenarioID,
     getStudyID,
     getTimetableID,
-    getOriginV2,
-    getDestinationV2,
+    getOrigin,
+    getDestination,
   } = useOsrdConfSelectors();
   const projectID = useSelector(getProjectID);
   const studyID = useSelector(getStudyID);
   const scenarioID = useSelector(getScenarioID);
   const timetableID = useSelector(getTimetableID);
-  const originV2 = useSelector(getOriginV2);
-  const destinationV2 = useSelector(getDestinationV2);
+  const origin = useSelector(getOrigin);
+  const destination = useSelector(getDestination);
   const infraID = useInfraID();
 
   const [showMap, setShowMap] = useState<boolean>(true);
@@ -77,7 +77,7 @@ const StdcmConfig = ({
   );
 
   const disabledApplyButton = useMemo(() => {
-    if (!originV2 || !destinationV2 || !osrdconf.originDate) return true;
+    if (!origin || !destination || !osrdconf.originDate) return true;
 
     return (
       infra?.state !== 'CACHED' ||
@@ -87,7 +87,7 @@ const StdcmConfig = ({
         osrdconf.originTime > osrdconf.originUpperBoundTime) ||
       !osrdconf.rollingStockID
     );
-  }, [infra, osrdconf, originV2, destinationV2]);
+  }, [infra, osrdconf, origin, destination]);
 
   const handleClick = () => {
     launchStdcmRequest();
@@ -129,7 +129,7 @@ const StdcmConfig = ({
                 dispatchUpdateSpeedLimitByTag={dispatchUpdateSpeedLimitByTag}
               />
 
-              <ItineraryV2
+              <Itinerary
                 pathProperties={pathProperties}
                 setPathProperties={setPathProperties}
                 shouldManageStopDuration
diff --git a/front/src/applications/stdcm/views/StdcmResultsV2.tsx b/front/src/applications/stdcm/views/StdcmResultsV2.tsx
index a96ce707254..3e1e4ce47e7 100644
--- a/front/src/applications/stdcm/views/StdcmResultsV2.tsx
+++ b/front/src/applications/stdcm/views/StdcmResultsV2.tsx
@@ -6,9 +6,9 @@ import { useTranslation } from 'react-i18next';
 
 import type { ManageTrainSchedulePathProperties } from 'applications/operationalStudies/types';
 import { LoaderFill } from 'common/Loaders';
-import SpeedSpaceChartV2 from 'modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChartV2';
+import SpeedSpaceChartContainer from 'modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChartContainer';
 
-import SimulationReportSheetV2 from '../components/SimulationReportSheetV2';
+import SimulationReportSheet from '../components/SimulationReportSheet';
 import { STDCM_TRAIN_ID } from '../consts';
 import type { StdcmV2Results } from '../types';
 import {
@@ -27,8 +27,6 @@ type StcdmResultsProps = {
 
 const codeNumber = generateCodeNumber();
 
-// TODO TS2 : Adapt StdcmResult to trainSchedule v2 (SpaceTimeChart and SpeedSpaceChart)
-
 const StcdmResultsV2 = ({ mapCanvas, stdcmV2Results, pathProperties }: StcdmResultsProps) => {
   const { t } = useTranslation(['stdcm']);
   const [speedSpaceChartContainerHeight, setSpeedSpaceChartContainerHeight] =
@@ -74,7 +72,7 @@ const StcdmResultsV2 = ({ mapCanvas, stdcmV2Results, pathProperties }: StcdmResu
             }}
           >
             {speedSpaceChartData ? (
-              <SpeedSpaceChartV2
+              <SpeedSpaceChartContainer
                 trainSimulation={stdcmResponse.simulation}
                 selectedTrainPowerRestrictions={speedSpaceChartData.formattedPowerRestrictions}
                 pathProperties={speedSpaceChartData.formattedPathProperties}
@@ -90,7 +88,7 @@ const StcdmResultsV2 = ({ mapCanvas, stdcmV2Results, pathProperties }: StcdmResu
           <button className="btn d-flex align-items-center mb-1 font-weight-bold" type="button">
             <PDFDownloadLink
               document={
-                <SimulationReportSheetV2
+                <SimulationReportSheet
                   stdcmData={stdcmResponse}
                   simulationReportSheetNumber={codeNumber}
                   mapCanvas={mapCanvas}
diff --git a/front/src/applications/stdcmV2/components/StdcmConfig.tsx b/front/src/applications/stdcmV2/components/StdcmConfig.tsx
index f732c854320..a45cf8f34a7 100644
--- a/front/src/applications/stdcmV2/components/StdcmConfig.tsx
+++ b/front/src/applications/stdcmV2/components/StdcmConfig.tsx
@@ -7,7 +7,7 @@ import { useSelector } from 'react-redux';
 
 import type { ManageTrainSchedulePathProperties } from 'applications/operationalStudies/types';
 import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
-import { usePathfindingV2 } from 'modules/pathfinding/hooks/usePathfinding';
+import { usePathfinding } from 'modules/pathfinding/hooks/usePathfinding';
 import { Map } from 'modules/trainschedule/components/ManageTrainSchedule';
 import type { StdcmConfSliceActions } from 'reducers/osrdconf/stdcmConf';
 import { useAppDispatch } from 'store';
@@ -67,11 +67,11 @@ const StdcmConfig = ({
     updateDestinationArrivalType,
   } = useOsrdConfActions() as StdcmConfSliceActions;
 
-  const { getOriginV2, getDestinationV2 } = useOsrdConfSelectors();
-  const origin = useSelector(getOriginV2);
-  const destination = useSelector(getDestinationV2);
+  const { getOrigin, getDestination } = useOsrdConfSelectors();
+  const origin = useSelector(getOrigin);
+  const destination = useSelector(getDestination);
 
-  const { pathfindingState } = usePathfindingV2(undefined, pathProperties);
+  const { pathfindingState } = usePathfinding(undefined, pathProperties);
 
   const [formErrors, setFormErrors] = useState<StdcmConfigErrors | undefined>(undefined);
 
diff --git a/front/src/applications/stdcmV2/components/StdcmDestination.tsx b/front/src/applications/stdcmV2/components/StdcmDestination.tsx
index 9db78f9caec..a15eb35b25c 100644
--- a/front/src/applications/stdcmV2/components/StdcmDestination.tsx
+++ b/front/src/applications/stdcmV2/components/StdcmDestination.tsx
@@ -25,7 +25,7 @@ const StdcmDestination = ({
   const { t } = useTranslation('stdcm');
   const dispatch = useAppDispatch();
   const {
-    updateDestinationV2,
+    updateDestination,
     updateDestinationArrival,
     updateDestinationArrivalType,
     updateDestinationTolerances,
@@ -58,7 +58,7 @@ const StdcmDestination = ({
   }, [destination]);
 
   const updateDestinationPoint = (pathStep: PathStep | null) => {
-    dispatch(updateDestinationV2(pathStep));
+    dispatch(updateDestination(pathStep));
   };
 
   const onDestinationArrivalChange = (arrival: string) => {
diff --git a/front/src/applications/stdcmV2/components/StdcmOrigin.tsx b/front/src/applications/stdcmV2/components/StdcmOrigin.tsx
index 03f714edd7a..21b5d88efb8 100644
--- a/front/src/applications/stdcmV2/components/StdcmOrigin.tsx
+++ b/front/src/applications/stdcmV2/components/StdcmOrigin.tsx
@@ -25,7 +25,7 @@ const StdcmOrigin = ({
   const { t } = useTranslation('stdcm');
   const dispatch = useAppDispatch();
 
-  const { updateOriginV2, updateOriginArrival, updateOriginArrivalType, updateOriginTolerances } =
+  const { updateOrigin, updateOriginArrival, updateOriginArrivalType, updateOriginTolerances } =
     useOsrdConfActions() as StdcmConfSliceActions;
 
   const { originArrival, originToleranceValues } = useMemo(
@@ -48,8 +48,8 @@ const StdcmOrigin = ({
     }));
   }, [origin]);
 
-  const updateOriginV2Point = (pathStep: PathStep | null) => {
-    dispatch(updateOriginV2(pathStep));
+  const updateOriginPoint = (pathStep: PathStep | null) => {
+    dispatch(updateOrigin(pathStep));
   };
 
   const onOriginArrivalChange = (arrival: string) => {
@@ -79,7 +79,7 @@ const StdcmOrigin = ({
     >
       <div className="stdcm-v2-origin__parameters">
         <StdcmOperationalPoint
-          updatePoint={updateOriginV2Point}
+          updatePoint={updateOriginPoint}
           point={origin}
           opPointId={origin?.id || 'origin'}
           disabled={disabled}
diff --git a/front/src/applications/stdcmV2/components/StdcmResults/StdcmResults.tsx b/front/src/applications/stdcmV2/components/StdcmResults/StdcmResults.tsx
index 3310e0df62f..5c3c1d72194 100644
--- a/front/src/applications/stdcmV2/components/StdcmResults/StdcmResults.tsx
+++ b/front/src/applications/stdcmV2/components/StdcmResults/StdcmResults.tsx
@@ -4,7 +4,7 @@ import { Button } from '@osrd-project/ui-core';
 import { PDFDownloadLink } from '@react-pdf/renderer';
 import { useTranslation } from 'react-i18next';
 
-import SimulationReportSheetV2 from 'applications/stdcm/components/SimulationReportSheetV2';
+import SimulationReportSheet from 'applications/stdcm/components/SimulationReportSheet';
 import {
   generateCodeNumber,
   getOperationalPointsWithTimes,
@@ -83,7 +83,7 @@ const StcdmResults = ({
                 <div className="download-simulation">
                   <PDFDownloadLink
                     document={
-                      <SimulationReportSheetV2
+                      <SimulationReportSheet
                         stdcmData={selectedSimulation.outputs.results}
                         simulationReportSheetNumber={simulationReportSheetNumber}
                         mapCanvas={mapCanvas}
diff --git a/front/src/applications/stdcmV2/components/StdcmVias.tsx b/front/src/applications/stdcmV2/components/StdcmVias.tsx
index db809413123..115fe6255cd 100644
--- a/front/src/applications/stdcmV2/components/StdcmVias.tsx
+++ b/front/src/applications/stdcmV2/components/StdcmVias.tsx
@@ -23,7 +23,7 @@ const StdcmVias = ({ disabled = false, setCurrentSimulationInputs }: StdcmConfig
   const { t } = useTranslation('stdcm');
   const dispatch = useAppDispatch();
   const { getPathSteps } = useOsrdConfSelectors();
-  const { deleteViaV2, updatePathSteps, updateViaStopTimeV2 } =
+  const { deleteVia, updatePathSteps, updateViaStopTime } =
     useOsrdConfActions() as StdcmConfSliceActions;
   const pathSteps = useSelector(getPathSteps);
 
@@ -38,7 +38,7 @@ const StdcmVias = ({ disabled = false, setCurrentSimulationInputs }: StdcmConfig
     const pathStepToUpdate = pathSteps[index];
     if (!pathStepToUpdate) return;
     dispatch(
-      updateViaStopTimeV2({
+      updateViaStopTime({
         via: pathStepToUpdate,
         duration: formatDurationAsISO8601(Number(stopTime) * 60),
       })
@@ -46,7 +46,7 @@ const StdcmVias = ({ disabled = false, setCurrentSimulationInputs }: StdcmConfig
   };
 
   const deleteViaOnClick = (index: number) => {
-    dispatch(deleteViaV2(index));
+    dispatch(deleteVia(index));
   };
 
   const addViaOnClick = (pathStepIndex: number) => {
diff --git a/front/src/common/Map/WarpedMap/SimulationWarpedMap.tsx b/front/src/common/Map/WarpedMap/SimulationWarpedMap.tsx
index 76349ce6848..a5077e56cb4 100644
--- a/front/src/common/Map/WarpedMap/SimulationWarpedMap.tsx
+++ b/front/src/common/Map/WarpedMap/SimulationWarpedMap.tsx
@@ -85,7 +85,7 @@ const SimulationWarpedMap = ({
   // const [localPositionValues, setLocalPositionValues] = useState<PositionsSpeedTimes<Date>>(
   //   {} as PositionsSpeedTimes<Date>
   // );
-  // useChartSynchronizerV2(
+  // useChartSynchronizer(
   //   debounce((timePosition, positionValues) => {
   //     setLocalTimePosition(timePosition);
   //     setLocalPositionValues(positionValues);
@@ -183,7 +183,7 @@ const SimulationWarpedMap = ({
   }, [itineraryState, state]);
 
   // Trains handling:
-  // TODO: fix warped map - adapt this part with simulations results v2
+  // TODO: fix warped map - adapt this part with simulations results
   // const trainsIndex = useMemo(() => keyBy(simulation.trains as Train[], 'id'), [simulation.trains]);
   // const trainsPositionsState: AsyncMemoState<
   //   (TrainPosition & { train: Train; isSelected?: boolean })[]
@@ -297,7 +297,7 @@ const SimulationWarpedMap = ({
             osrdData={state.osrd}
             osmData={state.osm}
             itinerary={warpedItinerary}
-            // TODO: fix warped map - adapt this part with simulations results v2
+            // TODO: fix warped map - adapt this part with simulations results
             // trainsPositions={getAsyncMemoData(trainsPositionsState) || undefined}
             boundingBox={mode === 'auto' ? syncedBoundingBox : undefined}
           />
diff --git a/front/src/common/Map/components/TrainOnMap/TrainOnMap.tsx b/front/src/common/Map/components/TrainOnMap/TrainOnMap.tsx
index 59cf192a4f3..5534bb16705 100644
--- a/front/src/common/Map/components/TrainOnMap/TrainOnMap.tsx
+++ b/front/src/common/Map/components/TrainOnMap/TrainOnMap.tsx
@@ -61,8 +61,6 @@ type TrainOnMapProps = {
   viewport: Viewport;
 };
 
-// TO DO DROP V1: remove this comment
-// TrainOnMap corresponds to TrainHoverPositionV2
 const TrainOnMap = ({ trainInfo, geojsonPath, viewport, trainSimulation }: TrainOnMapProps) => {
   const zoomLengthFactor = getZoomPowerOf2LengthFactor(viewport);
 
diff --git a/front/src/common/api/osrdEditoastApi.ts b/front/src/common/api/osrdEditoastApi.ts
index eda7337d153..6b49ed8775c 100644
--- a/front/src/common/api/osrdEditoastApi.ts
+++ b/front/src/common/api/osrdEditoastApi.ts
@@ -33,13 +33,13 @@ const osrdEditoastApi = generatedEditoastApi.enhanceEndpoints({
       }),
     },
     deleteTrainSchedule: {
-      // As we always use all get trainschedule v2 endpoints after updating the timetable,
-      // we don't want to invalidate the trainschedulev2 tag here to prevent multiple calls
+      // As we always use all get trainschedule endpoints after updating the timetable,
+      // we don't want to invalidate the trainschedule tag here to prevent multiple calls
       invalidatesTags: ['timetable', 'scenarios'],
     },
     postTimetableByIdTrainSchedule: {
-      // As we always use all get trainschedule v2 endpoints after updating the timetable,
-      // we don't want to invalidate the trainschedulev2 tag here to prevent multiple calls
+      // As we always use all get trainschedule endpoints after updating the timetable,
+      // we don't want to invalidate the trainschedule tag here to prevent multiple calls
       invalidatesTags: ['timetable', 'scenarios'],
     },
     // Invalidate the children count and last update timestamp
diff --git a/front/src/main/app.jsx b/front/src/main/app.jsx
index 868902c9a90..0fe86030516 100644
--- a/front/src/main/app.jsx
+++ b/front/src/main/app.jsx
@@ -6,8 +6,8 @@ import 'i18n';
 import HomeEditor from 'applications/editor/Home';
 import HomeOperationalStudies from 'applications/operationalStudies/Home';
 import Project from 'applications/operationalStudies/views/Project';
+import Scenario from 'applications/operationalStudies/views/Scenario';
 import Study from 'applications/operationalStudies/views/Study';
-import Scenario from 'applications/operationalStudies/views/v2/ScenarioV2';
 import HomeMap from 'applications/referenceMap/Home';
 import HomeRollingStockEditor from 'applications/rollingStockEditor/Home';
 import HomeStdcm from 'applications/stdcm/Home';
diff --git a/front/src/modules/conflict/components/ConflictCardV2.tsx b/front/src/modules/conflict/components/ConflictCard.tsx
similarity index 95%
rename from front/src/modules/conflict/components/ConflictCardV2.tsx
rename to front/src/modules/conflict/components/ConflictCard.tsx
index b6a39a0bba0..67fba472fc8 100644
--- a/front/src/modules/conflict/components/ConflictCardV2.tsx
+++ b/front/src/modules/conflict/components/ConflictCard.tsx
@@ -5,7 +5,7 @@ import { formatToIsoDate } from 'utils/date';
 
 import type { ConflictWithTrainNames } from '../types';
 
-const ConflictCardV2 = ({
+const ConflictCard = ({
   conflict,
   onConflictClick,
 }: {
@@ -45,4 +45,4 @@ const ConflictCardV2 = ({
   );
 };
 
-export default ConflictCardV2;
+export default ConflictCard;
diff --git a/front/src/modules/conflict/components/ConflictsListV2.tsx b/front/src/modules/conflict/components/ConflictsList.tsx
similarity index 87%
rename from front/src/modules/conflict/components/ConflictsListV2.tsx
rename to front/src/modules/conflict/components/ConflictsList.tsx
index 606c8b1cb03..123cec51b81 100644
--- a/front/src/modules/conflict/components/ConflictsListV2.tsx
+++ b/front/src/modules/conflict/components/ConflictsList.tsx
@@ -4,13 +4,13 @@ import cx from 'classnames';
 import { useTranslation } from 'react-i18next';
 
 import type { Conflict } from 'common/api/osrdEditoastApi';
-import type { TrainScheduleWithDetails } from 'modules/trainschedule/components/TimetableV2/types';
+import type { TrainScheduleWithDetails } from 'modules/trainschedule/components/Timetable/types';
 
-import ConflictCardV2 from './ConflictCardV2';
+import ConflictCard from './ConflictCard';
 import type { ConflictWithTrainNames } from '../types';
 import addTrainNamesToConflicts from '../utils';
 
-type ConflictsListV2Props = {
+type ConflictsListProps = {
   conflicts: Conflict[];
   expanded: boolean;
   trainSchedulesDetails: TrainScheduleWithDetails[];
@@ -18,13 +18,13 @@ type ConflictsListV2Props = {
   onConflictClick: (conflict: ConflictWithTrainNames) => void;
 };
 
-const ConflictsListV2 = ({
+const ConflictsList = ({
   conflicts,
   expanded,
   trainSchedulesDetails,
   toggleConflictsList,
   onConflictClick,
-}: ConflictsListV2Props) => {
+}: ConflictsListProps) => {
   const { t } = useTranslation(['operationalStudies/scenario']);
   const enrichedConflicts = useMemo(
     () => addTrainNamesToConflicts(conflicts, trainSchedulesDetails),
@@ -51,7 +51,7 @@ const ConflictsListV2 = ({
 
       <div className={cx('conflicts-container', expanded && 'expanded')}>
         {enrichedConflicts.map((conflict, index) => (
-          <ConflictCardV2
+          <ConflictCard
             key={`${conflict.train_ids.join(', ')}-${conflict.conflict_type}-${index}`}
             conflict={conflict}
             onConflictClick={onConflictClick}
@@ -62,4 +62,4 @@ const ConflictsListV2 = ({
   );
 };
 
-export default ConflictsListV2;
+export default ConflictsList;
diff --git a/front/src/modules/conflict/utils.ts b/front/src/modules/conflict/utils.ts
index ddb66a4ae47..dfc9e7bbf4a 100644
--- a/front/src/modules/conflict/utils.ts
+++ b/front/src/modules/conflict/utils.ts
@@ -1,5 +1,5 @@
 import type { Conflict } from 'common/api/osrdEditoastApi';
-import type { TrainScheduleWithDetails } from 'modules/trainschedule/components/TimetableV2/types';
+import type { TrainScheduleWithDetails } from 'modules/trainschedule/components/Timetable/types';
 
 import type { ConflictWithTrainNames } from './types';
 
diff --git a/front/src/modules/infra/components/InfraSelector/InfraSelectorModalBodyStandard.tsx b/front/src/modules/infra/components/InfraSelector/InfraSelectorModalBodyStandard.tsx
index 118ab0901ca..a3b8e706b6c 100644
--- a/front/src/modules/infra/components/InfraSelector/InfraSelectorModalBodyStandard.tsx
+++ b/front/src/modules/infra/components/InfraSelector/InfraSelectorModalBodyStandard.tsx
@@ -51,7 +51,7 @@ export default function InfraSelectorModalBodyStandard({
   const { updateInfraID } = useInfraActions();
   const infraID = useInfraID();
   const { closeModal } = useContext(ModalContext);
-  const { deleteItineraryV2 } = useOsrdConfActions();
+  const { deleteItinerary } = useOsrdConfActions();
   const navigate = useNavigate();
 
   const setInfraID = useCallback(
@@ -60,7 +60,7 @@ export default function InfraSelectorModalBodyStandard({
       if (isInEditor) {
         navigate(`/editor/${id}`);
       }
-      if ([MODES.simulation, MODES.stdcm].includes(mode)) dispatch(deleteItineraryV2());
+      if ([MODES.simulation, MODES.stdcm].includes(mode)) dispatch(deleteItinerary());
       if (!onlySelectionMode) {
         closeModal();
       }
diff --git a/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/v2/DestinationV2.tsx b/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/Destination.tsx
similarity index 86%
rename from front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/v2/DestinationV2.tsx
rename to front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/Destination.tsx
index c26d400cd2a..c7f4e0d1cbc 100644
--- a/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/v2/DestinationV2.tsx
+++ b/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/Destination.tsx
@@ -10,10 +10,10 @@ type DestinationProps = {
   zoomToFeaturePoint: (lngLat?: Position, id?: string) => void;
 };
 
-const DestinationV2 = ({ zoomToFeaturePoint }: DestinationProps) => {
-  const { getDestinationV2 } = useOsrdConfSelectors();
-  const { updateDestinationV2 } = useOsrdConfActions();
-  const destination = useSelector(getDestinationV2);
+const Destination = ({ zoomToFeaturePoint }: DestinationProps) => {
+  const { getDestination } = useOsrdConfSelectors();
+  const { updateDestination } = useOsrdConfActions();
+  const destination = useSelector(getDestination);
 
   const dispatch = useDispatch();
   const { t } = useTranslation(['operationalStudies/manageTrainSchedule']);
@@ -51,7 +51,7 @@ const DestinationV2 = ({ zoomToFeaturePoint }: DestinationProps) => {
           className="btn btn-sm btn-only-icon btn-white ml-auto"
           type="button"
           onClick={() => {
-            dispatch(updateDestinationV2(null));
+            dispatch(updateDestination(null));
           }}
         >
           <XCircle variant="fill" />
@@ -64,4 +64,4 @@ const DestinationV2 = ({ zoomToFeaturePoint }: DestinationProps) => {
   );
 };
 
-export default DestinationV2;
+export default Destination;
diff --git a/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/v2/OriginV2.tsx b/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/Origin.tsx
similarity index 94%
rename from front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/v2/OriginV2.tsx
rename to front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/Origin.tsx
index 6258103de64..6bcac4c5fbd 100644
--- a/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/v2/OriginV2.tsx
+++ b/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/Origin.tsx
@@ -14,9 +14,9 @@ type OriginProps = {
   zoomToFeaturePoint: (lngLat?: Position, id?: string) => void;
 };
 
-const OriginV2 = ({ zoomToFeaturePoint }: OriginProps) => {
+const Origin = ({ zoomToFeaturePoint }: OriginProps) => {
   const {
-    getOriginV2,
+    getOrigin,
     getOriginDate,
     getOriginTime,
     getOriginLinkedBounds,
@@ -27,7 +27,7 @@ const OriginV2 = ({ zoomToFeaturePoint }: OriginProps) => {
   const { mode } = useOsrdContext();
 
   const {
-    updateOriginV2,
+    updateOrigin,
     updateOriginDate,
     updateOriginTime,
     updateOriginUpperBoundDate,
@@ -35,8 +35,7 @@ const OriginV2 = ({ zoomToFeaturePoint }: OriginProps) => {
     toggleOriginLinkedBounds,
   } = useOsrdConfActions();
 
-  const origin = useSelector(getOriginV2);
-  // TODO TS2 : update stdcm store for trainschedule V2 ?
+  const origin = useSelector(getOrigin);
   const originDate = useSelector(getOriginDate);
   const originTime = useSelector(getOriginTime);
   const originLinkedBounds = useSelector(getOriginLinkedBounds);
@@ -101,7 +100,7 @@ const OriginV2 = ({ zoomToFeaturePoint }: OriginProps) => {
           className="btn btn-sm btn-only-icon btn-white"
           type="button"
           onClick={() => {
-            dispatch(updateOriginV2(null));
+            dispatch(updateOrigin(null));
           }}
         >
           <XCircle variant="fill" />
@@ -157,4 +156,4 @@ const OriginV2 = ({ zoomToFeaturePoint }: OriginProps) => {
   );
 };
 
-export default OriginV2;
+export default Origin;
diff --git a/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/v2/ViaStopDurationSelector.tsx b/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/ViaStopDurationSelector.tsx
similarity index 93%
rename from front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/v2/ViaStopDurationSelector.tsx
rename to front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/ViaStopDurationSelector.tsx
index 8cf585ea83d..17917ac1703 100644
--- a/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/v2/ViaStopDurationSelector.tsx
+++ b/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/ViaStopDurationSelector.tsx
@@ -17,7 +17,7 @@ const ViaStopDurationSelector = ({
   setFocusedViaId: (focusedViaIndex?: string) => void;
 }) => {
   const dispatch = useAppDispatch();
-  const { updateViaStopTimeV2 } = useOsrdConfActions();
+  const { updateViaStopTime } = useOsrdConfActions();
 
   const currentStopTime = via.stopFor ? ISO8601Duration2sec(via.stopFor) : 0;
 
@@ -25,7 +25,7 @@ const ViaStopDurationSelector = ({
   const debouncedStopTime = useDebounce(stopTime, 2000);
 
   const updateViaStopDuration = (durationInSec: number) => {
-    dispatch(updateViaStopTimeV2({ via, duration: formatDurationAsISO8601(durationInSec) }));
+    dispatch(updateViaStopTime({ via, duration: formatDurationAsISO8601(durationInSec) }));
   };
 
   useEffect(() => {
diff --git a/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/v2/ViasV2.tsx b/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/Vias.tsx
similarity index 91%
rename from front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/v2/ViasV2.tsx
rename to front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/Vias.tsx
index f45ae1120b4..ce138ded7e1 100644
--- a/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/v2/ViasV2.tsx
+++ b/front/src/modules/pathfinding/components/Itinerary/DisplayItinerary/Vias.tsx
@@ -13,17 +13,17 @@ import { formatUicToCi } from 'utils/strings';
 
 import ViaStopDurationSelector from './ViaStopDurationSelector';
 
-type DisplayViasV2Props = {
+type ViasProps = {
   shouldManageStopDuration?: boolean;
   zoomToFeaturePoint: (lngLat?: Position, id?: string) => void;
 };
 
-const ViasV2 = ({ zoomToFeaturePoint, shouldManageStopDuration }: DisplayViasV2Props) => {
+const Vias = ({ zoomToFeaturePoint, shouldManageStopDuration }: ViasProps) => {
   const { t } = useTranslation('operationalStudies/manageTrainSchedule');
-  const { getViasV2 } = useOsrdConfSelectors();
+  const { getVias } = useOsrdConfSelectors();
   const dispatch = useAppDispatch();
-  const vias = useSelector(getViasV2());
-  const { moveVia, deleteViaV2 } = useOsrdConfActions();
+  const vias = useSelector(getVias());
+  const { moveVia, deleteVia } = useOsrdConfActions();
   const [focusedViaId, setFocusedViaId] = useState<string>();
 
   return (
@@ -83,7 +83,7 @@ const ViasV2 = ({ zoomToFeaturePoint, shouldManageStopDuration }: DisplayViasV2P
                         data-testid="delete-via-button"
                         className="btn btn-sm btn-only-icon btn-white ml-auto"
                         type="button"
-                        onClick={() => dispatch(deleteViaV2(index))}
+                        onClick={() => dispatch(deleteVia(index))}
                       >
                         <XCircle variant="fill" />
                         <span className="sr-only" aria-hidden="true">
@@ -103,4 +103,4 @@ const ViasV2 = ({ zoomToFeaturePoint, shouldManageStopDuration }: DisplayViasV2P
   );
 };
 
-export default ViasV2;
+export default Vias;
diff --git a/front/src/modules/pathfinding/components/Itinerary/ItineraryV2.tsx b/front/src/modules/pathfinding/components/Itinerary/Itinerary.tsx
similarity index 84%
rename from front/src/modules/pathfinding/components/Itinerary/ItineraryV2.tsx
rename to front/src/modules/pathfinding/components/Itinerary/Itinerary.tsx
index 660ca659d58..ce134f0b200 100644
--- a/front/src/modules/pathfinding/components/Itinerary/ItineraryV2.tsx
+++ b/front/src/modules/pathfinding/components/Itinerary/Itinerary.tsx
@@ -12,37 +12,36 @@ import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
 import { computeBBoxViewport } from 'common/Map/WarpedMap/core/helpers';
 import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
 import Tipped from 'common/Tipped';
-import PathfindingV2 from 'modules/pathfinding/components/Pathfinding/PathfindingV2';
-import TypeAndPathV2 from 'modules/pathfinding/components/Pathfinding/TypeAndPathV2';
+import Pathfinding from 'modules/pathfinding/components/Pathfinding/Pathfinding';
+import TypeAndPath from 'modules/pathfinding/components/Pathfinding/TypeAndPath';
 import { setWarning } from 'reducers/main';
 import { updateViewport } from 'reducers/map';
 import { getMap } from 'reducers/map/selectors';
 import { useAppDispatch } from 'store';
 import { isEmptyArray } from 'utils/array';
 
-import DestinationV2 from './DisplayItinerary/v2/DestinationV2';
-import OriginV2 from './DisplayItinerary/v2/OriginV2';
-import ViasV2 from './DisplayItinerary/v2/ViasV2';
+import Destination from './DisplayItinerary/Destination';
+import Origin from './DisplayItinerary/Origin';
+import Vias from './DisplayItinerary/Vias';
 import ModalSuggestedVias from './ModalSuggestedVias';
 
-type ItineraryV2Props = {
+type ItineraryProps = {
   pathProperties?: ManageTrainSchedulePathProperties;
   setPathProperties: (pathProperties?: ManageTrainSchedulePathProperties) => void;
   shouldManageStopDuration?: boolean;
 };
 
-const ItineraryV2 = ({
+const Itinerary = ({
   pathProperties,
   setPathProperties,
   shouldManageStopDuration,
-}: ItineraryV2Props) => {
-  const { getPathSteps, getOriginV2, getDestinationV2, getPowerRestrictionV2 } =
-    useOsrdConfSelectors();
+}: ItineraryProps) => {
+  const { getPathSteps, getOrigin, getDestination, getPowerRestriction } = useOsrdConfSelectors();
   const { updatePathSteps } = useOsrdConfActions();
-  const origin = useSelector(getOriginV2);
-  const destination = useSelector(getDestinationV2);
+  const origin = useSelector(getOrigin);
+  const destination = useSelector(getDestination);
   const pathSteps = useSelector(getPathSteps);
-  const powerRestrictions = useSelector(getPowerRestrictionV2);
+  const powerRestrictions = useSelector(getPowerRestriction);
 
   const [displayTypeAndPath, setDisplayTypeAndPath] = useState(false);
   const dispatch = useAppDispatch();
@@ -99,7 +98,7 @@ const ItineraryV2 = ({
   return (
     <div className="osrd-config-item">
       <div className="mb-2 d-flex">
-        <PathfindingV2 pathProperties={pathProperties} setPathProperties={setPathProperties} />
+        <Pathfinding pathProperties={pathProperties} setPathProperties={setPathProperties} />
         <button
           type="button"
           className="btn btn-sm btn-only-icon btn-white px-3 ml-2"
@@ -113,7 +112,7 @@ const ItineraryV2 = ({
       </div>
       {displayTypeAndPath && (
         <div className="mb-2">
-          <TypeAndPathV2 setDisplayTypeAndPath={setDisplayTypeAndPath} />
+          <TypeAndPath setDisplayTypeAndPath={setDisplayTypeAndPath} />
         </div>
       )}
       {origin && destination && (
@@ -166,10 +165,10 @@ const ItineraryV2 = ({
       )}
       <div className="osrd-config-item-container pathfinding-details" data-testid="itinerary">
         <div data-testid="display-itinerary">
-          <OriginV2 zoomToFeaturePoint={zoomToFeaturePoint} />
+          <Origin zoomToFeaturePoint={zoomToFeaturePoint} />
           <div className="vias-list mb-2" data-testid="itinerary-vias">
             {pathSteps.length > 2 ? (
-              <ViasV2
+              <Vias
                 zoomToFeaturePoint={zoomToFeaturePoint}
                 shouldManageStopDuration={shouldManageStopDuration}
               />
@@ -179,11 +178,11 @@ const ItineraryV2 = ({
               </small>
             )}
           </div>
-          <DestinationV2 zoomToFeaturePoint={zoomToFeaturePoint} />
+          <Destination zoomToFeaturePoint={zoomToFeaturePoint} />
         </div>
       </div>
     </div>
   );
 };
 
-export default ItineraryV2;
+export default Itinerary;
diff --git a/front/src/modules/pathfinding/components/Itinerary/ModalSuggestedVias.tsx b/front/src/modules/pathfinding/components/Itinerary/ModalSuggestedVias.tsx
index 1c5e67001eb..ec0d1f9830c 100644
--- a/front/src/modules/pathfinding/components/Itinerary/ModalSuggestedVias.tsx
+++ b/front/src/modules/pathfinding/components/Itinerary/ModalSuggestedVias.tsx
@@ -20,11 +20,11 @@ type ModalSuggestedViasProps = {
 };
 
 const ModalSuggestedVias = ({ suggestedVias }: ModalSuggestedViasProps) => {
-  const { updatePathSteps, upsertViaFromSuggestedOP, clearViasV2 } = useOsrdConfActions();
-  const { getViasV2, getDestinationV2, getPathSteps } = useOsrdConfSelectors();
+  const { updatePathSteps, upsertViaFromSuggestedOP, clearVias } = useOsrdConfActions();
+  const { getVias, getDestination, getPathSteps } = useOsrdConfSelectors();
   const dispatch = useAppDispatch();
-  const vias = useSelector(getViasV2());
-  const destination = useSelector(getDestinationV2);
+  const vias = useSelector(getVias());
+  const destination = useSelector(getDestination);
   const pathSteps = useSelector(getPathSteps);
   const { t } = useTranslation('operationalStudies/manageTrainSchedule');
 
@@ -122,7 +122,7 @@ const ModalSuggestedVias = ({ suggestedVias }: ModalSuggestedViasProps) => {
           <button
             className="btn btn-danger btn-sm btn-block mb-1"
             type="button"
-            onClick={() => dispatch(clearViasV2())}
+            onClick={() => dispatch(clearVias())}
           >
             <Trash />
             <span className="ml-2">{t('deleteVias')}</span>
diff --git a/front/src/modules/pathfinding/components/Pathfinding/PathfindingV2.tsx b/front/src/modules/pathfinding/components/Pathfinding/Pathfinding.tsx
similarity index 93%
rename from front/src/modules/pathfinding/components/Pathfinding/PathfindingV2.tsx
rename to front/src/modules/pathfinding/components/Pathfinding/Pathfinding.tsx
index 1ab995c6965..18cf6b00ded 100644
--- a/front/src/modules/pathfinding/components/Pathfinding/PathfindingV2.tsx
+++ b/front/src/modules/pathfinding/components/Pathfinding/Pathfinding.tsx
@@ -9,7 +9,7 @@ import type { ManageTrainSchedulePathProperties } from 'applications/operational
 import infraLogo from 'assets/pictures/components/tracks.svg';
 import { Spinner } from 'common/Loaders';
 import { useOsrdConfSelectors } from 'common/osrdContext';
-import { usePathfindingV2 } from 'modules/pathfinding/hooks/usePathfinding';
+import { usePathfinding } from 'modules/pathfinding/hooks/usePathfinding';
 import { useStoreDataForRollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector/useStoreDataForRollingStockSelector';
 import { conditionalStringConcat, formatKmValue } from 'utils/strings';
 
@@ -23,15 +23,15 @@ type PathfindingProps = {
 const Pathfinding = ({ pathProperties, setPathProperties }: PathfindingProps) => {
   const { t } = useTranslation(['operationalStudies/manageTrainSchedule']);
 
-  const { getOriginV2, getDestinationV2 } = useOsrdConfSelectors();
-  const origin = useSelector(getOriginV2, isEqual);
-  const destination = useSelector(getDestinationV2, isEqual);
+  const { getOrigin, getDestination } = useOsrdConfSelectors();
+  const origin = useSelector(getOrigin, isEqual);
+  const destination = useSelector(getDestination, isEqual);
   const { rollingStock } = useStoreDataForRollingStockSelector();
 
   const {
     pathfindingState,
     infraInfos: { infra, reloadCount },
-  } = usePathfindingV2(setPathProperties, pathProperties);
+  } = usePathfinding(setPathProperties, pathProperties);
 
   const missingElements = conditionalStringConcat([
     [!origin, t('origin')],
diff --git a/front/src/modules/pathfinding/components/Pathfinding/TypeAndPathV2.tsx b/front/src/modules/pathfinding/components/Pathfinding/TypeAndPath.tsx
similarity index 98%
rename from front/src/modules/pathfinding/components/Pathfinding/TypeAndPathV2.tsx
rename to front/src/modules/pathfinding/components/Pathfinding/TypeAndPath.tsx
index 945f3ffc979..8c2bbae71c3 100644
--- a/front/src/modules/pathfinding/components/Pathfinding/TypeAndPathV2.tsx
+++ b/front/src/modules/pathfinding/components/Pathfinding/TypeAndPath.tsx
@@ -54,11 +54,11 @@ function OpTooltips({ opList }: { opList: SearchResultItemOperationalPoint[] })
     </div>
   );
 }
-type typeAndPathV2Props = {
+type TypeAndPathProps = {
   setDisplayTypeAndPath: React.Dispatch<React.SetStateAction<boolean>>;
 };
 
-const TypeAndPathV2 = ({ setDisplayTypeAndPath }: typeAndPathV2Props) => {
+const TypeAndPath = ({ setDisplayTypeAndPath }: TypeAndPathProps) => {
   const dispatch = useAppDispatch();
   const [inputText, setInputText] = useState('');
   const [opList, setOpList] = useState<SearchResultItemOperationalPoint[]>([]);
@@ -306,4 +306,4 @@ const TypeAndPathV2 = ({ setDisplayTypeAndPath }: typeAndPathV2Props) => {
   );
 };
 
-export default TypeAndPathV2;
+export default TypeAndPath;
diff --git a/front/src/modules/pathfinding/components/Pathfinding/__tests__/PathfindingV2.spec.ts b/front/src/modules/pathfinding/components/Pathfinding/__tests__/Pathfinding.spec.ts
similarity index 94%
rename from front/src/modules/pathfinding/components/Pathfinding/__tests__/PathfindingV2.spec.ts
rename to front/src/modules/pathfinding/components/Pathfinding/__tests__/Pathfinding.spec.ts
index 72cd9afacf3..dc9408987f2 100644
--- a/front/src/modules/pathfinding/components/Pathfinding/__tests__/PathfindingV2.spec.ts
+++ b/front/src/modules/pathfinding/components/Pathfinding/__tests__/Pathfinding.spec.ts
@@ -1,6 +1,6 @@
 import { initialState } from 'modules/pathfinding/consts';
 import { reducer } from 'modules/pathfinding/hooks/usePathfinding';
-import type { PathfindingActionV2 } from 'modules/pathfinding/types';
+import type { PathfindingAction } from 'modules/pathfinding/types';
 import rollingStock from 'modules/rollingStock/components/RollingStockSelector/sampleData';
 
 import { origin, destination } from './data';
@@ -143,7 +143,7 @@ describe('reducer', () => {
   describe('origin/destination/rolling stock/infra changed', () => {
     test('origin missing', () => {
       const state = initialState;
-      const action: PathfindingActionV2 = {
+      const action: PathfindingAction = {
         type: 'PATHFINDING_PARAM_CHANGED',
         params: {
           origin: null,
@@ -158,7 +158,7 @@ describe('reducer', () => {
     });
     test('destination missing', () => {
       const state = initialState;
-      const action: PathfindingActionV2 = {
+      const action: PathfindingAction = {
         type: 'PATHFINDING_PARAM_CHANGED',
         params: {
           origin,
@@ -176,7 +176,7 @@ describe('reducer', () => {
         ...initialState,
         done: true,
       };
-      const action: PathfindingActionV2 = {
+      const action: PathfindingAction = {
         type: 'PATHFINDING_PARAM_CHANGED',
         params: {
           origin,
@@ -195,7 +195,7 @@ describe('reducer', () => {
         ...initialState,
         error: 'error',
       };
-      const action: PathfindingActionV2 = {
+      const action: PathfindingAction = {
         type: 'PATHFINDING_PARAM_CHANGED',
         params: {
           origin,
@@ -210,7 +210,7 @@ describe('reducer', () => {
     });
     test('rollingStock missing', () => {
       const state = initialState;
-      const action: PathfindingActionV2 = {
+      const action: PathfindingAction = {
         type: 'PATHFINDING_PARAM_CHANGED',
         params: {
           origin,
@@ -227,7 +227,7 @@ describe('reducer', () => {
         ...initialState,
         missingParam: true,
       };
-      const action: PathfindingActionV2 = {
+      const action: PathfindingAction = {
         type: 'PATHFINDING_PARAM_CHANGED',
         params: {
           origin,
@@ -247,7 +247,7 @@ describe('reducer', () => {
         running: true,
         done: false,
       };
-      const action: PathfindingActionV2 = {
+      const action: PathfindingAction = {
         type: 'PATHFINDING_PARAM_CHANGED',
         params: {
           origin,
diff --git a/front/src/modules/pathfinding/hooks/usePathfinding.ts b/front/src/modules/pathfinding/hooks/usePathfinding.ts
index 35734471d6b..bcfcdb6fd40 100644
--- a/front/src/modules/pathfinding/hooks/usePathfinding.ts
+++ b/front/src/modules/pathfinding/hooks/usePathfinding.ts
@@ -13,7 +13,7 @@ import type {
 import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
 import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
 import { initialState } from 'modules/pathfinding/consts';
-import type { PathfindingActionV2, PathfindingState } from 'modules/pathfinding/types';
+import type { PathfindingAction, PathfindingState } from 'modules/pathfinding/types';
 import {
   formatSuggestedOperationalPoints,
   getPathfindingQuery,
@@ -29,7 +29,7 @@ import { castErrorToFailure } from 'utils/error';
 
 import useInfraStatus from './useInfraStatus';
 
-export function reducer(state: PathfindingState, action: PathfindingActionV2): PathfindingState {
+export function reducer(state: PathfindingState, action: PathfindingAction): PathfindingState {
   switch (action.type) {
     case 'PATHFINDING_STARTED': {
       return {
@@ -142,26 +142,20 @@ function init({
   return initialState;
 }
 
-export const usePathfindingV2 = (
+export const usePathfinding = (
   setPathProperties?: (pathProperties?: ManageTrainSchedulePathProperties) => void | null,
   pathProperties?: ManageTrainSchedulePathProperties
 ) => {
   const { t } = useTranslation(['operationalStudies/manageTrainSchedule']);
   const dispatch = useAppDispatch();
-  const {
-    getInfraID,
-    getOriginV2,
-    getDestinationV2,
-    getViasV2,
-    getPathSteps,
-    getPowerRestrictionV2,
-  } = useOsrdConfSelectors();
+  const { getInfraID, getOrigin, getDestination, getVias, getPathSteps, getPowerRestriction } =
+    useOsrdConfSelectors();
   const infraId = useSelector(getInfraID, isEqual);
-  const origin = useSelector(getOriginV2, isEqual);
-  const destination = useSelector(getDestinationV2, isEqual);
-  const vias = useSelector(getViasV2(), isEqual);
+  const origin = useSelector(getOrigin, isEqual);
+  const destination = useSelector(getDestination, isEqual);
+  const vias = useSelector(getVias(), isEqual);
   const pathSteps = useSelector(getPathSteps);
-  const powerRestrictions = useSelector(getPowerRestrictionV2);
+  const powerRestrictions = useSelector(getPowerRestriction);
   const { infra, reloadCount, setIsInfraError } = useInfraStatus();
   const { rollingStock } = useStoreDataForRollingStockSelector();
 
diff --git a/front/src/modules/pathfinding/types.ts b/front/src/modules/pathfinding/types.ts
index ccc5a2643d7..542b0fe13a3 100644
--- a/front/src/modules/pathfinding/types.ts
+++ b/front/src/modules/pathfinding/types.ts
@@ -11,7 +11,7 @@ export type PathfindingState = {
   cancelled: boolean;
 };
 
-export type PathfindingActionV2 = {
+export type PathfindingAction = {
   type: string;
   message?: string;
   params?: {
diff --git a/front/src/modules/powerRestriction/components/PowerRestrictionsSelectorV2.tsx b/front/src/modules/powerRestriction/components/PowerRestrictionsSelector.tsx
similarity index 98%
rename from front/src/modules/powerRestriction/components/PowerRestrictionsSelectorV2.tsx
rename to front/src/modules/powerRestriction/components/PowerRestrictionsSelector.tsx
index f55f722a660..b3abfe5a5b1 100644
--- a/front/src/modules/powerRestriction/components/PowerRestrictionsSelectorV2.tsx
+++ b/front/src/modules/powerRestriction/components/PowerRestrictionsSelector.tsx
@@ -20,7 +20,7 @@ type PowerRestrictionsSelectorProps = {
   pathProperties: ManageTrainSchedulePathProperties;
 };
 
-const PowerRestrictionsSelectorV2 = ({
+const PowerRestrictionsSelector = ({
   voltageRanges,
   rollingStockModes,
   rollingStockPowerRestrictions,
@@ -130,4 +130,4 @@ const PowerRestrictionsSelectorV2 = ({
   );
 };
 
-export default PowerRestrictionsSelectorV2;
+export default PowerRestrictionsSelector;
diff --git a/front/src/modules/powerRestriction/helpers/formatPowerRestrictions.ts b/front/src/modules/powerRestriction/helpers/formatPowerRestrictions.ts
index 856ddcd8cba..8e22045a87d 100644
--- a/front/src/modules/powerRestriction/helpers/formatPowerRestrictions.ts
+++ b/front/src/modules/powerRestriction/helpers/formatPowerRestrictions.ts
@@ -1,6 +1,6 @@
 import { isEmpty, keyBy, sortBy } from 'lodash';
 
-import type { PowerRestrictionV2 } from 'applications/operationalStudies/types';
+import type { PowerRestriction } from 'applications/operationalStudies/types';
 import type { IntervalItem } from 'common/IntervalsEditor/types';
 import type { PathStep } from 'reducers/osrdconf/types';
 import { mmToM } from 'utils/physics';
@@ -46,7 +46,7 @@ const appendFinalNoPowerRestriction = (
 
 const reducePowerRestrictions =
   (pathStepById: Record<string, PathStep>, electrificationChangePoints: number[]) =>
-  (acc: IntervalItem[], restriction: PowerRestrictionV2, index: number): IntervalItem[] => {
+  (acc: IntervalItem[], restriction: PowerRestriction, index: number): IntervalItem[] => {
     const fromPathStep = pathStepById[restriction.from];
     const toPathStep = pathStepById[restriction.to];
     const from =
@@ -71,7 +71,7 @@ const reducePowerRestrictions =
   };
 
 const formatPowerRestrictions = (
-  powerRestrictionRanges: PowerRestrictionV2[],
+  powerRestrictionRanges: PowerRestriction[],
   changePoints: number[],
   pathSteps: PathStep[],
   pathLength: number
diff --git a/front/src/modules/powerRestriction/helpers/getRestrictionsToResize.ts b/front/src/modules/powerRestriction/helpers/getRestrictionsToResize.ts
index 8941f647682..dc538e44ac8 100644
--- a/front/src/modules/powerRestriction/helpers/getRestrictionsToResize.ts
+++ b/front/src/modules/powerRestriction/helpers/getRestrictionsToResize.ts
@@ -1,4 +1,4 @@
-import type { PowerRestrictionV2 } from 'applications/operationalStudies/types';
+import type { PowerRestriction } from 'applications/operationalStudies/types';
 import type { IntervalItem } from 'common/IntervalsEditor/types';
 import type { PathStep } from 'reducers/osrdconf/types';
 
@@ -7,9 +7,9 @@ import { NO_POWER_RESTRICTION } from '../consts';
 
 const getPowerRestrictionFromRange = (
   pathSteps: PathStep[],
-  powerRestrictionRanges: PowerRestrictionV2[],
+  powerRestrictionRanges: PowerRestriction[],
   rangeData: IntervalItem
-): PowerRestrictionV2 | null => {
+): PowerRestriction | null => {
   const fromPathStep = getPathStep(pathSteps, rangeData.begin);
   const toPathStep = getPathStep(pathSteps, rangeData.end);
 
@@ -26,7 +26,7 @@ const getPowerRestrictionFromRange = (
  */
 const getPowerRestrictionsToUpdate = (
   pathSteps: PathStep[],
-  powerRestrictionRanges: PowerRestrictionV2[],
+  powerRestrictionRanges: PowerRestriction[],
   ranges: IntervalItem[],
   position: number,
   selectedRangeIndex: number
@@ -62,7 +62,7 @@ const getRestrictionsToResize = (
   context: 'begin' | 'end',
   newPosition: number,
   pathSteps: PathStep[],
-  powerRestrictionRanges: PowerRestrictionV2[]
+  powerRestrictionRanges: PowerRestriction[]
 ) => {
   const result = getPowerRestrictionsToUpdate(
     pathSteps,
@@ -75,8 +75,8 @@ const getRestrictionsToResize = (
 
   const { selectedRange, selectedRestriction, otherRange, otherRestriction } = result;
 
-  let firstRestriction: PowerRestrictionV2 | undefined;
-  let secondRestriction: PowerRestrictionV2 | undefined;
+  let firstRestriction: PowerRestriction | undefined;
+  let secondRestriction: PowerRestriction | undefined;
   if (context === 'begin') {
     // default hypothesis: the begin was decremented
     firstRestriction = otherRestriction || undefined;
diff --git a/front/src/modules/powerRestriction/helpers/powerRestrictionWarnings.ts b/front/src/modules/powerRestriction/helpers/powerRestrictionWarnings.ts
index e0fcac2f519..346ad4a1f50 100644
--- a/front/src/modules/powerRestriction/helpers/powerRestrictionWarnings.ts
+++ b/front/src/modules/powerRestriction/helpers/powerRestrictionWarnings.ts
@@ -1,6 +1,6 @@
 import { compact, isEmpty, keyBy } from 'lodash';
 
-import type { PowerRestrictionV2 } from 'applications/operationalStudies/types';
+import type { PowerRestriction } from 'applications/operationalStudies/types';
 import type { RollingStock } from 'common/api/osrdEditoastApi';
 import type { RangedValue } from 'common/types';
 import { NO_POWER_RESTRICTION } from 'modules/powerRestriction/consts';
@@ -8,7 +8,7 @@ import type { PowerRestrictionWarnings } from 'modules/powerRestriction/types';
 import { getRollingStockPowerRestrictionsByMode } from 'modules/rollingStock/helpers/powerRestrictions';
 import type { PathStep } from 'reducers/osrdconf/types';
 
-// TODO drop v1: convert begin and end in meters here instead of in PowerRestrictionsSelectorV2
+// TODO : convert begin and end in meters here instead of in PowerRestrictionsSelector
 const getInvalidZoneBoundaries = (
   powerRestrictionRange: RangedValue,
   voltageRange: RangedValue
@@ -100,7 +100,7 @@ export const countWarnings = (
 };
 
 const formatElectricalRanges = (
-  ranges: PowerRestrictionV2[],
+  ranges: PowerRestriction[],
   pathStepsById: Record<string, PathStep>
 ): { begin: number; end: number; value: string }[] => {
   const formattedRanges = compact(
@@ -130,7 +130,7 @@ const getPowerRestrictionsWarningsData = ({
   pathSteps: PathStep[];
   rollingStockPowerRestrictions: RollingStock['power_restrictions'];
   voltageRanges: RangedValue[];
-  powerRestrictionRanges: PowerRestrictionV2[];
+  powerRestrictionRanges: PowerRestriction[];
   rollingStockModes: RollingStock['effort_curves']['modes'];
 }) => {
   const pathStepsById = keyBy(pathSteps, 'id');
diff --git a/front/src/modules/powerRestriction/hooks/usePowerRestrictionSelectorBehaviours.ts b/front/src/modules/powerRestriction/hooks/usePowerRestrictionSelectorBehaviours.ts
index 9a1cce15355..bb3eb609d08 100644
--- a/front/src/modules/powerRestriction/hooks/usePowerRestrictionSelectorBehaviours.ts
+++ b/front/src/modules/powerRestriction/hooks/usePowerRestrictionSelectorBehaviours.ts
@@ -2,7 +2,7 @@ import { useMemo } from 'react';
 
 import type {
   ManageTrainSchedulePathProperties,
-  PowerRestrictionV2,
+  PowerRestriction,
 } from 'applications/operationalStudies/types';
 import type { IntervalItem } from 'common/IntervalsEditor/types';
 import { useOsrdConfActions } from 'common/osrdContext';
@@ -24,7 +24,7 @@ type UsePowerRestrictionSelectorBehavioursArgs = {
   cutPositions: number[];
   pathProperties: ManageTrainSchedulePathProperties;
   pathSteps: PathStep[];
-  powerRestrictionRanges: PowerRestrictionV2[];
+  powerRestrictionRanges: PowerRestriction[];
   setCutPositions: (newCutPosition: number[]) => void;
 };
 
@@ -39,9 +39,9 @@ const usePowerRestrictionSelectorBehaviours = ({
   const dispatch = useAppDispatch();
 
   const {
-    upsertPowerRestrictionRangesV2,
-    cutPowerRestrictionRangesV2,
-    deletePowerRestrictionRangesV2,
+    upsertPowerRestrictionRanges,
+    cutPowerRestrictionRanges,
+    deletePowerRestrictionRanges,
     resizeSegmentEndInput,
     resizeSegmentBeginInput,
   } = useOsrdConfActions() as OperationalStudiesConfSliceActions;
@@ -78,14 +78,14 @@ const usePowerRestrictionSelectorBehaviours = ({
     if (from && to) {
       if (newRange.value !== NO_POWER_RESTRICTION) {
         dispatch(
-          upsertPowerRestrictionRangesV2({
+          upsertPowerRestrictionRanges({
             from,
             to,
             code: newRange.value.toString(),
           })
         );
       } else {
-        dispatch(deletePowerRestrictionRangesV2({ from, to }));
+        dispatch(deletePowerRestrictionRanges({ from, to }));
       }
     }
   };
@@ -100,7 +100,7 @@ const usePowerRestrictionSelectorBehaviours = ({
       setCutPositions
     );
     if (cutAt) {
-      dispatch(cutPowerRestrictionRangesV2({ cutAt }));
+      dispatch(cutPowerRestrictionRanges({ cutAt }));
     }
   };
 
@@ -109,7 +109,7 @@ const usePowerRestrictionSelectorBehaviours = ({
     const toPathStep = getPathStep(pathSteps, to);
 
     if (fromPathStep && toPathStep) {
-      dispatch(deletePowerRestrictionRangesV2({ from: fromPathStep, to: toPathStep }));
+      dispatch(deletePowerRestrictionRanges({ from: fromPathStep, to: toPathStep }));
     }
   };
 
diff --git a/front/src/modules/powerRestriction/hooks/usePowerRestrictionSelectorData.ts b/front/src/modules/powerRestriction/hooks/usePowerRestrictionSelectorData.ts
index abb0bc4a678..55c621ced26 100644
--- a/front/src/modules/powerRestriction/hooks/usePowerRestrictionSelectorData.ts
+++ b/front/src/modules/powerRestriction/hooks/usePowerRestrictionSelectorData.ts
@@ -21,8 +21,8 @@ const usePowerRestrictionSelector = (
   rollingStockModes: RollingStock['effort_curves']['modes'],
   pathProperties: ManageTrainSchedulePathProperties
 ) => {
-  const { getPowerRestrictionV2, getPathSteps } = useOsrdConfSelectors();
-  const powerRestrictionRanges = useSelector(getPowerRestrictionV2);
+  const { getPowerRestriction, getPathSteps } = useOsrdConfSelectors();
+  const powerRestrictionRanges = useSelector(getPowerRestriction);
   const pathSteps = compact(useSelector(getPathSteps));
 
   const [cutPositions, setCutPositions] = useState<number[]>([]); // in meters
diff --git a/front/src/modules/rollingStock/components/RollingStockCard/RollingStockCardButtons.tsx b/front/src/modules/rollingStock/components/RollingStockCard/RollingStockCardButtons.tsx
index dbf10827aee..6820283880c 100644
--- a/front/src/modules/rollingStock/components/RollingStockCard/RollingStockCardButtons.tsx
+++ b/front/src/modules/rollingStock/components/RollingStockCard/RollingStockCardButtons.tsx
@@ -26,16 +26,16 @@ const RollingStockCardButtons = ({
   const { t } = useTranslation(['rollingstock']);
   const { closeModal } = useContext(ModalContext);
 
-  const { getRollingStockComfortV2 } = useOsrdConfSelectors();
-  const currentComfortInStore = useSelector(getRollingStockComfortV2);
+  const { getRollingStockComfort } = useOsrdConfSelectors();
+  const currentComfortInStore = useSelector(getRollingStockComfort);
   const [comfort, setComfort] = useState(currentComfortInStore as string);
 
-  const { updateRollingStockComfortV2, updateRollingStockID } = useOsrdConfActions();
+  const { updateRollingStockComfort, updateRollingStockID } = useOsrdConfActions();
 
   const selectRollingStock = () => {
     setOpenedRollingStockCardId(undefined);
     dispatch(updateRollingStockID(id));
-    dispatch(updateRollingStockComfortV2(comfort as Comfort));
+    dispatch(updateRollingStockComfort(comfort as Comfort));
     closeModal();
   };
 
diff --git a/front/src/modules/rollingStock/components/RollingStockSelector/useStoreDataForRollingStockSelector.ts b/front/src/modules/rollingStock/components/RollingStockSelector/useStoreDataForRollingStockSelector.ts
index 367132eed9e..3f5ce31c687 100644
--- a/front/src/modules/rollingStock/components/RollingStockSelector/useStoreDataForRollingStockSelector.ts
+++ b/front/src/modules/rollingStock/components/RollingStockSelector/useStoreDataForRollingStockSelector.ts
@@ -4,9 +4,9 @@ import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
 import { useOsrdConfSelectors } from 'common/osrdContext';
 
 export const useStoreDataForRollingStockSelector = () => {
-  const { getRollingStockID, getRollingStockComfortV2 } = useOsrdConfSelectors();
+  const { getRollingStockID, getRollingStockComfort } = useOsrdConfSelectors();
   const rollingStockId = useSelector(getRollingStockID);
-  const rollingStockComfort = useSelector(getRollingStockComfortV2);
+  const rollingStockComfort = useSelector(getRollingStockComfort);
 
   const { data: rollingStock } = osrdEditoastApi.endpoints.getRollingStockByRollingStockId.useQuery(
     {
diff --git a/front/src/modules/scenario/components/AddOrEditScenarioModal.tsx b/front/src/modules/scenario/components/AddOrEditScenarioModal.tsx
index 84a5d69c0d7..7ffa4892fdf 100644
--- a/front/src/modules/scenario/components/AddOrEditScenarioModal.tsx
+++ b/front/src/modules/scenario/components/AddOrEditScenarioModal.tsx
@@ -84,7 +84,7 @@ export default function AddOrEditScenarioModal({
     [urlStudyId, urlProjectId]
   );
 
-  const [postTimetableV2] = osrdEditoastApi.endpoints.postTimetable.useMutation({});
+  const [postTimetable] = osrdEditoastApi.endpoints.postTimetable.useMutation({});
   const [postScenario] =
     osrdEditoastApi.endpoints.postProjectsByProjectIdStudiesAndStudyIdScenarios.useMutation({});
   const [patchScenario] =
@@ -160,7 +160,7 @@ export default function AddOrEditScenarioModal({
       setDisplayErrors(true);
     } else if (projectId && studyId && currentScenario && currentScenario.name) {
       const ids = { projectId, studyId };
-      const timetable = await postTimetableV2().unwrap();
+      const timetable = await postTimetable().unwrap();
       postScenario({
         ...ids,
         scenarioCreateForm: {
diff --git a/front/src/modules/scenario/components/ScenarioExplorer/ScenarioExplorer.tsx b/front/src/modules/scenario/components/ScenarioExplorer/ScenarioExplorer.tsx
index ce18f4d9600..c7c4e6aa849 100644
--- a/front/src/modules/scenario/components/ScenarioExplorer/ScenarioExplorer.tsx
+++ b/front/src/modules/scenario/components/ScenarioExplorer/ScenarioExplorer.tsx
@@ -57,7 +57,7 @@ const ScenarioExplorer = ({
       }
     );
 
-  const { data: timetableV2 } = osrdEditoastApi.endpoints.getTimetableById.useQuery(
+  const { data: timetable } = osrdEditoastApi.endpoints.getTimetableById.useQuery(
     { id: timetableID as number },
     { skip: !timetableID }
   );
@@ -71,7 +71,7 @@ const ScenarioExplorer = ({
     }
   };
 
-  const v2TrainCount = (trainIds: number[]) => trainIds.length;
+  const trainCount = (trainIds: number[]) => trainIds.length;
 
   useEffect(() => {
     if (scenario) {
@@ -151,7 +151,7 @@ const ScenarioExplorer = ({
                 </span>
 
                 <span className="scenario-explorator-card-head-scenario-traincount">
-                  {timetableV2 && v2TrainCount(timetableV2.train_ids)}
+                  {timetable && trainCount(timetable.train_ids)}
                   <MdTrain />
                 </span>
               </div>
diff --git a/front/src/modules/simulationResult/components/ChartHelpers/ChartHelpers.ts b/front/src/modules/simulationResult/components/ChartHelpers/ChartHelpers.ts
index 1e6c522676b..aa0d084af76 100644
--- a/front/src/modules/simulationResult/components/ChartHelpers/ChartHelpers.ts
+++ b/front/src/modules/simulationResult/components/ChartHelpers/ChartHelpers.ts
@@ -7,7 +7,6 @@ import type { ReportTrainData } from 'modules/simulationResult/components/SpeedS
 import type { ChartAxes, ListValues, XAxis, Y2Axis, YAxis } from 'modules/simulationResult/consts';
 import type {
   Position,
-  PositionSpeedTime,
   SimulationD3Scale,
   PositionsSpeedTimes,
 } from 'reducers/osrdsimulation/types';
@@ -37,7 +36,7 @@ export type MergedBlock<Keys extends string> = {
 // called with keyValues
 // ['position', 'gradient']
 // ['position', 'speed']
-export const mergeDatasAreaConstantV2 = <Keys extends 'position' | 'gradient'>(
+export const mergeDatasAreaConstant = <Keys extends 'position' | 'gradient'>(
   data1: PositionData<'gradient'>[],
   data2: number,
   keyValues: Keys[]
@@ -71,12 +70,12 @@ export const gridY2 = (axisScale: SimulationD3Scale, width: number) =>
 
 // Interpolation of cursor based on space position
 // ['position', 'speed']
-export const interpolateOnPositionV2 = (
-  dataSimulation: { speed: PositionSpeedTime[] | ReportTrainData[] }, // TODO DROP V1 : remove PositionSpeedTime type
+export const interpolateOnPosition = (
+  dataSimulation: { speed: ReportTrainData[] },
   positionLocal: number,
   offset: number // in seconds
 ) => {
-  const bisect = d3.bisector<PositionSpeedTime, number>((d) => d.position).left;
+  const bisect = d3.bisector<ReportTrainData, number>((d) => d.position).left;
   const index = bisect(dataSimulation.speed, positionLocal, 1);
   const bisection = [dataSimulation.speed[index - 1], dataSimulation.speed[index]];
   if (bisection[1]) {
diff --git a/front/src/modules/simulationResult/components/ChartHelpers/enableInteractivity.tsx b/front/src/modules/simulationResult/components/ChartHelpers/enableInteractivity.tsx
index 7b429ad9ce1..3a5a06137bc 100644
--- a/front/src/modules/simulationResult/components/ChartHelpers/enableInteractivity.tsx
+++ b/front/src/modules/simulationResult/components/ChartHelpers/enableInteractivity.tsx
@@ -9,12 +9,12 @@ import {
   gridY2,
   interpolateOnTime,
   getAxis,
-  interpolateOnPositionV2,
+  interpolateOnPosition,
 } from 'modules/simulationResult/components/ChartHelpers/ChartHelpers';
 import drawGuideLines from 'modules/simulationResult/components/ChartHelpers/drawGuideLines';
 import type { AreaBlock } from 'modules/simulationResult/components/SpeedSpaceChart/types';
 import { CHART_AXES, LIST_VALUES, type ChartAxes } from 'modules/simulationResult/consts';
-import type { PositionScaleDomain, SpaceCurvesSlopesDataV2 } from 'modules/simulationResult/types';
+import type { PositionScaleDomain, SpaceCurvesSlopesData } from 'modules/simulationResult/types';
 import type {
   Chart,
   ConsolidatedRouteAspect,
@@ -256,9 +256,9 @@ function wheelDelta(event: WheelEvent) {
   return -event.deltaY * factor;
 }
 
-export const enableInteractivityV2 = <
+export const enableInteractivity = <
   T extends Chart | SpeedSpaceChart,
-  Data extends SimulationTrain<Date> | SpaceCurvesSlopesDataV2,
+  Data extends SimulationTrain<Date> | SpaceCurvesSlopesData,
 >(
   chart: T | undefined,
   selectedTrainData: Data,
@@ -310,7 +310,7 @@ export const enableInteractivityV2 = <
     if (!simulationIsPlaying) {
       // SpaceCurvesSlopesChart
       const positionLocal = chart.x.invert(pointer(event, event.currentTarget)[0]) as number;
-      const timePositionLocal = interpolateOnPositionV2(
+      const timePositionLocal = interpolateOnPosition(
         selectedTrainData as { speed: PositionSpeedTime[] },
         Math.max(positionLocal, 0),
         isoDateWithTimezoneToSec(selectedTrainDepartureDate)
diff --git a/front/src/modules/simulationResult/components/ChartHelpers/getScaleDomainFromValues.ts b/front/src/modules/simulationResult/components/ChartHelpers/getScaleDomainFromValues.ts
index 097d608c02b..34696ff3b06 100644
--- a/front/src/modules/simulationResult/components/ChartHelpers/getScaleDomainFromValues.ts
+++ b/front/src/modules/simulationResult/components/ChartHelpers/getScaleDomainFromValues.ts
@@ -3,7 +3,7 @@ import * as d3 from 'd3';
 
 import { mmToM } from 'utils/physics';
 
-export const getScaleDomainFromValuesV2 = (values: number[]) => {
+export const getScaleDomainFromValues = (values: number[]) => {
   const [minScaleValue, maxScaleValue] = d3.extent(values) as number[];
   // These values needs to be in meters
   return [mmToM(minScaleValue), mmToM(maxScaleValue) + 100];
diff --git a/front/src/modules/simulationResult/components/ChartSynchronizer/ChartSynchronizerV2.ts b/front/src/modules/simulationResult/components/ChartSynchronizer/ChartSynchronizer.ts
similarity index 89%
rename from front/src/modules/simulationResult/components/ChartSynchronizer/ChartSynchronizerV2.ts
rename to front/src/modules/simulationResult/components/ChartSynchronizer/ChartSynchronizer.ts
index e0b34c71a0b..b295674e801 100644
--- a/front/src/modules/simulationResult/components/ChartSynchronizer/ChartSynchronizerV2.ts
+++ b/front/src/modules/simulationResult/components/ChartSynchronizer/ChartSynchronizer.ts
@@ -18,8 +18,8 @@ const IS_TRAIN_SCHEDULE_V2 = true;
  * each function passed to @method subscribe will receive the new data.
  * subscriber functions can be used to refresh d3 graphes, or rehydrate react component with this data, now isolated from react life cycle.
  */
-export class ChartSynchronizerV2 {
-  private static instance: ChartSynchronizerV2;
+export class ChartSynchronizer {
+  private static instance: ChartSynchronizer;
 
   private subscribers: Map<string, Subscriber>;
 
@@ -36,10 +36,10 @@ export class ChartSynchronizerV2 {
   }
 
   static getInstance() {
-    if (!ChartSynchronizerV2.instance) {
-      ChartSynchronizerV2.instance = new ChartSynchronizerV2();
+    if (!ChartSynchronizer.instance) {
+      ChartSynchronizer.instance = new ChartSynchronizer();
     }
-    return ChartSynchronizerV2.instance;
+    return ChartSynchronizer.instance;
   }
 
   setTrainData(trainData?: ChartSynchronizerTrainData) {
@@ -82,12 +82,12 @@ export class ChartSynchronizerV2 {
  * @param dependencies – When a dependency changes, update the subscriber.
  * @returns
  */
-export function useChartSynchronizerV2(
+export function useChartSynchronizer(
   subscriber?: Subscriber,
   key?: string,
   dependencies?: unknown[]
 ) {
-  const synchronizer = useRef(ChartSynchronizerV2.getInstance());
+  const synchronizer = useRef(ChartSynchronizer.getInstance());
 
   // create or update subscription
   useEffect(() => {
diff --git a/front/src/modules/simulationResult/components/ChartSynchronizer/index.ts b/front/src/modules/simulationResult/components/ChartSynchronizer/index.ts
index e9eaa128196..6fee9f65d1f 100644
--- a/front/src/modules/simulationResult/components/ChartSynchronizer/index.ts
+++ b/front/src/modules/simulationResult/components/ChartSynchronizer/index.ts
@@ -1 +1 @@
-export { ChartSynchronizerV2, useChartSynchronizerV2 } from './ChartSynchronizerV2';
+export { ChartSynchronizer, useChartSynchronizer } from './ChartSynchronizer';
diff --git a/front/src/modules/simulationResult/components/ChartSynchronizer/utils.ts b/front/src/modules/simulationResult/components/ChartSynchronizer/utils.ts
index f9f0b1b93ac..b629f9a8b21 100644
--- a/front/src/modules/simulationResult/components/ChartSynchronizer/utils.ts
+++ b/front/src/modules/simulationResult/components/ChartSynchronizer/utils.ts
@@ -4,10 +4,10 @@ import type { RollingStock } from 'common/api/osrdEditoastApi';
 import { isoDateWithTimezoneToSec } from 'utils/date';
 import { mmToM } from 'utils/physics';
 
-import { ChartSynchronizerV2, type ChartSynchronizerTrainData } from './ChartSynchronizerV2';
+import { ChartSynchronizer, type ChartSynchronizerTrainData } from './ChartSynchronizer';
 import { sec2d3datetime } from '../ChartHelpers/ChartHelpers';
 
-export const updateChartSynchronizerV2TrainData = (
+export const updateChartSynchronizerTrainData = (
   simulation: SimulationResponseSuccess,
   rollingStock: RollingStock,
   departureTime: string
@@ -86,5 +86,5 @@ export const updateChartSynchronizerV2TrainData = (
     eco_speed: ecoSpeeds,
   };
 
-  ChartSynchronizerV2.getInstance().setTrainData(chartSynchronizerData);
+  ChartSynchronizer.getInstance().setTrainData(chartSynchronizerData);
 };
diff --git a/front/src/modules/simulationResult/components/SimulationResultsMapV2.tsx b/front/src/modules/simulationResult/components/SimulationResultsMap/SimulationResultsMap.tsx
similarity index 96%
rename from front/src/modules/simulationResult/components/SimulationResultsMapV2.tsx
rename to front/src/modules/simulationResult/components/SimulationResultsMap/SimulationResultsMap.tsx
index f74370ebd23..433a4aea62e 100644
--- a/front/src/modules/simulationResult/components/SimulationResultsMapV2.tsx
+++ b/front/src/modules/simulationResult/components/SimulationResultsMap/SimulationResultsMap.tsx
@@ -55,17 +55,17 @@ import { useAppDispatch } from 'store';
 import { isoDateWithTimezoneToSec } from 'utils/date';
 import { kmToM, mmToM, msToKmh } from 'utils/physics';
 
-import { interpolateOnPositionV2 } from './ChartHelpers/ChartHelpers';
-import { useChartSynchronizerV2 } from './ChartSynchronizer';
-import getSelectedTrainHoverPositions from './SimulationResultsMap/getSelectedTrainHoverPositions';
+import getSelectedTrainHoverPositions from './getSelectedTrainHoverPositions';
+import { interpolateOnPosition } from '../ChartHelpers/ChartHelpers';
+import { useChartSynchronizer } from '../ChartSynchronizer';
 
-type MapProps = {
+type SimulationResultMapProps = {
   setExtViewport: (viewport: Viewport) => void;
   geometry?: PathPropertiesFormatted['geometry'];
   trainSimulation?: SimulationResponseSuccess & { trainId: number; startTime: string };
 };
 
-const SimulationResultMapV2 = ({ geometry, trainSimulation }: MapProps) => {
+const SimulationResultMap = ({ geometry, trainSimulation }: SimulationResultMapProps) => {
   const { urlLat = '', urlLon = '', urlZoom = '', urlBearing = '', urlPitch = '' } = useParams();
 
   const mapBlankStyle = useMapBlankStyle();
@@ -84,7 +84,7 @@ const SimulationResultMapV2 = ({ geometry, trainSimulation }: MapProps) => {
 
   const dispatch = useAppDispatch();
 
-  const { updateTimePosition } = useChartSynchronizerV2(
+  const { updateTimePosition } = useChartSynchronizer(
     (_, positionValues) => {
       if (trainSimulation && geojsonPath) {
         const selectedTrainPosition = getSelectedTrainHoverPositions(
@@ -136,7 +136,7 @@ const SimulationResultMapV2 = ({ geometry, trainSimulation }: MapProps) => {
         position: mmToM(trainSimulation.base.positions[i]),
         time: trainSimulation.base.times[i],
       }));
-      const timePositionLocal = interpolateOnPositionV2(
+      const timePositionLocal = interpolateOnPosition(
         { speed: baseSpeedData },
         positionLocal,
         isoDateWithTimezoneToSec(trainSimulation.startTime)
@@ -350,4 +350,4 @@ const SimulationResultMapV2 = ({ geometry, trainSimulation }: MapProps) => {
   );
 };
 
-export default SimulationResultMapV2;
+export default SimulationResultMap;
diff --git a/front/src/modules/simulationResult/components/SimulationResultsMap/TrainHoverPosition.tsx b/front/src/modules/simulationResult/components/SimulationResultsMap/TrainHoverPosition.tsx
index 9e9a71e3b01..51e9f2961f1 100644
--- a/front/src/modules/simulationResult/components/SimulationResultsMap/TrainHoverPosition.tsx
+++ b/front/src/modules/simulationResult/components/SimulationResultsMap/TrainHoverPosition.tsx
@@ -1,5 +1,3 @@
-// TO DO DROP V1: remove this file
-
 import along from '@turf/along';
 import bezierSpline from '@turf/bezier-spline';
 import { type Point, polygon, lineString } from '@turf/helpers';
diff --git a/front/src/modules/simulationResult/components/SpaceCurvesSlopes/SpaceCurvesSlopesV2.tsx b/front/src/modules/simulationResult/components/SpaceCurvesSlopes/SpaceCurvesSlopes.tsx
similarity index 91%
rename from front/src/modules/simulationResult/components/SpaceCurvesSlopes/SpaceCurvesSlopesV2.tsx
rename to front/src/modules/simulationResult/components/SpaceCurvesSlopes/SpaceCurvesSlopes.tsx
index 725289f2fca..970f4a6aa7f 100644
--- a/front/src/modules/simulationResult/components/SpaceCurvesSlopes/SpaceCurvesSlopesV2.tsx
+++ b/front/src/modules/simulationResult/components/SpaceCurvesSlopes/SpaceCurvesSlopes.tsx
@@ -10,18 +10,18 @@ import type {
 } from 'applications/operationalStudies/types';
 import {
   defineLinear,
-  interpolateOnPositionV2,
-  mergeDatasAreaConstantV2,
+  interpolateOnPosition,
+  mergeDatasAreaConstant,
 } from 'modules/simulationResult/components/ChartHelpers/ChartHelpers';
 import defineChart from 'modules/simulationResult/components/ChartHelpers/defineChart';
 import drawArea from 'modules/simulationResult/components/ChartHelpers/drawArea';
 import {
   traceVerticalLine,
-  enableInteractivityV2,
+  enableInteractivity,
 } from 'modules/simulationResult/components/ChartHelpers/enableInteractivity';
 import type { ReportTrainData } from 'modules/simulationResult/components/SpeedSpaceChart/types';
 import { CHART_AXES } from 'modules/simulationResult/consts';
-import type { PositionScaleDomain, SpaceCurvesSlopesDataV2 } from 'modules/simulationResult/types';
+import type { PositionScaleDomain, SpaceCurvesSlopesData } from 'modules/simulationResult/types';
 import { getIsPlaying } from 'reducers/osrdsimulation/selectors';
 import type { Chart, SpeedSpaceChart } from 'reducers/osrdsimulation/types';
 import { dateIsInRange, isoDateWithTimezoneToSec } from 'utils/date';
@@ -33,11 +33,11 @@ import {
   drawAxisTitle,
   drawSpaceCurvesSlopesChartCurve,
 } from './utils';
-import { useChartSynchronizerV2 } from '../ChartSynchronizer';
+import { useChartSynchronizer } from '../ChartSynchronizer';
 
 const CHART_ID = 'SpaceCurvesSlopes';
 
-type SpaceCurvesSlopesV2Props = {
+type SpaceCurvesSlopesProps = {
   initialHeight: number;
   trainSimulation: SimulationResponseSuccess;
   pathProperties: PathPropertiesFormatted;
@@ -46,14 +46,14 @@ type SpaceCurvesSlopesV2Props = {
   departureTime: string;
 };
 
-const SpaceCurvesSlopesV2 = ({
+const SpaceCurvesSlopes = ({
   initialHeight,
   trainSimulation,
   pathProperties,
   sharedXScaleDomain,
   setSharedXScaleDomain,
   departureTime,
-}: SpaceCurvesSlopesV2Props) => {
+}: SpaceCurvesSlopesProps) => {
   const simulationIsPlaying = useSelector(getIsPlaying);
   const { base } = trainSimulation;
   const { operationalPoints, slopes, curves } = pathProperties;
@@ -64,7 +64,7 @@ const SpaceCurvesSlopesV2 = ({
 
   const ref = useRef<HTMLDivElement>(null);
 
-  const trainData: SpaceCurvesSlopesDataV2 = useMemo(() => {
+  const trainData: SpaceCurvesSlopesData = useMemo(() => {
     // speeds (needed for enableInteractivity)
 
     const baseSpeedData: ReportTrainData[] = base.speeds.map((speed, i) => ({
@@ -75,7 +75,7 @@ const SpaceCurvesSlopesV2 = ({
 
     // slopes
     const gradients = slopes.map((step) => step.gradient);
-    const areaSlopesHistogram = mergeDatasAreaConstantV2(slopes, 0, ['position', 'gradient']);
+    const areaSlopesHistogram = mergeDatasAreaConstant(slopes, 0, ['position', 'gradient']);
     const slopesCurve = createSlopeCurve(slopes, gradients);
 
     // curves
@@ -95,13 +95,13 @@ const SpaceCurvesSlopesV2 = ({
     if (chart) {
       const spaceScaleRange = chart.x.domain();
       return spaceScaleRange.map((position) =>
-        interpolateOnPositionV2(trainData, position, isoDateWithTimezoneToSec(departureTime))
+        interpolateOnPosition(trainData, position, isoDateWithTimezoneToSec(departureTime))
       ) as [Date, Date];
     }
     return [new Date(), new Date()];
   }, [chart]);
 
-  const { updateTimePosition } = useChartSynchronizerV2(
+  const { updateTimePosition } = useChartSynchronizer(
     (timePosition, positionValues) => {
       if (dateIsInRange(timePosition, timeScaleRange)) {
         traceVerticalLine(chart, CHART_AXES.SPACE_GRADIENT, positionValues);
@@ -214,7 +214,7 @@ const SpaceCurvesSlopesV2 = ({
     // Operational points
     drawOPs(chartLocal);
 
-    enableInteractivityV2(
+    enableInteractivity(
       chartLocal,
       trainData,
       CHART_AXES.SPACE_GRADIENT,
@@ -275,4 +275,4 @@ const SpaceCurvesSlopesV2 = ({
   );
 };
 
-export default SpaceCurvesSlopesV2;
+export default SpaceCurvesSlopes;
diff --git a/front/src/modules/simulationResult/components/SpaceCurvesSlopes/utils.ts b/front/src/modules/simulationResult/components/SpaceCurvesSlopes/utils.ts
index 9b53cf30cbf..e7e1d741830 100644
--- a/front/src/modules/simulationResult/components/SpaceCurvesSlopes/utils.ts
+++ b/front/src/modules/simulationResult/components/SpaceCurvesSlopes/utils.ts
@@ -2,7 +2,7 @@ import * as d3 from 'd3';
 
 import type { PositionData } from 'applications/operationalStudies/types';
 import drawCurve from 'modules/simulationResult/components/ChartHelpers/drawCurve';
-import type { SpaceCurvesSlopesDataV2 } from 'modules/simulationResult/types';
+import type { SpaceCurvesSlopesData } from 'modules/simulationResult/types';
 import type {
   Chart,
   GradientPosition,
@@ -11,10 +11,7 @@ import type {
   SpeedSpaceChart,
 } from 'reducers/osrdsimulation/types';
 
-export const drawAxisTitle = (
-  chart: Chart,
-  slopes?: SpaceCurvesSlopesDataV2['slopesHistogram']
-) => {
+export const drawAxisTitle = (chart: Chart, slopes?: SpaceCurvesSlopesData['slopesHistogram']) => {
   chart.drawZone
     .append('text')
     .attr('class', 'axis-unit')
@@ -77,7 +74,7 @@ const calculateReferentialHeight = (data: number[]) => {
 };
 
 export const createCurveCurve = (
-  curves: RadiusPosition[] | PositionData<'radius'>[], // TODO DROPV1 : remove RadiusPosition type
+  curves: PositionData<'radius'>[],
   speeds: number[]
 ): RadiusPosition[] => {
   const referentialHeight = calculateReferentialHeight(speeds);
diff --git a/front/src/modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChartV2.tsx b/front/src/modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChartContainer.tsx
similarity index 96%
rename from front/src/modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChartV2.tsx
rename to front/src/modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChartContainer.tsx
index aba6066c05f..4bf9bc9200c 100644
--- a/front/src/modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChartV2.tsx
+++ b/front/src/modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChartContainer.tsx
@@ -16,7 +16,7 @@ import type {
 
 import { formatData } from './helpers';
 
-export type SpeedSpaceChartV2Props = {
+export type SpeedSpaceChartContainerProps = {
   trainSimulation: SimulationResponseSuccess;
   selectedTrainPowerRestrictions?: LayerData<PowerRestrictionValues>[];
   pathProperties: PathPropertiesFormatted;
@@ -29,13 +29,13 @@ const SPEEDSPACECHART_MIN_HEIGHT = 400;
 const SPEEDSPACECHART_BACKGROUND_COLOR = 'rgb(247, 246, 238)';
 const SPEEDSPACECHART_PADDING_BOTTOM = 22.5;
 
-const SpeedSpaceChartV2 = ({
+const SpeedSpaceChartContainer = ({
   trainSimulation,
   selectedTrainPowerRestrictions,
   pathProperties,
   heightOfSpeedSpaceChartContainer,
   setHeightOfSpeedSpaceChartContainer,
-}: SpeedSpaceChartV2Props) => {
+}: SpeedSpaceChartContainerProps) => {
   const { t } = useTranslation('simulation');
 
   const [heightOfSpeedSpaceChart, setHeightOfSpeedSpaceChart] = useState(SPEEDSPACECHART_HEIGHT);
@@ -119,4 +119,4 @@ const SpeedSpaceChartV2 = ({
   );
 };
 
-export default SpeedSpaceChartV2;
+export default SpeedSpaceChartContainer;
diff --git a/front/src/modules/simulationResult/components/SpeedSpaceChart/useSpeedSpaceChart.ts b/front/src/modules/simulationResult/components/SpeedSpaceChart/useSpeedSpaceChart.ts
index 131e4682b8e..f781ad07747 100644
--- a/front/src/modules/simulationResult/components/SpeedSpaceChart/useSpeedSpaceChart.ts
+++ b/front/src/modules/simulationResult/components/SpeedSpaceChart/useSpeedSpaceChart.ts
@@ -17,7 +17,7 @@ import { useInfraID } from 'common/osrdContext';
 import usePathProperties from 'modules/pathfinding/hooks/usePathProperties';
 import formatPowerRestrictionRangesWithHandled from 'modules/powerRestriction/helpers/formatPowerRestrictionRangesWithHandled';
 
-import { updateChartSynchronizerV2TrainData } from '../ChartSynchronizer/utils';
+import { updateChartSynchronizerTrainData } from '../ChartSynchronizer/utils';
 
 /** Prepare data needed for speedSpaceChart */
 const useSpeedSpaceChart = (
@@ -83,7 +83,7 @@ const useSpeedSpaceChart = (
   // setup chart synchronizer
   useEffect(() => {
     if (simulation?.status === 'success' && trainScheduleResult && rollingStock && departureTime) {
-      updateChartSynchronizerV2TrainData(simulation, rollingStock, departureTime);
+      updateChartSynchronizerTrainData(simulation, rollingStock, departureTime);
     }
   }, [simulation, trainScheduleResult, rollingStock, departureTime]);
 
diff --git a/front/src/modules/simulationResult/components/TimeButtons.tsx b/front/src/modules/simulationResult/components/TimeButtons.tsx
index 773fb196a1e..9fc9cb865fe 100644
--- a/front/src/modules/simulationResult/components/TimeButtons.tsx
+++ b/front/src/modules/simulationResult/components/TimeButtons.tsx
@@ -9,7 +9,7 @@ import { updateIsPlaying } from 'reducers/osrdsimulation/actions';
 import { useAppDispatch } from 'store';
 import { datetime2time, sec2datetime, time2datetime } from 'utils/timeManipulation';
 
-import { useChartSynchronizerV2 } from './ChartSynchronizer';
+import { useChartSynchronizer } from './ChartSynchronizer';
 
 // transform a speed ratio (X2 X10 X20, etc.) to interval time & step to bypass
 const factor2ms = (factor: number) => {
@@ -33,7 +33,7 @@ const TimeButtons = ({ departureTime }: TimeButtonsProps) => {
 
   const [localTimePosition, setLocalTimePosition] = useState<Date>(new Date());
 
-  const { updateTimePosition: updateTimePositionV2 } = useChartSynchronizerV2(
+  const { updateTimePosition } = useChartSynchronizer(
     (timePosition) => {
       setLocalTimePosition(timePosition);
     },
@@ -44,8 +44,7 @@ const TimeButtons = ({ departureTime }: TimeButtonsProps) => {
   const stop = () => {
     clearInterval(playInterval);
     setPlayInterval(undefined);
-    if (departureTime)
-      updateTimePositionV2(sec2datetime(convertDepartureTimeIntoSec(departureTime)));
+    if (departureTime) updateTimePosition(sec2datetime(convertDepartureTimeIntoSec(departureTime)));
 
     dispatch(updateIsPlaying(false));
   };
@@ -67,7 +66,7 @@ const TimeButtons = ({ departureTime }: TimeButtonsProps) => {
       } else {
         i += factor.steps;
       }
-      updateTimePositionV2(new Date(i * 1000));
+      updateTimePosition(new Date(i * 1000));
     }, factor.ms);
     setPlayInterval(playIntervalLocal);
     dispatch(updateIsPlaying(true));
@@ -101,7 +100,7 @@ const TimeButtons = ({ departureTime }: TimeButtonsProps) => {
   const changeTimePosition = (newTimePosition: string) => {
     const newTimePositionDate = time2datetime(newTimePosition);
     if (newTimePositionDate) {
-      updateTimePositionV2(newTimePositionDate);
+      updateTimePosition(newTimePositionDate);
     }
   };
 
diff --git a/front/src/modules/simulationResult/components/TrainDetailsV2.tsx b/front/src/modules/simulationResult/components/TrainDetails.tsx
similarity index 95%
rename from front/src/modules/simulationResult/components/TrainDetailsV2.tsx
rename to front/src/modules/simulationResult/components/TrainDetails.tsx
index a7d3fe8ad15..dc6d05391b0 100644
--- a/front/src/modules/simulationResult/components/TrainDetailsV2.tsx
+++ b/front/src/modules/simulationResult/components/TrainDetails.tsx
@@ -6,7 +6,7 @@ import type { TrainSpaceTimeData } from 'applications/operationalStudies/types';
 import type { PositionsSpeedTimes } from 'reducers/osrdsimulation/types';
 
 import { sec2d3datetime } from './ChartHelpers/ChartHelpers';
-import { useChartSynchronizerV2 } from './ChartSynchronizer';
+import { useChartSynchronizer } from './ChartSynchronizer';
 
 /**
  * Given the routeAspects and a timePosition, returns the bounds [start, end]
@@ -38,17 +38,17 @@ const getOccupancyBounds = (
   return relevantAspect ? [relevantAspect.position_start, relevantAspect.position_end] : [0, 0];
 };
 
-type TrainDetailsV2Props = {
+type TrainDetailsProps = {
   projectedTrain: TrainSpaceTimeData;
 };
 
-const TrainDetailsV2 = ({ projectedTrain }: TrainDetailsV2Props) => {
+const TrainDetails = ({ projectedTrain }: TrainDetailsProps) => {
   const [
     { eco_headPosition: headPosition, eco_tailPosition: tailPosition, eco_speed: speed },
     setLocalPositionValues,
   ] = useState<PositionsSpeedTimes<Date>>({} as PositionsSpeedTimes<Date>);
 
-  useChartSynchronizerV2(
+  useChartSynchronizer(
     (_, positionValues) => {
       setLocalPositionValues(positionValues);
     },
@@ -113,4 +113,4 @@ const TrainDetailsV2 = ({ projectedTrain }: TrainDetailsV2Props) => {
   );
 };
 
-export default TrainDetailsV2;
+export default TrainDetails;
diff --git a/front/src/modules/simulationResult/types.ts b/front/src/modules/simulationResult/types.ts
index 45ee1d7259e..bbf8742e12a 100644
--- a/front/src/modules/simulationResult/types.ts
+++ b/front/src/modules/simulationResult/types.ts
@@ -19,7 +19,7 @@ export type TimeScaleDomain = {
   source?: 'SpaceTimeChart' | 'Timeline';
 };
 
-export type SpaceCurvesSlopesDataV2 = {
+export type SpaceCurvesSlopesData = {
   gradients: number[];
   speed: ReportTrainData[];
   slopesHistogram: PositionData<'gradient'>[];
diff --git a/front/src/modules/timesStops/TimesStopsOutput.tsx b/front/src/modules/timesStops/TimesStopsOutput.tsx
index 2c9ad5f424c..69fdd5c3923 100644
--- a/front/src/modules/timesStops/TimesStopsOutput.tsx
+++ b/front/src/modules/timesStops/TimesStopsOutput.tsx
@@ -6,7 +6,7 @@ import type {
 } from 'applications/operationalStudies/types';
 import type { PathfindingResultSuccess, TrainScheduleResult } from 'common/api/osrdEditoastApi';
 import { Loader } from 'common/Loaders/Loader';
-import type { OperationalPointWithTimeAndSpeed } from 'modules/trainschedule/components/DriverTrainScheduleV2/types';
+import type { OperationalPointWithTimeAndSpeed } from 'modules/trainschedule/components/DriverTrainSchedule/types';
 import { convertIsoUtcToLocalTime } from 'utils/date';
 import { NO_BREAK_SPACE } from 'utils/strings';
 
diff --git a/front/src/modules/timesStops/helpers/computeMargins.ts b/front/src/modules/timesStops/helpers/computeMargins.ts
index e8ccace56da..bb0b647da4b 100644
--- a/front/src/modules/timesStops/helpers/computeMargins.ts
+++ b/front/src/modules/timesStops/helpers/computeMargins.ts
@@ -1,7 +1,7 @@
 import type { SimulationResponseSuccess } from 'applications/operationalStudies/types';
 import type { ReportTrain, TrainScheduleResult } from 'common/api/osrdEditoastApi';
-import type { OperationalPointWithTimeAndSpeed } from 'modules/trainschedule/components/DriverTrainScheduleV2/types';
-import { interpolateValue } from 'modules/trainschedule/components/DriverTrainScheduleV2/utils';
+import type { OperationalPointWithTimeAndSpeed } from 'modules/trainschedule/components/DriverTrainSchedule/types';
+import { interpolateValue } from 'modules/trainschedule/components/DriverTrainSchedule/utils';
 import { mToMm, msToS } from 'utils/physics';
 
 import { formatDigitsAndUnit } from './utils';
diff --git a/front/src/modules/timesStops/helpers/utils.ts b/front/src/modules/timesStops/helpers/utils.ts
index b505fa63683..31f908fdb8c 100644
--- a/front/src/modules/timesStops/helpers/utils.ts
+++ b/front/src/modules/timesStops/helpers/utils.ts
@@ -3,7 +3,7 @@ import { round } from 'lodash';
 import { keyColumn, createTextColumn } from 'react-datasheet-grid';
 
 import { matchPathStepAndOp } from 'modules/pathfinding/utils';
-import type { OperationalPointWithTimeAndSpeed } from 'modules/trainschedule/components/DriverTrainScheduleV2/types';
+import type { OperationalPointWithTimeAndSpeed } from 'modules/trainschedule/components/DriverTrainSchedule/types';
 import type { SuggestedOP } from 'modules/trainschedule/components/ManageTrainSchedule/types';
 import type { PathStep } from 'reducers/osrdconf/types';
 import { extractHHMMSS } from 'utils/date';
diff --git a/front/src/modules/timesStops/hooks/useOutputTableData.ts b/front/src/modules/timesStops/hooks/useOutputTableData.ts
index 200a2305f27..2f2add01680 100644
--- a/front/src/modules/timesStops/hooks/useOutputTableData.ts
+++ b/front/src/modules/timesStops/hooks/useOutputTableData.ts
@@ -8,7 +8,7 @@ import type {
 } from 'applications/operationalStudies/types';
 import type { PathfindingResultSuccess, TrainScheduleResult } from 'common/api/osrdEditoastApi';
 import { formatSuggestedOperationalPoints } from 'modules/pathfinding/utils';
-import type { OperationalPointWithTimeAndSpeed } from 'modules/trainschedule/components/DriverTrainScheduleV2/types';
+import type { OperationalPointWithTimeAndSpeed } from 'modules/trainschedule/components/DriverTrainSchedule/types';
 import type { SuggestedOP } from 'modules/trainschedule/components/ManageTrainSchedule/types';
 import { secToHoursString } from 'utils/timeManipulation';
 
diff --git a/front/src/modules/trainschedule/components/DriverTrainScheduleV2/DriverTrainScheduleV2.tsx b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainSchedule.tsx
similarity index 84%
rename from front/src/modules/trainschedule/components/DriverTrainScheduleV2/DriverTrainScheduleV2.tsx
rename to front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainSchedule.tsx
index 38741d3c6f8..3032d746310 100644
--- a/front/src/modules/trainschedule/components/DriverTrainScheduleV2/DriverTrainScheduleV2.tsx
+++ b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainSchedule.tsx
@@ -8,11 +8,11 @@ import type { LightRollingStock, TrainScheduleBase } from 'common/api/osrdEditoa
 import { Loader } from 'common/Loaders';
 
 import { BaseOrEco, type BaseOrEcoType } from './consts';
-import DriverTrainScheduleHeaderV2 from './DriverTrainScheduleHeaderV2';
-import DriverTrainScheduleStopListV2 from './DriverTrainScheduleStopListV2';
+import DriverTrainScheduleHeader from './DriverTrainScheduleHeader';
+import DriverTrainScheduleStopList from './DriverTrainScheduleStopList';
 import type { OperationalPointWithTimeAndSpeed } from './types';
 
-type DriverTrainScheduleV2Props = {
+type DriverTrainScheduleProps = {
   train: TrainScheduleBase;
   simulatedTrain: SimulationResponseSuccess;
   pathProperties: PathPropertiesFormatted;
@@ -26,7 +26,7 @@ type DriverTrainScheduleV2Props = {
   setBaseOrEco: (baseOrEco: BaseOrEcoType) => void;
 };
 
-const DriverTrainScheduleV2 = ({
+const DriverTrainSchedule = ({
   train,
   simulatedTrain,
   pathProperties,
@@ -35,7 +35,7 @@ const DriverTrainScheduleV2 = ({
   formattedOpPointsLoading,
   baseOrEco,
   setBaseOrEco,
-}: DriverTrainScheduleV2Props) => {
+}: DriverTrainScheduleProps) => {
   const selectedTrainRegime = useMemo(
     () => (baseOrEco === BaseOrEco.eco ? simulatedTrain.final_output : simulatedTrain.base),
     [baseOrEco, simulatedTrain]
@@ -48,7 +48,7 @@ const DriverTrainScheduleV2 = ({
 
   return (
     <div className="simulation-driver-train-schedule">
-      <DriverTrainScheduleHeaderV2
+      <DriverTrainScheduleHeader
         simulatedTrain={simulatedTrain}
         train={train}
         operationalPoints={operationPointsToUse}
@@ -63,7 +63,7 @@ const DriverTrainScheduleV2 = ({
           <Loader />
         </div>
       ) : (
-        <DriverTrainScheduleStopListV2
+        <DriverTrainScheduleStopList
           trainRegime={selectedTrainRegime}
           mrsp={simulatedTrain.mrsp}
           operationalPoints={operationPointsToUse}
@@ -73,4 +73,4 @@ const DriverTrainScheduleV2 = ({
   );
 };
 
-export default DriverTrainScheduleV2;
+export default DriverTrainSchedule;
diff --git a/front/src/modules/trainschedule/components/DriverTrainScheduleV2/DriverTrainScheduleHeaderV2.tsx b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleHeader.tsx
similarity index 94%
rename from front/src/modules/trainschedule/components/DriverTrainScheduleV2/DriverTrainScheduleHeaderV2.tsx
rename to front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleHeader.tsx
index 15f7b113ee3..0df9c0f95b6 100644
--- a/front/src/modules/trainschedule/components/DriverTrainScheduleV2/DriverTrainScheduleHeaderV2.tsx
+++ b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleHeader.tsx
@@ -3,7 +3,7 @@ import cx from 'classnames';
 import { useTranslation } from 'react-i18next';
 
 import type {
-  ElectrificationRangeV2,
+  ElectrificationRange,
   SimulationResponseSuccess,
 } from 'applications/operationalStudies/types';
 import type { LightRollingStock, TrainScheduleBase } from 'common/api/osrdEditoastApi';
@@ -15,17 +15,17 @@ import exportTrainCSV from './exportDriverScheduleCSV';
 import type { OperationalPointWithTimeAndSpeed } from './types';
 import { isEco, massWithOneDecimal } from './utils';
 
-type DriverTrainScheduleHeaderV2Props = {
+type DriverTrainScheduleHeaderProps = {
   simulatedTrain: SimulationResponseSuccess;
   train: TrainScheduleBase;
   operationalPoints: OperationalPointWithTimeAndSpeed[];
-  electrificationRanges: ElectrificationRangeV2[];
+  electrificationRanges: ElectrificationRange[];
   rollingStock: LightRollingStock;
   baseOrEco: BaseOrEcoType;
   setBaseOrEco: (baseOrEco: BaseOrEcoType) => void;
 };
 
-const DriverTrainScheduleHeaderV2 = ({
+const DriverTrainScheduleHeader = ({
   simulatedTrain,
   train,
   operationalPoints,
@@ -33,7 +33,7 @@ const DriverTrainScheduleHeaderV2 = ({
   rollingStock,
   baseOrEco,
   setBaseOrEco,
-}: DriverTrainScheduleHeaderV2Props) => {
+}: DriverTrainScheduleHeaderProps) => {
   const { t } = useTranslation(['operationalStudies/drivertrainschedule']);
   const trainRegime =
     baseOrEco === BaseOrEco.base ? simulatedTrain.base : simulatedTrain.final_output;
@@ -121,4 +121,4 @@ const DriverTrainScheduleHeaderV2 = ({
   );
 };
 
-export default DriverTrainScheduleHeaderV2;
+export default DriverTrainScheduleHeader;
diff --git a/front/src/modules/trainschedule/components/DriverTrainScheduleV2/DriverTrainScheduleStopV2.tsx b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleStop.tsx
similarity index 95%
rename from front/src/modules/trainschedule/components/DriverTrainScheduleV2/DriverTrainScheduleStopV2.tsx
rename to front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleStop.tsx
index 6269728e4e9..6dbd5d39b57 100644
--- a/front/src/modules/trainschedule/components/DriverTrainScheduleV2/DriverTrainScheduleStopV2.tsx
+++ b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleStop.tsx
@@ -7,7 +7,7 @@ import type { PositionSpeedTime, SpeedRanges } from 'reducers/osrdsimulation/typ
 import type { OperationalPointWithTimeAndSpeed } from './types';
 import { getActualSpeed, getActualVmax, getAverageSpeed, getTime } from './utils';
 
-type DriverTrainScheduleStopV2Props = {
+type DriverTrainScheduleStopProps = {
   operationalPoint: OperationalPointWithTimeAndSpeed;
   operationalPoints: OperationalPointWithTimeAndSpeed[];
   idx: number;
@@ -15,13 +15,13 @@ type DriverTrainScheduleStopV2Props = {
   speedLimits: SpeedRanges;
 };
 
-const DriverTrainScheduleStopV2 = ({
+const DriverTrainScheduleStop = ({
   operationalPoint,
   operationalPoints,
   idx,
   trainRegimeReports,
   speedLimits,
-}: DriverTrainScheduleStopV2Props) => {
+}: DriverTrainScheduleStopProps) => {
   const actualSpeed = useMemo(
     () => getActualSpeed(operationalPoint.position, trainRegimeReports),
     [operationalPoint.position]
@@ -111,4 +111,4 @@ const DriverTrainScheduleStopV2 = ({
   );
 };
 
-export default DriverTrainScheduleStopV2;
+export default DriverTrainScheduleStop;
diff --git a/front/src/modules/trainschedule/components/DriverTrainScheduleV2/DriverTrainScheduleStopListV2.tsx b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleStopList.tsx
similarity index 92%
rename from front/src/modules/trainschedule/components/DriverTrainScheduleV2/DriverTrainScheduleStopListV2.tsx
rename to front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleStopList.tsx
index 741ae2610bd..0353053dd18 100644
--- a/front/src/modules/trainschedule/components/DriverTrainScheduleV2/DriverTrainScheduleStopListV2.tsx
+++ b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleStopList.tsx
@@ -7,20 +7,20 @@ import type { ReportTrain } from 'common/api/osrdEditoastApi';
 import type { PositionSpeedTime, SpeedRanges } from 'reducers/osrdsimulation/types';
 import { mmToM } from 'utils/physics';
 
-import DriverTrainScheduleStopV2 from './DriverTrainScheduleStopV2';
+import DriverTrainScheduleStop from './DriverTrainScheduleStop';
 import type { OperationalPointWithTimeAndSpeed } from './types';
 
-type DriverTrainScheduleStopListV2Props = {
+type DriverTrainScheduleStopListProps = {
   trainRegime: ReportTrain | SimulationResponseSuccess['final_output'];
   mrsp: SimulationResponseSuccess['mrsp'];
   operationalPoints: OperationalPointWithTimeAndSpeed[];
 };
 
-const DriverTrainScheduleStopListV2 = ({
+const DriverTrainScheduleStopList = ({
   trainRegime,
   mrsp,
   operationalPoints,
-}: DriverTrainScheduleStopListV2Props) => {
+}: DriverTrainScheduleStopListProps) => {
   const { t } = useTranslation(['operationalStudies/drivertrainschedule']);
 
   const formattedTrainRegimeReports: PositionSpeedTime[] = useMemo(
@@ -77,7 +77,7 @@ const DriverTrainScheduleStopListV2 = ({
           <tbody>
             {operationalPoints.length > 0 &&
               operationalPoints.map((op, idx) => (
-                <DriverTrainScheduleStopV2
+                <DriverTrainScheduleStop
                   operationalPoint={op}
                   operationalPoints={operationalPoints}
                   idx={idx}
@@ -93,4 +93,4 @@ const DriverTrainScheduleStopListV2 = ({
   );
 };
 
-export default DriverTrainScheduleStopListV2;
+export default DriverTrainScheduleStopList;
diff --git a/front/src/modules/trainschedule/components/DriverTrainScheduleV2/__tests__/utils.spec.ts b/front/src/modules/trainschedule/components/DriverTrainSchedule/__tests__/utils.spec.ts
similarity index 100%
rename from front/src/modules/trainschedule/components/DriverTrainScheduleV2/__tests__/utils.spec.ts
rename to front/src/modules/trainschedule/components/DriverTrainSchedule/__tests__/utils.spec.ts
diff --git a/front/src/modules/trainschedule/components/DriverTrainScheduleV2/consts.ts b/front/src/modules/trainschedule/components/DriverTrainSchedule/consts.ts
similarity index 100%
rename from front/src/modules/trainschedule/components/DriverTrainScheduleV2/consts.ts
rename to front/src/modules/trainschedule/components/DriverTrainSchedule/consts.ts
diff --git a/front/src/modules/trainschedule/components/DriverTrainScheduleV2/exportDriverScheduleCSV.ts b/front/src/modules/trainschedule/components/DriverTrainSchedule/exportDriverScheduleCSV.ts
similarity index 97%
rename from front/src/modules/trainschedule/components/DriverTrainScheduleV2/exportDriverScheduleCSV.ts
rename to front/src/modules/trainschedule/components/DriverTrainSchedule/exportDriverScheduleCSV.ts
index 149ec6c8387..7675cfc0def 100644
--- a/front/src/modules/trainschedule/components/DriverTrainScheduleV2/exportDriverScheduleCSV.ts
+++ b/front/src/modules/trainschedule/components/DriverTrainSchedule/exportDriverScheduleCSV.ts
@@ -1,5 +1,5 @@
 import type {
-  ElectrificationRangeV2,
+  ElectrificationRange,
   SimulationResponseSuccess,
 } from 'applications/operationalStudies/types';
 import { convertDepartureTimeIntoSec } from 'applications/operationalStudies/utils';
@@ -60,7 +60,7 @@ const overloadSteps = (
   trainRegime: ReportTrain,
   operationalPoints: OperationalPointWithTimeAndSpeed[],
   speedLimits: SpeedRanges,
-  electrificationRanges: ElectrificationRangeV2[]
+  electrificationRanges: ElectrificationRange[]
 ): PositionSpeedTimeOP[] => {
   const speedsAtOps = operationalPoints.map((op) => ({
     position: op.position,
@@ -190,10 +190,10 @@ function createFakeLinkWithData(trainName: string, baseOrEco: BaseOrEcoType, csv
   document.body.removeChild(fakeLink);
 }
 
-export default function driverTrainScheduleV2ExportCSV(
+export default function driverTrainScheduleExportCSV(
   simulatedTrain: SimulationResponseSuccess,
   operationalPoints: OperationalPointWithTimeAndSpeed[],
-  electrificationRanges: ElectrificationRangeV2[],
+  electrificationRanges: ElectrificationRange[],
   baseOrEco: BaseOrEcoType,
   train: TrainScheduleBase
 ) {
diff --git a/front/src/modules/trainschedule/components/DriverTrainScheduleV2/types.ts b/front/src/modules/trainschedule/components/DriverTrainSchedule/types.ts
similarity index 100%
rename from front/src/modules/trainschedule/components/DriverTrainScheduleV2/types.ts
rename to front/src/modules/trainschedule/components/DriverTrainSchedule/types.ts
diff --git a/front/src/modules/trainschedule/components/DriverTrainScheduleV2/utils.ts b/front/src/modules/trainschedule/components/DriverTrainSchedule/utils.ts
similarity index 100%
rename from front/src/modules/trainschedule/components/DriverTrainScheduleV2/utils.ts
rename to front/src/modules/trainschedule/components/DriverTrainSchedule/utils.ts
diff --git a/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleConfigV2.tsx b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx
similarity index 99%
rename from front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleConfigV2.tsx
rename to front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx
index bffa4fb03d0..acc4c6937cd 100644
--- a/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleConfigV2.tsx
+++ b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx
@@ -25,7 +25,7 @@ interface ImportTrainScheduleConfigProps {
   setTrainsJsonData: (trainsJsonData: TrainScheduleBase[]) => void;
 }
 
-const ImportTrainScheduleConfigV2 = ({
+const ImportTrainScheduleConfig = ({
   setTrainsList,
   setIsLoading,
   setTrainsJsonData,
@@ -287,4 +287,4 @@ const ImportTrainScheduleConfigV2 = ({
   );
 };
 
-export default ImportTrainScheduleConfigV2;
+export default ImportTrainScheduleConfig;
diff --git a/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainsListV2.tsx b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainsList.tsx
similarity index 92%
rename from front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainsListV2.tsx
rename to front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainsList.tsx
index 858278b4873..296a863a575 100644
--- a/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainsListV2.tsx
+++ b/front/src/modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainsList.tsx
@@ -17,7 +17,7 @@ import rollingstockOpenData2OSRD from 'modules/trainschedule/components/ImportTr
 import { setFailure, setSuccess } from 'reducers/main';
 import { useAppDispatch } from 'store';
 
-import { generateV2TrainSchedulesPayloads } from './generateTrainSchedulesPayloads';
+import { generateTrainSchedulesPayloads } from './generateTrainSchedulesPayloads';
 import type { RollingstockOpenData2OSRDKeys } from './types';
 
 function LoadingIfSearching({ isLoading, t }: { isLoading: boolean; t: TFunction }) {
@@ -36,7 +36,7 @@ type ImportTrainScheduleTrainsListProps = {
   trainsJsonData: TrainScheduleBase[];
 };
 
-const ImportTrainScheduleTrainsListV2 = ({
+const ImportTrainScheduleTrainsList = ({
   trainsList,
   rollingStocks,
   isLoading,
@@ -66,12 +66,12 @@ const ImportTrainScheduleTrainsListV2 = ({
 
   const dispatch = useAppDispatch();
 
-  async function generateV2TrainSchedules() {
+  async function generateTrainSchedules() {
     try {
       const payloads =
         trainsJsonData.length > 0
           ? trainsJsonData
-          : generateV2TrainSchedulesPayloads(formattedTrainsList);
+          : generateTrainSchedulesPayloads(formattedTrainsList);
 
       await postTrainSchedule({ id: timetableId, body: payloads }).unwrap();
       dispatch(
@@ -107,7 +107,7 @@ const ImportTrainScheduleTrainsListV2 = ({
           <button
             className="btn btn-primary btn-sm ml-auto"
             type="button"
-            onClick={() => generateV2TrainSchedules()}
+            onClick={() => generateTrainSchedules()}
           >
             <Rocket />
             <span className="ml-3">{t('launchImport')}</span>
@@ -140,4 +140,4 @@ const ImportTrainScheduleTrainsListV2 = ({
   );
 };
 
-export default ImportTrainScheduleTrainsListV2;
+export default ImportTrainScheduleTrainsList;
diff --git a/front/src/modules/trainschedule/components/ImportTrainSchedule/generateTrainSchedulesPayloads.ts b/front/src/modules/trainschedule/components/ImportTrainSchedule/generateTrainSchedulesPayloads.ts
index 2aaacc274ba..54ae8e9285a 100644
--- a/front/src/modules/trainschedule/components/ImportTrainSchedule/generateTrainSchedulesPayloads.ts
+++ b/front/src/modules/trainschedule/components/ImportTrainSchedule/generateTrainSchedulesPayloads.ts
@@ -6,7 +6,7 @@ import type { TrainScheduleBase } from 'common/api/osrdEditoastApi';
 import { formatToIsoDate } from 'utils/date';
 import { calculateTimeDifferenceInSeconds, formatDurationAsISO8601 } from 'utils/timeManipulation';
 
-export function generateV2TrainSchedulesPayloads(
+export function generateTrainSchedulesPayloads(
   trains: ImportedTrainSchedule[]
 ): TrainScheduleBase[] {
   return trains.map((train) => {
diff --git a/front/src/modules/trainschedule/components/ImportTrainSchedule/index.ts b/front/src/modules/trainschedule/components/ImportTrainSchedule/index.ts
index d7a4bf79cd2..40c26acaa0d 100644
--- a/front/src/modules/trainschedule/components/ImportTrainSchedule/index.ts
+++ b/front/src/modules/trainschedule/components/ImportTrainSchedule/index.ts
@@ -1,3 +1,3 @@
-export { default as ImportTrainScheduleConfigV2 } from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleConfigV2';
+export { default as ImportTrainScheduleConfig } from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleConfig';
 export { default as ImportTrainScheduleStationSelector } from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleStationSelector';
 export { default as ImportTrainScheduleTrainDetail } from 'modules/trainschedule/components/ImportTrainSchedule/ImportTrainScheduleTrainDetail';
diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/AddTrainScheduleV2Button.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/AddTrainScheduleButton.tsx
similarity index 95%
rename from front/src/modules/trainschedule/components/ManageTrainSchedule/AddTrainScheduleV2Button.tsx
rename to front/src/modules/trainschedule/components/ManageTrainSchedule/AddTrainScheduleButton.tsx
index 1d4d2f87707..a1dd7c290f0 100644
--- a/front/src/modules/trainschedule/components/ManageTrainSchedule/AddTrainScheduleV2Button.tsx
+++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/AddTrainScheduleButton.tsx
@@ -20,17 +20,17 @@ import { sec2time } from 'utils/timeManipulation';
 import checkCurrentConfig from './helpers/checkCurrentConfig';
 import formatTrainSchedulePayload from './helpers/formatTrainSchedulePayload';
 
-type SubmitConfAddTrainScheduleProps = {
+type AddTrainScheduleButtonProps = {
   infraState?: InfraState;
   setIsWorking: (isWorking: boolean) => void;
   upsertTrainSchedules: (trainSchedules: TrainScheduleResult[]) => void;
 };
 
-const AddTrainScheduleV2Button = ({
+const AddTrainScheduleButton = ({
   infraState,
   setIsWorking,
   upsertTrainSchedules,
-}: SubmitConfAddTrainScheduleProps) => {
+}: AddTrainScheduleButtonProps) => {
   const [postTrainSchedule] =
     osrdEditoastApi.endpoints.postTimetableByIdTrainSchedule.useMutation();
   const dispatch = useAppDispatch();
@@ -107,4 +107,4 @@ const AddTrainScheduleV2Button = ({
   );
 };
 
-export default AddTrainScheduleV2Button;
+export default AddTrainScheduleButton;
diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/ItineraryLayer.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/ItineraryLayer.tsx
index e73a86979fa..1296b04a3b9 100644
--- a/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/ItineraryLayer.tsx
+++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/ItineraryLayer.tsx
@@ -16,9 +16,9 @@ export default function ItineraryLayer({
   geometry,
   hideItineraryLine = false,
 }: ItineraryLayerProps) {
-  const { getOriginV2, getDestinationV2 } = useOsrdConfSelectors();
-  const origin = useSelector(getOriginV2);
-  const destination = useSelector(getDestinationV2);
+  const { getOrigin, getDestination } = useOsrdConfSelectors();
+  const origin = useSelector(getOrigin);
+  const destination = useSelector(getDestination);
   if (geometry && origin && destination) {
     return (
       <Source type="geojson" data={geometry}>
diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/ItineraryMarkersV2.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/ItineraryMarkers.tsx
similarity index 100%
rename from front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/ItineraryMarkersV2.tsx
rename to front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/ItineraryMarkers.tsx
diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.tsx
index b5bc9e0a7b2..77365e68b6c 100644
--- a/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.tsx
+++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/RenderPopup.tsx
@@ -15,7 +15,7 @@ import { calculateDistanceAlongTrack } from 'applications/editor/tools/utils';
 import type { ManageTrainSchedulePathProperties } from 'applications/operationalStudies/types';
 import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
 import { useOsrdConfActions, useOsrdConfSelectors } from 'common/osrdContext';
-import { setPointItiV2 } from 'modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/setPointIti';
+import { setPointIti } from 'modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/setPointIti';
 import type { PathStep } from 'reducers/osrdconf/types';
 
 type FeatureInfoClickType = {
@@ -29,13 +29,13 @@ type RenderPopupProps = {
 };
 
 function RenderPopup({ pathProperties }: RenderPopupProps) {
-  const { getFeatureInfoClick, getInfraID, getOriginV2, getDestinationV2 } = useOsrdConfSelectors();
+  const { getFeatureInfoClick, getInfraID, getOrigin, getDestination } = useOsrdConfSelectors();
   const osrdConfActions = useOsrdConfActions();
   const { t } = useTranslation(['operationalStudies/manageTrainSchedule']);
   const featureInfoClick: FeatureInfoClickType = useSelector(getFeatureInfoClick);
   const infraId = useSelector(getInfraID);
-  const origin = useSelector(getOriginV2);
-  const destination = useSelector(getDestinationV2);
+  const origin = useSelector(getOrigin);
+  const destination = useSelector(getDestination);
 
   const [trackOffset, setTrackOffset] = useState(0);
 
@@ -124,7 +124,7 @@ function RenderPopup({ pathProperties }: RenderPopupProps) {
           data-testid="map-origin-button"
           className="btn btn-sm btn-success"
           type="button"
-          onClick={() => setPointItiV2('origin', pathStepProperties, osrdConfActions)}
+          onClick={() => setPointIti('origin', pathStepProperties, osrdConfActions)}
         >
           <RiMapPin2Fill />
           <span className="d-none">{t('origin')}</span>
@@ -133,9 +133,7 @@ function RenderPopup({ pathProperties }: RenderPopupProps) {
           <button
             className="btn btn-sm btn-info"
             type="button"
-            onClick={() =>
-              setPointItiV2('via', pathStepProperties, osrdConfActions, pathProperties)
-            }
+            onClick={() => setPointIti('via', pathStepProperties, osrdConfActions, pathProperties)}
           >
             <RiMapPin3Fill />
             <span className="d-none">{t('via')}</span>
@@ -145,7 +143,7 @@ function RenderPopup({ pathProperties }: RenderPopupProps) {
           data-testid="map-destination-button"
           className="btn btn-sm btn-warning"
           type="button"
-          onClick={() => setPointItiV2('destination', pathStepProperties, osrdConfActions)}
+          onClick={() => setPointIti('destination', pathStepProperties, osrdConfActions)}
         >
           <IoFlag />
           <span className="d-none">{t('destination')}</span>
diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/setPointIti.ts b/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/setPointIti.ts
index 691ad260ea2..c0e626e3846 100644
--- a/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/setPointIti.ts
+++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/setPointIti.ts
@@ -5,26 +5,26 @@ import type { PathStep } from 'reducers/osrdconf/types';
 import { store } from 'store';
 import { addElementAtIndex } from 'utils/array';
 
-export function setPointItiV2(
+export function setPointIti(
   pointType: 'origin' | 'destination' | 'via',
   pathStep: PathStep,
   actions: ConfSliceActions,
   pathProperties?: ManageTrainSchedulePathProperties
 ) {
-  const { updateOriginV2, updateDestinationV2, addViaV2, updatePathSteps, updateFeatureInfoClick } =
+  const { updateOrigin, updateDestination, addVia, updatePathSteps, updateFeatureInfoClick } =
     actions;
   const { pathSteps } = store.getState().operationalStudiesConf;
 
   switch (pointType) {
     case 'origin':
-      store.dispatch(updateOriginV2(pathStep));
+      store.dispatch(updateOrigin(pathStep));
       break;
     case 'destination':
-      store.dispatch(updateDestinationV2(pathStep));
+      store.dispatch(updateDestination(pathStep));
       break;
     default:
       if (pathProperties) {
-        store.dispatch(addViaV2({ newVia: pathStep, pathProperties }));
+        store.dispatch(addVia({ newVia: pathStep, pathProperties }));
       } else {
         store.dispatch(
           updatePathSteps({
diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx
index 00bafa1af0d..308cbafcbf1 100644
--- a/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx
+++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx
@@ -52,7 +52,7 @@ import { useAppDispatch } from 'store';
 import { getMapMouseEventNearestFeature } from 'utils/mapHelper';
 
 import ItineraryLayer from './ManageTrainScheduleMap/ItineraryLayer';
-import ItineraryMarkersV2 from './ManageTrainScheduleMap/ItineraryMarkersV2';
+import ItineraryMarkers from './ManageTrainScheduleMap/ItineraryMarkers';
 
 type MapProps = {
   pathProperties?: ManageTrainSchedulePathProperties;
@@ -403,7 +403,7 @@ const Map = ({
               hideItineraryLine={hideItinerary}
             />
             {mapRef.current && (
-              <ItineraryMarkersV2
+              <ItineraryMarkers
                 simulationPathSteps={simulationPathSteps}
                 map={mapRef.current.getMap()}
               />
diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/TimetableManageTrainScheduleV2.tsx b/front/src/modules/trainschedule/components/ManageTrainSchedule/TimetableManageTrainSchedule.tsx
similarity index 94%
rename from front/src/modules/trainschedule/components/ManageTrainSchedule/TimetableManageTrainScheduleV2.tsx
rename to front/src/modules/trainschedule/components/ManageTrainSchedule/TimetableManageTrainSchedule.tsx
index de47fa67cbd..b88aeab53bb 100644
--- a/front/src/modules/trainschedule/components/ManageTrainSchedule/TimetableManageTrainScheduleV2.tsx
+++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/TimetableManageTrainSchedule.tsx
@@ -8,7 +8,7 @@ import type { InfraState, TrainScheduleResult } from 'common/api/osrdEditoastApi
 import DotsLoader from 'common/DotsLoader/DotsLoader';
 import TrainAddingSettings from 'modules/trainschedule/components/ManageTrainSchedule/TrainAddingSettings';
 
-import AddTrainScheduleV2Button from './AddTrainScheduleV2Button';
+import AddTrainScheduleButton from './AddTrainScheduleButton';
 import useUpdateTrainSchedule from './hooks/useUpdateTrainSchedule';
 
 type TimetableManageTrainScheduleProps = {
@@ -20,7 +20,7 @@ type TimetableManageTrainScheduleProps = {
   setTrainIdToEdit: (trainIdToEdit?: number) => void;
 };
 
-const TimetableManageTrainScheduleV2 = ({
+const TimetableManageTrainSchedule = ({
   displayTrainScheduleManagement,
   setDisplayTrainScheduleManagement,
   upsertTrainSchedules,
@@ -73,7 +73,7 @@ const TimetableManageTrainScheduleV2 = ({
                 <DotsLoader />
               </button>
             ) : (
-              <AddTrainScheduleV2Button
+              <AddTrainScheduleButton
                 infraState={infraState}
                 setIsWorking={setIsWorking}
                 upsertTrainSchedules={upsertTrainSchedules}
@@ -104,4 +104,4 @@ const TimetableManageTrainScheduleV2 = ({
   );
 };
 
-export default TimetableManageTrainScheduleV2;
+export default TimetableManageTrainSchedule;
diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify.ts b/front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify.ts
index 5f7e2e8923f..67a331db3bc 100644
--- a/front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify.ts
+++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify.ts
@@ -7,7 +7,7 @@ import type { PathStep } from 'reducers/osrdconf/types';
 import { convertIsoUtcToLocalTime } from 'utils/date';
 import { msToKmh } from 'utils/physics';
 
-export function adjustConfWithTrainToModifyV2(
+export function adjustConfWithTrainToModify(
   trainSchedule: TrainScheduleResult,
   pathSteps: (PathStep | null)[],
   rollingStockId: number | undefined,
@@ -23,7 +23,7 @@ export function adjustConfWithTrainToModifyV2(
     updateName,
     updateStartTime,
     updateInitialSpeed,
-    updatePowerRestrictionRangesV2,
+    updatePowerRestrictionRanges,
     updatePathSteps,
   } = osrdActions;
 
@@ -52,5 +52,5 @@ export function adjustConfWithTrainToModifyV2(
 
   dispatch(updateLabels(labels || []));
 
-  dispatch(updatePowerRestrictionRangesV2(power_restrictions || []));
+  dispatch(updatePowerRestrictionRanges(power_restrictions || []));
 }
diff --git a/front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/checkCurrentConfig.ts b/front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/checkCurrentConfig.ts
index 3bcde5b44f4..31e8dcac969 100644
--- a/front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/checkCurrentConfig.ts
+++ b/front/src/modules/trainschedule/components/ManageTrainSchedule/helpers/checkCurrentConfig.ts
@@ -31,8 +31,8 @@ const checkCurrentConfig = (
     speedLimitByTag,
     initialSpeed,
     usingElectricalProfiles,
-    rollingStockComfortV2,
-    powerRestrictionV2,
+    rollingStockComfort,
+    powerRestriction,
     startTime,
   } = osrdconf;
   let error = false;
@@ -142,7 +142,7 @@ const checkCurrentConfig = (
     trainStep,
     trainDelta,
     labels,
-    rollingStockComfort: rollingStockComfortV2,
+    rollingStockComfort,
     initialSpeed: initialSpeed ? kmhToMs(initialSpeed) : 0,
     usingElectricalProfiles,
     path: compact(osrdconf.pathSteps).map((step) => {
@@ -164,7 +164,6 @@ const checkCurrentConfig = (
       if ('track' in stepLocation) {
         return {
           ...stepLocation,
-          // TODO drop V1: we should store the offset in mm in the store
           offset: mToMm(stepLocation.offset),
         };
       }
@@ -173,7 +172,7 @@ const checkCurrentConfig = (
 
     margins: formatMargin(compact(pathSteps)),
     schedule: formatSchedule(compact(pathSteps), startTime),
-    powerRestrictions: powerRestrictionV2,
+    powerRestrictions: powerRestriction,
     firstStartTime: startTime,
     speedLimitByTag,
   };
diff --git a/front/src/modules/trainschedule/components/TimetableV2/FilterPanel.tsx b/front/src/modules/trainschedule/components/Timetable/FilterPanel.tsx
similarity index 100%
rename from front/src/modules/trainschedule/components/TimetableV2/FilterPanel.tsx
rename to front/src/modules/trainschedule/components/Timetable/FilterPanel.tsx
diff --git a/front/src/modules/trainschedule/components/TimetableV2/TimetableV2.tsx b/front/src/modules/trainschedule/components/Timetable/Timetable.tsx
similarity index 95%
rename from front/src/modules/trainschedule/components/TimetableV2/TimetableV2.tsx
rename to front/src/modules/trainschedule/components/Timetable/Timetable.tsx
index cef60a5ef33..904bb59428d 100644
--- a/front/src/modules/trainschedule/components/TimetableV2/TimetableV2.tsx
+++ b/front/src/modules/trainschedule/components/Timetable/Timetable.tsx
@@ -8,18 +8,18 @@ import { useSelector } from 'react-redux';
 
 import { MANAGE_TRAIN_SCHEDULE_TYPES } from 'applications/operationalStudies/consts';
 import type { Conflict, InfraState, TrainScheduleResult } from 'common/api/osrdEditoastApi';
-import ConflictsListV2 from 'modules/conflict/components/ConflictsListV2';
+import ConflictsList from 'modules/conflict/components/ConflictsList';
 import { updateSelectedTrainId } from 'reducers/osrdsimulation/actions';
 import { getTrainIdUsedForProjection } from 'reducers/osrdsimulation/selectors';
 import { useAppDispatch } from 'store';
 import { distributedIntervalsFromArrayOfValues, valueToInterval } from 'utils/numbers';
 
 import TimetableToolbar from './TimetableToolbar';
-import TimetableTrainCardV2 from './TimetableTrainCardV2';
+import TimetableTrainCard from './TimetableTrainCard';
 import type { TrainScheduleWithDetails } from './types';
 import { timetableHasInvalidTrain } from './utils';
 
-type TimetableV2Props = {
+type TimetableProps = {
   setDisplayTrainScheduleManagement: (mode: string) => void;
   trainsWithDetails: boolean;
   infraState: InfraState;
@@ -34,7 +34,7 @@ type TimetableV2Props = {
   trainSchedulesWithDetails: TrainScheduleWithDetails[];
 };
 
-const TimetableV2 = ({
+const Timetable = ({
   setDisplayTrainScheduleManagement,
   trainsWithDetails,
   infraState,
@@ -47,7 +47,7 @@ const TimetableV2 = ({
   trainIdToEdit,
   trainSchedules = [],
   trainSchedulesWithDetails,
-}: TimetableV2Props) => {
+}: TimetableProps) => {
   const { t } = useTranslation(['operationalStudies/scenario', 'common/itemTypes']);
 
   const trainIdUsedForProjection = useSelector(getTrainIdUsedForProjection);
@@ -151,7 +151,7 @@ const TimetableV2 = ({
       >
         {trainsDurationsIntervals &&
           displayedTrainSchedules.map((train: TrainScheduleWithDetails, idx: number) => (
-            <TimetableTrainCardV2
+            <TimetableTrainCard
               idx={idx}
               isSelectable={multiselectOn}
               isInSelection={selectedTrainIds.includes(train.id)}
@@ -181,7 +181,7 @@ const TimetableV2 = ({
           </div>
         )}
         {conflicts && (
-          <ConflictsListV2
+          <ConflictsList
             conflicts={conflicts}
             expanded={conflictsListExpanded}
             toggleConflictsList={toggleConflictsListExpanded}
@@ -194,4 +194,4 @@ const TimetableV2 = ({
   );
 };
 
-export default TimetableV2;
+export default Timetable;
diff --git a/front/src/modules/trainschedule/components/TimetableV2/TimetableToolbar.tsx b/front/src/modules/trainschedule/components/Timetable/TimetableToolbar.tsx
similarity index 100%
rename from front/src/modules/trainschedule/components/TimetableV2/TimetableToolbar.tsx
rename to front/src/modules/trainschedule/components/Timetable/TimetableToolbar.tsx
diff --git a/front/src/modules/trainschedule/components/TimetableV2/TimetableTrainCardV2.tsx b/front/src/modules/trainschedule/components/Timetable/TimetableTrainCard.tsx
similarity index 98%
rename from front/src/modules/trainschedule/components/TimetableV2/TimetableTrainCardV2.tsx
rename to front/src/modules/trainschedule/components/Timetable/TimetableTrainCard.tsx
index d5132ee945e..fbb73f0ed7a 100644
--- a/front/src/modules/trainschedule/components/TimetableV2/TimetableTrainCardV2.tsx
+++ b/front/src/modules/trainschedule/components/Timetable/TimetableTrainCard.tsx
@@ -48,7 +48,7 @@ type TimetableTrainCardProps = {
   removeTrains: (trainIds: number[]) => void;
 };
 
-const TimetableTrainCardV2 = ({
+const TimetableTrainCard = ({
   isSelectable,
   isInSelection,
   train,
@@ -223,7 +223,7 @@ const TimetableTrainCardV2 = ({
               )}
             </div>
             <div
-              className={cx('scenario-timetable-train-times V2', {
+              className={cx('scenario-timetable-train-times', {
                 'not-honored': train.notHonoredReason === 'scheduleNotHonored',
                 'too-fast': train.notHonoredReason === 'trainTooFast',
               })}
@@ -322,4 +322,4 @@ const TimetableTrainCardV2 = ({
   );
 };
 
-export default React.memo(TimetableTrainCardV2);
+export default React.memo(TimetableTrainCard);
diff --git a/front/src/modules/trainschedule/components/TimetableV2/consts.ts b/front/src/modules/trainschedule/components/Timetable/consts.ts
similarity index 100%
rename from front/src/modules/trainschedule/components/TimetableV2/consts.ts
rename to front/src/modules/trainschedule/components/Timetable/consts.ts
diff --git a/front/src/modules/trainschedule/components/TimetableV2/types.ts b/front/src/modules/trainschedule/components/Timetable/types.ts
similarity index 100%
rename from front/src/modules/trainschedule/components/TimetableV2/types.ts
rename to front/src/modules/trainschedule/components/Timetable/types.ts
diff --git a/front/src/modules/trainschedule/components/TimetableV2/useFilterTrainSchedules.ts b/front/src/modules/trainschedule/components/Timetable/useFilterTrainSchedules.ts
similarity index 100%
rename from front/src/modules/trainschedule/components/TimetableV2/useFilterTrainSchedules.ts
rename to front/src/modules/trainschedule/components/Timetable/useFilterTrainSchedules.ts
diff --git a/front/src/modules/trainschedule/components/TimetableV2/utils.ts b/front/src/modules/trainschedule/components/Timetable/utils.ts
similarity index 100%
rename from front/src/modules/trainschedule/components/TimetableV2/utils.ts
rename to front/src/modules/trainschedule/components/Timetable/utils.ts
diff --git a/front/src/modules/trainschedule/useFormattedOperationalPoints.ts b/front/src/modules/trainschedule/useFormattedOperationalPoints.ts
index 140dcf873af..a19d312d08f 100644
--- a/front/src/modules/trainschedule/useFormattedOperationalPoints.ts
+++ b/front/src/modules/trainschedule/useFormattedOperationalPoints.ts
@@ -7,9 +7,9 @@ import type {
 } from 'applications/operationalStudies/types';
 import type { TrainScheduleBase } from 'common/api/osrdEditoastApi';
 
-import { BaseOrEco, type BaseOrEcoType } from './components/DriverTrainScheduleV2/consts';
-import type { OperationalPointWithTimeAndSpeed } from './components/DriverTrainScheduleV2/types';
-import { formatOperationalPoints, isEco } from './components/DriverTrainScheduleV2/utils';
+import { BaseOrEco, type BaseOrEcoType } from './components/DriverTrainSchedule/consts';
+import type { OperationalPointWithTimeAndSpeed } from './components/DriverTrainSchedule/types';
+import { formatOperationalPoints, isEco } from './components/DriverTrainSchedule/utils';
 
 /**
  * add time, speed, position, duration to operational points
diff --git a/front/src/reducers/osrdconf/operationalStudiesConf/powerRestrictionReducer.ts b/front/src/reducers/osrdconf/operationalStudiesConf/powerRestrictionReducer.ts
index 7c410c1ce5c..daaf7f71c9a 100644
--- a/front/src/reducers/osrdconf/operationalStudiesConf/powerRestrictionReducer.ts
+++ b/front/src/reducers/osrdconf/operationalStudiesConf/powerRestrictionReducer.ts
@@ -2,7 +2,7 @@ import type { CaseReducer, PayloadAction } from '@reduxjs/toolkit';
 import type { Draft } from 'immer';
 import { compact, isEqual, keyBy, sortBy } from 'lodash';
 
-import type { PowerRestrictionV2 } from 'applications/operationalStudies/types';
+import type { PowerRestriction } from 'applications/operationalStudies/types';
 import { NO_POWER_RESTRICTION } from 'modules/powerRestriction/consts';
 import type { OsrdConfState, PathStep } from 'reducers/osrdconf/types';
 import { addElementAtIndex } from 'utils/array';
@@ -10,29 +10,26 @@ import { addElementAtIndex } from 'utils/array';
 import { addPathStep, cleanPathSteps, isRangeCovered, updateRestrictions } from './utils';
 
 export type PowerRestrictionReducer<S extends OsrdConfState> = {
-  ['updatePowerRestrictionRangesV2']: CaseReducer<S, PayloadAction<PowerRestrictionV2[]>>;
-  ['upsertPowerRestrictionRangesV2']: CaseReducer<
+  ['updatePowerRestrictionRanges']: CaseReducer<S, PayloadAction<PowerRestriction[]>>;
+  ['upsertPowerRestrictionRanges']: CaseReducer<
     S,
     PayloadAction<{ from: PathStep; to: PathStep; code: string }>
   >;
-  ['cutPowerRestrictionRangesV2']: CaseReducer<S, PayloadAction<{ cutAt: PathStep }>>;
-  ['deletePowerRestrictionRangesV2']: CaseReducer<
-    S,
-    PayloadAction<{ from: PathStep; to: PathStep }>
-  >;
+  ['cutPowerRestrictionRanges']: CaseReducer<S, PayloadAction<{ cutAt: PathStep }>>;
+  ['deletePowerRestrictionRanges']: CaseReducer<S, PayloadAction<{ from: PathStep; to: PathStep }>>;
   ['resizeSegmentEndInput']: CaseReducer<
     S,
     PayloadAction<{
-      firstRestriction: PowerRestrictionV2;
-      secondRestriction?: PowerRestrictionV2;
+      firstRestriction: PowerRestriction;
+      secondRestriction?: PowerRestriction;
       newEndPathStep: PathStep;
     }>
   >;
   ['resizeSegmentBeginInput']: CaseReducer<
     S,
     PayloadAction<{
-      firstRestriction?: PowerRestrictionV2;
-      secondRestriction: PowerRestrictionV2;
+      firstRestriction?: PowerRestriction;
+      secondRestriction: PowerRestriction;
       newFromPathStep: PathStep;
     }>
   >;
@@ -40,17 +37,17 @@ export type PowerRestrictionReducer<S extends OsrdConfState> = {
 
 export function builPowerRestrictionReducer<S extends OsrdConfState>(): PowerRestrictionReducer<S> {
   return {
-    updatePowerRestrictionRangesV2(state: Draft<S>, action: PayloadAction<PowerRestrictionV2[]>) {
-      state.powerRestrictionV2 = action.payload;
+    updatePowerRestrictionRanges(state: Draft<S>, action: PayloadAction<PowerRestriction[]>) {
+      state.powerRestriction = action.payload;
     },
 
-    upsertPowerRestrictionRangesV2(
+    upsertPowerRestrictionRanges(
       state: Draft<S>,
       action: PayloadAction<{ from: PathStep; to: PathStep; code: string }>
     ) {
       const { from, to, code } = action.payload;
       let newPathSteps = compact(state.pathSteps);
-      let newPowerRestrictionRangesV2 = state.powerRestrictionV2.filter(
+      let newPowerRestrictionRanges = state.powerRestriction.filter(
         (restriction) => restriction.from !== from.id && restriction.to !== to.id
       );
 
@@ -62,18 +59,18 @@ export function builPowerRestrictionReducer<S extends OsrdConfState>(): PowerRes
 
       // update power restriction ranges
       if (code !== NO_POWER_RESTRICTION) {
-        newPowerRestrictionRangesV2.push({ from: from.id, to: to.id, value: code });
-        newPowerRestrictionRangesV2 = sortBy(
-          newPowerRestrictionRangesV2,
+        newPowerRestrictionRanges.push({ from: from.id, to: to.id, value: code });
+        newPowerRestrictionRanges = sortBy(
+          newPowerRestrictionRanges,
           (range) => newPathStepsById[range.from]?.positionOnPath
         );
       }
 
       state.pathSteps = newPathSteps;
-      state.powerRestrictionV2 = newPowerRestrictionRangesV2;
+      state.powerRestriction = newPowerRestrictionRanges;
     },
 
-    cutPowerRestrictionRangesV2(state: Draft<S>, action: PayloadAction<{ cutAt: PathStep }>) {
+    cutPowerRestrictionRanges(state: Draft<S>, action: PayloadAction<{ cutAt: PathStep }>) {
       const { cutAt } = action.payload;
       let newPathSteps = [...state.pathSteps];
 
@@ -93,10 +90,10 @@ export function builPowerRestrictionReducer<S extends OsrdConfState>(): PowerRes
         const nextStep = newPathSteps[cutAtIndex + 1];
 
         if (!prevStep || !nextStep) {
-          console.error('cutPowerRestrictionRangesV2: prevStep or nextStep is undefined');
+          console.error('cutPowerRestrictionRanges: prevStep or nextStep is undefined');
         } else {
           // update the power restriction ranges by splitting 1 range into 2
-          const newPowerRestrictionRangesV2 = state.powerRestrictionV2.reduce(
+          const newPowerRestrictionRanges = state.powerRestriction.reduce(
             (acc, powerRestriction) => {
               if (powerRestriction.from === prevStep.id) {
                 acc.push({
@@ -113,35 +110,35 @@ export function builPowerRestrictionReducer<S extends OsrdConfState>(): PowerRes
               }
               return acc;
             },
-            [] as PowerRestrictionV2[]
+            [] as PowerRestriction[]
           );
 
           state.pathSteps = newPathSteps;
-          state.powerRestrictionV2 = newPowerRestrictionRangesV2;
+          state.powerRestriction = newPowerRestrictionRanges;
         }
       }
     },
 
-    deletePowerRestrictionRangesV2(
+    deletePowerRestrictionRanges(
       state: Draft<S>,
       action: PayloadAction<{ from: PathStep; to: PathStep }>
     ) {
       const { from, to } = action.payload;
 
-      const newPowerRestrictionRanges = state.powerRestrictionV2.filter(
+      const newPowerRestrictionRanges = state.powerRestriction.filter(
         (restriction) => restriction.from !== from.id && restriction.to !== to.id
       );
 
       const newPathSteps = [...state.pathSteps] as PathStep[];
       state.pathSteps = cleanPathSteps(newPathSteps, newPowerRestrictionRanges);
-      state.powerRestrictionV2 = newPowerRestrictionRanges;
+      state.powerRestriction = newPowerRestrictionRanges;
     },
 
     resizeSegmentBeginInput(
       state: Draft<S>,
       action: PayloadAction<{
-        firstRestriction?: PowerRestrictionV2;
-        secondRestriction: PowerRestrictionV2;
+        firstRestriction?: PowerRestriction;
+        secondRestriction: PowerRestriction;
         newFromPathStep: PathStep;
       }>
     ) {
@@ -150,7 +147,7 @@ export function builPowerRestrictionReducer<S extends OsrdConfState>(): PowerRes
       // pathSteps should not be undefined or have null values
       if (state.pathSteps && !state.pathSteps.some((pathStep) => !pathStep)) {
         let newPathSteps = [...state.pathSteps] as PathStep[];
-        let newPowerRestrictionRanges = state.powerRestrictionV2.filter(
+        let newPowerRestrictionRanges = state.powerRestriction.filter(
           (restriction) =>
             !isEqual(restriction, firstRestriction) || !isEqual(restriction, secondRestriction)
         );
@@ -184,14 +181,14 @@ export function builPowerRestrictionReducer<S extends OsrdConfState>(): PowerRes
         newPathSteps = cleanPathSteps(newPathSteps, newPowerRestrictionRanges);
 
         state.pathSteps = newPathSteps;
-        state.powerRestrictionV2 = newPowerRestrictionRanges;
+        state.powerRestriction = newPowerRestrictionRanges;
       }
     },
     resizeSegmentEndInput(
       state: Draft<S>,
       action: PayloadAction<{
-        firstRestriction: PowerRestrictionV2;
-        secondRestriction?: PowerRestrictionV2;
+        firstRestriction: PowerRestriction;
+        secondRestriction?: PowerRestriction;
         newEndPathStep: PathStep;
       }>
     ) {
@@ -200,7 +197,7 @@ export function builPowerRestrictionReducer<S extends OsrdConfState>(): PowerRes
       // pathSteps should not be undefined or have null values
       if (state.pathSteps && !state.pathSteps.some((pathStep) => !pathStep)) {
         let newPathSteps = [...state.pathSteps] as PathStep[];
-        let newPowerRestrictionRanges = state.powerRestrictionV2.filter(
+        let newPowerRestrictionRanges = state.powerRestriction.filter(
           (restriction) =>
             !isEqual(restriction, firstRestriction) || !isEqual(restriction, secondRestriction)
         );
@@ -236,7 +233,7 @@ export function builPowerRestrictionReducer<S extends OsrdConfState>(): PowerRes
         newPathSteps = cleanPathSteps(newPathSteps, newPowerRestrictionRanges);
 
         state.pathSteps = newPathSteps;
-        state.powerRestrictionV2 = newPowerRestrictionRanges;
+        state.powerRestriction = newPowerRestrictionRanges;
       }
     },
   };
diff --git a/front/src/reducers/osrdconf/operationalStudiesConf/utils.ts b/front/src/reducers/osrdconf/operationalStudiesConf/utils.ts
index 133b4605be6..1566eeb3f1f 100644
--- a/front/src/reducers/osrdconf/operationalStudiesConf/utils.ts
+++ b/front/src/reducers/osrdconf/operationalStudiesConf/utils.ts
@@ -1,6 +1,6 @@
 import { compact } from 'lodash';
 
-import type { PowerRestrictionV2 } from 'applications/operationalStudies/types';
+import type { PowerRestriction } from 'applications/operationalStudies/types';
 import { addElementAtIndex } from 'utils/array';
 
 import type { PathStep } from '../types';
@@ -13,7 +13,7 @@ import type { PathStep } from '../types';
  */
 export const canRemovePathStep = (
   pathStep: PathStep,
-  powerRestrictionRanges: PowerRestrictionV2[]
+  powerRestrictionRanges: PowerRestriction[]
 ) => {
   const pathStepIsUsed = powerRestrictionRanges.some(
     (restriction) => restriction.from === pathStep.id || restriction.to === pathStep.id
@@ -29,12 +29,12 @@ export const canRemovePathStep = (
 
 /** Remove some restrictions and update the first and second restrictions with the new path step */
 export const updateRestrictions = (
-  restrictions: PowerRestrictionV2[],
-  firstRestriction: PowerRestrictionV2 | undefined,
-  secondRestriction: PowerRestrictionV2 | undefined,
+  restrictions: PowerRestriction[],
+  firstRestriction: PowerRestriction | undefined,
+  secondRestriction: PowerRestriction | undefined,
   newPathStepId: string,
-  restrictionsToRemove: PowerRestrictionV2[] = []
-): PowerRestrictionV2[] =>
+  restrictionsToRemove: PowerRestriction[] = []
+): PowerRestriction[] =>
   compact(
     restrictions.map((restriction) => {
       for (const restrictionToRemove of restrictionsToRemove) {
@@ -58,7 +58,7 @@ export const updateRestrictions = (
 
 export const isRangeCovered = (
   pathSteps: PathStep[],
-  powerRestrictionRange: PowerRestrictionV2,
+  powerRestrictionRange: PowerRestriction,
   positionMin: number | undefined,
   positionMax: number | undefined
 ): boolean => {
@@ -92,7 +92,7 @@ export const addPathStep = (pathSteps: PathStep[], newPathStep: PathStep): PathS
 /** Remove the unused path steps */
 export const cleanPathSteps = (
   pathSteps: PathStep[],
-  powerRestrictions: PowerRestrictionV2[]
+  powerRestrictions: PowerRestriction[]
 ): PathStep[] =>
   pathSteps.reduce((acc, pathStep, index) => {
     if (index === 0 || index === pathSteps.length - 1) {
diff --git a/front/src/reducers/osrdconf/osrdConfCommon/__tests__/utils.ts b/front/src/reducers/osrdconf/osrdConfCommon/__tests__/utils.ts
index 15a5cc83c8b..83fdfe8f8fd 100644
--- a/front/src/reducers/osrdconf/osrdConfCommon/__tests__/utils.ts
+++ b/front/src/reducers/osrdconf/osrdConfCommon/__tests__/utils.ts
@@ -335,14 +335,14 @@ const testCommonConfReducers = (slice: OperationalStudiesConfSlice | StdcmConfSl
     expect(state.originUpperBoundDate).toBe(newOriginUpperBoundDate);
   });
 
-  it('should handle updateViaStopTimeV2', () => {
+  it('should handle updateViaStopTime', () => {
     const pathSteps = testDataBuilder.buildPathSteps();
     const via = pathSteps[1];
     const store = createStore(slice, {
       pathSteps,
     });
 
-    store.dispatch(slice.actions.updateViaStopTimeV2({ via, duration: 'PT60S' }));
+    store.dispatch(slice.actions.updateViaStopTime({ via, duration: 'PT60S' }));
     const state = store.getState()[slice.name];
     expect(state.pathSteps[1]?.stopFor).toEqual('PT60S');
   });
@@ -377,55 +377,55 @@ const testCommonConfReducers = (slice: OperationalStudiesConfSlice | StdcmConfSl
     expect(state.pathSteps).toEqual(pathSteps);
   });
 
-  it('should handle updateOriginV2', () => {
+  it('should handle updateOrigin', () => {
     const newOrigin = {
       ...testDataBuilder.buildPathSteps()[0],
       arrivalType: ArrivalTimeTypes.PRECISE_TIME,
     };
-    defaultStore.dispatch(slice.actions.updateOriginV2(newOrigin));
+    defaultStore.dispatch(slice.actions.updateOrigin(newOrigin));
     const state = defaultStore.getState()[slice.name];
     expect(state.pathSteps[0]).toEqual(newOrigin);
   });
 
-  it('should handle updateDestinationV2', () => {
+  it('should handle updateDestination', () => {
     const lastPathStep = last(testDataBuilder.buildPathSteps());
     const newDestination = { ...lastPathStep!, arrivalType: ArrivalTimeTypes.ASAP };
-    defaultStore.dispatch(slice.actions.updateDestinationV2(newDestination));
+    defaultStore.dispatch(slice.actions.updateDestination(newDestination));
     const state = defaultStore.getState()[slice.name];
     expect(last(state.pathSteps)).toEqual(newDestination);
   });
 
-  it('should handle deleteItineraryV2', () => {
+  it('should handle deleteItinerary', () => {
     const pathSteps = testDataBuilder.buildPathSteps();
     const store = createStore(slice, {
       pathSteps,
     });
-    store.dispatch(slice.actions.deleteItineraryV2());
+    store.dispatch(slice.actions.deleteItinerary());
     const state = store.getState()[slice.name];
     expect(state.pathSteps).toEqual([null, null]);
   });
 
-  it('should handle clearViasV2', () => {
+  it('should handle clearVias', () => {
     const pathSteps = testDataBuilder.buildPathSteps();
     const store = createStore(slice, {
       pathSteps,
     });
-    store.dispatch(slice.actions.clearViasV2());
+    store.dispatch(slice.actions.clearVias());
     const state = store.getState()[slice.name];
     expect(state.pathSteps).toEqual([pathSteps[0], last(pathSteps)]);
   });
 
-  it('should handle deleteViaV2', () => {
+  it('should handle deleteVia', () => {
     const pathSteps = testDataBuilder.buildPathSteps();
     const store = createStore(slice, {
       pathSteps,
     });
-    store.dispatch(slice.actions.deleteViaV2(0));
+    store.dispatch(slice.actions.deleteVia(0));
     const state = store.getState()[slice.name];
     expect(state.pathSteps).toEqual(removeElementAtIndex(pathSteps, 1));
   });
 
-  describe('should handle addViaV2', () => {
+  describe('should handle addVia', () => {
     const pathStepsData = testDataBuilder.buildPathSteps();
     const [brest, rennes, lemans, paris, strasbourg] = compact(pathStepsData);
     const pathProperties = testDataBuilder.buildPathProperties();
@@ -440,7 +440,7 @@ const testCommonConfReducers = (slice: OperationalStudiesConfSlice | StdcmConfSl
         pathSteps,
       });
 
-      store.dispatch(slice.actions.addViaV2({ newVia: paris, pathProperties }));
+      store.dispatch(slice.actions.addVia({ newVia: paris, pathProperties }));
       const state = store.getState()[slice.name];
       expect(state.pathSteps).toStrictEqual([null, parisNoPosition, strasbourg]);
     });
@@ -451,7 +451,7 @@ const testCommonConfReducers = (slice: OperationalStudiesConfSlice | StdcmConfSl
         pathSteps,
       });
 
-      store.dispatch(slice.actions.addViaV2({ newVia: rennes, pathProperties }));
+      store.dispatch(slice.actions.addVia({ newVia: rennes, pathProperties }));
       const state = store.getState()[slice.name];
       expect(state.pathSteps).toStrictEqual([brest, rennesNoPosition, null]);
     });
@@ -462,7 +462,7 @@ const testCommonConfReducers = (slice: OperationalStudiesConfSlice | StdcmConfSl
         pathSteps,
       });
 
-      store.dispatch(slice.actions.addViaV2({ newVia: lemans, pathProperties }));
+      store.dispatch(slice.actions.addVia({ newVia: lemans, pathProperties }));
       const state = store.getState()[slice.name];
       expect(state.pathSteps).toStrictEqual([brest, lemansNoPosition, strasbourg]);
     });
@@ -473,7 +473,7 @@ const testCommonConfReducers = (slice: OperationalStudiesConfSlice | StdcmConfSl
         pathSteps,
       });
 
-      store.dispatch(slice.actions.addViaV2({ newVia: lemans, pathProperties }));
+      store.dispatch(slice.actions.addVia({ newVia: lemans, pathProperties }));
       const state = store.getState()[slice.name];
       expect(state.pathSteps).toStrictEqual([brest, rennes, lemansNoPosition, strasbourg]);
     });
@@ -484,7 +484,7 @@ const testCommonConfReducers = (slice: OperationalStudiesConfSlice | StdcmConfSl
         pathSteps,
       });
 
-      store.dispatch(slice.actions.addViaV2({ newVia: lemans, pathProperties }));
+      store.dispatch(slice.actions.addVia({ newVia: lemans, pathProperties }));
       const state = store.getState()[slice.name];
       expect(state.pathSteps).toStrictEqual([brest, rennes, lemansNoPosition, paris, strasbourg]);
     });
@@ -495,7 +495,7 @@ const testCommonConfReducers = (slice: OperationalStudiesConfSlice | StdcmConfSl
         pathSteps,
       });
 
-      store.dispatch(slice.actions.addViaV2({ newVia: paris, pathProperties }));
+      store.dispatch(slice.actions.addVia({ newVia: paris, pathProperties }));
       const state = store.getState()[slice.name];
       expect(state.pathSteps).toStrictEqual([brest, rennes, lemans, parisNoPosition, strasbourg]);
     });
@@ -583,11 +583,11 @@ const testCommonConfReducers = (slice: OperationalStudiesConfSlice | StdcmConfSl
     });
   });
 
-  it('should handle updateRollingStockComfortV2', () => {
+  it('should handle updateRollingStockComfort', () => {
     const newRollingStockComfort: TrainScheduleBase['comfort'] = 'AIR_CONDITIONING';
-    defaultStore.dispatch(slice.actions.updateRollingStockComfortV2(newRollingStockComfort));
+    defaultStore.dispatch(slice.actions.updateRollingStockComfort(newRollingStockComfort));
     const state = defaultStore.getState()[slice.name];
-    expect(state.rollingStockComfortV2).toBe(newRollingStockComfort);
+    expect(state.rollingStockComfort).toBe(newRollingStockComfort);
   });
 
   it('should handle updateStartTime', () => {
diff --git a/front/src/reducers/osrdconf/osrdConfCommon/index.ts b/front/src/reducers/osrdconf/osrdConfCommon/index.ts
index fb731bff748..af598b17080 100644
--- a/front/src/reducers/osrdconf/osrdConfCommon/index.ts
+++ b/front/src/reducers/osrdconf/osrdConfCommon/index.ts
@@ -40,7 +40,7 @@ export const defaultCommonConf: OsrdConfState = {
   timetableID: undefined,
   electricalProfileSetId: undefined,
   rollingStockID: undefined,
-  powerRestrictionV2: [],
+  powerRestriction: [],
   speedLimitByTag: undefined,
   initialSpeed: 0,
   originDate: formatIsoDate(new Date()),
@@ -54,7 +54,7 @@ export const defaultCommonConf: OsrdConfState = {
   featureInfoClick: { displayPopup: false },
   // Corresponds to origin and destination not defined
   pathSteps: [null, null],
-  rollingStockComfortV2: 'STANDARD' as const,
+  rollingStockComfort: 'STANDARD' as const,
   startTime: new Date().toISOString(),
 };
 
@@ -79,7 +79,7 @@ interface CommonConfReducers<S extends OsrdConfState> extends InfraStateReducers
   ['toggleOriginLinkedBounds']: CaseReducer<S>;
   ['updateOriginDate']: CaseReducer<S, PayloadAction<S['originDate']>>;
   ['updateOriginUpperBoundDate']: CaseReducer<S, PayloadAction<S['originUpperBoundDate']>>;
-  ['updateViaStopTimeV2']: CaseReducer<S, PayloadAction<{ via: PathStep; duration: string }>>;
+  ['updateViaStopTime']: CaseReducer<S, PayloadAction<{ via: PathStep; duration: string }>>;
   ['updateGridMarginBefore']: CaseReducer<S, PayloadAction<S['gridMarginBefore']>>;
   ['updateGridMarginAfter']: CaseReducer<S, PayloadAction<S['gridMarginAfter']>>;
   ['updateFeatureInfoClick']: CaseReducer<S, PayloadAction<S['featureInfoClick']>>;
@@ -87,10 +87,10 @@ interface CommonConfReducers<S extends OsrdConfState> extends InfraStateReducers
     S,
     PayloadAction<{ pathSteps: S['pathSteps']; resetPowerRestrictions?: boolean }>
   >;
-  ['deleteItineraryV2']: CaseReducer<S>;
-  ['clearViasV2']: CaseReducer<S>;
-  ['deleteViaV2']: CaseReducer<S, PayloadAction<number>>;
-  ['addViaV2']: CaseReducer<
+  ['deleteItinerary']: CaseReducer<S>;
+  ['clearVias']: CaseReducer<S>;
+  ['deleteVia']: CaseReducer<S, PayloadAction<number>>;
+  ['addVia']: CaseReducer<
     S,
     PayloadAction<{ newVia: PathStep; pathProperties: ManageTrainSchedulePathProperties }>
   >;
@@ -99,10 +99,10 @@ interface CommonConfReducers<S extends OsrdConfState> extends InfraStateReducers
     prepare: PrepareAction<S['pathSteps']>;
   };
   ['upsertViaFromSuggestedOP']: CaseReducer<S, PayloadAction<SuggestedOP>>;
-  ['updateRollingStockComfortV2']: CaseReducer<S, PayloadAction<S['rollingStockComfortV2']>>;
+  ['updateRollingStockComfort']: CaseReducer<S, PayloadAction<S['rollingStockComfort']>>;
   ['updateStartTime']: CaseReducer<S, PayloadAction<S['startTime']>>;
-  ['updateOriginV2']: CaseReducer<S, PayloadAction<ArrayElement<S['pathSteps']>>>;
-  ['updateDestinationV2']: CaseReducer<S, PayloadAction<ArrayElement<S['pathSteps']>>>;
+  ['updateOrigin']: CaseReducer<S, PayloadAction<ArrayElement<S['pathSteps']>>>;
+  ['updateDestination']: CaseReducer<S, PayloadAction<ArrayElement<S['pathSteps']>>>;
 }
 
 export function buildCommonConfReducers<S extends OsrdConfState>(): CommonConfReducers<S> {
@@ -217,10 +217,7 @@ export function buildCommonConfReducers<S extends OsrdConfState>(): CommonConfRe
     },
     // TODO: Change the type of duration to number. It is preferable to keep this value in seconds in the store
     //* to avoid multiple conversions between seconds and ISO8601 format across the front.
-    updateViaStopTimeV2(
-      state: Draft<S>,
-      action: PayloadAction<{ via: PathStep; duration: string }>
-    ) {
+    updateViaStopTime(state: Draft<S>, action: PayloadAction<{ via: PathStep; duration: string }>) {
       const {
         payload: { via, duration },
       } = action;
@@ -247,22 +244,22 @@ export function buildCommonConfReducers<S extends OsrdConfState>(): CommonConfRe
     ) {
       state.pathSteps = action.payload.pathSteps;
       if (action.payload.resetPowerRestrictions) {
-        state.powerRestrictionV2 = [];
+        state.powerRestriction = [];
       }
     },
-    deleteItineraryV2(state: Draft<S>) {
+    deleteItinerary(state: Draft<S>) {
       state.pathSteps = [null, null];
     },
-    clearViasV2(state: Draft<S>) {
+    clearVias(state: Draft<S>) {
       state.pathSteps = [state.pathSteps[0], state.pathSteps[state.pathSteps.length - 1]];
     },
     // Use this action in the via list, not the suggested op list
-    deleteViaV2(state: Draft<S>, action: PayloadAction<number>) {
+    deleteVia(state: Draft<S>, action: PayloadAction<number>) {
       // Index takes count of the origin in the array
       state.pathSteps = removeElementAtIndex(state.pathSteps, action.payload + 1);
     },
     // Use this action only to via added by click on map
-    addViaV2(
+    addVia(
       state: Draft<S>,
       action: PayloadAction<{
         newVia: PathStep;
@@ -339,16 +336,13 @@ export function buildCommonConfReducers<S extends OsrdConfState>(): CommonConfRe
         state.pathSteps = addElementAtIndex(state.pathSteps, index || 1, newVia);
       }
     },
-    updateRollingStockComfortV2(
-      state: Draft<S>,
-      action: PayloadAction<S['rollingStockComfortV2']>
-    ) {
-      state.rollingStockComfortV2 = action.payload;
+    updateRollingStockComfort(state: Draft<S>, action: PayloadAction<S['rollingStockComfort']>) {
+      state.rollingStockComfort = action.payload;
     },
     updateStartTime(state: Draft<S>, action: PayloadAction<S['startTime']>) {
       state.startTime = action.payload;
     },
-    updateOriginV2(state: Draft<S>, action: PayloadAction<ArrayElement<S['pathSteps']>>) {
+    updateOrigin(state: Draft<S>, action: PayloadAction<ArrayElement<S['pathSteps']>>) {
       const newPoint = action.payload
         ? {
             ...action.payload,
@@ -357,7 +351,7 @@ export function buildCommonConfReducers<S extends OsrdConfState>(): CommonConfRe
         : null;
       state.pathSteps = updateOriginPathStep(state.pathSteps, newPoint, true);
     },
-    updateDestinationV2(state: Draft<S>, action: PayloadAction<ArrayElement<S['pathSteps']>>) {
+    updateDestination(state: Draft<S>, action: PayloadAction<ArrayElement<S['pathSteps']>>) {
       const newPoint = action.payload
         ? {
             ...action.payload,
diff --git a/front/src/reducers/osrdconf/osrdConfCommon/selectors.ts b/front/src/reducers/osrdconf/osrdConfCommon/selectors.ts
index 4329913ce04..9dcb3ae4945 100644
--- a/front/src/reducers/osrdconf/osrdConfCommon/selectors.ts
+++ b/front/src/reducers/osrdconf/osrdConfCommon/selectors.ts
@@ -17,7 +17,7 @@ const buildCommonConfSelectors = <ConfState extends OsrdConfState>(
   const getPathSteps = makeOsrdConfSelector('pathSteps');
 
   // If createSelector is not used and we return directly : pathSteps.slice(1, -1), we get this rtk warning :
-  // Selector getViasV2 returned a different result when called with the same parameters. This can lead to unnecessary rerenders.
+  // Selector getVias returned a different result when called with the same parameters. This can lead to unnecessary rerenders.
   // Selectors that return a new reference (such as an object or an array) should be memoized: https://redux.js.org/usage/deriving-data-selectors#optimizing-selectors-with-memoization
   const viasSelector = createSelector(
     getPathSteps,
@@ -50,20 +50,20 @@ const buildCommonConfSelectors = <ConfState extends OsrdConfState>(
     getOriginLinkedBounds: makeOsrdConfSelector('originLinkedBounds'),
     getGridMarginBefore: makeOsrdConfSelector('gridMarginBefore'),
     getGridMarginAfter: makeOsrdConfSelector('gridMarginAfter'),
-    getPowerRestrictionV2: makeOsrdConfSelector('powerRestrictionV2'),
+    getPowerRestriction: makeOsrdConfSelector('powerRestriction'),
     getFeatureInfoClick: makeOsrdConfSelector('featureInfoClick'),
     getPathSteps,
-    getOriginV2: (state: RootState) => {
+    getOrigin: (state: RootState) => {
       const pathSteps = getPathSteps(state);
       return pathSteps[0];
     },
-    getDestinationV2: (state: RootState) => {
+    getDestination: (state: RootState) => {
       const pathSteps = getPathSteps(state);
       return pathSteps[pathSteps.length - 1];
     },
-    /** To use this action, do useSelector(getViasV2()) */
-    getViasV2: () => viasSelector,
-    getRollingStockComfortV2: makeOsrdConfSelector('rollingStockComfortV2'),
+    /** To use this action, do useSelector(getVias()) */
+    getVias: () => viasSelector,
+    getRollingStockComfort: makeOsrdConfSelector('rollingStockComfort'),
     getStartTime: makeOsrdConfSelector('startTime'),
   };
 };
diff --git a/front/src/reducers/osrdconf/stdcmConf/stdcmConfReducers.spec.ts b/front/src/reducers/osrdconf/stdcmConf/stdcmConfReducers.spec.ts
index cd7a4dc5671..273407ff82b 100644
--- a/front/src/reducers/osrdconf/stdcmConf/stdcmConfReducers.spec.ts
+++ b/front/src/reducers/osrdconf/stdcmConf/stdcmConfReducers.spec.ts
@@ -121,7 +121,7 @@ describe('stdcmConfReducers', () => {
     };
 
     it('should handle updateOriginArrival', () => {
-      store.dispatch(stdcmConfSliceActions.updateOriginV2(newOrigin));
+      store.dispatch(stdcmConfSliceActions.updateOrigin(newOrigin));
       store.dispatch(stdcmConfSliceActions.updateOriginArrival('2024-08-12T15:45:00.000+02:00'));
       const state = store.getState()[stdcmConfSlice.name];
       expect(state.pathSteps[0]).toEqual({
@@ -168,7 +168,7 @@ describe('stdcmConfReducers', () => {
     };
 
     it('should handle updateDestinationArrival', () => {
-      store.dispatch(stdcmConfSliceActions.updateDestinationV2(newDestination));
+      store.dispatch(stdcmConfSliceActions.updateDestination(newDestination));
       store.dispatch(
         stdcmConfSliceActions.updateDestinationArrival('2024-08-12T15:45:00.000+02:00')
       );
diff --git a/front/src/reducers/osrdconf/types.ts b/front/src/reducers/osrdconf/types.ts
index 0e9cca40898..d0676b10dc7 100644
--- a/front/src/reducers/osrdconf/types.ts
+++ b/front/src/reducers/osrdconf/types.ts
@@ -1,6 +1,6 @@
 import type { Feature, Position } from 'geojson';
 
-import type { PowerRestrictionV2 } from 'applications/operationalStudies/types';
+import type { PowerRestriction } from 'applications/operationalStudies/types';
 import type { AllowanceValue } from 'applications/stdcm/types';
 import type { ArrivalTimeTypes } from 'applications/stdcmV2/types';
 import type { Comfort, Distribution, PathItemLocation } from 'common/api/osrdEditoastApi';
@@ -23,7 +23,7 @@ export interface OsrdConfState extends InfraState {
   searchDatetimeWindow?: { begin: Date; end: Date };
   rollingStockID?: number;
   speedLimitByTag?: string;
-  powerRestrictionV2: PowerRestrictionV2[];
+  powerRestriction: PowerRestriction[];
   initialSpeed?: number;
   originDate?: string;
   originTime?: string;
@@ -34,7 +34,7 @@ export interface OsrdConfState extends InfraState {
   gridMarginAfter?: number;
   featureInfoClick: { displayPopup: boolean; feature?: Feature; coordinates?: number[] };
   pathSteps: (PathStep | null)[];
-  rollingStockComfortV2: Comfort;
+  rollingStockComfort: Comfort;
   // Format ISO 8601
   startTime: string;
 }
diff --git a/front/src/styles/scss/applications/operationalStudies/_scenario.scss b/front/src/styles/scss/applications/operationalStudies/_scenario.scss
index ca7c7d9d990..db3d6740273 100644
--- a/front/src/styles/scss/applications/operationalStudies/_scenario.scss
+++ b/front/src/styles/scss/applications/operationalStudies/_scenario.scss
@@ -333,7 +333,7 @@
                   display: flex;
                   justify-content: right;
                   align-items: center;
-                  min-width: 20%;
+                  min-width: 45%;
                   text-align: right;
                   line-height: 0.8rem;
                   padding-right: 0.25rem;
@@ -347,9 +347,6 @@
                     font-size: 0.8rem;
                   }
                 }
-                .V2 {
-                  min-width: 45%;
-                }
                 .not-honored {
                   background-color: #eaa72b;
                   justify-content: space-between;
diff --git a/front/src/utils/date.ts b/front/src/utils/date.ts
index 9ad87d7d646..9e7b1564185 100644
--- a/front/src/utils/date.ts
+++ b/front/src/utils/date.ts
@@ -112,19 +112,7 @@ export const isoDateWithTimezoneToSec = (isoDate: string) => {
   return isoDateToMs(isoDate) / 1000 + Math.abs(timeDifferenceMinutes) * 60;
 };
 
-// TODO: This function is only used for V1, so it must be deleted when V1 is abandoned. Also we must rename formatDayV2.
-export function formatDay(locale = 'fr') {
-  if (!['en', 'fr'].includes(locale)) {
-    throw new Error('Invalid locale');
-  }
-  const currentDate = dayjs().locale(locale);
-  if (locale === 'en') {
-    return currentDate.format('dddd, MMMM D, YYYY');
-  }
-  return currentDate.format('dddd D MMMM YYYY');
-}
-
-export function formatDayV2(dateString: string, locale: string = 'fr'): string {
+export function formatDay(dateString: string, locale: string = 'fr'): string {
   if (!['en', 'fr'].includes(locale)) {
     throw new Error('Invalid locale');
   }
diff --git a/front/tests/pages/home-page-model.ts b/front/tests/pages/home-page-model.ts
index 0a3930e3cf4..c6ecbfbb995 100644
--- a/front/tests/pages/home-page-model.ts
+++ b/front/tests/pages/home-page-model.ts
@@ -30,8 +30,6 @@ class HomePage {
 
   readonly getViteOverlay: Locator;
 
-  readonly TSV2Switch: Locator;
-
   readonly dropDown: Locator;
 
   readonly userSettings: Locator;
@@ -55,7 +53,6 @@ class HomePage {
     this.getBody = page.locator('body');
     this.translation = home;
     this.getViteOverlay = page.locator('vite-plugin-checker-error-overlay');
-    this.TSV2Switch = page.getByTestId('train-schedule-version-switch');
     this.stdcmSwitch = page.getByTestId('stdcm-version-switch');
     this.dropDown = page.getByTestId('dropdown-sncf');
     this.userSettings = page.getByTestId('user-settings-btn');