diff --git a/.forgejo/workflows/go-services.yml b/.forgejo/workflows/go-services.yml
index beeb9b7a2..c90ef1d5e 100644
--- a/.forgejo/workflows/go-services.yml
+++ b/.forgejo/workflows/go-services.yml
@@ -8,15 +8,18 @@ on:
   push:
     branches: [main]
     paths:
-      - 'services/mana-search-go/**'
-      - 'services/mana-notify-go/**'
-      - 'services/mana-crawler-go/**'
-      - 'services/mana-api-gateway-go/**'
+      - 'services/mana-search/**'
+      - 'services/mana-notify/**'
+      - 'services/mana-crawler/**'
+      - 'services/mana-api-gateway/**'
       - 'services/mana-sync/**'
       - 'services/mana-matrix-bot/**'
   pull_request:
     paths:
-      - 'services/mana-*-go/**'
+      - 'services/mana-search/**'
+      - 'services/mana-notify/**'
+      - 'services/mana-crawler/**'
+      - 'services/mana-api-gateway/**'
       - 'services/mana-sync/**'
       - 'services/mana-matrix-bot/**'
 
@@ -26,10 +29,10 @@ jobs:
     strategy:
       matrix:
         service:
-          - mana-search-go
-          - mana-notify-go
-          - mana-crawler-go
-          - mana-api-gateway-go
+          - mana-search
+          - mana-notify
+          - mana-crawler
+          - mana-api-gateway
           - mana-sync
     steps:
       - uses: actions/checkout@v4
@@ -56,13 +59,13 @@ jobs:
     strategy:
       matrix:
         include:
-          - service: mana-search-go
+          - service: mana-search
             image: mana-search
-          - service: mana-notify-go
+          - service: mana-notify
             image: mana-notify
-          - service: mana-crawler-go
+          - service: mana-crawler
             image: mana-crawler
-          - service: mana-api-gateway-go
+          - service: mana-api-gateway
             image: mana-api-gateway
     steps:
       - uses: actions/checkout@v4
diff --git a/CLAUDE.md b/CLAUDE.md
index 1d1471288..6e9b6fea3 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -134,13 +134,13 @@ manacore-monorepo/
 │   ├── mana-user/           # User settings, tags, storage (Hono + Bun, extracted from auth)
 │   ├── mana-subscriptions/  # Subscription billing (Hono + Bun, extracted from auth)
 │   ├── mana-analytics/      # Feedback & analytics (Hono + Bun, extracted from auth)
-│   ├── mana-search-go/      # Central search & content extraction (Go)
-│   ├── mana-crawler-go/     # Web crawler service (Go)
+│   ├── mana-search/      # Central search & content extraction (Go)
+│   ├── mana-crawler/     # Web crawler service (Go)
 │   ├── mana-llm/            # Central LLM abstraction service
 │   ├── mana-landing-builder/# Org landing page builder (Astro → Cloudflare Pages)
 │   ├── mana-media/          # Central media platform (CAS, thumbnails)
-│   ├── mana-api-gateway-go/ # API gateway with rate limiting (Go)
-│   ├── mana-notify-go/      # Notification service (Go)
+│   ├── mana-api-gateway/ # API gateway with rate limiting (Go)
+│   ├── mana-notify/      # Notification service (Go)
 │   ├── mana-image-gen/      # Local AI image generation (FLUX)
 │   ├── mana-stt/            # Speech-to-text service
 │   ├── mana-tts/            # Text-to-speech service
@@ -450,10 +450,10 @@ GET /metrics
 
 ```bash
 # Start SearXNG + Redis for local development
-cd services/mana-search-go && docker-compose -f docker-compose.dev.yml up -d
+cd services/mana-search && docker-compose -f docker-compose.dev.yml up -d
 
 # Start Go search service
-cd services/mana-search-go && go run ./cmd/server
+cd services/mana-search && go run ./cmd/server
 ```
 
 #### Environment Variables
