diff --git a/src/main/java/com/learning/mfscreener/web/controllers/NAVController.java b/src/main/java/com/learning/mfscreener/web/controllers/NAVController.java
index 06b32c2e..e0e40678 100644
--- a/src/main/java/com/learning/mfscreener/web/controllers/NAVController.java
+++ b/src/main/java/com/learning/mfscreener/web/controllers/NAVController.java
@@ -21,15 +21,15 @@ public class NAVController implements NAVApi {
 
     @Override
     @GetMapping(path = "/{schemeCode}")
-    public ResponseEntity<MFSchemeDTO> getScheme(@PathVariable(name = "schemeCode") Long schemeCode) {
+    public ResponseEntity<MFSchemeDTO> getScheme(@PathVariable Long schemeCode) {
         return ResponseEntity.ok(navService.getNav(schemeCode));
     }
 
     @Override
     @GetMapping(path = "/{schemeCode}/{date}")
     public ResponseEntity<MFSchemeDTO> getSchemeNavOnDate(
-            @PathVariable(name = "schemeCode") Long schemeCode,
-            @PathVariable(name = "date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date) {
+            @PathVariable Long schemeCode,
+            @PathVariable @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date) {
         return ResponseEntity.ok(navService.getNavOnDate(schemeCode, date));
     }
 }
diff --git a/src/main/java/com/learning/mfscreener/web/controllers/PortfolioController.java b/src/main/java/com/learning/mfscreener/web/controllers/PortfolioController.java
index 9991c331..34f3ed12 100644
--- a/src/main/java/com/learning/mfscreener/web/controllers/PortfolioController.java
+++ b/src/main/java/com/learning/mfscreener/web/controllers/PortfolioController.java
@@ -37,7 +37,7 @@ public ResponseEntity<String> upload(@RequestPart("file") MultipartFile multipar
     @Override
     public ResponseEntity<PortfolioResponse> getPortfolio(
             @PathVariable("pan") String panNumber,
-            @RequestParam(name = "date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date) {
+            @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date) {
         return ResponseEntity.ok(portfolioService.getPortfolioByPAN(panNumber, date));
     }
 }
diff --git a/src/main/java/com/learning/mfscreener/web/controllers/SchemeController.java b/src/main/java/com/learning/mfscreener/web/controllers/SchemeController.java
index a8090851..def631fd 100644
--- a/src/main/java/com/learning/mfscreener/web/controllers/SchemeController.java
+++ b/src/main/java/com/learning/mfscreener/web/controllers/SchemeController.java
@@ -20,15 +20,13 @@ public class SchemeController implements SchemeApi {
 
     @Override
     @GetMapping(path = "/{schemeName}")
-    public ResponseEntity<List<FundDetailProjection>> fetchSchemes(
-            @PathVariable(name = "schemeName") String schemeName) {
+    public ResponseEntity<List<FundDetailProjection>> fetchSchemes(@PathVariable String schemeName) {
         return ResponseEntity.ok(schemeService.fetchSchemes(schemeName));
     }
 
     @Override
     @GetMapping(path = "/fund/{fundName}")
-    public ResponseEntity<List<FundDetailProjection>> fetchSchemesByFundName(
-            @PathVariable(name = "fundName") String fundName) {
+    public ResponseEntity<List<FundDetailProjection>> fetchSchemesByFundName(@PathVariable String fundName) {
         return ResponseEntity.ok(schemeService.fetchSchemesByFundName(fundName));
     }
 }
diff --git a/src/test/java/com/learning/mfscreener/archunit/MapperArchUnitTest.java b/src/test/java/com/learning/mfscreener/archunit/MapperArchUnitTest.java
index 08cae170..b7389942 100644
--- a/src/test/java/com/learning/mfscreener/archunit/MapperArchUnitTest.java
+++ b/src/test/java/com/learning/mfscreener/archunit/MapperArchUnitTest.java
@@ -14,7 +14,7 @@
 class MapperArchUnitTest {
 
     @Test
-    void testMappers() {
+    void mappers() {
 
         // we have some built other ArchUnit-checks that make sure we can rely on this filter
         final long mapperCount = new ClassFileImporter()
diff --git a/src/test/java/com/learning/mfscreener/repository/SchemaValidationH2Test.java b/src/test/java/com/learning/mfscreener/repository/SchemaValidationH2Test.java
index e0560e97..d5de23d8 100644
--- a/src/test/java/com/learning/mfscreener/repository/SchemaValidationH2Test.java
+++ b/src/test/java/com/learning/mfscreener/repository/SchemaValidationH2Test.java
@@ -14,7 +14,7 @@ class SchemaValidationH2Test {
     EntityManager entityManager;
 
     @Test
-    void testSchemaValidity() {
+    void schemaValidity() {
         assertThat(entityManager).isNotNull();
     }
 }
diff --git a/src/test/java/com/learning/mfscreener/repository/SchemaValidationPostgresIntegrationTest.java b/src/test/java/com/learning/mfscreener/repository/SchemaValidationPostgresIntegrationTest.java
index ea0072b2..5a370bb4 100644
--- a/src/test/java/com/learning/mfscreener/repository/SchemaValidationPostgresIntegrationTest.java
+++ b/src/test/java/com/learning/mfscreener/repository/SchemaValidationPostgresIntegrationTest.java
@@ -20,7 +20,7 @@ class SchemaValidationPostgresIntegrationTest {
     EntityManager entityManager;
 
     @Test
-    void testSchemaValidity() {
+    void schemaValidity() {
         assertThat(entityManager).isNotNull();
     }
 }
diff --git a/src/test/java/com/learning/mfscreener/web/controllers/PortfolioControllerIT.java b/src/test/java/com/learning/mfscreener/web/controllers/PortfolioControllerIT.java
index cbac885a..734d93bd 100644
--- a/src/test/java/com/learning/mfscreener/web/controllers/PortfolioControllerIT.java
+++ b/src/test/java/com/learning/mfscreener/web/controllers/PortfolioControllerIT.java
@@ -26,7 +26,7 @@ class PortfolioControllerIT extends AbstractIntegrationTest {
 
     @Test
     @Order(1)
-    void testUploadFile() throws Exception {
+    void uploadFile() throws Exception {
 
         File tempFile = File.createTempFile("file", ".json");
         FileWriter fileWriter = new FileWriter(tempFile);