diff --git a/openapi/p4pa-pdnd.openapi.yaml b/openapi/p4pa-pdnd.openapi.yaml
index dd5cff0..6820fe3 100644
--- a/openapi/p4pa-pdnd.openapi.yaml
+++ b/openapi/p4pa-pdnd.openapi.yaml
@@ -10,6 +10,7 @@ paths:
     get:
       summary: Retrieve citizen data
       description: Returns detailed information about a citizen based on their fiscal code.
+      operationId: getCitizenDataByFiscalCode
       parameters:
         - name: fiscalCode
           in: query
diff --git a/src/main/java/it/gov/pagopa/payhub/pdnd/anpr/controller/PdndServiceController.java b/src/main/java/it/gov/pagopa/payhub/pdnd/anpr/controller/PdndServiceController.java
index 7e90f2a..39f6c2e 100644
--- a/src/main/java/it/gov/pagopa/payhub/pdnd/anpr/controller/PdndServiceController.java
+++ b/src/main/java/it/gov/pagopa/payhub/pdnd/anpr/controller/PdndServiceController.java
@@ -16,7 +16,7 @@ public PdndServiceController(PdndService pdndService) {
     }
 
     @Override
-    public ResponseEntity<Citizen> anprServiceE002CitizenGet(String fiscalCode) {
+    public ResponseEntity<Citizen> getCitizenDataByFiscalCode(String fiscalCode) {
         Citizen response = pdndService.getCitizenData(fiscalCode);
         return ResponseEntity.ok(response);
     }
diff --git a/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c003/client/AnprC003ClientImplTest.java b/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c003/client/AnprC003ClientImplTest.java
index 77b8a4b..292ea97 100644
--- a/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c003/client/AnprC003ClientImplTest.java
+++ b/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c003/client/AnprC003ClientImplTest.java
@@ -43,7 +43,7 @@ void setUp() {
     }
 
     @Test
-    void getUserData() {
+    void givenValidRequestWhenGetUserDataThenReturnValidResponse() {
         RichiestaE002 request = RichiestaE002.builder()
                 .idOperazioneClient("13f32508-7bcb-38d0-8510-d68bf240aa59-1733496758205")
                 .build();
diff --git a/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c003/service/AnprC003ServiceTest.java b/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c003/service/AnprC003ServiceTest.java
index 005c5de..9df1db3 100644
--- a/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c003/service/AnprC003ServiceTest.java
+++ b/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c003/service/AnprC003ServiceTest.java
@@ -24,7 +24,7 @@ class AnprC003ServiceTest {
     private AnprC003Service anprC003Service;
 
     @Test
-    void getUserData() {
+    void givenValidIdAnprAndFiscalCodeWhenGetUserDataThenReturnUserDataSuccessfully() {
         String fiscalCode = "DNTCRL65S67M126K";
         String idAnpr = "d20fcd8e-f228-323c-8924-6405b44879bf";
 
diff --git a/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c030/client/AnprC030ClientImplTest.java b/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c030/client/AnprC030ClientImplTest.java
index 7e5a85f..d4931e4 100644
--- a/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c030/client/AnprC030ClientImplTest.java
+++ b/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c030/client/AnprC030ClientImplTest.java
@@ -42,7 +42,7 @@ void setUp() {
     }
 
     @Test
-    void testGetIdAnprFromFc() {
+    void givenValidRequestWhenGetIdAnprFromFcThenReturnValidResponse() {
         RichiestaE002 request = RichiestaE002.builder()
                 .idOperazioneClient("13f32508-7bcb-38d0-8510-d68bf240aa59-1733496758205")
                 .build();
diff --git a/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c030/service/AnprC030ServiceTest.java b/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c030/service/AnprC030ServiceTest.java
index 2781f16..4a68ccc 100644
--- a/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c030/service/AnprC030ServiceTest.java
+++ b/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/c030/service/AnprC030ServiceTest.java
@@ -24,7 +24,7 @@ class AnprC030ServiceTest {
     private AnprC030Service anprC030Service;
 
     @Test
-    void testGetIdAnprFromFc() {
+    void givenValidFiscalCodeWhenGetIdAnprFromFcThenReturnValidResponse() {
         String fiscalCode = "DNTCRL65S67M126K";
 
         TipoIdentificativi idTypes = TipoIdentificativi.builder()
diff --git a/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/controller/PdndServiceControllerTest.java b/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/controller/PdndServiceControllerTest.java
index 0b25f2c..cd08dc5 100644
--- a/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/controller/PdndServiceControllerTest.java
+++ b/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/controller/PdndServiceControllerTest.java
@@ -27,7 +27,7 @@ class PdndServiceControllerTest {
     private PdndService pdndService;
 
     @Test
-    void testAnprServiceE002CitizenGet_Success() throws Exception {
+    void givenValidFiscalCodeWhenGetCitizenDataThenReturnCitizenDetails() throws Exception {
         String fiscalCode = "DNTCRL65S67M126K";
         Citizen citizen = Citizen.builder()
                 .firstName("Julieta")
diff --git a/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/service/PdndServiceImplTest.java b/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/service/PdndServiceImplTest.java
index 503a81e..c9864d9 100644
--- a/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/service/PdndServiceImplTest.java
+++ b/src/test/java/it/gov/pagopa/payhub/pdnd/anpr/service/PdndServiceImplTest.java
@@ -34,7 +34,7 @@ class PdndServiceImplTest {
     private PdndServiceImpl pdndService;
 
     @Test
-    void testGetCitizenData_Success() {
+    void givenValidFiscalCodeAndIdAnprWhenGetCitizenDataThenReturnCitizenDetails() {
         String fiscalCode = "DNTCRL65S67M126K";
         String idAnpr = "d20fcd8e-f228-323c-8924-6405b44879bf";
 
@@ -73,7 +73,7 @@ void testGetCitizenData_Success() {
     }
 
     @Test
-    void testGetCitizenData_InvalidListaSoggetti() {
+    void givenValidFiscalCodeAndInvalidSubjectListWhenGetCitizenDataThenThrowIllegalArgumentException() {
         String fiscalCode = "DNTCRL65S67M126K";
         String idAnpr = "d20fcd8e-f228-323c-8924-6405b44879bf";
 
@@ -98,7 +98,7 @@ void testGetCitizenData_InvalidListaSoggetti() {
     }
 
     @Test
-    void testGetCitizenData_InvalidC003Response() {
+    void givenValidFiscalCodeAndInvalidC003ResponseWhenGetCitizenDataThenThrowIllegalArgumentException() {
         String fiscalCode = "DNTCRL65S67M126K";
         String idAnpr = "d20fcd8e-f228-323c-8924-6405b44879bf";
 
@@ -120,7 +120,7 @@ void testGetCitizenData_InvalidC003Response() {
     }
 
     @Test
-    void testGetCitizenData_InvalidSubDataType() {
+    void givenValidFiscalCodeAndInvalidSubDataTypeWhenGetCitizenDataThenThrowIllegalArgumentException() {
         String fiscalCode = "DNTCRL65S67M126K";
         String idAnpr = "d20fcd8e-f228-323c-8924-6405b44879bf";
 
@@ -146,7 +146,7 @@ void testGetCitizenData_InvalidSubDataType() {
     }
 
     @Test
-    void testGetCitizenData_EmptySubDataType() {
+    void givenValidFiscalCodeAndEmptySubDataTypeWhenGetCitizenDataThenThrowIllegalArgumentException() {
         String fiscalCode = "DNTCRL65S67M126K";
         String idAnpr = "d20fcd8e-f228-323c-8924-6405b44879bf";
 
@@ -172,11 +172,11 @@ void testGetCitizenData_EmptySubDataType() {
     }
 
     @Test
-    void testGetCitizenData_InvalidResponse_ThrowsException() {
+    void givenServiceUnavailableWhenGetCitizenDataThenThrowRuntimeException() {
         String fiscalCode = "DNTCRL65S67M126K";
 
         Mockito.when(anprC030Service.getIdAnprFromFc(fiscalCode)).thenThrow(new RuntimeException("Service unavailable"));
 
         assertThrows(RuntimeException.class, () -> pdndService.getCitizenData(fiscalCode));
     }
-}
+}
\ No newline at end of file