diff --git a/skills/building-sf-integrations/LICENSE b/skills/building-sf-integrations/LICENSE
deleted file mode 100644
index f388692..0000000
--- a/skills/building-sf-integrations/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024-2025 Salesforce
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/skills/building-sf-integrations/README.md b/skills/building-sf-integrations/README.md
index d31cec6..069624c 100644
--- a/skills/building-sf-integrations/README.md
+++ b/skills/building-sf-integrations/README.md
@@ -83,7 +83,7 @@ Automate credential configuration without manual UI steps:
 | configuring-connected-apps | Create OAuth Connected App for Named Credential |
 | generating-apex | Custom callout services beyond templates |
 | generating-flow | HTTP Callout Flow for Agentforce |
-| deploying-sf-metadata | Deploy credentials and callout code |
+| deploying-metadata | Deploy credentials and callout code |
 | sf-ai-agentscript | Agent actions using External Services |
 
 ## Documentation
@@ -93,7 +93,3 @@ Automate credential configuration without manual UI steps:
 - [references/named-credentials-guide.md](references/named-credentials-guide.md) - Template reference
 - [references/callout-patterns.md](references/callout-patterns.md) - REST/SOAP patterns
 - [references/event-patterns.md](references/event-patterns.md) - Platform Events & CDC
-
-## License
-
-See [LICENSE](LICENSE) for complete terms.
diff --git a/skills/building-sf-integrations/SKILL.md b/skills/building-sf-integrations/SKILL.md
index 63b7fba..3fb1fa2 100644
--- a/skills/building-sf-integrations/SKILL.md
+++ b/skills/building-sf-integrations/SKILL.md
@@ -1,7 +1,7 @@
 ---
 name: building-sf-integrations
 description: "Salesforce integration architecture and runtime plumbing with 120-point scoring. Use this skill to set up Named Credentials, External Credentials, External Services, REST/SOAP callout patterns, Platform Events, and Change Data Capture. TRIGGER when: user sets up Named Credentials, External Services, REST/SOAP callouts, Platform Events, CDC, or touches .namedCredential-meta.xml files. DO NOT TRIGGER when: Connected App/OAuth config (use configuring-connected-apps), Apex-only logic (use generating-apex), or data import/export (use handling-sf-data)."
-license: LICENSE.txt has complete terms
+license: MIT
 metadata:
   version: "1.1"
 ---
@@ -22,7 +22,7 @@ Use `building-sf-integrations` when the work involves:
 Delegate elsewhere when the user is:
 - configuring the OAuth app itself → [configuring-connected-apps](../configuring-connected-apps/SKILL.md)
 - writing Apex-only business logic → [generating-apex](../generating-apex/SKILL.md)
-- deploying metadata → [deploying-sf-metadata](../deploying-sf-metadata/SKILL.md)
+- deploying metadata → [deploying-metadata](../deploying-metadata/SKILL.md)
 - importing/exporting data → [handling-sf-data](../handling-sf-data/SKILL.md)
 
 ---
@@ -75,7 +75,7 @@ Check:
 
 ### 5. Hand off deployment or implementation details
 Use:
-- [deploying-sf-metadata](../deploying-sf-metadata/SKILL.md) for deployment
+- [deploying-metadata](../deploying-metadata/SKILL.md) for deployment
 - [generating-apex](../generating-apex/SKILL.md) for deeper service / retry code
 - [generating-flow](../generating-flow/SKILL.md) for declarative HTTP callout orchestration
 
@@ -126,7 +126,7 @@ Next step: <deploy, register, test, or implement>
 | OAuth app setup | [configuring-connected-apps](../configuring-connected-apps/SKILL.md) | consumer key / cert / app config |
 | advanced callout service code | [generating-apex](../generating-apex/SKILL.md) | Apex implementation |
 | declarative HTTP callout / Flow wrapper | [generating-flow](../generating-flow/SKILL.md) | Flow orchestration |
-| deploy integration metadata | [deploying-sf-metadata](../deploying-sf-metadata/SKILL.md) | validation and rollout |
+| deploy integration metadata | [deploying-metadata](../deploying-metadata/SKILL.md) | validation and rollout |
 | use integration from Agentforce | [developing-agentforce](../developing-agentforce/SKILL.md) | agent action composition |
 
 ---
diff --git a/skills/configuring-connected-apps/LICENSE b/skills/configuring-connected-apps/LICENSE
deleted file mode 100644
index f388692..0000000
--- a/skills/configuring-connected-apps/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024-2025 Salesforce
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/skills/configuring-connected-apps/README.md b/skills/configuring-connected-apps/README.md
index 2a09ae4..19b9954 100644
--- a/skills/configuring-connected-apps/README.md
+++ b/skills/configuring-connected-apps/README.md
@@ -95,11 +95,5 @@ configuring-connected-apps/
 
 ## Dependencies
 
-- **deploying-sf-metadata**: For deploying apps to orgs
+- **deploying-metadata**: For deploying apps to orgs
 - **sf-metadata**: For creating related metadata (Named Credentials)
-
-## License
-
-MIT License. See [LICENSE](LICENSE) file.
-
-Copyright (c) 2024-2025 Salesforce
diff --git a/skills/configuring-connected-apps/SKILL.md b/skills/configuring-connected-apps/SKILL.md
index dbbc6d7..a008ba3 100644
--- a/skills/configuring-connected-apps/SKILL.md
+++ b/skills/configuring-connected-apps/SKILL.md
@@ -1,7 +1,7 @@
 ---
 name: configuring-connected-apps
