diff --git a/README.md b/README.md
index 526747f3..b811d99d 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,7 @@
   - [x] @satorijs/core
   - [x] @satorijs/element
   - [x] @satorijs/satori
-  - [ ] @satorijs/database
-  - [x] @satorijs/server
+  - [x] @satorijs/server-satori
 - Ecosystem
   - [x] DingTalk (钉钉)
   - [x] Discord
diff --git a/packages/router-proxy/.npmignore b/packages/server-proxy/.npmignore
similarity index 100%
rename from packages/router-proxy/.npmignore
rename to packages/server-proxy/.npmignore
diff --git a/packages/router-proxy/package.json b/packages/server-proxy/package.json
similarity index 89%
rename from packages/router-proxy/package.json
rename to packages/server-proxy/package.json
index 206bed08..6b37b76e 100644
--- a/packages/router-proxy/package.json
+++ b/packages/server-proxy/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@satorijs/router-proxy",
+  "name": "@satorijs/server-proxy",
   "description": "Proxy plugin for cordis",
   "version": "1.0.0",
   "main": "lib/index.js",
@@ -13,7 +13,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/satorijs/satori.git",
-    "directory": "packages/router-proxy"
+    "directory": "packages/server-proxy"
   },
   "bugs": {
     "url": "https://github.com/satorijs/satori/issues"
diff --git a/packages/router-proxy/src/index.ts b/packages/server-proxy/src/index.ts
similarity index 93%
rename from packages/router-proxy/src/index.ts
rename to packages/server-proxy/src/index.ts
index 76df1ffb..be9d979f 100644
--- a/packages/router-proxy/src/index.ts
+++ b/packages/server-proxy/src/index.ts
@@ -4,7 +4,7 @@ import internal from 'stream'
 
 declare module '@satorijs/core' {
   interface Context {
-    'router.proxy': ProxyService
+    'server\.proxy': ProxyService
   }
 }
 
@@ -26,7 +26,7 @@ class ProxyService {
       }
     })
 
-    ctx.root.provide('router.proxy', this)
+    ctx.root.provide('server\.proxy', this)
   }
 }
 
diff --git a/packages/router-proxy/tsconfig.json b/packages/server-proxy/tsconfig.json
similarity index 100%
rename from packages/router-proxy/tsconfig.json
rename to packages/server-proxy/tsconfig.json
diff --git a/packages/server/.npmignore b/packages/server-satori/.npmignore
similarity index 100%
rename from packages/server/.npmignore
rename to packages/server-satori/.npmignore
diff --git a/packages/server/package.json b/packages/server-satori/package.json
similarity index 88%
rename from packages/server/package.json
rename to packages/server-satori/package.json
index 33fbc86b..26f4bd0e 100644
--- a/packages/server/package.json
+++ b/packages/server-satori/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@satorijs/server",
+  "name": "@satorijs/server-satori",
   "description": "Basic API server for Satori protocol",
   "version": "2.2.2",
   "main": "lib/index.js",
@@ -21,7 +21,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/satorijs/satori.git",
-    "directory": "packages/server"
+    "directory": "packages/server-satori"
   },
   "bugs": {
     "url": "https://github.com/satorijs/satori/issues"
@@ -38,6 +38,6 @@
     "@satorijs/router": "^1.1.2"
   },
   "peerDependencies": {
-    "@satorijs/satori": "^3.1.4"
+    "@satorijs/satori": "^3.1.5"
   }
 }
diff --git a/packages/server/src/index.ts b/packages/server-satori/src/index.ts
similarity index 100%
rename from packages/server/src/index.ts
rename to packages/server-satori/src/index.ts
diff --git a/packages/server/tsconfig.json b/packages/server-satori/tsconfig.json
similarity index 100%
rename from packages/server/tsconfig.json
rename to packages/server-satori/tsconfig.json