Fixed object_name usage.

The object_name attribute was used as both an identifier and a
label which sometimes require different values (e.g. hbacrule
vs. HBAC rule). The code that uses object_name as an identifier
has been changed to use the 'name' attribute instead. The values
of the object_name attribute have been fixed to become proper
labels.

Ticket #1217

1 files changed, 44 insertions, 44 deletions

diff --git a/API.txt b/API.txt
index 5f423302e..24f6d7466 100644
--- a/API.txt
+++ b/API.txt
@@ -927,8 +927,8 @@ option: List('in_role?', cli_name='in_roles', label='role', multivalue=True)
 option: List('not_in_role?', cli_name='not_in_roles', label='role', multivalue=True)
 option: List('in_hbacrule?', cli_name='in_hbacrules', label='HBAC rule', multivalue=True)
 option: List('not_in_hbacrule?', cli_name='not_in_hbacrules', label='HBAC rule', multivalue=True)
-option: List('in_sudorule?', cli_name='in_sudorules', label='Sudo Rule', multivalue=True)
-option: List('not_in_sudorule?', cli_name='not_in_sudorules', label='Sudo Rule', multivalue=True)
+option: List('in_sudorule?', cli_name='in_sudorules', label='sudo rule', multivalue=True)
+option: List('not_in_sudorule?', cli_name='not_in_sudorules', label='sudo rule', multivalue=True)
 output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
 output: Output('count', <type 'int'>, 'Number of entries returned')
@@ -994,7 +994,7 @@ option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
 option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member host group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
@@ -1004,8 +1004,8 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domai
 option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label='member hbacsvc', multivalue=True)
-option: List('hbacsvcgroup?', alwaysask=True, cli_name='hbacsvcgroups', label='member hbacsvcgroup', multivalue=True)
+option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label='member HBAC service', multivalue=True)
+option: List('hbacsvcgroup?', alwaysask=True, cli_name='hbacsvcgroups', label='member HBAC service group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
@@ -1016,7 +1016,7 @@ option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
 option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member host group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
@@ -1094,7 +1094,7 @@ option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
 option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member host group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
@@ -1104,8 +1104,8 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Rule name', domai
 option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label='member hbacsvc', multivalue=True)
-option: List('hbacsvcgroup?', alwaysask=True, cli_name='hbacsvcgroups', label='member hbacsvcgroup', multivalue=True)
+option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label='member HBAC service', multivalue=True)
+option: List('hbacsvcgroup?', alwaysask=True, cli_name='hbacsvcgroups', label='member HBAC service group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
@@ -1116,7 +1116,7 @@ option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
 option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member host group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
@@ -1215,7 +1215,7 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Service group nam
 option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label='member hbacsvc', multivalue=True)