-description: "Salesforce Connected Apps and External Client Apps OAuth configuration with 120-point scoring. Use this skill to configure OAuth flows, JWT bearer auth, Connected Apps, and External Client Apps in Salesforce. TRIGGER when: user configures OAuth flows, JWT bearer auth, Connected Apps, ECAs, or touches .connectedApp-meta.xml / .eca-meta.xml files. DO NOT TRIGGER when: configuring Named Credentials for callouts (use building-sf-integrations), reviewing permission policies (use deploying-sf-metadata), or writing Apex token-handling code (use generating-apex)."
-license: LICENSE.txt has complete terms
+description: "Salesforce Connected Apps and External Client Apps OAuth configuration with 120-point scoring. Use this skill to configure OAuth flows, JWT bearer auth, Connected Apps, and External Client Apps in Salesforce. TRIGGER when: user configures OAuth flows, JWT bearer auth, Connected Apps, ECAs, or touches .connectedApp-meta.xml / .eca-meta.xml files. DO NOT TRIGGER when: configuring Named Credentials for callouts (use building-sf-integrations), reviewing permission policies (use deploying-metadata), or writing Apex token-handling code (use generating-apex)."
+license: MIT
 allowed-tools: Bash Read Write Edit Glob Grep WebFetch AskUserQuestion TodoWrite
 metadata:
   version: "1.1"
@@ -22,7 +22,7 @@ Use this skill when the user needs **OAuth app configuration** in Salesforce: Co
 
 **Out of scope — delegate elsewhere:**
 - Configuring Named Credentials or runtime callouts → [building-sf-integrations](../building-sf-integrations/SKILL.md)
-- Deploying metadata to orgs → [deploying-sf-metadata](../deploying-sf-metadata/SKILL.md)
+- Deploying metadata to orgs → [deploying-metadata](../deploying-metadata/SKILL.md)
 - Writing Apex token-handling code → [generating-apex](../generating-apex/SKILL.md)
 
 ---
@@ -190,7 +190,7 @@ Score: <x>/120
 | Need | Delegate to | Reason |
 |---|---|---|
 | Named Credential / callout runtime config | [building-sf-integrations](../building-sf-integrations/SKILL.md) | runtime integration setup |
-| Deploy app metadata | [deploying-sf-metadata](../deploying-sf-metadata/SKILL.md) | org validation and deployment |
+| Deploy app metadata | [deploying-metadata](../deploying-metadata/SKILL.md) | org validation and deployment |
 | Apex token or refresh handling | [generating-apex](../generating-apex/SKILL.md) | implementation logic |
 
 ---
diff --git a/skills/debugging-apex-logs/LICENSE b/skills/debugging-apex-logs/LICENSE
deleted file mode 100644
index f388692..0000000
--- a/skills/debugging-apex-logs/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024-2025 Salesforce
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/skills/debugging-apex-logs/README.md b/skills/debugging-apex-logs/README.md
index 505ccc5..05aeb4e 100644
--- a/skills/debugging-apex-logs/README.md
+++ b/skills/debugging-apex-logs/README.md
@@ -72,8 +72,3 @@ sf apex tail log --target-org [alias] --color
 - sf CLI v2
 - Target Salesforce org
 - Debug logs enabled for target user
-
-## License
-
-MIT License. See LICENSE file.
-Copyright (c) 2024-2025 Salesforce
diff --git a/skills/debugging-apex-logs/SKILL.md b/skills/debugging-apex-logs/SKILL.md
index 796e458..7751a8f 100644
--- a/skills/debugging-apex-logs/SKILL.md
+++ b/skills/debugging-apex-logs/SKILL.md
@@ -1,7 +1,7 @@
 ---
 name: debugging-apex-logs
 description: "Salesforce debug log analysis and troubleshooting with 100-point scoring. TRIGGER when: user analyzes debug logs, hits governor limits, reads stack traces, or touches .log files from Salesforce orgs. DO NOT TRIGGER when: running Apex tests (use running-apex-tests), generating or fixing Apex code (use generating-apex), or Agentforce session tracing (use observing-agentforce)."
-license: LICENSE.txt has complete terms
+license: MIT
 metadata:
   version: "1.1"
 ---
@@ -137,7 +137,7 @@ Verify: <test or rerun step>
 |---|---|---|
 | Implement Apex fix | [generating-apex](../generating-apex/SKILL.md) | code change generation / review |
 | Reproduce via tests | [running-apex-tests](../running-apex-tests/SKILL.md) | test execution and coverage loop |
-| Deploy fix | [deploying-sf-metadata](../deploying-sf-metadata/SKILL.md) | deployment orchestration |
+| Deploy fix | [deploying-metadata](../deploying-metadata/SKILL.md) | deployment orchestration |
 | Create debugging data | [handling-sf-data](../handling-sf-data/SKILL.md) | targeted seed / repro data |
 
 ---
diff --git a/skills/debugging-apex-logs/references/analysis-playbook.md b/skills/debugging-apex-logs/references/analysis-playbook.md
index e1676f8..edb6af7 100644
--- a/skills/debugging-apex-logs/references/analysis-playbook.md
+++ b/skills/debugging-apex-logs/references/analysis-playbook.md
@@ -49,5 +49,5 @@ Prefer fixes that are:
 
 - use `sf-apex` for code fixes
 - use `running-apex-tests` to reproduce and verify
-- use `deploying-sf-metadata` to deploy fixes
+- use `deploying-metadata` to deploy fixes
 - use `handling-sf-data` when the issue depends on missing or malformed test data
diff --git a/skills/deploying-sf-metadata/CREDITS.md b/skills/deploying-metadata/CREDITS.md
similarity index 100%
rename from skills/deploying-sf-metadata/CREDITS.md
rename to skills/deploying-metadata/CREDITS.md
diff --git a/skills/deploying-sf-metadata/README.md b/skills/deploying-metadata/README.md
similarity index 91%
rename from skills/deploying-sf-metadata/README.md
rename to skills/deploying-metadata/README.md
index fe10d39..055ea30 100644
--- a/skills/deploying-sf-metadata/README.md
+++ b/skills/deploying-metadata/README.md
@@ -1,4 +1,4 @@
-# deploying-sf-metadata
+# deploying-metadata
 
 Comprehensive Salesforce DevOps automation using sf CLI v2. Validate, deploy, verify, and hand off cleanly to post-deploy activities.
 