@@ -933,9 +933,9 @@ Each project has its own `CLAUDE.md` with detailed information:
 - `apps/chat/CLAUDE.md` - Chat API endpoints, AI models
 - `apps/picture/CLAUDE.md` - AI image generation
 - `services/mana-core-auth/` - Central authentication service
-- `services/mana-search-go/CLAUDE.md` - Search & content extraction service (Go)
-- `services/mana-crawler-go/CLAUDE.md` - Web crawler service (Go)
-- `services/mana-notify-go/CLAUDE.md` - Notification service (Go)
+- `services/mana-search/CLAUDE.md` - Search & content extraction service (Go)
+- `services/mana-crawler/CLAUDE.md` - Web crawler service (Go)
+- `services/mana-notify/CLAUDE.md` - Notification service (Go)
 - `services/mana-llm/CLAUDE.md` - Central LLM abstraction service
 - `services/mana-landing-builder/CLAUDE.md` - Org landing page builder service
 
diff --git a/docker-compose.macmini.yml b/docker-compose.macmini.yml
index 07ce4954e..dc819b519 100644
--- a/docker-compose.macmini.yml
+++ b/docker-compose.macmini.yml
@@ -321,8 +321,8 @@ services:
   api-gateway:
     build:
       context: .
-      dockerfile: services/mana-api-gateway-go/Dockerfile
-    image: mana-api-gateway-go:local
+      dockerfile: services/mana-api-gateway/Dockerfile
+    image: mana-api-gateway:local
     container_name: mana-api-gateway
     restart: always
     depends_on:
@@ -357,8 +357,8 @@ services:
     container_name: mana-core-searxng
     restart: always
     volumes:
-      - ./services/mana-search-go/searxng/settings.yml:/etc/searxng/settings.yml:ro
-      - ./services/mana-search-go/searxng/limiter.toml:/etc/searxng/limiter.toml:ro
+      - ./services/mana-search/searxng/settings.yml:/etc/searxng/settings.yml:ro
+      - ./services/mana-search/searxng/limiter.toml:/etc/searxng/limiter.toml:ro
     environment:
       SEARXNG_BASE_URL: http://searxng:8080
       SEARXNG_SECRET: ${SEARXNG_SECRET:-change-me-searxng-secret}
@@ -373,7 +373,7 @@ services:
   mana-search:
     build:
       context: .
-      dockerfile: services/mana-search-go/Dockerfile
+      dockerfile: services/mana-search/Dockerfile
     image: mana-search:local
     container_name: mana-core-search
     restart: always
@@ -428,7 +428,7 @@ services:
   mana-notify:
     build:
       context: .
-      dockerfile: services/mana-notify-go/Dockerfile
+      dockerfile: services/mana-notify/Dockerfile
     image: mana-notify:local
     container_name: mana-core-notify
     restart: always
@@ -460,8 +460,8 @@ services:
   mana-crawler:
     build:
       context: .
-      dockerfile: services/mana-crawler-go/Dockerfile
-    image: mana-crawler-go:local
+      dockerfile: services/mana-crawler/Dockerfile
+    image: mana-crawler:local
     container_name: mana-crawler
     restart: always
     depends_on:
diff --git a/package.json b/package.json
index 169a3ab10..814e07008 100644
--- a/package.json
+++ b/package.json
@@ -254,9 +254,9 @@
 		"cf:login": "npx wrangler login",
 		"cf:projects:list": "npx wrangler pages project list",
 		"cf:projects:create": "echo 'Creating Cloudflare Pages projects...' && npx wrangler pages project create chat-landing --production-branch=main && npx wrangler pages project create picture-landing --production-branch=main && npx wrangler pages project create manacore-landing --production-branch=main && npx wrangler pages project create manadeck-landing --production-branch=main && npx wrangler pages project create zitare-landing --production-branch=main",