+option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label='member HBAC service', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
@@ -1259,7 +1259,7 @@ arg: Str('cn', attribute=True, cli_name='name', label=Gettext('Service group nam
 option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label='member hbacsvc', multivalue=True)
+option: List('hbacsvc?', alwaysask=True, cli_name='hbacsvcs', label='member HBAC service', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
@@ -1332,16 +1332,16 @@ option: Int('sizelimit?', autofill=False, flags=['no_display'], label=Gettext('S
 option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('in_hostgroup?', cli_name='in_hostgroups', label='hostgroup', multivalue=True)
-option: List('not_in_hostgroup?', cli_name='not_in_hostgroups', label='hostgroup', multivalue=True)
+option: List('in_hostgroup?', cli_name='in_hostgroups', label='host group', multivalue=True)
+option: List('not_in_hostgroup?', cli_name='not_in_hostgroups', label='host group', multivalue=True)
 option: List('in_netgroup?', cli_name='in_netgroups', label='netgroup', multivalue=True)
 option: List('not_in_netgroup?', cli_name='not_in_netgroups', label='netgroup', multivalue=True)
 option: List('in_role?', cli_name='in_roles', label='role', multivalue=True)
 option: List('not_in_role?', cli_name='not_in_roles', label='role', multivalue=True)
 option: List('in_hbacrule?', cli_name='in_hbacrules', label='HBAC rule', multivalue=True)
 option: List('not_in_hbacrule?', cli_name='not_in_hbacrules', label='HBAC rule', multivalue=True)
-option: List('in_sudorule?', cli_name='in_sudorules', label='Sudo Rule', multivalue=True)
-option: List('not_in_sudorule?', cli_name='not_in_sudorules', label='Sudo Rule', multivalue=True)
+option: List('in_sudorule?', cli_name='in_sudorules', label='sudo rule', multivalue=True)
+option: List('not_in_sudorule?', cli_name='not_in_sudorules', label='sudo rule', multivalue=True)
 option: List('enroll_by_user?', cli_name='enroll_by_users', label='user', multivalue=True)
 option: List('not_enroll_by_user?', cli_name='not_enroll_by_users', label='user', multivalue=True)
 option: List('man_by_host?', cli_name='man_by_hosts', label='host', multivalue=True)
@@ -1411,7 +1411,7 @@ option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
 option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member host group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
@@ -1434,14 +1434,14 @@ option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
 option: List('host?', cli_name='hosts', label='host', multivalue=True)
 option: List('no_host?', cli_name='no_hosts', label='host', multivalue=True)
-option: List('hostgroup?', cli_name='hostgroups', label='hostgroup', multivalue=True)
-option: List('no_hostgroup?', cli_name='no_hostgroups', label='hostgroup', multivalue=True)
-option: List('in_hostgroup?', cli_name='in_hostgroups', label='hostgroup', multivalue=True)
-option: List('not_in_hostgroup?', cli_name='not_in_hostgroups', label='hostgroup', multivalue=True)
+option: List('hostgroup?', cli_name='hostgroups', label='host group', multivalue=True)
+option: List('no_hostgroup?', cli_name='no_hostgroups', label='host group', multivalue=True)
+option: List('in_hostgroup?', cli_name='in_hostgroups', label='host group', multivalue=True)
+option: List('not_in_hostgroup?', cli_name='not_in_hostgroups', label='host group', multivalue=True)
 option: List('in_hbacrule?', cli_name='in_hbacrules', label='HBAC rule', multivalue=True)
 option: List('not_in_hbacrule?', cli_name='not_in_hbacrules', label='HBAC rule', multivalue=True)
-option: List('in_sudorule?', cli_name='in_sudorules', label='Sudo Rule', multivalue=True)
-option: List('not_in_sudorule?', cli_name='not_in_sudorules', label='Sudo Rule', multivalue=True)
+option: List('in_sudorule?', cli_name='in_sudorules', label='sudo rule', multivalue=True)
+option: List('not_in_sudorule?', cli_name='not_in_sudorules', label='sudo rule', multivalue=True)
 output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
 output: Output('count', <type 'int'>, 'Number of entries returned')
@@ -1466,7 +1466,7 @@ option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
 option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member host group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
@@ -1566,7 +1566,7 @@ option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
 option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
 option: List('group?', alwaysask=True, cli_name='groups', label='member group', multivalue=True)
 option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member host group', multivalue=True)
 option: List('netgroup?', alwaysask=True, cli_name='netgroups', label='member netgroup', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
@@ -1602,8 +1602,8 @@ option: List('group?', cli_name='groups', label='group', multivalue=True)
 option: List('no_group?', cli_name='no_groups', label='group', multivalue=True)
 option: List('host?', cli_name='hosts', label='host', multivalue=True)
 option: List('no_host?', cli_name='no_hosts', label='host', multivalue=True)
-option: List('hostgroup?', cli_name='hostgroups', label='hostgroup', multivalue=True)
-option: List('no_hostgroup?', cli_name='no_hostgroups', label='hostgroup', multivalue=True)
+option: List('hostgroup?', cli_name='hostgroups', label='host group', multivalue=True)
+option: List('no_hostgroup?', cli_name='no_hostgroups', label='host group', multivalue=True)
 option: List('in_netgroup?', cli_name='in_netgroups', label='netgroup', multivalue=True)
 option: List('not_in_netgroup?', cli_name='not_in_netgroups', label='netgroup', multivalue=True)
 output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
@@ -1635,7 +1635,7 @@ option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
 option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
 option: List('group?', alwaysask=True, cli_name='groups', label='member group', multivalue=True)
 option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member host group', multivalue=True)
 option: List('netgroup?', alwaysask=True, cli_name='netgroups', label='member netgroup', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
@@ -1965,7 +1965,7 @@ option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
 option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
 option: List('group?', alwaysask=True, cli_name='groups', label='member group', multivalue=True)
 option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member host group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
@@ -2023,7 +2023,7 @@ option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
 option: List('user?', alwaysask=True, cli_name='users', label='member user', multivalue=True)
 option: List('group?', alwaysask=True, cli_name='groups', label='member group', multivalue=True)
 option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member host group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
@@ -2254,7 +2254,7 @@ arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', label=Gettext('Sudo
 option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudocmd', multivalue=True)
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudo command', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
@@ -2298,7 +2298,7 @@ arg: Str('cn', attribute=True, cli_name='sudocmdgroup_name', label=Gettext('Sudo
 option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudocmd', multivalue=True)
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudo command', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
@@ -2338,8 +2338,8 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudocmd', multivalue=True)
-option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='member sudocmdgroup', multivalue=True)
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudo command', multivalue=True)
+option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='member sudo command group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
@@ -2349,8 +2349,8 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudocmd', multivalue=True)
-option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='member sudocmdgroup', multivalue=True)
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudo command', multivalue=True)
+option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='member sudo command group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
@@ -2361,7 +2361,7 @@ option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
 option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member host group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be added', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members added', domain='ipa', localedir=None))
@@ -2466,8 +2466,8 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudocmd', multivalue=True)
-option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='member sudocmdgroup', multivalue=True)
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudo command', multivalue=True)
+option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='member sudo command group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
@@ -2477,8 +2477,8 @@ arg: Str('cn', attribute=True, cli_name='sudorule_name', label=Gettext('Rule nam
 option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
-option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudocmd', multivalue=True)
-option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='member sudocmdgroup', multivalue=True)
+option: List('sudocmd?', alwaysask=True, cli_name='sudocmds', label='member sudo command', multivalue=True)
+option: List('sudocmdgroup?', alwaysask=True, cli_name='sudocmdgroups', label='member sudo command group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
@@ -2489,7 +2489,7 @@ option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui
 option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
 option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
 option: List('host?', alwaysask=True, cli_name='hosts', label='member host', multivalue=True)
-option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member hostgroup', multivalue=True)
+option: List('hostgroup?', alwaysask=True, cli_name='hostgroups', label='member host group', multivalue=True)
 output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None))
 output: Output('failed', <type 'dict'>, Gettext('Members that could not be removed', domain='ipa', localedir=None))
 output: Output('completed', <type 'int'>, Gettext('Number of members removed', domain='ipa', localedir=None))
@@ -2639,8 +2639,8 @@ option: List('in_role?', cli_name='in_roles', label='role', multivalue=True)
 option: List('not_in_role?', cli_name='not_in_roles', label='role', multivalue=True)
 option: List('in_hbacrule?', cli_name='in_hbacrules', label='HBAC rule', multivalue=True)
 option: List('not_in_hbacrule?', cli_name='not_in_hbacrules', label='HBAC rule', multivalue=True)
-option: List('in_sudorule?', cli_name='in_sudorules', label='Sudo Rule', multivalue=True)
-option: List('not_in_sudorule?', cli_name='not_in_sudorules', label='Sudo Rule', multivalue=True)
+option: List('in_sudorule?', cli_name='in_sudorules', label='sudo rule', multivalue=True)
+option: List('not_in_sudorule?', cli_name='not_in_sudorules', label='sudo rule', multivalue=True)
 output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly description of action performed')
 output: ListOfEntries('result', (<type 'list'>, <type 'tuple'>), Gettext('A list of LDAP entries', domain='ipa', localedir=None))
 output: Output('count', <type 'int'>, 'Number of entries returned')