@@ -17,7 +17,7 @@ Comprehensive Salesforce DevOps automation using sf CLI v2. Validate, deploy, ve
 ### 1. Invoke the skill
 
 ```
-Skill: deploying-sf-metadata
+Skill: deploying-metadata
 Request: "Deploy all changes to org dev with validation"
 ```
 
@@ -62,10 +62,10 @@ After a successful dry run, guide the user to the next safe step:
 ## Orchestration Order
 
 ```
-generating-custom-object/generating-flow → deploying-sf-metadata → handling-sf-data
+generating-custom-object/generating-flow → deploying-metadata → handling-sf-data
 ```
 
-**Within deploying-sf-metadata**:
+**Within deploying-metadata**:
 1. Objects/Fields
 2. Permission Sets
 3. Apex
@@ -102,8 +102,3 @@ generating-custom-object/generating-flow → deploying-sf-metadata → handling-
 - sf CLI v2
 - Target Salesforce org
 - Proper permissions for deployment
-
-## License
-
-MIT License. See LICENSE file.
-Copyright (c) 2024-2026 Salesforce Skills Contributors
diff --git a/skills/deploying-sf-metadata/SKILL.md b/skills/deploying-metadata/SKILL.md
similarity index 97%
rename from skills/deploying-sf-metadata/SKILL.md
rename to skills/deploying-metadata/SKILL.md
index ec491dd..a930323 100644
--- a/skills/deploying-sf-metadata/SKILL.md
+++ b/skills/deploying-metadata/SKILL.md
@@ -1,18 +1,18 @@
 ---
-name: deploying-sf-metadata
+name: deploying-metadata
 description: "Salesforce DevOps automation using sf CLI v2. TRIGGER when: user deploys metadata, creates/manages scratch orgs or sandboxes, sets up CI/CD pipelines, or troubleshoots deployment errors with sf project deploy. DO NOT TRIGGER when: writing Apex code (use generating-apex), building LWC components (use generating-lwc-components), creating metadata definitions (use generating-custom-object or generating-custom-field), or querying org data (use handling-sf-data)."
-license: LICENSE.txt has complete terms
+license: MIT
 metadata:
   version: "1.1"
 ---
 
-# deploying-sf-metadata: Comprehensive Salesforce DevOps Automation
+# deploying-metadata: Comprehensive Salesforce DevOps Automation
 
 Use this skill when the user needs **deployment orchestration**: dry-run validation, targeted or manifest-based deploys, CI/CD workflow advice, scratch-org management, failure triage, or safe rollout sequencing for Salesforce metadata.
 
 ## When This Skill Owns the Task
 
-Use `deploying-sf-metadata` when the work involves:
+Use `deploying-metadata` when the work involves:
 - `sf project deploy start`, `quick`, `report`, or retrieval workflows
 - release sequencing across objects, permission sets, Apex, and Flows
 - CI/CD gates, test-level selection, or deployment reports
diff --git a/skills/deploying-sf-metadata/assets/destructiveChanges.xml b/skills/deploying-metadata/assets/destructiveChanges.xml
similarity index 100%
rename from skills/deploying-sf-metadata/assets/destructiveChanges.xml
rename to skills/deploying-metadata/assets/destructiveChanges.xml
diff --git a/skills/deploying-sf-metadata/assets/package.xml b/skills/deploying-metadata/assets/package.xml
similarity index 100%
rename from skills/deploying-sf-metadata/assets/package.xml
rename to skills/deploying-metadata/assets/package.xml
diff --git a/skills/deploying-sf-metadata/references/agent-deployment-guide.md b/skills/deploying-metadata/references/agent-deployment-guide.md
similarity index 97%
rename from skills/deploying-sf-metadata/references/agent-deployment-guide.md
rename to skills/deploying-metadata/references/agent-deployment-guide.md
index 02acb3c..ed182c3 100644
--- a/skills/deploying-sf-metadata/references/agent-deployment-guide.md
+++ b/skills/deploying-metadata/references/agent-deployment-guide.md
@@ -1,4 +1,4 @@
-<!-- Parent: deploying-sf-metadata/SKILL.md -->
+<!-- Parent: deploying-metadata/SKILL.md -->
 # Agentforce Agent Deployment Guide
 
 > Complete DevOps guide for deploying Agentforce agents using SF CLI
@@ -13,7 +13,7 @@ This guide covers the complete deployment lifecycle for Agentforce agents, inclu
 
 **Related Skills:**
 - `developing-agentforce` - Agent authoring, publishing, Agent Builder, and Prompt Builder
-- `deploying-sf-metadata` - This skill - deployment orchestration
+- `deploying-metadata` - This skill - deployment orchestration
 
 ---
 
@@ -570,10 +570,10 @@ sf agent activate --api-name My_Agent --target-org myorg
 
 | From Skill | To Skill | Purpose |
 |------------|----------|---------|
-| developing-agentforce | deploying-sf-metadata | Publish and activate agents |
-| generating-apex | deploying-sf-metadata | Deploy Apex before agent |
-| generating-flow | deploying-sf-metadata | Deploy Flows before agent |
-| building-sf-integrations | deploying-sf-metadata | Deploy Named Credentials for external APIs |
+| developing-agentforce | deploying-metadata | Publish and activate agents |
+| generating-apex | deploying-metadata | Deploy Apex before agent |
+| generating-flow | deploying-metadata | Deploy Flows before agent |
+| building-sf-integrations | deploying-metadata | Deploy Named Credentials for external APIs |
 
 ### Integration Pattern
 
