diff --git a/conf/flavor/openstack_chef.conf b/conf/flavor/openstack_chef.conf
index ec5f4c61..96cb15c3 100644
--- a/conf/flavor/openstack_chef.conf
+++ b/conf/flavor/openstack_chef.conf
@@ -6,7 +6,7 @@ FLAVORS = [{
     'roles': ['allinone-compute']
 }, {
     'flavor': 'single-contoller-multi-compute',
-    'display_name': 'Single controller multi-compute',
+    'display_name': 'Single Controller, Multi-compute',
     'template': 'multinodes.tmpl',
     'roles': [
         'os-controller', 'os-compute-worker', 'os-network',
@@ -14,7 +14,7 @@ FLAVORS = [{
     ]
 }, {
     'flavor': 'multinodes',
-    'display_name': 'multi-nodes',
+    'display_name': 'Multi-node Cluster',
     'template': 'multnodes.tmpl',
     'roles': [
         'os-ops-database', 'os-ops-messaging', 'os-compute-controller',
diff --git a/conf/role/openstack_chef.conf b/conf/role/openstack_chef.conf
index b04951a0..b8da4f25 100644
--- a/conf/role/openstack_chef.conf
+++ b/conf/role/openstack_chef.conf
@@ -19,14 +19,11 @@ ROLES = [{
     'role': 'os-block-storage-controller',
     'display_name': 'storage controller node',
     'description': 'storage controller node'
-},{
-    'role': 'os-block-storage-worker',
-    'display_name': 'storage node',
-    'description': 'storage node'
 }, {
     'role': 'os-block-storage-volume',
     'display_name': 'storage node',
-    'description': 'storage node'
+    'description': 'storage node',
+    'optional': True
 }, {
     'role': 'os-image',
     'display_name': 'image node',
@@ -41,7 +38,7 @@ ROLES = [{
     'description': 'controller node including identity, dashboard, network server, and block stroage controller services'
 }, {
     'role': 'os-compute-controller',
-    'display_name': 'controller-only node',
+    'display_name': 'Nova controller node',
     'description': 'controller node for nova APIs'
 }, {
     'role': 'os-ops-messaging',