diff --git a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
index 21aa746aa..723b47612 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
@@ -178,7 +178,7 @@ class CustomFieldsGroup
      *
      * @return CustomFieldsGroup
      */
-    public function setName($name)
+    public function setName(array|string $name)
     {
         $this->name = $name;
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
index 29b77a430..bd698fdc8 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/GenderFilter.php
@@ -91,9 +91,7 @@ class GenderFilter implements
                 'unknown' => null,
             ];
 
-            $transformedData['accepted_genders_entity'] = array_map(function ($gender) use ($genderMapping) {
-                return $genderMapping[$gender] ?? null;
-            }, $before['accepted_genders']);
+            $transformedData['accepted_genders_entity'] = array_map(fn($gender) => $genderMapping[$gender] ?? null, $before['accepted_genders']);
         }
 
         return $transformedData;