@@ -581,7 +581,7 @@ sf agent activate --api-name My_Agent --target-org myorg
 # 1. generating-apex creates InvocableMethod class
 # 2. generating-flow creates wrapper Flow
 # 3. developing-agentforce creates agent with flow:// action
-# 4. deploying-sf-metadata orchestrates deployment in correct order
+# 4. deploying-metadata orchestrates deployment in correct order
 ```
 
 ---
diff --git a/skills/deploying-sf-metadata/references/deploy.sh b/skills/deploying-metadata/references/deploy.sh
similarity index 98%
rename from skills/deploying-sf-metadata/references/deploy.sh
rename to skills/deploying-metadata/references/deploy.sh
index df84dea..4857c7b 100644
--- a/skills/deploying-sf-metadata/references/deploy.sh
+++ b/skills/deploying-metadata/references/deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # Multi-Step Deployment Script
-# Generated by deploying-sf-metadata skill
+# Generated by deploying-metadata skill
 #
 # Usage: ./scripts/deploy.sh <target-org-alias>
 
diff --git a/skills/deploying-sf-metadata/references/deployment-report-template.md b/skills/deploying-metadata/references/deployment-report-template.md
similarity index 97%
rename from skills/deploying-sf-metadata/references/deployment-report-template.md
rename to skills/deploying-metadata/references/deployment-report-template.md
index 53f25b1..57db44c 100644
--- a/skills/deploying-sf-metadata/references/deployment-report-template.md
+++ b/skills/deploying-metadata/references/deployment-report-template.md
@@ -1,4 +1,4 @@
-<!-- Parent: deploying-sf-metadata/SKILL.md -->
+<!-- Parent: deploying-metadata/SKILL.md -->
 # Deployment Report Template
 
 Standard output format for Salesforce deployment summaries.
diff --git a/skills/deploying-sf-metadata/references/deployment-workflows.md b/skills/deploying-metadata/references/deployment-workflows.md
similarity index 97%
rename from skills/deploying-sf-metadata/references/deployment-workflows.md
rename to skills/deploying-metadata/references/deployment-workflows.md
index 211813a..644fee2 100644
--- a/skills/deploying-sf-metadata/references/deployment-workflows.md
+++ b/skills/deploying-metadata/references/deployment-workflows.md
@@ -1,7 +1,7 @@
-<!-- Parent: deploying-sf-metadata/SKILL.md -->
+<!-- Parent: deploying-metadata/SKILL.md -->
 # Salesforce Deployment Workflow Examples
 
-This file contains practical examples of common Salesforce deployment scenarios using the deploying-sf-metadata skill.
+This file contains practical examples of common Salesforce deployment scenarios using the deploying-metadata skill.
 
 ## Example 1: Basic Production Deployment
 
@@ -392,4 +392,4 @@ This file contains practical examples of common Salesforce deployment scenarios
 
 ---
 
-*These examples demonstrate common patterns. The deploying-sf-metadata skill adapts to your specific use case and provides guided assistance.*
+*These examples demonstrate common patterns. The deploying-metadata skill adapts to your specific use case and provides guided assistance.*
diff --git a/skills/deploying-sf-metadata/references/orchestration.md b/skills/deploying-metadata/references/orchestration.md
similarity index 85%
rename from skills/deploying-sf-metadata/references/orchestration.md
rename to skills/deploying-metadata/references/orchestration.md
index a3c40b8..b70d966 100644
--- a/skills/deploying-sf-metadata/references/orchestration.md
+++ b/skills/deploying-metadata/references/orchestration.md
@@ -1,7 +1,7 @@
-<!-- Parent: deploying-sf-metadata/SKILL.md -->
-# Multi-Skill Orchestration: deploying-sf-metadata Perspective
+<!-- Parent: deploying-metadata/SKILL.md -->
+# Multi-Skill Orchestration: deploying-metadata Perspective
 
-This document details how deploying-sf-metadata fits into the multi-skill workflow for Salesforce development.
+This document details how deploying-metadata fits into the multi-skill workflow for Salesforce development.
 
 ---
 
@@ -17,7 +17,7 @@ This document details how deploying-sf-metadata fits into the multi-skill workfl
 │  2. generating-flow                                                         │
 │     └── Create flow definitions (LOCAL files)                               │
 │                                                                             │
-│  3. deploying-sf-metadata  ◀── YOU ARE HERE                                            │
+│  3. deploying-metadata  ◀── YOU ARE HERE                                            │
 │     └── Deploy all metadata (REMOTE)                                        │
 │                                                                             │
 │  4. handling-sf-data                                                                 │
@@ -27,11 +27,11 @@ This document details how deploying-sf-metadata fits into the multi-skill workfl
 
 ---
 
-## Why deploying-sf-metadata Goes Third (Not Last)
+## Why deploying-metadata Goes Third (Not Last)
 
-deploying-sf-metadata is the **bridge** between local files and the org:
+deploying-metadata is the **bridge** between local files and the org:
 
-| Before deploying-sf-metadata | After deploying-sf-metadata |
+| Before deploying-metadata | After deploying-metadata |
 |------------------|-----------------|
 | Metadata exists locally | Metadata exists in org |
 | Flows reference objects | Flows can run |
@@ -41,7 +41,7 @@ deploying-sf-metadata is the **bridge** between local files and the org:
 
 ---
 
-## Deploy Order WITHIN deploying-sf-metadata
+## Deploy Order WITHIN deploying-metadata
 
 When deploying multiple metadata types:
 
@@ -87,12 +87,12 @@ When deploying agents with external API integrations:
 │  3. generating-apex   → Create @InvocableMethod (if needed)                 │
 │  4. generating-flow   → Create Flow wrapper                                 │
 │                                                                             │
-│  5. deploying-sf-metadata         ◀── FIRST DEPLOYMENT                                 │
+│  5. deploying-metadata         ◀── FIRST DEPLOYMENT                                 │
 │     └── Deploy: Objects, Fields, Permission Sets, Apex, Flows              │
 │                                                                             │
 │  6. developing-agentforce → Create agent with flow:// target               │
 │                                                                             │
-│  7. deploying-sf-metadata         ◀── SECOND DEPLOYMENT (Agent Publish)                │
+│  7. deploying-metadata         ◀── SECOND DEPLOYMENT (Agent Publish)                │
 │     └── sf agent publish authoring-bundle --api-name [AgentName]           │
 │                                                                             │
 │  8. handling-sf-data           → Create test data                                    │
@@ -165,12 +165,12 @@ sf agent activate --api-name AgentName --version N --target-org alias --json
 
 ## Invocation Patterns
 
-| From Skill | To deploying-sf-metadata | When |
+| From Skill | To deploying-metadata | When |
 |------------|--------------|------|
-| generating-custom-object | → deploying-sf-metadata | "Deploy objects to [org]" |
-| generating-flow | → deploying-sf-metadata | "Deploy flow with --dry-run" |
-| generating-apex | → deploying-sf-metadata | "Deploy classes with RunLocalTests" |
-| developing-agentforce | → deploying-sf-metadata | "Deploy and publish agent" |
+| generating-custom-object | → deploying-metadata | "Deploy objects to [org]" |
+| generating-flow | → deploying-metadata | "Deploy flow with --dry-run" |
+| generating-apex | → deploying-metadata | "Deploy classes with RunLocalTests" |
+| developing-agentforce | → deploying-metadata | "Deploy and publish agent" |
 
 ---
 
@@ -178,6 +178,6 @@ sf agent activate --api-name AgentName --version N --target-org alias --json
 
 | Topic | Location |
 |-------|----------|
-| Deployment workflows | `deploying-sf-metadata/references/deployment-workflows.md` |
-| Agent deployment guide | `deploying-sf-metadata/references/agent-deployment-guide.md` |
-| Deploy script template | `deploying-sf-metadata/references/deploy.sh` |
+| Deployment workflows | `deploying-metadata/references/deployment-workflows.md` |
+| Agent deployment guide | `deploying-metadata/references/agent-deployment-guide.md` |
+| Deploy script template | `deploying-metadata/references/deploy.sh` |
diff --git a/skills/deploying-sf-metadata/references/trigger-deployment-safety.md b/skills/deploying-metadata/references/trigger-deployment-safety.md
similarity index 99%
rename from skills/deploying-sf-metadata/references/trigger-deployment-safety.md
rename to skills/deploying-metadata/references/trigger-deployment-safety.md
index 9d61a0b..8e67b5c 100644
--- a/skills/deploying-sf-metadata/references/trigger-deployment-safety.md
+++ b/skills/deploying-metadata/references/trigger-deployment-safety.md
@@ -1,4 +1,4 @@
-<!-- Parent: deploying-sf-metadata/SKILL.md -->
+<!-- Parent: deploying-metadata/SKILL.md -->
 # Trigger Deployment Safety Guide
 
 ## Overview
diff --git a/skills/deploying-sf-metadata/LICENSE b/skills/deploying-sf-metadata/LICENSE
deleted file mode 100644
index 4660dfa..0000000
--- a/skills/deploying-sf-metadata/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024-2026 Salesforce Skills Contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/skills/developing-agentforce/references/actions-reference.md b/skills/developing-agentforce/references/actions-reference.md
index eb63d40..744cb33 100644
--- a/skills/developing-agentforce/references/actions-reference.md
+++ b/skills/developing-agentforce/references/actions-reference.md
@@ -575,9 +575,9 @@ When building agents with external API integrations, follow this order:
 │  2. building-sf-integrations → Named Credential + External Service │
 │  3. generating-apex            → @InvocableMethod (if custom logic)  │
 │  4. generating-flow            → Flow wrapper (HTTP Callout / Apex)  │
-│  5. deploying-sf-metadata          → Deploy all metadata to org          │
+│  5. deploying-metadata          → Deploy all metadata to org          │
 │  6. sf-ai-agentscript  → Agent with flow:// target           │
-│  7. deploying-sf-metadata          → Publish (sf agent publish           │
+│  7. deploying-metadata          → Publish (sf agent publish           │
 │                           authoring-bundle)                  │
 └──────────────────────────────────────────────────────────────┘
 ```