-		"dev:search": "cd services/mana-search-go && go run ./cmd/server",
-		"dev:crawler": "cd services/mana-crawler-go && go run ./cmd/server",
-		"dev:notify": "cd services/mana-notify-go && go run ./cmd/server",
+		"dev:search": "cd services/mana-search && go run ./cmd/server",
+		"dev:crawler": "cd services/mana-crawler && go run ./cmd/server",
+		"dev:notify": "cd services/mana-notify && go run ./cmd/server",
 		"questions:dev": "turbo run dev --filter=questions...",
 		"dev:questions:backend": "pnpm --filter @questions/backend dev",
 		"dev:questions:web": "pnpm --filter @questions/web dev",
diff --git a/services/mana-api-gateway-go/.gitignore b/services/mana-api-gateway/.gitignore
similarity index 100%
rename from services/mana-api-gateway-go/.gitignore
rename to services/mana-api-gateway/.gitignore
diff --git a/services/mana-api-gateway-go/CLAUDE.md b/services/mana-api-gateway/CLAUDE.md
similarity index 100%
rename from services/mana-api-gateway-go/CLAUDE.md
rename to services/mana-api-gateway/CLAUDE.md
diff --git a/services/mana-api-gateway-go/Dockerfile b/services/mana-api-gateway/Dockerfile
similarity index 100%
rename from services/mana-api-gateway-go/Dockerfile
rename to services/mana-api-gateway/Dockerfile
diff --git a/services/mana-api-gateway-go/cmd/server/main.go b/services/mana-api-gateway/cmd/server/main.go
similarity index 100%
rename from services/mana-api-gateway-go/cmd/server/main.go
rename to services/mana-api-gateway/cmd/server/main.go
diff --git a/services/mana-api-gateway-go/go.mod b/services/mana-api-gateway/go.mod
similarity index 100%
rename from services/mana-api-gateway-go/go.mod
rename to services/mana-api-gateway/go.mod
diff --git a/services/mana-api-gateway-go/go.sum b/services/mana-api-gateway/go.sum
similarity index 100%
rename from services/mana-api-gateway-go/go.sum
rename to services/mana-api-gateway/go.sum
diff --git a/services/mana-api-gateway-go/internal/config/config.go b/services/mana-api-gateway/internal/config/config.go
similarity index 100%
rename from services/mana-api-gateway-go/internal/config/config.go
rename to services/mana-api-gateway/internal/config/config.go
diff --git a/services/mana-api-gateway-go/internal/db/db.go b/services/mana-api-gateway/internal/db/db.go
similarity index 100%
rename from services/mana-api-gateway-go/internal/db/db.go
rename to services/mana-api-gateway/internal/db/db.go
diff --git a/services/mana-api-gateway-go/internal/handler/apikeys.go b/services/mana-api-gateway/internal/handler/apikeys.go
similarity index 100%
rename from services/mana-api-gateway-go/internal/handler/apikeys.go
rename to services/mana-api-gateway/internal/handler/apikeys.go
diff --git a/services/mana-api-gateway-go/internal/handler/health.go b/services/mana-api-gateway/internal/handler/health.go
similarity index 100%
rename from services/mana-api-gateway-go/internal/handler/health.go
rename to services/mana-api-gateway/internal/handler/health.go
diff --git a/services/mana-api-gateway-go/internal/middleware/apikey.go b/services/mana-api-gateway/internal/middleware/apikey.go
similarity index 100%
rename from services/mana-api-gateway-go/internal/middleware/apikey.go
rename to services/mana-api-gateway/internal/middleware/apikey.go
diff --git a/services/mana-api-gateway-go/internal/middleware/jwt.go b/services/mana-api-gateway/internal/middleware/jwt.go
similarity index 100%
rename from services/mana-api-gateway-go/internal/middleware/jwt.go
rename to services/mana-api-gateway/internal/middleware/jwt.go
diff --git a/services/mana-api-gateway-go/internal/middleware/ratelimit.go b/services/mana-api-gateway/internal/middleware/ratelimit.go
similarity index 100%
rename from services/mana-api-gateway-go/internal/middleware/ratelimit.go
rename to services/mana-api-gateway/internal/middleware/ratelimit.go
diff --git a/services/mana-api-gateway-go/internal/proxy/proxy.go b/services/mana-api-gateway/internal/proxy/proxy.go
similarity index 100%
rename from services/mana-api-gateway-go/internal/proxy/proxy.go
rename to services/mana-api-gateway/internal/proxy/proxy.go
diff --git a/services/mana-api-gateway-go/internal/service/apikeys.go b/services/mana-api-gateway/internal/service/apikeys.go
similarity index 100%
rename from services/mana-api-gateway-go/internal/service/apikeys.go
rename to services/mana-api-gateway/internal/service/apikeys.go
diff --git a/services/mana-api-gateway-go/internal/service/apikeys_test.go b/services/mana-api-gateway/internal/service/apikeys_test.go
similarity index 100%
rename from services/mana-api-gateway-go/internal/service/apikeys_test.go
rename to services/mana-api-gateway/internal/service/apikeys_test.go
diff --git a/services/mana-api-gateway-go/internal/service/usage.go b/services/mana-api-gateway/internal/service/usage.go
similarity index 100%
rename from services/mana-api-gateway-go/internal/service/usage.go
rename to services/mana-api-gateway/internal/service/usage.go
diff --git a/services/mana-api-gateway-go/package.json b/services/mana-api-gateway/package.json
similarity index 89%
rename from services/mana-api-gateway-go/package.json
rename to services/mana-api-gateway/package.json
index 9f208e467..94151027f 100644
--- a/services/mana-api-gateway-go/package.json
+++ b/services/mana-api-gateway/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "mana-api-gateway-go",
+	"name": "mana-api-gateway",
 	"version": "1.0.0",
 	"private": true,
 	"description": "Go API Gateway replacing NestJS mana-api-gateway",
