diff --git a/src/modules/bmm/agents/n8n-expert.agent.yaml b/src/modules/bmm/agents/autominator.agent.yaml
similarity index 61%
rename from src/modules/bmm/agents/n8n-expert.agent.yaml
rename to src/modules/bmm/agents/autominator.agent.yaml
index 396d6ada..fcd25014 100644
--- a/src/modules/bmm/agents/n8n-expert.agent.yaml
+++ b/src/modules/bmm/agents/autominator.agent.yaml
@@ -1,18 +1,18 @@
-# n8n Expert Agent Definition
+# Autominator - Arnold the Automation Expert
 
 agent:
   webskip: true
   metadata:
-    id: "{bmad_folder}/bmm/agents/n8n-expert.md"
-    name: Atlas
-    title: n8n Workflow Automation Expert
-    icon: 🔄
+    id: "{bmad_folder}/bmm/agents/autominator.md"
+    name: Arnold
+    title: Arnold the Autominator
+    icon: 🦾
     module: bmm
 
   persona:
     role: n8n Workflow Automation Specialist
-    identity: Expert in n8n workflow creation, migration, and optimization. Specializes in building automation workflows, migrating from other platforms (Zapier, Make, HubSpot), and optimizing existing n8n workflows using up-to-date documentation via Context7.
-    communication_style: Automation-first, elicitation-driven, solution-oriented. Presents options as numbered lists for easy selection. Always validates understanding before building.
+    identity: Arnold the Autominator - I'll be back... with your workflows automated! 🦾 Expert in n8n workflow creation, migration, and optimization. Specializes in building automation workflows, migrating from other platforms (Zapier, Make, HubSpot), and optimizing existing n8n workflows using up-to-date documentation via Context7.
+    communication_style: Automation-first, elicitation-driven, solution-oriented. Presents options as numbered lists for easy selection. Always validates understanding before building. Direct, confident, and results-focused.
     principles: |
       - Context7 Integration - Always use latest n8n documentation via Context7 MCP server for accurate, up-to-date implementations.
       - Elicitation First - Understand requirements thoroughly before suggesting or building solutions.
@@ -24,19 +24,19 @@ agent:
 
   menu:
     - trigger: create-workflow
-      workflow: "{project-root}/{bmad_folder}/bmm/workflows/n8n-expert/create-workflow/workflow.yaml"
+      workflow: "{project-root}/{bmad_folder}/bmm/workflows/autominator/create-workflow/workflow.yaml"
       description: Create new n8n workflow from scratch based on requirements
 
     - trigger: modify-workflow
-      workflow: "{project-root}/{bmad_folder}/bmm/workflows/n8n-expert/modify-workflow/workflow.yaml"
+      workflow: "{project-root}/{bmad_folder}/bmm/workflows/autominator/modify-workflow/workflow.yaml"
       description: Edit or update existing n8n workflow
 
     - trigger: migrate-workflow
-      workflow: "{project-root}/{bmad_folder}/bmm/workflows/n8n-expert/migrate-workflow/workflow.yaml"
+      workflow: "{project-root}/{bmad_folder}/bmm/workflows/autominator/migrate-workflow/workflow.yaml"
       description: Migrate workflows from other platforms (Zapier, Make, HubSpot, etc.) to n8n
 
     - trigger: optimize-workflow
-      workflow: "{project-root}/{bmad_folder}/bmm/workflows/n8n-expert/optimize-workflow/workflow.yaml"
+      workflow: "{project-root}/{bmad_folder}/bmm/workflows/autominator/optimize-workflow/workflow.yaml"
       description: Review and improve existing n8n workflows for performance and best practices
 
     - trigger: party-mode
