diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index c88b8247b2..989523eb92 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -50,7 +50,7 @@ function create_octavia_accounts {
     create_service_user "octavia"
 
     local octavia_service=$(get_or_create_service "octavia" \
-        "octavia" "Octavia Service")
+        "load-balancing" "Octavia Load Balancing Service")
     get_or_create_endpoint $octavia_service \
         "$REGION_NAME" \
         "$OCTAVIA_PROTOCOL://$SERVICE_HOST:$OCTAVIA_PORT/" \
diff --git a/octavia/tests/tempest/v1/scenario/base.py b/octavia/tests/tempest/v1/scenario/base.py
index 908c30fefc..7ad202e89d 100644
--- a/octavia/tests/tempest/v1/scenario/base.py
+++ b/octavia/tests/tempest/v1/scenario/base.py
@@ -74,7 +74,7 @@ class BaseTestCase(manager.NetworkScenarioTest):
 
         auth_provider = mgr.auth_provider
         region = config.network.region or config.identity.region
-        self.client_args = [auth_provider, 'octavia', region]
+        self.client_args = [auth_provider, 'load-balancing', region]
         self.load_balancers_client = (
             load_balancers_client.LoadBalancersClient(*self.client_args))
         self.listeners_client = (
diff --git a/octavia/tests/tempest/v2/scenario/base.py b/octavia/tests/tempest/v2/scenario/base.py
index 7b3daa26b8..f0518c95ed 100644
--- a/octavia/tests/tempest/v2/scenario/base.py
+++ b/octavia/tests/tempest/v2/scenario/base.py
@@ -76,7 +76,7 @@ class BaseTestCase(manager.NetworkScenarioTest):
 
         auth_provider = mgr.auth_provider
         region = config.network.region or config.identity.region
-        self.client_args = [auth_provider, 'octavia', region]
+        self.client_args = [auth_provider, 'load-balancing', region]
         self.load_balancers_client = (
             load_balancers_client.LoadBalancersClient(*self.client_args))
         self.listeners_client = (