diff --git a/services/mana-crawler-go/.gitignore b/services/mana-crawler/.gitignore
similarity index 100%
rename from services/mana-crawler-go/.gitignore
rename to services/mana-crawler/.gitignore
diff --git a/services/mana-crawler-go/CLAUDE.md b/services/mana-crawler/CLAUDE.md
similarity index 100%
rename from services/mana-crawler-go/CLAUDE.md
rename to services/mana-crawler/CLAUDE.md
diff --git a/services/mana-crawler-go/Dockerfile b/services/mana-crawler/Dockerfile
similarity index 100%
rename from services/mana-crawler-go/Dockerfile
rename to services/mana-crawler/Dockerfile
diff --git a/services/mana-crawler-go/cmd/server/main.go b/services/mana-crawler/cmd/server/main.go
similarity index 100%
rename from services/mana-crawler-go/cmd/server/main.go
rename to services/mana-crawler/cmd/server/main.go
diff --git a/services/mana-crawler-go/go.mod b/services/mana-crawler/go.mod
similarity index 100%
rename from services/mana-crawler-go/go.mod
rename to services/mana-crawler/go.mod
diff --git a/services/mana-crawler-go/go.sum b/services/mana-crawler/go.sum
similarity index 100%
rename from services/mana-crawler-go/go.sum
rename to services/mana-crawler/go.sum
diff --git a/services/mana-crawler-go/internal/config/config.go b/services/mana-crawler/internal/config/config.go
similarity index 100%
rename from services/mana-crawler-go/internal/config/config.go
rename to services/mana-crawler/internal/config/config.go
diff --git a/services/mana-crawler-go/internal/crawler/crawler.go b/services/mana-crawler/internal/crawler/crawler.go
similarity index 100%
rename from services/mana-crawler-go/internal/crawler/crawler.go
rename to services/mana-crawler/internal/crawler/crawler.go
diff --git a/services/mana-crawler-go/internal/db/db.go b/services/mana-crawler/internal/db/db.go
similarity index 100%
rename from services/mana-crawler-go/internal/db/db.go
rename to services/mana-crawler/internal/db/db.go
diff --git a/services/mana-crawler-go/internal/handler/handler.go b/services/mana-crawler/internal/handler/handler.go
similarity index 100%
rename from services/mana-crawler-go/internal/handler/handler.go
rename to services/mana-crawler/internal/handler/handler.go
diff --git a/services/mana-crawler-go/internal/parser/parser.go b/services/mana-crawler/internal/parser/parser.go
similarity index 100%
rename from services/mana-crawler-go/internal/parser/parser.go
rename to services/mana-crawler/internal/parser/parser.go
diff --git a/services/mana-crawler-go/internal/parser/parser_test.go b/services/mana-crawler/internal/parser/parser_test.go
similarity index 100%
rename from services/mana-crawler-go/internal/parser/parser_test.go
rename to services/mana-crawler/internal/parser/parser_test.go
diff --git a/services/mana-crawler-go/internal/robots/robots.go b/services/mana-crawler/internal/robots/robots.go
similarity index 100%
rename from services/mana-crawler-go/internal/robots/robots.go
rename to services/mana-crawler/internal/robots/robots.go
diff --git a/services/mana-crawler-go/package.json b/services/mana-crawler/package.json
similarity index 90%
rename from services/mana-crawler-go/package.json
rename to services/mana-crawler/package.json
index fc5f4fe4d..317c344a4 100644
--- a/services/mana-crawler-go/package.json
+++ b/services/mana-crawler/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "mana-crawler-go",
+	"name": "mana-crawler",
 	"version": "1.0.0",
 	"private": true,
 	"description": "Go web crawler replacing NestJS mana-crawler",
