diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmQueryController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java
similarity index 71%
rename from src/main/java/com/onixbyte/deltaforceguide/controller/FirearmQueryController.java
rename to src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java
index b4570b1..40b6617 100644
--- a/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmQueryController.java
+++ b/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java
@@ -2,7 +2,7 @@ package com.onixbyte.deltaforceguide.controller;
 
 import com.onixbyte.deltaforceguide.domain.dto.FirearmResponse;
 import com.onixbyte.deltaforceguide.domain.dto.PageResponse;
-import com.onixbyte.deltaforceguide.service.FirearmQueryService;
+import com.onixbyte.deltaforceguide.service.FirearmService;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import org.springframework.data.domain.PageRequest;
@@ -16,13 +16,13 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Validated
 @RestController
-@RequestMapping("/api/v1/firearms")
-public class FirearmQueryController {
+@RequestMapping("/firearms")
+public class FirearmController {
 
-    private final FirearmQueryService firearmQueryService;
+    private final FirearmService firearmService;
 
-    public FirearmQueryController(FirearmQueryService firearmQueryService) {
-        this.firearmQueryService = firearmQueryService;
+    public FirearmController(FirearmService firearmService) {
+        this.firearmService = firearmService;
     }
 
     @GetMapping
@@ -32,12 +32,12 @@ public class FirearmQueryController {
             @RequestParam(defaultValue = "id") String sortBy,
             @RequestParam(defaultValue = "DESC") Sort.Direction direction
     ) {
-        return firearmQueryService.pageQuery(PageRequest.of(page, size, Sort.by(direction, sortBy)));
+        return firearmService.pageQuery(PageRequest.of(page, size, Sort.by(direction, sortBy)));
     }
 
     @GetMapping("/{id}")
     public FirearmResponse queryById(@PathVariable Long id) {
-        return firearmQueryService.queryById(id);
+        return firearmService.queryById(id);
     }
 }
 
diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationQueryController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java
similarity index 69%
rename from src/main/java/com/onixbyte/deltaforceguide/controller/ModificationQueryController.java
rename to src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java
index 888b964..8029f1f 100644
--- a/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationQueryController.java
+++ b/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java
@@ -2,7 +2,7 @@ package com.onixbyte.deltaforceguide.controller;
 
 import com.onixbyte.deltaforceguide.domain.dto.ModificationResponse;
 import com.onixbyte.deltaforceguide.domain.dto.PageResponse;
-import com.onixbyte.deltaforceguide.service.ModificationQueryService;
+import com.onixbyte.deltaforceguide.service.ModificationService;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import org.springframework.data.domain.PageRequest;
@@ -16,13 +16,13 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Validated
 @RestController
-@RequestMapping("/api/v1/modifications")
-public class ModificationQueryController {
+@RequestMapping("/modifications")
+public class ModificationController {
 
-    private final ModificationQueryService modificationQueryService;
+    private final ModificationService modificationService;
 
-    public ModificationQueryController(ModificationQueryService modificationQueryService) {
-        this.modificationQueryService = modificationQueryService;
+    public ModificationController(ModificationService modificationService) {
+        this.modificationService = modificationService;
     }
 
     @GetMapping
@@ -32,12 +32,12 @@ public class ModificationQueryController {
             @RequestParam(defaultValue = "id") String sortBy,
             @RequestParam(defaultValue = "DESC") Sort.Direction direction
     ) {
-        return modificationQueryService.pageQuery(PageRequest.of(page, size, Sort.by(direction, sortBy)));
+        return modificationService.pageQuery(PageRequest.of(page, size, Sort.by(direction, sortBy)));
     }
 
     @GetMapping("/{id}")
     public ModificationResponse queryById(@PathVariable Long id) {
-        return modificationQueryService.queryById(id);
+        return modificationService.queryById(id);
     }
 }
 
diff --git a/src/main/java/com/onixbyte/deltaforceguide/repository/FirearmRepository.java b/src/main/java/com/onixbyte/deltaforceguide/repository/FirearmRepository.java
index cb78b5b..88c38fe 100644
--- a/src/main/java/com/onixbyte/deltaforceguide/repository/FirearmRepository.java
+++ b/src/main/java/com/onixbyte/deltaforceguide/repository/FirearmRepository.java
@@ -2,7 +2,9 @@ package com.onixbyte.deltaforceguide.repository;
 
 import com.onixbyte.deltaforceguide.domain.entity.Firearm;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface FirearmRepository extends JpaRepository<Firearm, Long> {
 }
 
diff --git a/src/main/java/com/onixbyte/deltaforceguide/repository/ModificationRepository.java b/src/main/java/com/onixbyte/deltaforceguide/repository/ModificationRepository.java
index baf5ad4..2fbc122 100644
--- a/src/main/java/com/onixbyte/deltaforceguide/repository/ModificationRepository.java
+++ b/src/main/java/com/onixbyte/deltaforceguide/repository/ModificationRepository.java
@@ -5,9 +5,11 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
 
+@Repository
 public interface ModificationRepository extends JpaRepository<Modification, Long> {
 
     @EntityGraph(attributePaths = {"firearm"})
diff --git a/src/main/java/com/onixbyte/deltaforceguide/service/FirearmQueryService.java b/src/main/java/com/onixbyte/deltaforceguide/service/FirearmService.java
similarity index 91%
rename from src/main/java/com/onixbyte/deltaforceguide/service/FirearmQueryService.java
rename to src/main/java/com/onixbyte/deltaforceguide/service/FirearmService.java
index 6b07124..7506826 100644
--- a/src/main/java/com/onixbyte/deltaforceguide/service/FirearmQueryService.java
+++ b/src/main/java/com/onixbyte/deltaforceguide/service/FirearmService.java
@@ -10,11 +10,11 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.server.ResponseStatusException;
 
 @Service
-public class FirearmQueryService {
+public class FirearmService {
 
     private final FirearmRepository firearmRepository;
 
-    public FirearmQueryService(FirearmRepository firearmRepository) {
+    public FirearmService(FirearmRepository firearmRepository) {
         this.firearmRepository = firearmRepository;
     }
 
diff --git a/src/main/java/com/onixbyte/deltaforceguide/service/ModificationQueryService.java b/src/main/java/com/onixbyte/deltaforceguide/service/ModificationService.java
similarity index 90%
rename from src/main/java/com/onixbyte/deltaforceguide/service/ModificationQueryService.java
rename to src/main/java/com/onixbyte/deltaforceguide/service/ModificationService.java
index e44e616..da75ce9 100644
--- a/src/main/java/com/onixbyte/deltaforceguide/service/ModificationQueryService.java
+++ b/src/main/java/com/onixbyte/deltaforceguide/service/ModificationService.java
@@ -10,11 +10,11 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.server.ResponseStatusException;
 
 @Service
-public class ModificationQueryService {
+public class ModificationService {
 
     private final ModificationRepository modificationRepository;
 
-    public ModificationQueryService(ModificationRepository modificationRepository) {
+    public ModificationService(ModificationRepository modificationRepository) {
         this.modificationRepository = modificationRepository;
     }