diff --git a/contrib/devstack/lib/mistral b/contrib/devstack/lib/mistral
index 42819c4e1..a079fdf2d 100644
--- a/contrib/devstack/lib/mistral
+++ b/contrib/devstack/lib/mistral
@@ -71,7 +71,7 @@ function create_mistral_accounts() {
     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
         MISTRAL_SERVICE=$(openstack service create \
             mistral \
-            --type=workflow_service \
+            --type=workflow \
             --description="Workflow Service" \
             | grep " id " | get_field 2)
         openstack endpoint create \
diff --git a/functionaltests/api/base.py b/functionaltests/api/base.py
index 9e26a6618..3418b78f6 100644
--- a/functionaltests/api/base.py
+++ b/functionaltests/api/base.py
@@ -32,7 +32,7 @@ class MistralClient(rest_client.RestClient):
     def __init__(self, auth_provider):
         super(MistralClient, self).__init__(auth_provider)
 
-        self.service = 'workflow_service'
+        self.service = 'workflow'
         self.endpoint_url = 'publicURL'
 
     def get_list_obj(self, name):