diff --git a/plugins/deploy-on-aws/.mcp.json b/plugins/deploy-on-aws/.mcp.json
index 0e201a2..d25d81b 100644
--- a/plugins/deploy-on-aws/.mcp.json
+++ b/plugins/deploy-on-aws/.mcp.json
@@ -1,16 +1,16 @@
 {
   "mcpServers": {
-    "awsiac": {
+    "iac": {
       "args": [
         "awslabs.aws-iac-mcp-server@latest"
       ],
       "command": "uvx"
     },
-    "awsknowledge": {
+    "knowledge": {
       "type": "http",
       "url": "https://knowledge-mcp.global.api.aws"
     },
-    "awspricing": {
+    "pricing": {
       "args": [
         "awslabs.aws-pricing-mcp-server@latest"
       ],
diff --git a/plugins/deploy-on-aws/README.md b/plugins/deploy-on-aws/README.md
index b8ff2f2..a85f210 100644
--- a/plugins/deploy-on-aws/README.md
+++ b/plugins/deploy-on-aws/README.md
@@ -17,9 +17,9 @@ This plugin provides two skills: infrastructure deployment with cost estimation,
 
 | Server         | Description                                       |
 | -------------- | ------------------------------------------------- |
-| `awsiac`       | AWS IaC best practices and patterns               |
-| `awsknowledge` | Architecture guidance and service recommendations |
-| `awspricing`   | Real-time AWS pricing data for cost estimation    |
+| `iac`       | AWS IaC best practices and patterns               |
+| `knowledge` | Architecture guidance and service recommendations |
+| `pricing`   | Real-time AWS pricing data for cost estimation    |
 
 ## Installation
 
diff --git a/plugins/deploy-on-aws/skills/deploy/SKILL.md b/plugins/deploy-on-aws/skills/deploy/SKILL.md
index 29ac7b1..c5172a7 100644
--- a/plugins/deploy-on-aws/skills/deploy/SKILL.md
+++ b/plugins/deploy-on-aws/skills/deploy/SKILL.md
@@ -28,7 +28,7 @@ Core principle: Default to **dev-sized** (cost-conscious: small instance sizes,
 
 ## MCP Servers
 
-### awsknowledge
+### knowledge
 
 Consult for architecture decisions. Use when choosing between AWS services
 or validating that a service fits the use case. Helps answer "what's the
@@ -37,13 +37,13 @@ right AWS service for X?"
 Key topics: `general` for architecture, `amplify_docs` for static sites/SPAs,
 `cdk_docs` and `cdk_constructs` for IaC patterns.
 
-### awspricing
+### pricing
 
 Get cost estimates. **Always present costs before generating IaC** so user
 can adjust before committing. See [cost-estimation.md](references/cost-estimation.md)
 for query patterns.
 
-### awsiac
+### iac
 
 Consult for IaC best practices. Use when writing CDK/CloudFormation/Terraform
 to ensure patterns follow AWS recommendations.
diff --git a/plugins/deploy-on-aws/skills/deploy/references/cost-estimation.md b/plugins/deploy-on-aws/skills/deploy/references/cost-estimation.md
index 51a457f..694160d 100644
--- a/plugins/deploy-on-aws/skills/deploy/references/cost-estimation.md
+++ b/plugins/deploy-on-aws/skills/deploy/references/cost-estimation.md
@@ -1,6 +1,6 @@
 # Cost Estimation Patterns
 
-Use the **awspricing** MCP server to get accurate cost estimates before generating IaC.
+Use the **pricing** MCP server to get accurate cost estimates before generating IaC.
 
 ## Workflow
 
diff --git a/plugins/deploy-on-aws/skills/deploy/references/defaults.md b/plugins/deploy-on-aws/skills/deploy/references/defaults.md
index 60f77ce..833724e 100644
--- a/plugins/deploy-on-aws/skills/deploy/references/defaults.md
+++ b/plugins/deploy-on-aws/skills/deploy/references/defaults.md
@@ -27,7 +27,7 @@ Less configuration than S3 + CloudFront. Git-based deployments work out of the b
 Use S3 + CloudFront when user needs fine-grained control over caching, edge functions,
 or has existing CloudFront infrastructure.
 
-Use `amplify_docs` topic in awsknowledge MCP for framework-specific guidance
+Use `amplify_docs` topic in knowledge MCP for framework-specific guidance
 (React, Next.js, Vue, Angular, etc.).
 
 ## Database
diff --git a/plugins/deploy-on-aws/skills/deploy/references/security.md b/plugins/deploy-on-aws/skills/deploy/references/security.md
index 7da9e51..716d65e 100644
--- a/plugins/deploy-on-aws/skills/deploy/references/security.md
+++ b/plugins/deploy-on-aws/skills/deploy/references/security.md
@@ -72,7 +72,7 @@ through NAT Gateway. ALB is the only public-facing component.
 ### Dev simplification
 
 For dev, a single-AZ VPC with 1 public + 1 private subnet is sufficient.
-Use `awsknowledge` topic `vpc_patterns` for multi-AZ production layouts.
+Use `knowledge` topic `vpc_patterns` for multi-AZ production layouts.
 
 ## IAM
 
@@ -89,7 +89,7 @@ Never use `*` for resources or actions unless unavoidable (e.g., S3 bucket
 contents require `s3:GetObject` on `bucket/*`). Enumerate specific ARNs.
 Use conditions where possible.
 
-Consult `awsiac` MCP for IAM policy patterns by service.
+Consult `iac` MCP for IAM policy patterns by service.
 
 ## Security Groups
 
@@ -187,5 +187,5 @@ When user requests "production" or "prod", additionally enable:
 
 ## MCP References
 
-- `awsknowledge` topics: `vpc_patterns`, `iam_best_practices`, `security`
-- `awsiac` for CDK security constructs (L2 constructs apply many defaults)
+- `knowledge` topics: `vpc_patterns`, `iam_best_practices`, `security`
+- `iac` for CDK security constructs (L2 constructs apply many defaults)