diff --git a/src/modules/bmm/workflows/n8n-expert/_shared/n8n-helpers.md b/src/modules/bmm/workflows/autominator/_shared/n8n-helpers.md
similarity index 100%
rename from src/modules/bmm/workflows/n8n-expert/_shared/n8n-helpers.md
rename to src/modules/bmm/workflows/autominator/_shared/n8n-helpers.md
diff --git a/src/modules/bmm/workflows/n8n-expert/_shared/n8n-templates.yaml b/src/modules/bmm/workflows/autominator/_shared/n8n-templates.yaml
similarity index 100%
rename from src/modules/bmm/workflows/n8n-expert/_shared/n8n-templates.yaml
rename to src/modules/bmm/workflows/autominator/_shared/n8n-templates.yaml
diff --git a/src/modules/bmm/workflows/n8n-expert/_shared/platform-mappings.yaml b/src/modules/bmm/workflows/autominator/_shared/platform-mappings.yaml
similarity index 100%
rename from src/modules/bmm/workflows/n8n-expert/_shared/platform-mappings.yaml
rename to src/modules/bmm/workflows/autominator/_shared/platform-mappings.yaml
diff --git a/src/modules/bmm/workflows/n8n-expert/create-workflow/checklist.md b/src/modules/bmm/workflows/autominator/create-workflow/checklist.md
similarity index 100%
rename from src/modules/bmm/workflows/n8n-expert/create-workflow/checklist.md
rename to src/modules/bmm/workflows/autominator/create-workflow/checklist.md
diff --git a/src/modules/bmm/workflows/n8n-expert/create-workflow/instructions.md b/src/modules/bmm/workflows/autominator/create-workflow/instructions.md
similarity index 100%
rename from src/modules/bmm/workflows/n8n-expert/create-workflow/instructions.md
rename to src/modules/bmm/workflows/autominator/create-workflow/instructions.md
diff --git a/src/modules/bmm/workflows/n8n-expert/create-workflow/workflow.yaml b/src/modules/bmm/workflows/autominator/create-workflow/workflow.yaml
similarity index 84%
rename from src/modules/bmm/workflows/n8n-expert/create-workflow/workflow.yaml
rename to src/modules/bmm/workflows/autominator/create-workflow/workflow.yaml
index 32705349..63ad6e15 100644
--- a/src/modules/bmm/workflows/n8n-expert/create-workflow/workflow.yaml
+++ b/src/modules/bmm/workflows/autominator/create-workflow/workflow.yaml
@@ -3,8 +3,8 @@ description: "Create new n8n workflow from scratch based on requirements"
 author: "Saif"
 
 # Workflow components
-installed_path: "{project-root}/{bmad_folder}/bmm/workflows/n8n-expert/create-workflow"
-shared_path: "{project-root}/{bmad_folder}/bmm/workflows/n8n-expert/_shared"
+installed_path: "{project-root}/{bmad_folder}/bmm/workflows/autominator/create-workflow"
+shared_path: "{project-root}/{bmad_folder}/bmm/workflows/autominator/_shared"
 instructions: "{installed_path}/instructions.md"
 validation: "{installed_path}/checklist.md"
 
diff --git a/src/modules/bmm/workflows/n8n-expert/migrate-workflow/checklist.md b/src/modules/bmm/workflows/autominator/migrate-workflow/checklist.md
similarity index 100%
rename from src/modules/bmm/workflows/n8n-expert/migrate-workflow/checklist.md
rename to src/modules/bmm/workflows/autominator/migrate-workflow/checklist.md
diff --git a/src/modules/bmm/workflows/n8n-expert/migrate-workflow/instructions.md b/src/modules/bmm/workflows/autominator/migrate-workflow/instructions.md
similarity index 100%
rename from src/modules/bmm/workflows/n8n-expert/migrate-workflow/instructions.md
rename to src/modules/bmm/workflows/autominator/migrate-workflow/instructions.md
diff --git a/src/modules/bmm/workflows/n8n-expert/migrate-workflow/workflow.yaml b/src/modules/bmm/workflows/autominator/migrate-workflow/workflow.yaml
similarity index 85%
rename from src/modules/bmm/workflows/n8n-expert/migrate-workflow/workflow.yaml
rename to src/modules/bmm/workflows/autominator/migrate-workflow/workflow.yaml
index 8634098e..7344191e 100644
--- a/src/modules/bmm/workflows/n8n-expert/migrate-workflow/workflow.yaml
+++ b/src/modules/bmm/workflows/autominator/migrate-workflow/workflow.yaml
@@ -3,8 +3,8 @@ description: "Migrate workflows from other platforms (Zapier, Make, HubSpot, etc
 author: "Saif"
 
 # Workflow components
-installed_path: "{project-root}/{bmad_folder}/bmm/workflows/n8n-expert/migrate-workflow"
-shared_path: "{project-root}/{bmad_folder}/bmm/workflows/n8n-expert/_shared"
+installed_path: "{project-root}/{bmad_folder}/bmm/workflows/autominator/migrate-workflow"
+shared_path: "{project-root}/{bmad_folder}/bmm/workflows/autominator/_shared"
 instructions: "{installed_path}/instructions.md"
 validation: "{installed_path}/checklist.md"
 
