diff --git a/tools/start b/tools/start
index e61166fd4b..ed36e08085 100755
--- a/tools/start
+++ b/tools/start
@@ -1,7 +1,6 @@
-kubecfg -c ../k8s/mariadb/mariadb-service.json create services
-kubecfg -c ../k8s/keystone/keystone-public-service.json create services
-kubecfg -c ../k8s/keystone/keystone-admin-service.json create services
-
-kubecfg -c ../k8s/pod/mariadb/mariadb-pod.json create pods
-kubecfg -c ../k8s/pod/keystone/keystone-pod.json create pods
+kubecfg -c ../k8s/service/mariadb-service.json create services
+kubecfg -c ../k8s/service/keystone-public-service.json create services
+kubecfg -c ../k8s/service/keystone-admin-service.json create services
 
+kubecfg -c ../k8s/pod/mariadb-pod.json create pods
+kubecfg -c ../k8s/pod/keystone-pod.json create pods
diff --git a/tools/stop b/tools/stop
index 0d7f994958..084194cb81 100755
--- a/tools/stop
+++ b/tools/stop
@@ -1,6 +1,6 @@
 kubecfg delete /pods/mariadb
 kubecfg delete /pods/keystone
 
-kubecfg delete /services/mariadbmaster
-kubecfg delete /services/keystonemaster-5000
-kubecfg delete /services/keystonemaster-35357
+kubecfg delete /services/mariadb
+kubecfg delete /services/keystone-public
+kubecfg delete /services/keystone-admin