diff --git a/skills/fetching-salesforce-docs/LICENSE.txt b/skills/fetching-salesforce-docs/LICENSE.txt
deleted file mode 100644
index f388692..0000000
--- a/skills/fetching-salesforce-docs/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024-2025 Salesforce
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/skills/fetching-salesforce-docs/SKILL.md b/skills/fetching-salesforce-docs/SKILL.md
index 6eb85be..3a8704e 100644
--- a/skills/fetching-salesforce-docs/SKILL.md
+++ b/skills/fetching-salesforce-docs/SKILL.md
@@ -1,7 +1,7 @@
 ---
 name: fetching-salesforce-docs
 description: "Official Salesforce documentation retrieval skill. Use when you need authoritative Salesforce docs from developer.salesforce.com, help.salesforce.com, architect.salesforce.com, admin.salesforce.com, or lightningdesignsystem.com, especially when pages are JS-heavy, shell-rendered, or hard to extract with naive fetching. Use to ground answers in official Salesforce sources instead of third-party blogs or summaries. TRIGGER when: user asks for official Salesforce documentation, Apex or API reference, LWC docs, Agentforce docs, setup or help articles, or any doc from a Salesforce-owned domain. DO NOT TRIGGER when: user is asking for a code change, deployment task, or anything not requiring documentation retrieval — use the appropriate sf-* skill instead."
