diff --git a/common/services.yaml b/common/services.yaml
index 350026cc04..0bc3462f50 100644
--- a/common/services.yaml
+++ b/common/services.yaml
@@ -35,7 +35,7 @@ parameters:
     description: Role name on which the service is applied
     type: string
   RoleParameters:
-    description: Role Specific parameters to be provided to service
+    description: Parameters specific to the role
     default: {}
     type: json
 
diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml
index 16deb7d6b6..d116e7c678 100644
--- a/deployed-server/deployed-server.yaml
+++ b/deployed-server/deployed-server.yaml
@@ -9,6 +9,7 @@ parameters:
   key_name:
     type: string
     default: unused
+    description: Name of keypair to assign to servers
   security_groups:
     type: json
     default: []
diff --git a/extraconfig/pre_network/contrail/compute_pre_network.yaml b/extraconfig/pre_network/contrail/compute_pre_network.yaml
index a30330f9b2..69e89f8778 100644
--- a/extraconfig/pre_network/contrail/compute_pre_network.yaml
+++ b/extraconfig/pre_network/contrail/compute_pre_network.yaml
@@ -34,7 +34,7 @@ parameters:
     type: string
   RoleParameters:
     type: json
-    description: Role Specific parameters
+    description: Parameters specific to the role
     default: {}
   ServiceNames:
     type: comma_delimited_list
diff --git a/extraconfig/pre_network/contrail/contrail_dpdk_pre_network.yaml b/extraconfig/pre_network/contrail/contrail_dpdk_pre_network.yaml
index 623eb7e091..4b3c673c4e 100644
--- a/extraconfig/pre_network/contrail/contrail_dpdk_pre_network.yaml
+++ b/extraconfig/pre_network/contrail/contrail_dpdk_pre_network.yaml
@@ -38,7 +38,7 @@ parameters:
     type: string
   RoleParameters:
     type: json
-    description: Role Specific parameters
+    description: Parameters specific to the role
     default: {}
   ServiceNames:
     type: comma_delimited_list
diff --git a/extraconfig/pre_network/host_config_and_reboot.yaml b/extraconfig/pre_network/host_config_and_reboot.yaml
index 5c7cc27374..87dbeaec4c 100644
--- a/extraconfig/pre_network/host_config_and_reboot.yaml
+++ b/extraconfig/pre_network/host_config_and_reboot.yaml
@@ -9,7 +9,7 @@ parameters:
     type: string
   RoleParameters:
     type: json
-    description: Role Specific parameters
+    description: Parameters specific to the role
     default: {}
   ServiceNames:
     type: comma_delimited_list
diff --git a/puppet/blockstorage-role.yaml b/puppet/blockstorage-role.yaml
index 7d58d1da49..de7b6b4914 100644
--- a/puppet/blockstorage-role.yaml
+++ b/puppet/blockstorage-role.yaml
@@ -141,7 +141,7 @@ parameters:
       parameter is generated from the parent template.
   RoleParameters:
     type: json
-    description: Role Specific Parameters
+    description: Parameters specific to the role
     default: {}
   DeploymentSwiftDataMap:
     type: json
diff --git a/puppet/cephstorage-role.yaml b/puppet/cephstorage-role.yaml
index 48e5b97a78..ce44fd68ef 100644
--- a/puppet/cephstorage-role.yaml
+++ b/puppet/cephstorage-role.yaml
@@ -147,7 +147,7 @@ parameters:
       parameter is generated from the parent template.
   RoleParameters:
     type: json
-    description: Role Specific Parameters
+    description: Parameters specific to the role
     default: {}
   DeploymentSwiftDataMap:
     type: json
diff --git a/puppet/compute-role.yaml b/puppet/compute-role.yaml
index 3ad6f7452e..af45793e3c 100644
--- a/puppet/compute-role.yaml
+++ b/puppet/compute-role.yaml
@@ -159,7 +159,7 @@ parameters:
       parameter is generated from the parent template.
   RoleParameters:
     type: json
-    description: Role Specific Parameters
+    description: Parameters specific to the role
     default: {}
   DeploymentSwiftDataMap:
     type: json
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml
index 933b5e602d..38589a4e3e 100644
--- a/puppet/controller-role.yaml
+++ b/puppet/controller-role.yaml
@@ -173,7 +173,7 @@ parameters:
       parameter is generated from the parent template.
   RoleParameters:
     type: json
-    description: Role Specific Parameters
+    description: Parameters specific to the role
     default: {}
   DeploymentSwiftDataMap:
     type: json
diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml
index a03a9da545..10e5645022 100644
--- a/puppet/objectstorage-role.yaml
+++ b/puppet/objectstorage-role.yaml
@@ -141,7 +141,7 @@ parameters:
       parameter is generated from the parent template.
   RoleParameters:
     type: json
-    description: Role Specific Parameters
+    description: Parameters specific to the role
     default: {}
   DeploymentSwiftDataMap:
     type: json
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 18707b9a21..23d8896e7a 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -180,7 +180,7 @@ parameters:
       parameter is generated from the parent template.
   RoleParameters:
     type: json
-    description: Role Specific Parameters
+    description: Parameters specific to the role
     default: {}
   DeploymentSwiftDataMap:
     type: json
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 3a2691d848..ccaa5bdeda 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -58,6 +58,7 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                    'TenantAllocationPools': ['default'],
                                    'InternalApiNetCidr': ['default'],
                                    'UpdateIdentifier': ['description'],
+                                   'key_name': ['default'],
                                    # TODO(bnemec): Address these existing
                                    # inconsistencies.
                                    'NeutronMetadataProxySharedSecret': [
@@ -111,7 +112,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                    'StorageNetName': ['description'],
                                    'ManagementNetName': ['description'],
                                    'NeutronPublicInterface': ['description'],
-                                   'RoleParameters': ['description'],
                                    'ManagementInterfaceDefaultRoute':
                                        ['default'],
                                    'image': ['description', 'default'],
@@ -126,7 +126,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                    'replacement_policy': ['default'],
                                    'StorageMgmtIpSubnet': ['description'],
                                    'CloudDomain': ['description', 'default'],
-                                   'key_name': ['default', 'description'],
                                    'EnableLoadBalancer': ['description'],
                                    'ControllerExtraConfig': ['description'],
                                    'NovaComputeExtraConfig': ['description'],