diff --git a/assets/controllers/user_controller.js b/assets/controllers/user_controller.js
index 0c4a3b7..e98869e 100644
--- a/assets/controllers/user_controller.js
+++ b/assets/controllers/user_controller.js
@@ -162,8 +162,8 @@ export default class extends base_controller {
                     return wrapper;
                 },
             },
-            {title: "<b>Nom</b>", field: "name", headerFilter: "input", widthGrow: 2, vertAlign: "middle"},
-            {title: "<b>Prénom</b>", field: "prenom", headerFilter: "input", widthGrow: 2, vertAlign: "middle"},
+            {title: "<b>Nom</b>", field: "surname", headerFilter: "input", widthGrow: 2, vertAlign: "middle"},
+            {title: "<b>Prénom</b>", field: "name", headerFilter: "input", widthGrow: 2, vertAlign: "middle"},
             {title: "<b>Email</b>", field: "email", headerFilter: "input", widthGrow: 3, vertAlign: "middle"},
             {
                 title: "<b>Statut</b>", field: "statut", vertAlign: "middle",
@@ -302,6 +302,7 @@ export default class extends base_controller {
                 // Add filters
                 if (params.filter) {
                     params.filter.forEach(filter => {
+                        console.log("Adding filter to query:", filter.field, filter.value);
                         queryParams.append(`filter[${filter.field}]`, filter.value);
                     });
                 }
@@ -640,8 +641,8 @@ export default class extends base_controller {
                     return wrapper;
                 },
             },
-            {title: "<b>Nom</b>", field: "name", headerFilter: "input", widthGrow: 2, vertAlign: "middle"},
-            {title: "<b>Prénom</b>", field: "prenom", headerFilter: "input", widthGrow: 2, vertAlign: "middle"},
+            {title: "<b>Nom</b>", field: "surname", headerFilter: "input", widthGrow: 2, vertAlign: "middle"},
+            {title: "<b>Prénom</b>", field: "name", headerFilter: "input", widthGrow: 2, vertAlign: "middle"},
             {title: "<b>Email</b>", field: "email", headerFilter: "input", widthGrow: 3, vertAlign: "middle"},
             {
                 title: "<b>Statut</b>", field: "statut", vertAlign: "middle",
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index e197bf6..e86d7c2 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -531,8 +531,8 @@ class UserController extends AbstractController
             return [
                 'id' => $user->getId(),
                 'pictureUrl' => $user->getPictureUrl(),
-                'name' => $user->getSurname(),
-                'prenom' => $user->getName(),
+                'surname' => $user->getSurname(),
+                'name' => $user->getName(),
                 'email' => $user->getEmail(),
                 'isConnected' => $this->userService->isUserConnected($user->getUserIdentifier()),
                 'showUrl' => $this->generateUrl('user_show', ['id' => $user->getId()]),
diff --git a/src/Repository/UserRepository.php b/src/Repository/UserRepository.php
index f817d6d..ced8937 100644
--- a/src/Repository/UserRepository.php
+++ b/src/Repository/UserRepository.php
@@ -45,14 +45,13 @@ class UserRepository extends ServiceEntityRepository implements PasswordUpgrader
         $qb = $this->createQueryBuilder('u')
             ->where('u.isDeleted = :del')
             ->setParameter('del', false);
-
-        if (!empty($filters['name'])) {
-            $qb->andWhere('u.surname LIKE :name')
-                ->setParameter('name', '%' . strtolower($filters['name']) . '%');
+        if (!empty($filters['surname'])) {
+            $qb->andWhere('u.surname LIKE :surname')
+                ->setParameter('surname', '%' . strtoupper($filters['surname']) . '%');
         }
-        if (!empty($filters['prenom'])) {
-            $qb->andWhere('u.name LIKE :prenom')
-                ->setParameter('prenom', '%' . strtolower($filters['prenom']) . '%');
+        if (!empty($filters['name'])) {
+            $qb->andWhere('u.name LIKE :name')
+                ->setParameter('name', '%' . ucFirst($filters['name']) . '%');
         }
         if (!empty($filters['email'])) {
             $qb->andWhere('u.email LIKE :email')
diff --git a/src/Repository/UsersOrganizationsRepository.php b/src/Repository/UsersOrganizationsRepository.php
index 4a13edd..806f21b 100644
--- a/src/Repository/UsersOrganizationsRepository.php
+++ b/src/Repository/UsersOrganizationsRepository.php
@@ -58,13 +58,13 @@ class UsersOrganizationsRepository extends ServiceEntityRepository
             ->setParameter('org', $org);
 
         // Apply filters
-        if (!empty($filters['name'])) {
-            $qb->andWhere('u.surname LIKE :name')
-                ->setParameter('name', '%' . strtolower($filters['name']) . '%');
+        if (!empty($filters['surname'])) {
+            $qb->andWhere('u.surname LIKE :surname')
+                ->setParameter('surname', '%' . strtoupper($filters['surname']) . '%');
         }
-        if (!empty($filters['prenom'])) {
-            $qb->andWhere('u.name LIKE :prenom')
-                ->setParameter('prenom', '%' . strtolower($filters['prenom']) . '%');
+        if (!empty($filters['name'])) {
+            $qb->andWhere('u.name LIKE :name')
+                ->setParameter('name', '%' . ucFirst($filters['name']) . '%');
         }
         if (!empty($filters['email'])) {
             $qb->andWhere('u.email LIKE :email')
diff --git a/src/Service/UserService.php b/src/Service/UserService.php
index efd96b6..364ff43 100644
--- a/src/Service/UserService.php
+++ b/src/Service/UserService.php
@@ -418,8 +418,8 @@ class UserService
             }
             return [
                 'pictureUrl' => $user->getPictureUrl(),
-                'name' => $user->getSurname(),
-                'prenom' => $user->getName(),
+                'surname' => $user->getSurname(),
+                'name' => $user->getName(),
                 'email' => $user->getEmail(),
                 'isConnected' => $this->isUserConnected($user->getUserIdentifier()),
                 'statut' => $statut,