-license: LICENSE.txt has complete terms
+license: MIT
 metadata:
   version: "1.1"
 ---
diff --git a/skills/generating-apex-test/CREDITS.md b/skills/generating-apex-test/CREDITS.md
index 38fe101..24d1723 100644
--- a/skills/generating-apex-test/CREDITS.md
+++ b/skills/generating-apex-test/CREDITS.md
@@ -1,17 +1,5 @@
 # Credits & Acknowledgments
 
-This skill is built on established Salesforce Apex testing patterns and the collective knowledge of the Salesforce developer community.
+This skill is built on established Salesforce Apex development patterns and the collective knowledge of the Salesforce developer community.
 
----
-
-## Key Patterns Integrated
-
-- Apex test code generation and review patterns
-- Best practices and anti-patterns for unit testing, mocking, and stubbing
-- Template library for common Apex test class types
-
----
-
-## Special Thanks
-
-To the entire Salesforce developer community for sharing knowledge, writing documentation, and helping each other build better solutions.
+---
\ No newline at end of file
diff --git a/skills/generating-apex/CREDITS.md b/skills/generating-apex/CREDITS.md
index 577a404..a1f9808 100644
--- a/skills/generating-apex/CREDITS.md
+++ b/skills/generating-apex/CREDITS.md
@@ -3,15 +3,3 @@
 This skill is built on established Salesforce Apex development patterns and the collective knowledge of the Salesforce developer community.
 
 ---
-
-## Key Patterns Integrated
-
-- Apex code generation and review patterns
-- Best practices, anti-patterns, and design patterns for common Apex class types
-- Template library for service, selector, domain, and utility classes
-
----
-
-## Special Thanks
-
-To the entire Salesforce developer community for sharing knowledge, writing documentation, and helping each other build better solutions.
diff --git a/skills/generating-lwc-components/README.md b/skills/generating-lwc-components/README.md
index 3e7ebff..9414153 100644
--- a/skills/generating-lwc-components/README.md
+++ b/skills/generating-lwc-components/README.md
@@ -78,7 +78,7 @@ S → Security     │ Enforce permissions, FLS, and data protection
 | generating-apex | Create @AuraEnabled controllers |
 | generating-flow | Embed in Flow screens |
 | generating-metadata | Create Lightning Message Channels |
-| deploying-sf-metadata | Deploy component to org |
+| deploying-metadata | Deploy component to org |
 
 ## Spring '26 Features (API 66.0)
 
diff --git a/skills/generating-lwc-components/SKILL.md b/skills/generating-lwc-components/SKILL.md
index 0e3d3f0..ac8a19c 100644
--- a/skills/generating-lwc-components/SKILL.md
+++ b/skills/generating-lwc-components/SKILL.md
@@ -5,7 +5,7 @@ description: >
   TRIGGER when: user creates/edits LWC components, touches lwc/**/*.js, .html,
   .css, .js-meta.xml files, or asks about wire service, SLDS, or Jest LWC tests.
   DO NOT TRIGGER when: Apex classes (use generating-apex), Aura components, or Visualforce.
-license: LICENSE.txt has complete terms
+license: MIT
 metadata:
   version: "1.1"
 ---
@@ -26,7 +26,7 @@ Use `generating-lwc-components` when the work involves:
 Delegate elsewhere when the user is:
 - writing Apex controllers or business logic first → [generating-apex](../generating-apex/SKILL.md)
 - building Flow XML rather than an LWC screen component → [generating-flow](../generating-flow/SKILL.md)
-- deploying metadata → [deploying-sf-metadata](../deploying-sf-metadata/SKILL.md)
+- deploying metadata → [deploying-metadata](../deploying-metadata/SKILL.md)
 
 ---
 
@@ -84,7 +84,7 @@ Check:
 ### 5. Hand off supporting backend or deploy work
 Use:
 - [generating-apex](../generating-apex/SKILL.md) for controllers / services
-- [deploying-sf-metadata](../deploying-sf-metadata/SKILL.md) for deployment
+- [deploying-metadata](../deploying-metadata/SKILL.md) for deployment
 - [running-apex-tests](../running-apex-tests/SKILL.md) only for Apex-side test loops, not Jest
 
 ---
@@ -135,8 +135,8 @@ Local Dev commands install just-in-time on first run. They are long-running proc
 |---|---|---|
 | Apex controller or service | [generating-apex](../generating-apex/SKILL.md) | backend logic |
 | embed in Flow screens | [generating-flow](../generating-flow/SKILL.md) | declarative orchestration |
-| deploy component bundle | [deploying-sf-metadata](../deploying-sf-metadata/SKILL.md) | org rollout |
-| create supporting metadata (message channels, objects) | [deploying-sf-metadata](../deploying-sf-metadata/SKILL.md) | metadata deployment |
+| deploy component bundle | [deploying-metadata](../deploying-metadata/SKILL.md) | org rollout |
+| create supporting metadata (message channels, objects) | [deploying-metadata](../deploying-metadata/SKILL.md) | metadata deployment |
 
 ---
 
diff --git a/skills/handling-sf-data/LICENSE.txt b/skills/handling-sf-data/LICENSE.txt
deleted file mode 100644
index 3228c68..0000000
--- a/skills/handling-sf-data/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024-2026 sf-skills contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/skills/handling-sf-data/README.md b/skills/handling-sf-data/README.md
index d1dc631..81ed01f 100644
--- a/skills/handling-sf-data/README.md
+++ b/skills/handling-sf-data/README.md
@@ -55,9 +55,9 @@ Request: "Create 251 test Account records with varying Industries for trigger te
 
 ## Cross-Skill Integration
 
-### With deploying-sf-metadata
+### With deploying-metadata
 ```
-Skill(skill="deploying-sf-metadata")
+Skill(skill="deploying-metadata")
 Request: "Describe Invoice__c in org dev - show all fields"
 ```
 Then use handling-sf-data with accurate field names and permitted values.