diff --git a/src/modules/bmm/workflows/n8n-expert/modify-workflow/checklist.md b/src/modules/bmm/workflows/autominator/modify-workflow/checklist.md
similarity index 100%
rename from src/modules/bmm/workflows/n8n-expert/modify-workflow/checklist.md
rename to src/modules/bmm/workflows/autominator/modify-workflow/checklist.md
diff --git a/src/modules/bmm/workflows/n8n-expert/modify-workflow/instructions.md b/src/modules/bmm/workflows/autominator/modify-workflow/instructions.md
similarity index 100%
rename from src/modules/bmm/workflows/n8n-expert/modify-workflow/instructions.md
rename to src/modules/bmm/workflows/autominator/modify-workflow/instructions.md
diff --git a/src/modules/bmm/workflows/n8n-expert/modify-workflow/workflow.yaml b/src/modules/bmm/workflows/autominator/modify-workflow/workflow.yaml
similarity index 83%
rename from src/modules/bmm/workflows/n8n-expert/modify-workflow/workflow.yaml
rename to src/modules/bmm/workflows/autominator/modify-workflow/workflow.yaml
index 4ec24de8..d829b7db 100644
--- a/src/modules/bmm/workflows/n8n-expert/modify-workflow/workflow.yaml
+++ b/src/modules/bmm/workflows/autominator/modify-workflow/workflow.yaml
@@ -3,8 +3,8 @@ description: "Edit or update existing n8n workflow"
 author: "Saif"
 
 # Workflow components
-installed_path: "{project-root}/{bmad_folder}/bmm/workflows/n8n-expert/modify-workflow"
-shared_path: "{project-root}/{bmad_folder}/bmm/workflows/n8n-expert/_shared"
+installed_path: "{project-root}/{bmad_folder}/bmm/workflows/autominator/modify-workflow"
+shared_path: "{project-root}/{bmad_folder}/bmm/workflows/autominator/_shared"
 instructions: "{installed_path}/instructions.md"
 validation: "{installed_path}/checklist.md"
 
diff --git a/src/modules/bmm/workflows/n8n-expert/optimize-workflow/checklist.md b/src/modules/bmm/workflows/autominator/optimize-workflow/checklist.md
similarity index 100%
rename from src/modules/bmm/workflows/n8n-expert/optimize-workflow/checklist.md
rename to src/modules/bmm/workflows/autominator/optimize-workflow/checklist.md
diff --git a/src/modules/bmm/workflows/n8n-expert/optimize-workflow/instructions.md b/src/modules/bmm/workflows/autominator/optimize-workflow/instructions.md
similarity index 100%
rename from src/modules/bmm/workflows/n8n-expert/optimize-workflow/instructions.md
rename to src/modules/bmm/workflows/autominator/optimize-workflow/instructions.md
diff --git a/src/modules/bmm/workflows/n8n-expert/optimize-workflow/workflow.yaml b/src/modules/bmm/workflows/autominator/optimize-workflow/workflow.yaml
similarity index 82%
rename from src/modules/bmm/workflows/n8n-expert/optimize-workflow/workflow.yaml
rename to src/modules/bmm/workflows/autominator/optimize-workflow/workflow.yaml
index 5d0cf138..b3310a10 100644
--- a/src/modules/bmm/workflows/n8n-expert/optimize-workflow/workflow.yaml
+++ b/src/modules/bmm/workflows/autominator/optimize-workflow/workflow.yaml
@@ -3,8 +3,8 @@ description: "Review and improve existing n8n workflows for performance and best
 author: "Saif"
 
 # Workflow components
-installed_path: "{project-root}/{bmad_folder}/bmm/workflows/n8n-expert/optimize-workflow"
-shared_path: "{project-root}/{bmad_folder}/bmm/workflows/n8n-expert/_shared"
+installed_path: "{project-root}/{bmad_folder}/bmm/workflows/autominator/optimize-workflow"
+shared_path: "{project-root}/{bmad_folder}/bmm/workflows/autominator/_shared"
 instructions: "{installed_path}/instructions.md"
 validation: "{installed_path}/checklist.md"