diff --git a/config/routes/capi_rider.yaml b/config/routes/capi_rider.yaml
index f862c758..51a41d67 100644
--- a/config/routes/capi_rider.yaml
+++ b/config/routes/capi_rider.yaml
@@ -2,96 +2,96 @@
 
 capi_rider_register:
     path: /capi/rider/register
-    controller: App\Controller\CAPI\RiderController::register
+    controller: App\Controller\CAPI\RiderAppController::register
     methods: [POST]
 
 capi_rider_login:
     path: /capi/rider/login
-    controller: App\Controller\CAPI\RiderController::login
+    controller: App\Controller\CAPI\RiderAppController::login
     methods: [POST]
 
 capi_rider_logout:
     path: /capi/rider/logout
-    controller: App\Controller\CAPI\RiderController::logout
+    controller: App\Controller\CAPI\RiderAppController::logout
     methods: [POST]
 
 capi_rider_jo_get:
     path: /capi/rider/joborder
-    controller: App\Controller\CAPI\RiderController::getJobOrder
+    controller: App\Controller\CAPI\RiderAppController::getJobOrder
     methods: [GET]
 
 capi_rider_jo_accept:
     path: /capi/rider/accept
-    controller: App\Controller\CAPI\RiderController::acceptJobOrder
+    controller: App\Controller\CAPI\RiderAppController::acceptJobOrder
     methods: [POST]
 
 capi_rider_jo_cancel:
     path: /capi/rider/cancel
-    controller: App\Controller\CAPI\RiderController::cancelJobOrder
+    controller: App\Controller\CAPI\RiderAppController::cancelJobOrder
     methods: [POST]
 
 capi_rider_arrive:
     path: /capi/rider/arrive
-    controller: App\Controller\CAPI\RiderController::arrive
+    controller: App\Controller\CAPI\RiderAppController::arrive
     methods: [POST]
 
 capi_rider_payment:
     path: /capi/rider/payment
-    controller: App\Controller\CAPI\RiderController::payment
+    controller: App\Controller\CAPI\RiderAppController::payment
     methods: [POST]
 
 capi_rider_hub_arrive:
     path: /capi/rider/hub_arrive
-    controller: App\Controller\CAPI\RiderController::hubArrive
+    controller: App\Controller\CAPI\RiderAppController::hubArrive
     methods: [POST]
 
 capi_rider_promos:
     path: /capi/rider/promos
-    controller: App\Controller\CAPI\RiderController::getPromos
+    controller: App\Controller\CAPI\RiderAppController::getPromos
     methods: [GET]
 
 capi_rider_batteries:
     path: /capi/rider/batteries
-    controller: App\Controller\CAPI\RiderController::getBatteries
+    controller: App\Controller\CAPI\RiderAppController::getBatteries
     methods: [GET]
 
 capi_rider_change_service:
     path: /capi/rider/service
-    controller: App\Controller\CAPI\RiderController::changeService
+    controller: App\Controller\CAPI\RiderAppController::changeService
     methods: [POST]
 
 capi_rider_available:
     path: /capi/rider/available
-    controller: App\Controller\CAPI\RiderController::available
+    controller: App\Controller\CAPI\RiderAppController::available
     methods: [POST]
 
 capi_rider_hub_depart:
     path: /capi/rider/hub_depart
-    controller: App\Controller\CAPI\RiderController::hubDepart
+    controller: App\Controller\CAPI\RiderAppController::hubDepart
     methods: [POST]
 
 capi_rider_pre_hub_depart:
     path: /capi/rider/pre_hub_depart
-    controller: App\Controller\CAPI\RiderController::preHubDepart
+    controller: App\Controller\CAPI\RiderAppController::preHubDepart
     methods: [POST]
 
 capi_rider_pre_hub_arrive:
     path: /capi/rider/pre_hub_arrive
-    controller: App\Controller\CAPI\RiderController::preHubArrive
+    controller: App\Controller\CAPI\RiderAppController::preHubArrive
     methods: [POST]
 
 capi_rider_post_hub_depart:
     path: /capi/rider/post_hub_depart
-    controller: App\Controller\CAPI\RiderController::postHubDepart
+    controller: App\Controller\CAPI\RiderAppController::postHubDepart
     methods: [POST]
 
 capi_rider_post_hub_arrive:
     path: /capi/rider/post_hub_arrive
-    controller: App\Controller\CAPI\RiderController::postHubArrive
+    controller: App\Controller\CAPI\RiderAppController::postHubArrive
     methods: [POST]
 
 capi_rider_jo_start:
     path: /capi/rider/start
-    controller: App\Controller\CAPI\RiderController::startJobOrder
+    controller: App\Controller\CAPI\RiderAppController::startJobOrder
     methods: [POST]
 
diff --git a/src/Controller/CAPI/RiderController.php b/src/Controller/CAPI/RiderAppController.php
similarity index 99%
rename from src/Controller/CAPI/RiderController.php
rename to src/Controller/CAPI/RiderAppController.php
index 7184e97e..ec330176 100644
--- a/src/Controller/CAPI/RiderController.php
+++ b/src/Controller/CAPI/RiderAppController.php
@@ -44,7 +44,7 @@ use App\Ramcar\DeliveryStatus;
 use DateTime;
 
 // third party API for rider
-class RiderController extends APIController
+class RiderAppController extends APIController
 {
     public function register(Request $req, EntityManagerInterface $em, RedisClientProvider $redis)
     {