diff --git a/services/mana-notify-go/.gitignore b/services/mana-notify/.gitignore
similarity index 100%
rename from services/mana-notify-go/.gitignore
rename to services/mana-notify/.gitignore
diff --git a/services/mana-notify-go/CLAUDE.md b/services/mana-notify/CLAUDE.md
similarity index 100%
rename from services/mana-notify-go/CLAUDE.md
rename to services/mana-notify/CLAUDE.md
diff --git a/services/mana-notify-go/Dockerfile b/services/mana-notify/Dockerfile
similarity index 100%
rename from services/mana-notify-go/Dockerfile
rename to services/mana-notify/Dockerfile
diff --git a/services/mana-notify-go/cmd/server/main.go b/services/mana-notify/cmd/server/main.go
similarity index 100%
rename from services/mana-notify-go/cmd/server/main.go
rename to services/mana-notify/cmd/server/main.go
diff --git a/services/mana-notify-go/go.mod b/services/mana-notify/go.mod
similarity index 100%
rename from services/mana-notify-go/go.mod
rename to services/mana-notify/go.mod
diff --git a/services/mana-notify-go/go.sum b/services/mana-notify/go.sum
similarity index 100%
rename from services/mana-notify-go/go.sum
rename to services/mana-notify/go.sum
diff --git a/services/mana-notify-go/internal/auth/auth.go b/services/mana-notify/internal/auth/auth.go
similarity index 100%
rename from services/mana-notify-go/internal/auth/auth.go
rename to services/mana-notify/internal/auth/auth.go
diff --git a/services/mana-notify-go/internal/auth/auth_test.go b/services/mana-notify/internal/auth/auth_test.go
similarity index 100%
rename from services/mana-notify-go/internal/auth/auth_test.go
rename to services/mana-notify/internal/auth/auth_test.go
diff --git a/services/mana-notify-go/internal/channel/email.go b/services/mana-notify/internal/channel/email.go
similarity index 100%
rename from services/mana-notify-go/internal/channel/email.go
rename to services/mana-notify/internal/channel/email.go
diff --git a/services/mana-notify-go/internal/channel/matrix.go b/services/mana-notify/internal/channel/matrix.go
similarity index 100%
rename from services/mana-notify-go/internal/channel/matrix.go
rename to services/mana-notify/internal/channel/matrix.go
diff --git a/services/mana-notify-go/internal/channel/push.go b/services/mana-notify/internal/channel/push.go
similarity index 100%
rename from services/mana-notify-go/internal/channel/push.go
rename to services/mana-notify/internal/channel/push.go
diff --git a/services/mana-notify-go/internal/channel/push_test.go b/services/mana-notify/internal/channel/push_test.go
similarity index 100%
rename from services/mana-notify-go/internal/channel/push_test.go
rename to services/mana-notify/internal/channel/push_test.go
diff --git a/services/mana-notify-go/internal/channel/webhook.go b/services/mana-notify/internal/channel/webhook.go
similarity index 100%
rename from services/mana-notify-go/internal/channel/webhook.go
rename to services/mana-notify/internal/channel/webhook.go
diff --git a/services/mana-notify-go/internal/channel/webhook_test.go b/services/mana-notify/internal/channel/webhook_test.go
similarity index 100%
rename from services/mana-notify-go/internal/channel/webhook_test.go
rename to services/mana-notify/internal/channel/webhook_test.go
diff --git a/services/mana-notify-go/internal/config/config.go b/services/mana-notify/internal/config/config.go
similarity index 100%
rename from services/mana-notify-go/internal/config/config.go
rename to services/mana-notify/internal/config/config.go
diff --git a/services/mana-notify-go/internal/db/db.go b/services/mana-notify/internal/db/db.go
similarity index 100%
rename from services/mana-notify-go/internal/db/db.go
rename to services/mana-notify/internal/db/db.go
diff --git a/services/mana-notify-go/internal/db/migrations.go b/services/mana-notify/internal/db/migrations.go
similarity index 100%
rename from services/mana-notify-go/internal/db/migrations.go
rename to services/mana-notify/internal/db/migrations.go
diff --git a/services/mana-notify-go/internal/db/models.go b/services/mana-notify/internal/db/models.go
similarity index 100%
rename from services/mana-notify-go/internal/db/models.go
rename to services/mana-notify/internal/db/models.go
diff --git a/services/mana-notify-go/internal/handler/common.go b/services/mana-notify/internal/handler/common.go
similarity index 100%
rename from services/mana-notify-go/internal/handler/common.go
rename to services/mana-notify/internal/handler/common.go
diff --git a/services/mana-notify-go/internal/handler/devices.go b/services/mana-notify/internal/handler/devices.go
similarity index 100%
rename from services/mana-notify-go/internal/handler/devices.go
rename to services/mana-notify/internal/handler/devices.go
diff --git a/services/mana-notify-go/internal/handler/health.go b/services/mana-notify/internal/handler/health.go
similarity index 100%
rename from services/mana-notify-go/internal/handler/health.go
rename to services/mana-notify/internal/handler/health.go
diff --git a/services/mana-notify-go/internal/handler/notifications.go b/services/mana-notify/internal/handler/notifications.go
similarity index 100%
rename from services/mana-notify-go/internal/handler/notifications.go
rename to services/mana-notify/internal/handler/notifications.go
diff --git a/services/mana-notify-go/internal/handler/notifications_test.go b/services/mana-notify/internal/handler/notifications_test.go
similarity index 100%
rename from services/mana-notify-go/internal/handler/notifications_test.go
rename to services/mana-notify/internal/handler/notifications_test.go
diff --git a/services/mana-notify-go/internal/handler/preferences.go b/services/mana-notify/internal/handler/preferences.go
similarity index 100%
rename from services/mana-notify-go/internal/handler/preferences.go
rename to services/mana-notify/internal/handler/preferences.go
diff --git a/services/mana-notify-go/internal/handler/templates.go b/services/mana-notify/internal/handler/templates.go
similarity index 100%
rename from services/mana-notify-go/internal/handler/templates.go
rename to services/mana-notify/internal/handler/templates.go
diff --git a/services/mana-notify-go/internal/metrics/metrics.go b/services/mana-notify/internal/metrics/metrics.go
similarity index 100%
rename from services/mana-notify-go/internal/metrics/metrics.go
rename to services/mana-notify/internal/metrics/metrics.go
diff --git a/services/mana-notify-go/internal/queue/worker.go b/services/mana-notify/internal/queue/worker.go
similarity index 100%
rename from services/mana-notify-go/internal/queue/worker.go
rename to services/mana-notify/internal/queue/worker.go
diff --git a/services/mana-notify-go/internal/template/engine.go b/services/mana-notify/internal/template/engine.go
similarity index 100%
rename from services/mana-notify-go/internal/template/engine.go
rename to services/mana-notify/internal/template/engine.go
diff --git a/services/mana-notify-go/internal/template/engine_test.go b/services/mana-notify/internal/template/engine_test.go
similarity index 100%
rename from services/mana-notify-go/internal/template/engine_test.go
rename to services/mana-notify/internal/template/engine_test.go
diff --git a/services/mana-notify-go/package.json b/services/mana-notify/package.json
similarity index 82%
rename from services/mana-notify-go/package.json
rename to services/mana-notify/package.json
index 125f18b1f..54a4514ce 100644
--- a/services/mana-notify-go/package.json
+++ b/services/mana-notify/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "@manacore/mana-notify-go",
+	"name": "@manacore/mana-notify",
 	"version": "1.0.0",
 	"private": true,
 	"scripts": {
diff --git a/services/mana-search-go/.gitignore b/services/mana-search/.gitignore
similarity index 100%
rename from services/mana-search-go/.gitignore
rename to services/mana-search/.gitignore
diff --git a/services/mana-search-go/CLAUDE.md b/services/mana-search/CLAUDE.md
similarity index 97%
rename from services/mana-search-go/CLAUDE.md
rename to services/mana-search/CLAUDE.md
index 6fa52d9b8..87ea55e95 100644
--- a/services/mana-search-go/CLAUDE.md
+++ b/services/mana-search/CLAUDE.md
@@ -69,5 +69,5 @@ Uses the same `docker-compose.dev.yml` from `services/mana-search/` for SearXNG
 cd services/mana-search && docker-compose -f docker-compose.dev.yml up -d
 
 # Run Go service
-cd services/mana-search-go && go run ./cmd/server
+cd services/mana-search && go run ./cmd/server
 ```
diff --git a/services/mana-search-go/Dockerfile b/services/mana-search/Dockerfile
similarity index 100%
rename from services/mana-search-go/Dockerfile
rename to services/mana-search/Dockerfile
diff --git a/services/mana-search-go/cmd/server/main.go b/services/mana-search/cmd/server/main.go
similarity index 100%
rename from services/mana-search-go/cmd/server/main.go
rename to services/mana-search/cmd/server/main.go
diff --git a/services/mana-search-go/docker-compose.dev.yml b/services/mana-search/docker-compose.dev.yml
similarity index 100%
rename from services/mana-search-go/docker-compose.dev.yml
rename to services/mana-search/docker-compose.dev.yml
diff --git a/services/mana-search-go/go.mod b/services/mana-search/go.mod
similarity index 100%
rename from services/mana-search-go/go.mod
rename to services/mana-search/go.mod
diff --git a/services/mana-search-go/go.sum b/services/mana-search/go.sum
similarity index 100%
rename from services/mana-search-go/go.sum
rename to services/mana-search/go.sum
diff --git a/services/mana-search-go/internal/cache/cache.go b/services/mana-search/internal/cache/cache.go
similarity index 100%
rename from services/mana-search-go/internal/cache/cache.go
rename to services/mana-search/internal/cache/cache.go
diff --git a/services/mana-search-go/internal/config/config.go b/services/mana-search/internal/config/config.go
similarity index 100%
rename from services/mana-search-go/internal/config/config.go
rename to services/mana-search/internal/config/config.go
diff --git a/services/mana-search-go/internal/extract/extractor.go b/services/mana-search/internal/extract/extractor.go
similarity index 100%
rename from services/mana-search-go/internal/extract/extractor.go
rename to services/mana-search/internal/extract/extractor.go
diff --git a/services/mana-search-go/internal/extract/extractor_test.go b/services/mana-search/internal/extract/extractor_test.go
similarity index 100%
rename from services/mana-search-go/internal/extract/extractor_test.go
rename to services/mana-search/internal/extract/extractor_test.go
diff --git a/services/mana-search-go/internal/handler/common.go b/services/mana-search/internal/handler/common.go
similarity index 100%
rename from services/mana-search-go/internal/handler/common.go
rename to services/mana-search/internal/handler/common.go
diff --git a/services/mana-search-go/internal/handler/extract.go b/services/mana-search/internal/handler/extract.go
similarity index 100%
rename from services/mana-search-go/internal/handler/extract.go
rename to services/mana-search/internal/handler/extract.go
diff --git a/services/mana-search-go/internal/handler/extract_test.go b/services/mana-search/internal/handler/extract_test.go
similarity index 100%
rename from services/mana-search-go/internal/handler/extract_test.go
rename to services/mana-search/internal/handler/extract_test.go
diff --git a/services/mana-search-go/internal/handler/health.go b/services/mana-search/internal/handler/health.go
similarity index 100%
rename from services/mana-search-go/internal/handler/health.go
rename to services/mana-search/internal/handler/health.go
diff --git a/services/mana-search-go/internal/handler/helpers_test.go b/services/mana-search/internal/handler/helpers_test.go
similarity index 100%
rename from services/mana-search-go/internal/handler/helpers_test.go
rename to services/mana-search/internal/handler/helpers_test.go
diff --git a/services/mana-search-go/internal/handler/search.go b/services/mana-search/internal/handler/search.go
similarity index 100%
rename from services/mana-search-go/internal/handler/search.go
rename to services/mana-search/internal/handler/search.go
diff --git a/services/mana-search-go/internal/handler/search_test.go b/services/mana-search/internal/handler/search_test.go
similarity index 100%
rename from services/mana-search-go/internal/handler/search_test.go
rename to services/mana-search/internal/handler/search_test.go
diff --git a/services/mana-search-go/internal/metrics/metrics.go b/services/mana-search/internal/metrics/metrics.go
similarity index 100%
rename from services/mana-search-go/internal/metrics/metrics.go
rename to services/mana-search/internal/metrics/metrics.go
diff --git a/services/mana-search-go/internal/search/searxng.go b/services/mana-search/internal/search/searxng.go
similarity index 100%
rename from services/mana-search-go/internal/search/searxng.go
rename to services/mana-search/internal/search/searxng.go
diff --git a/services/mana-search-go/internal/search/searxng_test.go b/services/mana-search/internal/search/searxng_test.go
similarity index 100%
rename from services/mana-search-go/internal/search/searxng_test.go
rename to services/mana-search/internal/search/searxng_test.go
diff --git a/services/mana-search-go/package.json b/services/mana-search/package.json
similarity index 82%
rename from services/mana-search-go/package.json
rename to services/mana-search/package.json
index ece232d83..8cacd86a0 100644
--- a/services/mana-search-go/package.json
+++ b/services/mana-search/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "@manacore/mana-search-go",
+	"name": "@manacore/mana-search",
 	"version": "1.0.0",
 	"private": true,
 	"scripts": {
diff --git a/services/mana-search-go/searxng/limiter.toml b/services/mana-search/searxng/limiter.toml
similarity index 100%
rename from services/mana-search-go/searxng/limiter.toml
rename to services/mana-search/searxng/limiter.toml
diff --git a/services/mana-search-go/searxng/settings.yml b/services/mana-search/searxng/settings.yml
similarity index 100%
rename from services/mana-search-go/searxng/settings.yml
rename to services/mana-search/searxng/settings.yml