@@ -110,7 +110,3 @@ handling-sf-data/
 - sf CLI v2
 - Target Salesforce org (sandbox or production)
 - Claude Code with skill plugins enabled
-
-## License
-
-See the LICENSE file for terms.
diff --git a/skills/handling-sf-data/SKILL.md b/skills/handling-sf-data/SKILL.md
index cfae704..5cd8c56 100644
--- a/skills/handling-sf-data/SKILL.md
+++ b/skills/handling-sf-data/SKILL.md
@@ -1,7 +1,7 @@
 ---
 name: handling-sf-data
-description: "Salesforce data operations with 130-point scoring. Use this skill to create, update, delete, bulk import/export, generate test data, and clean up org records using sf CLI and anonymous Apex. TRIGGER when: user creates test data, performs bulk import/export, uses sf data CLI commands, needs data factory patterns for Apex tests, or needs to seed/clean records in a Salesforce org. DO NOT TRIGGER when: SOQL query writing only (use querying-soql), Apex test execution (use running-apex-tests), or metadata deployment (use deploying-sf-metadata)."
-license: LICENSE.txt has complete terms
+description: "Salesforce data operations with 130-point scoring. Use this skill to create, update, delete, bulk import/export, generate test data, and clean up org records using sf CLI and anonymous Apex. TRIGGER when: user creates test data, performs bulk import/export, uses sf data CLI commands, needs data factory patterns for Apex tests, or needs to seed/clean records in a Salesforce org. DO NOT TRIGGER when: SOQL query writing only (use querying-soql), Apex test execution (use running-apex-tests), or metadata deployment (use deploying-metadata)."
+license: MIT
 metadata:
   version: "1.1"
 ---
@@ -22,7 +22,7 @@ Use `handling-sf-data` when the work involves:
 Delegate elsewhere when the user is:
 - writing SOQL only → [querying-soql](../querying-soql/SKILL.md)
 - running or repairing Apex tests → [running-apex-tests](../running-apex-tests/SKILL.md)
-- deploying metadata first → [deploying-sf-metadata](../deploying-sf-metadata/SKILL.md)
+- deploying metadata first → [deploying-metadata](../deploying-metadata/SKILL.md)
 - creating or modifying custom objects / fields → [generating-custom-object](../generating-custom-object/SKILL.md) or [generating-custom-field](../generating-custom-field/SKILL.md)
 
 ---
@@ -62,7 +62,7 @@ Ask for or infer:
 - Prefer **CLI-first** for straightforward CRUD; use anonymous Apex when the operation truly needs server-side orchestration.
 
 If metadata is missing, stop and hand off to:
-- [generating-custom-object](../generating-custom-object/SKILL.md) or [generating-custom-field](../generating-custom-field/SKILL.md) to create the missing schema, then [deploying-sf-metadata](../deploying-sf-metadata/SKILL.md) to deploy it before retrying the data operation
+- [generating-custom-object](../generating-custom-object/SKILL.md) or [generating-custom-field](../generating-custom-field/SKILL.md) to create the missing schema, then [deploying-metadata](../deploying-metadata/SKILL.md) to deploy it before retrying the data operation
 
 ---
 
@@ -182,7 +182,7 @@ Cleanup: <exact delete or rollback guidance>
 | create missing custom objects | [generating-custom-object](../generating-custom-object/SKILL.md) | schema must exist before data operations |
 | create missing custom fields | [generating-custom-field](../generating-custom-field/SKILL.md) | field-level schema must exist before data creation |
 | run bulk-sensitive Apex validation | [running-apex-tests](../running-apex-tests/SKILL.md) | test execution and coverage |
-| deploy missing schema first | [deploying-sf-metadata](../deploying-sf-metadata/SKILL.md) | metadata readiness |
+| deploy missing schema first | [deploying-metadata](../deploying-metadata/SKILL.md) | metadata readiness |
 | implement production Apex logic consuming the data | [generating-apex](../generating-apex/SKILL.md) | Apex class / trigger authoring |
 | implement Flow logic consuming the data | [generating-flow](../generating-flow/SKILL.md) | Flow authoring and automation |
 
diff --git a/skills/handling-sf-data/references/orchestration.md b/skills/handling-sf-data/references/orchestration.md
index 1d2a7c8..c05db71 100644
--- a/skills/handling-sf-data/references/orchestration.md
+++ b/skills/handling-sf-data/references/orchestration.md
@@ -17,7 +17,7 @@ This document details how handling-sf-data fits into the multi-skill workflow fo
 │  2. sf-flow                                                                 │
 │     └── Create flow definitions (LOCAL files)                               │
 │                                                                             │
-│  3. deploying-sf-metadata                                                               │
+│  3. deploying-metadata                                                               │
 │     └── Deploy all metadata (REMOTE)                                        │
 │                                                                             │
 │  4. handling-sf-data  ◀── YOU ARE HERE (LAST!)                                      │
@@ -38,7 +38,7 @@ This document details how handling-sf-data fits into the multi-skill workflow fo
 ```
 ERROR: "SObject type 'Quote__c' is not supported"
 CAUSE: Quote__c object was never deployed to the org
-FIX:   Run deploying-sf-metadata BEFORE handling-sf-data
+FIX:   Run deploying-metadata BEFORE handling-sf-data
 ```
 
 ---
@@ -47,7 +47,7 @@ FIX:   Run deploying-sf-metadata BEFORE handling-sf-data
 
 | Error | Cause | Fix |
 |-------|-------|-----|
