diff --git a/config/acl.yaml b/config/acl.yaml
index 67bba243..7e777afd 100644
--- a/config/acl.yaml
+++ b/config/acl.yaml
@@ -190,9 +190,9 @@ access_keys:
         - id: jo_proc.unlock
           label: Dispatch Unlock
         - id: jo_assign.list
-          label: Assigning
+          label: Rider Assignment
         - id: jo_assign.unlock
-          label: Assigning Unlock
+          label: Rider Assignment Unlock
         - id: jo_fulfill.list
           label: Fulfillment
         - id: jo_open.list
diff --git a/config/menu.yaml b/config/menu.yaml
index 5f649673..9da352f9 100644
--- a/config/menu.yaml
+++ b/config/menu.yaml
@@ -91,7 +91,7 @@ main_menu:
       parent: joborder
     - id: jo_assign
       acl: jo_assign.list
-      label: Assigning
+      label: Rider Assignment
       parent: joborder
     - id: jo_fulfill
       acl: jo_fulfill.list
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index 87fb591e..fb19d994 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -23,10 +23,10 @@
 								</span>
 								<h3 class="m-portlet__head-text">
 									{% if mode == 'update-processing' %}
-	                                    Processing
+	                                    Dispatch
 	                                    <small>{{ obj.getID() }}</small>
 	                                {% elseif mode == 'update-assigning' %}
-	                                	Assigning
+	                                	Rider Assignment
 	                                	<small>{{ obj.getID() }}</small>
 	                                {% elseif mode == 'update-reassign-hub' %}
 	                                    Re-assign Hub
diff --git a/templates/job-order/list.assigning.html.twig b/templates/job-order/list.assigning.html.twig
index 8871ac37..18fa348e 100644
--- a/templates/job-order/list.assigning.html.twig
+++ b/templates/job-order/list.assigning.html.twig
@@ -6,7 +6,7 @@
         <div class="d-flex align-items-center">
             <div class="mr-auto">
                 <h3 class="m-subheader__title">
-                    Job Orders (Assigning)
+                    Job Orders (Rider Assignment)
                 </h3>
             </div>
         </div>