awslabs · Sagargupta16 · Apr 15, 2026 · Apr 30, 2026
@@ -10,7 +10,7 @@ This repository contains Agent Plugins for AWS that equip AI coding agents with
 - **Framework**: Claude Code plugins
 - **Cloud Platform**: AWS
 - **Infrastructure as Code**: CDK and CloudFormation
-- **Tools**: MCP Servers (awsknowledge, awspricing, aws-iac-mcp)
+- **Tools**: MCP Servers (knowledge, pricing, iac — plugin-local keys may vary)
 
 ## Code Organization
 

@@ -14,7 +14,7 @@ This repository supports **plugins** - bundles of skills, MCP servers, and agent
 | --------------- | ---------------------------------------------------------------------------------- | ----------------------------------------- |
 | **Plugin**      | A distributable bundle (skills + MCP servers + agents)                             | `deploy-on-aws`                           |
 | **Skill**       | Instructions that auto-trigger based on user intent (YAML frontmatter description) | "deploy to AWS" triggers the deploy skill |
-| **MCP Server**  | External tool integration via Model Context Protocol                               | `awspricing` for cost estimates           |
+| **MCP Server**  | External tool integration via Model Context Protocol                               | `pricing` for cost estimates              |
 | **Marketplace** | Registry of plugins users can install                                              | `awslabs/agent-plugins`                   |
 
 ### Key Design Decision: Skills Auto-Trigger
@@ -97,11 +97,11 @@ agent-plugins/
 
 ### deploy-on-aws
 
-| Server         | Type  | Purpose                                           |
-| -------------- | ----- | ------------------------------------------------- |
-| `awsknowledge` | HTTP  | AWS documentation, architecture guidance          |
-| `awspricing`   | stdio | Real-time cost estimates                          |
-| `awsiac`       | stdio | IaC best practices (CDK/CloudFormation/Terraform) |
+| Server      | Type  | Purpose                                           |
+| ----------- | ----- | ------------------------------------------------- |
+| `knowledge` | HTTP  | AWS documentation, architecture guidance          |
+| `pricing`   | stdio | Real-time cost estimates                          |
+| `iac`       | stdio | IaC best practices (CDK/CloudFormation/Terraform) |
 
 ### amazon-location-service
 

@@ -205,11 +205,11 @@ AWS デプロイを加速するスキルをエージェントに提供します
 
 ### MCP サーバー
 
-| サーバー         | 用途                                                           |
-| ---------------- | -------------------------------------------------------------- |
-| **awsknowledge** | AWS ドキュメント、アーキテクチャガイダンス、ベストプラクティス |
-| **awspricing**   | コスト見積もり用のリアルタイム AWS サービス料金                |
-| **aws-iac-mcp**  | CDK/CloudFormation の IaC ベストプラクティス                   |
+| サーバー      | 用途                                                           |
+| ------------- | -------------------------------------------------------------- |
+| **knowledge** | AWS ドキュメント、アーキテクチャガイダンス、ベストプラクティス |
+| **pricing**   | コスト見積もり用のリアルタイム AWS サービス料金                |
+| **iac**       | CDK/CloudFormation の IaC ベストプラクティス                   |
 
 ## 要件
 

@@ -296,11 +296,11 @@ Equips agents with the skills to accelerate AWS deployment - recommending AWS ar
 
 ### MCP Servers
 
-| Server           | Purpose                                                      |
-| ---------------- | ------------------------------------------------------------ |
-| **awsknowledge** | AWS documentation, architecture guidance, and best practices |
-| **awspricing**   | Real-time AWS service pricing for cost estimates             |
-| **aws-iac-mcp**  | IaC best practices for CDK/CloudFormation                    |
+| Server        | Purpose                                                      |
+| ------------- | ------------------------------------------------------------ |
+| **knowledge** | AWS documentation, architecture guidance, and best practices |
+| **pricing**   | Real-time AWS service pricing for cost estimates             |
+| **iac**       | IaC best practices for CDK/CloudFormation                    |
 
 ## sagemaker-ai
 

@@ -104,7 +104,7 @@ claude
 
 #### MCP Server Connection Issues
 
-If MCP servers (like `awspricing`, `awsknowledge`, `awsiac`) fail to connect:
+If MCP servers (like `pricing`, `knowledge`, `iac` — names may vary per plugin) fail to connect:
 
 1. Check MCP server logs:
 

@@ -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"
       ],

@@ -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
 

@@ -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.

@@ -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
 

@@ -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

@@ -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)