-| `SObject type 'X' not supported` | Object not deployed | Deploy via deploying-sf-metadata first |
+| `SObject type 'X' not supported` | Object not deployed | Deploy via deploying-metadata first |
 | `INVALID_FIELD: No such column 'Field__c'` | Field not deployed OR FLS | Deploy field + Permission Set |
 | `REQUIRED_FIELD_MISSING` | Validation rule requires field | Include all required fields |
 | `FIELD_CUSTOM_VALIDATION_EXCEPTION` | Validation rule triggered | Use valid test data values |
@@ -61,7 +61,7 @@ When testing triggers or flows, always create test data AFTER deployment:
 ```
 1. sf-apex   → Create trigger handler class
 2. sf-flow   → Create record-triggered flow
-3. deploying-sf-metadata → Deploy trigger + flow + objects
+3. deploying-metadata → Deploy trigger + flow + objects
 4. handling-sf-data   ◀── CREATE TEST DATA NOW
               └── Triggers and flows will fire!
 ```
@@ -104,7 +104,7 @@ sf apex run --file test-factory.apex --target-org alias
 | From handling-sf-data | To Skill | When |
 |--------------|----------|------|
 | handling-sf-data | → sf-metadata | "Describe Invoice__c" (discover object structure) |
-| handling-sf-data | → deploying-sf-metadata | "Redeploy field after adding validation rule" |
+| handling-sf-data | → deploying-metadata | "Redeploy field after adding validation rule" |
 
 ---
 
@@ -132,7 +132,7 @@ Test Data Factory classes work with handling-sf-data:
 ```
 sf-apex:  Creates TestDataFactory_Account.cls
           ↓
-deploying-sf-metadata: Deploys factory class
+deploying-metadata: Deploys factory class
           ↓
 handling-sf-data:  Calls factory via Anonymous Apex
           ↓
@@ -153,8 +153,8 @@ After testing, clean up in reverse order:
 
 ```
 1. handling-sf-data   → Delete test records
-2. deploying-sf-metadata → Deactivate flows (if needed)
-3. deploying-sf-metadata → Remove test metadata (if needed)
+2. deploying-metadata → Deactivate flows (if needed)
+3. deploying-metadata → Remove test metadata (if needed)
 ```
 
 **Cleanup command:**
diff --git a/skills/querying-soql/SKILL.md b/skills/querying-soql/SKILL.md
index 070a88a..ad2ef28 100644
--- a/skills/querying-soql/SKILL.md
+++ b/skills/querying-soql/SKILL.md
@@ -1,7 +1,7 @@
 ---
 name: querying-soql
 description: "SOQL query generation, optimization, and analysis with 100-point scoring. Use this skill when the user needs SOQL/SOSL authoring or optimization: natural-language-to-query generation, relationship queries, aggregates, query-plan analysis, and performance or safety improvements for Salesforce queries. TRIGGER when: user writes, optimizes, or debugs SOQL/SOSL queries, touches .soql files, or asks about relationship queries, aggregates, or query performance. DO NOT TRIGGER when: bulk data operations (use handling-sf-data), Apex DML logic (use generating-apex), or report/dashboard queries."
-license: LICENSE.txt has complete terms
+license: MIT
 metadata:
   version: "1.1"
 ---
diff --git a/skills/running-apex-tests/LICENSE b/skills/running-apex-tests/LICENSE
deleted file mode 100644
index f388692..0000000
--- a/skills/running-apex-tests/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024-2025 Salesforce
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/skills/running-apex-tests/README.md b/skills/running-apex-tests/README.md
index 19c4aa8..92ed97e 100644
--- a/skills/running-apex-tests/README.md
+++ b/skills/running-apex-tests/README.md
@@ -72,7 +72,7 @@ sf apex run test --class-names MyClassTest --output-dir test-results --target-or
 | sf-apex | Fix failing Apex code |
 | debugging-apex-logs | Analyze test failures with debug logs |
 | handling-sf-data | Generate 251+ bulk test records |
-| deploying-sf-metadata | Validate before deployment |
+| deploying-metadata | Validate before deployment |
 
 ## Agentic Test-Fix Loop
 
@@ -92,7 +92,3 @@ When enabled, the skill will:
 - sf CLI v2
 - Target Salesforce org
 - Test classes in org or local project
-
-## License
-
-MIT License. See LICENSE file.
diff --git a/skills/running-apex-tests/SKILL.md b/skills/running-apex-tests/SKILL.md
index 9e28df4..cc4163a 100644
--- a/skills/running-apex-tests/SKILL.md
+++ b/skills/running-apex-tests/SKILL.md
@@ -1,7 +1,7 @@
 ---
 name: running-apex-tests
 description: "Apex test execution, coverage analysis, and test-fix loops with 120-point scoring. Use when the user needs to run Apex tests, check code coverage, fix failing tests, or work with *Test.cls / *_Test.cls files. TRIGGER when: user runs Apex tests, checks code coverage, fixes failing tests, or touches *Test.cls / *_Test.cls files. DO NOT TRIGGER when: writing Apex production code (use generating-apex), Agentforce agent testing (use sf-ai-agentforce-testing), or Jest/LWC tests (use generating-lwc-components)."
-license: LICENSE.txt has complete terms
+license: MIT
 metadata:
   version: "1.1"
 ---
@@ -123,7 +123,7 @@ Next step: <fix class, add test, rerun scope, or widen regression>
 |------|-------------|--------|
 | Fix production code or author test classes | `generating-apex` skill | Code generation and repair |
 | Create bulk / edge-case test data | [handling-sf-data](../handling-sf-data/SKILL.md) | Realistic test datasets |
-| Deploy updated tests to org | [deploying-sf-metadata](../deploying-sf-metadata/SKILL.md) | Deployment workflows |
+| Deploy updated tests to org | [deploying-metadata](../deploying-metadata/SKILL.md) | Deployment workflows |
 | Inspect detailed runtime logs | [debugging-apex-logs](../debugging-apex-logs/SKILL.md) | Deeper failure analysis |
 
 ---