diff --git a/bin/keystone_data.sh b/bin/keystone_data.sh
index 34188eadc..b1afd3446 100755
--- a/bin/keystone_data.sh
+++ b/bin/keystone_data.sh
@@ -10,8 +10,8 @@
 export OS_AUTH_URL="http://localhost:5000/v2.0"
 # your secret password
 export OS_PASSWORD="password"
-export OS_TENANT_NAME="service" 
-export OS_USERNAME="nova" 
+export OS_TENANT_NAME="service"
+export OS_USERNAME="nova"
 
 # --------------------------------
 # alternately service_token and endpoint
@@ -27,8 +27,8 @@ echo " OS_USERNAME="$OS_USERNAME
 echo " OS_PASSWORD="$OS_PASSWORD
 echo " OS_AUTH_URL="$OS_AUTH_URL
 
-#test with 
-keystone tenant-list 
+#test with
+keystone tenant-list
 
 function get_id () {
     echo `"$@" | awk '/ id / { print $4 }'`
@@ -65,7 +65,7 @@ if [[ "$ENABLED_SERVICES" =~ "barbican" ]]; then
     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
         BARBICAN_SERVICE=$(get_id keystone service-create \
             --name=barbican \
-            --type="keystore" \
+            --type="key-manager" \
             --description="Barbican Key Management Service")
         keystone endpoint-create \
             --region RegionOne \
diff --git a/contrib/devstack/lib/barbican b/contrib/devstack/lib/barbican
index f6548106e..45b539e52 100755
--- a/contrib/devstack/lib/barbican
+++ b/contrib/devstack/lib/barbican
@@ -189,7 +189,7 @@ function create_barbican_accounts {
     if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
         BARBICAN_SERVICE=$(keystone service-create \
             --name=barbican \
-            --type=keystore \
+            --type='key-manager' \
             --description="Barbican Service" \
             | grep " id " | get_field 2)
         keystone endpoint-create \
diff --git a/functionaltests/common/client.py b/functionaltests/common/client.py
index 33b04ba18..1f7273bca 100644
--- a/functionaltests/common/client.py
+++ b/functionaltests/common/client.py
@@ -81,7 +81,7 @@ class BarbicanClient(object):
 
     def get_base_url(self, include_version=True):
         filters = {
-            'service': 'keystore',
+            'service': 'key-manager',
             'api_version': self.api_version if include_version else ''
         }