diff --git a/tools/general/generate-handler.go b/tools/general/generate-handler.go
index 06063330..bddbdcbf 100644
--- a/tools/general/generate-handler.go
+++ b/tools/general/generate-handler.go
@@ -344,7 +344,7 @@ func generateGetMethods(data HandlerData) string {
 // Get` + data.Name + ` godoc
 // @Summary Get ` + data.NameLower + ` with pagination and optional aggregation
 // @Description Returns a paginated list of ` + data.NamePlural + ` with optional summary statistics
-// @Tags ` + data.NameLower + `
+// @Tags ` + data.Name + `
 // @Accept json
 // @Produce json
 // @Param limit query int false "Limit (max 100)" default(10)
@@ -460,7 +460,7 @@ func (h *` + data.Name + `Handler) Get` + data.Name + `(c *gin.Context) {
 // Get` + data.Name + `ByID godoc
 // @Summary Get ` + data.Name + ` by ID
 // @Description Returns a single ` + data.NameLower + ` by ID
-// @Tags ` + data.NameLower + `
+// @Tags ` + data.Name + `
 // @Accept json
 // @Produce json
 // @Param id path string true "` + data.Name + ` ID (UUID)"
@@ -512,7 +512,7 @@ func generateDynamicMethod(data HandlerData) string {
 // Get` + data.Name + `Dynamic godoc
 // @Summary Get ` + data.NameLower + ` with dynamic filtering
 // @Description Returns ` + data.NamePlural + ` with advanced dynamic filtering like Directus
-// @Tags ` + data.NameLower + `
+// @Tags ` + data.Name + `
 // @Accept json
 // @Produce json
 // @Param fields query string false "Fields to select (e.g., fields=*.*)"
@@ -649,7 +649,7 @@ func generateCreateMethod(data HandlerData) string {
 // Create` + data.Name + ` godoc
 // @Summary Create ` + data.NameLower + `
 // @Description Creates a new ` + data.NameLower + ` record
-// @Tags ` + data.NameLower + `
+// @Tags ` + data.Name + `
 // @Accept json
 // @Produce json
 // @Param request body ` + data.Category + `.` + data.Name + `CreateRequest true "` + data.Name + ` creation request"
@@ -706,7 +706,7 @@ func generateUpdateMethod(data HandlerData) string {
 // Update` + data.Name + ` godoc
 // @Summary Update ` + data.NameLower + `
 // @Description Updates an existing ` + data.NameLower + ` record
-// @Tags ` + data.NameLower + `
+// @Tags ` + data.Name + `
 // @Accept json
 // @Produce json
 // @Param id path string true "` + data.Name + ` ID (UUID)"
@@ -774,7 +774,7 @@ func generateDeleteMethod(data HandlerData) string {
 // Delete` + data.Name + ` godoc
 // @Summary Delete ` + data.NameLower + `
 // @Description Soft deletes a ` + data.NameLower + ` by setting status to 'deleted'
-// @Tags ` + data.NameLower + `
+// @Tags ` + data.Name + `
 // @Accept json
 // @Produce json
 // @Param id path string true "` + data.Name + ` ID (UUID)"
@@ -826,7 +826,7 @@ func generateStatsMethod(data HandlerData) string {
 // Get` + data.Name + `Stats godoc
 // @Summary Get ` + data.NameLower + ` statistics
 // @Description Returns comprehensive statistics about ` + data.NameLower + ` data
-// @Tags ` + data.NameLower + `
+// @Tags ` + data.Name + `
 // @Accept json
 // @Produce json
 // @Param status query string false "Filter statistics by status"