diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodStepHistory.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodStepHistory.php
index fd4d573ce..c25c11e69 100644
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodStepHistory.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodStepHistory.php
@@ -64,7 +64,7 @@ class AccompanyingPeriodStepHistory implements TrackCreationInterface, TrackUpda
      *
      * @ORM\JoinColumn(nullable=true)
      */
-    private ?AccompanyingPeriod\ClosingMotive $closingMotive = null;
+    private ?ClosingMotive $closingMotive = null;
 
     public function getEndDate(): ?\DateTimeImmutable
     {
@@ -122,12 +122,12 @@ class AccompanyingPeriodStepHistory implements TrackCreationInterface, TrackUpda
         return $this;
     }
 
-    public function getClosingMotive(): ?AccompanyingPeriod\ClosingMotive
+    public function getClosingMotive(): ?ClosingMotive
     {
         return $this->closingMotive;
     }
 
-    public function setClosingMotive(?AccompanyingPeriod\ClosingMotive $closingMotive): self
+    public function setClosingMotive(?ClosingMotive $closingMotive): self
     {
         $this->closingMotive = $closingMotive;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByClosingMotiveAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByClosingMotiveAggregator.php
index f999a44db..b5776ebeb 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByClosingMotiveAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByClosingMotiveAggregator.php
@@ -40,7 +40,7 @@ final readonly class ByClosingMotiveAggregator implements AggregatorInterface
 
     public function getLabels($key, array $values, mixed $data)
     {
-        return function (null|int|string $value): string {
+        return function (int|string|null $value): string {
             if ('_header' === $value) {
                 return 'export.aggregator.step_history.by_closing_motive.header';
             }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByStepAggregatorTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByStepAggregatorTest.php
index f71b06351..65752fea2 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByStepAggregatorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Aggregator/AccompanyingPeriodStepHistoryAggregators/ByStepAggregatorTest.php
@@ -27,7 +27,7 @@ class ByStepAggregatorTest extends AbstractAggregatorTest
     public function getAggregator()
     {
         $translator = new class () implements TranslatorInterface {
-            public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null)
+            public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null)
             {
                 return $id;
             }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilterTest.php b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilterTest.php
index a603bd219..2924be7e7 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilterTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingPeriodStepHistoryFilters/ByStepFilterTest.php
@@ -28,7 +28,7 @@ class ByStepFilterTest extends AbstractFilterTest
     public function getFilter()
     {
         $translator = new class () implements TranslatorInterface {
-            public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null)
+            public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null)
             {
                 return $id;
             }