diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index a06b8bb0..52293351 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -13,8 +13,8 @@
     },
     "plugins": [
         {
-            "name": "014-agile-user-story",
-            "source": "./skills/014-agile-user-story",
+            "name": "014-agile-create-user-story",
+            "source": "./skills/014-agile-create-user-story",
             "description": "Guides the creation of agile user stories and Gherkin feature files. Use when the user wants to create a user story, write acceptance criteria, define Gherkin scenarios, or author BDD feature files.",
             "version": "0.13.0"
         },
diff --git a/.cursor/rules/014-agile-user-story.md b/.cursor/rules/014-agile-create-user-story.md
similarity index 99%
rename from .cursor/rules/014-agile-user-story.md
rename to .cursor/rules/014-agile-create-user-story.md
index 438d60f9..633c9945 100644
--- a/.cursor/rules/014-agile-user-story.md
+++ b/.cursor/rules/014-agile-create-user-story.md
@@ -1,5 +1,5 @@
 ---
-name: 014-agile-user-story
+name: 014-agile-create-user-story
 description: Use when the user wants to create a user story, write acceptance criteria, define Gherkin scenarios, or author BDD feature files.
 license: Apache-2.0
 metadata:
diff --git a/README.md b/README.md
index ada24fd7..7a97d5d4 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The project provides a curated collection of `System prompts` & `Skills` for mod
 
 The project add support for:
 
-- **AI-Driven Agile:** `User Stories` & `AI Planning`
+- **AI-Driven Agile:** `User Stories`, `Gherkin` & `AI Planning`
 - **Architecture:** `ADRs`& `UML/C4/ER Diagrams`
 - **Java development:** `Build system based on Maven`, `Design`, `Coding`, `Testing`, `Refactoring & JMH Benchmarking`, `Performance testing with JMeter`, `Profiling with Async profiler/OpenJDK tools`, `Documentation` & `Spring Boot`
 - **AI Tooling:** `AGENTS.md`
diff --git a/skills-generator/src/main/resources/skills/014-skill.xml b/skills-generator/src/main/resources/skills/014-skill.xml
index 594d48ac..c8be9c46 100644
--- a/skills-generator/src/main/resources/skills/014-skill.xml
+++ b/skills-generator/src/main/resources/skills/014-skill.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <skill xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="../schemas/skill.xsd"
-      id="014-agile-user-story"
+      id="014-agile-create-user-story"
       interactive="true">
   <metadata>
     <author>Juan Antonio Breña Moral</author>
@@ -32,5 +32,5 @@ Guide the agent to ask targeted questions to gather details for a user story and
     </constraint-list>
   </constraints>
 
-  <reference path="references/014-agile-user-story.md" />
+  <reference path="references/014-agile-create-user-story.md" />
 </skill>
diff --git a/skills/014-agile-user-story/SKILL.md b/skills/014-agile-create-user-story/SKILL.md
similarity index 93%
rename from skills/014-agile-user-story/SKILL.md
rename to skills/014-agile-create-user-story/SKILL.md
index 0ee3774b..af2b063e 100644
--- a/skills/014-agile-user-story/SKILL.md
+++ b/skills/014-agile-create-user-story/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: 014-agile-user-story
+name: 014-agile-create-user-story
 description: Guides the creation of agile user stories and Gherkin feature files. Use when the user wants to create a user story, write acceptance criteria, define Gherkin scenarios, or author BDD feature files. Part of the skills-for-java project
 license: Apache-2.0
 metadata:
@@ -28,4 +28,4 @@ Before generating artifacts, gather all required information through structured
 
 ## Reference
 
-For detailed guidance, examples, and constraints, see [references/014-agile-user-story.md](references/014-agile-user-story.md).
+For detailed guidance, examples, and constraints, see [references/014-agile-create-user-story.md](references/014-agile-create-user-story.md).
diff --git a/skills/014-agile-user-story/references/014-agile-user-story.md b/skills/014-agile-create-user-story/references/014-agile-create-user-story.md
similarity index 99%
rename from skills/014-agile-user-story/references/014-agile-user-story.md
rename to skills/014-agile-create-user-story/references/014-agile-create-user-story.md
index 438d60f9..633c9945 100644
--- a/skills/014-agile-user-story/references/014-agile-user-story.md
+++ b/skills/014-agile-create-user-story/references/014-agile-create-user-story.md
@@ -1,5 +1,5 @@
 ---
-name: 014-agile-user-story
+name: 014-agile-create-user-story
 description: Use when the user wants to create a user story, write acceptance criteria, define Gherkin scenarios, or author BDD feature files.
 license: Apache-2.0
 metadata:
diff --git a/system-prompts-generator/src/main/resources/system-prompt-inventory.json b/system-prompts-generator/src/main/resources/system-prompt-inventory.json
index cb1104ca..7d585d38 100644
--- a/system-prompts-generator/src/main/resources/system-prompt-inventory.json
+++ b/system-prompts-generator/src/main/resources/system-prompt-inventory.json
@@ -1,5 +1,5 @@
 [
-  {"name": "014-agile-user-story"},
+  {"name": "014-agile-create-user-story"},
   {"name": "020-architecture-functional-requirements-cli"},
   {"name": "021-architecture-functional-requirements-rest"},
   {"name": "030-architecture-non-functional-requirements"},
diff --git a/system-prompts-generator/src/main/resources/system-prompts/014-agile-user-story.xml b/system-prompts-generator/src/main/resources/system-prompts/014-agile-create-user-story.xml
similarity index 100%
rename from system-prompts-generator/src/main/resources/system-prompts/014-agile-user-story.xml
rename to system-prompts-generator/src/main/resources/system-prompts/014-agile-create-user-story.xml