diff --git a/docs/backend/documented_AITBC_Enhanced_Services__8010-8016__Implementation.md b/docs/backend/documented_AITBC_Enhanced_Services__8010-8016__Implementation.md
index f26a2dc6..c9dc469e 100644
--- a/docs/backend/documented_AITBC_Enhanced_Services__8010-8016__Implementation.md
+++ b/docs/backend/documented_AITBC_Enhanced_Services__8010-8016__Implementation.md
@@ -49,7 +49,7 @@ This document provides comprehensive technical documentation for aitbc enhanced
 /etc/systemd/system/aitbc-modality-optimization.service # Port 8012
 /etc/systemd/system/aitbc-adaptive-learning.service     # Port 8013
 /etc/systemd/system/aitbc-marketplace.service      # Port 8014
-/etc/systemd/system/aitbc-openclaw-enhanced.service     # Port 8015
+/etc/systemd/system/aitbc-openclaw.service     # Port 8015
 /etc/systemd/system/aitbc-web-ui.service               # Port 8016
 ```
 
diff --git a/docs/beginner/02_project/aitbc.md b/docs/beginner/02_project/aitbc.md
index 2c3d36d5..a29c6fc3 100644
--- a/docs/beginner/02_project/aitbc.md
+++ b/docs/beginner/02_project/aitbc.md
@@ -263,7 +263,7 @@ systemctl enable aitbc-multimodal.service
 systemctl enable aitbc-modality-optimization.service
 systemctl enable aitbc-adaptive-learning.service
 systemctl enable aitbc-marketplace.service
-systemctl enable aitbc-openclaw-enhanced.service
+systemctl enable aitbc-openclaw.service
 systemctl enable aitbc-loadbalancer-geo.service
 ```
 
diff --git a/docs/completed/implementation/enhanced-services-implementation-complete.md b/docs/completed/implementation/enhanced-services-implementation-complete.md
index f48ad9c2..9eab9ad7 100644
--- a/docs/completed/implementation/enhanced-services-implementation-complete.md
+++ b/docs/completed/implementation/enhanced-services-implementation-complete.md
@@ -77,7 +77,7 @@
 /etc/systemd/system/aitbc-modality-optimization.service # Port 8012
 /etc/systemd/system/aitbc-adaptive-learning.service     # Port 8013
 /etc/systemd/system/aitbc-marketplace-enhanced.service  # Port 8014
-/etc/systemd/system/aitbc-openclaw-enhanced.service     # Port 8015
+/etc/systemd/system/aitbc-openclaw.service     # Port 8015
 /etc/systemd/system/aitbc-web-ui.service               # Port 8016
 ```
 
diff --git a/docs/expert/01_issues/enhanced-services-deployment-completed-2026-02-24.md b/docs/expert/01_issues/enhanced-services-deployment-completed-2026-02-24.md
index 2463c2af..b4c06fb5 100644
--- a/docs/expert/01_issues/enhanced-services-deployment-completed-2026-02-24.md
+++ b/docs/expert/01_issues/enhanced-services-deployment-completed-2026-02-24.md
@@ -86,7 +86,7 @@ Successfully deployed the complete enhanced services suite for advanced AI agent
 - `aitbc-modality-optimization.service` - Modality optimization service
 - `aitbc-adaptive-learning.service` - Adaptive learning service
 - `aitbc-marketplace-enhanced.service` - Enhanced marketplace service
-- `aitbc-openclaw-enhanced.service` - OpenClaw enhanced service
+- `aitbc-openclaw.service` - OpenClaw service
 
 ### Test Files
 - `test_multimodal_agent.py` - Comprehensive multi-modal tests (26KB)
diff --git a/setup.sh b/setup.sh
index 60c913ab..2a74a0f5 100755
--- a/setup.sh
+++ b/setup.sh
@@ -166,7 +166,7 @@ install_services() {
         "aitbc-blockchain-rpc.service"
         "aitbc-multimodal-gpu.service"
         "aitbc-marketplace.service"
-        "aitbc-openclaw-enhanced.service"
+        "aitbc-openclaw.service"
         "aitbc-advanced-ai.service"
         "aitbc-adaptive-learning.service"
     )
@@ -244,12 +244,12 @@ start_services() {
     log "Starting AITBC services..."
     
     # Try systemd first
-    if systemctl start aitbc-wallet aitbc-coordinator-api aitbc-exchange-api aitbc-blockchain-node aitbc-blockchain-rpc aitbc-multimodal-gpu aitbc-marketplace aitbc-openclaw-enhanced aitbc-advanced-ai aitbc-adaptive-learning 2>/dev/null; then
+    if systemctl start aitbc-wallet aitbc-coordinator-api aitbc-exchange-api aitbc-blockchain-node aitbc-blockchain-rpc aitbc-multimodal-gpu aitbc-marketplace aitbc-openclaw aitbc-advanced-ai aitbc-adaptive-learning 2>/dev/null; then
         log "Services started via systemd"
         sleep 5
         
         # Check if services are running
-        if systemctl is-active --quiet aitbc-wallet aitbc-coordinator-api aitbc-exchange-api aitbc-blockchain-node aitbc-blockchain-rpc aitbc-multimodal-gpu aitbc-marketplace aitbc-openclaw-enhanced aitbc-advanced-ai aitbc-adaptive-learning; then
+        if systemctl is-active --quiet aitbc-wallet aitbc-coordinator-api aitbc-exchange-api aitbc-blockchain-node aitbc-blockchain-rpc aitbc-multimodal-gpu aitbc-marketplace aitbc-openclaw aitbc-advanced-ai aitbc-adaptive-learning; then
             success "Services started successfully via systemd"
         else
             warning "Some systemd services failed, falling back to manual startup"
@@ -279,7 +279,7 @@ setup_autostart() {
     systemctl enable aitbc-blockchain-rpc.service
     systemctl enable aitbc-multimodal-gpu.service
     systemctl enable aitbc-marketplace.service
-    systemctl enable aitbc-openclaw-enhanced.service
+    systemctl enable aitbc-openclaw.service
     systemctl enable aitbc-advanced-ai.service
     systemctl enable aitbc-adaptive-learning.service
     
diff --git a/systemd/aitbc-openclaw-enhanced.service b/systemd/aitbc-openclaw.service
similarity index 100%
rename from systemd/aitbc-openclaw-enhanced.service
rename to systemd/aitbc-openclaw.service
diff --git a/systemd/aitbc-openclaw-enhanced.service.d/10-central-env.conf b/systemd/aitbc-openclaw.service.d/10-central-env.conf
similarity index 100%
rename from systemd/aitbc-openclaw-enhanced.service.d/10-central-env.conf
rename to systemd/aitbc-openclaw.service.d/10-central-env.conf