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

10 files changed, 79 insertions, 85 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')
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index a7af63841..07ebc663a 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -10579,9 +10579,7 @@
                             ],
                             "memberindirect": [
                                 "user",
-                                "group",
-                                "netgroup",
-                                "role"
+                                "group"
                             ],
                             "memberof": [
                                 "group",
@@ -11335,8 +11333,8 @@
                             "ipahbacservice"
                         ],
                         "object_class_config": null,
-                        "object_name": "hbacsvc",
-                        "object_name_plural": "hbacsvcs",
+                        "object_name": "HBAC service",
+                        "object_name_plural": "HBAC services",
                         "parent_object": "",
                         "primary_key": "cn",
                         "rdn_attribute": "",
@@ -11464,8 +11462,8 @@
                             "ipahbacservicegroup"
                         ],
                         "object_class_config": null,
-                        "object_name": "hbacsvcgroup",
-                        "object_name_plural": "hbacsvcgroups",
+                        "object_name": "HBAC service group",
+                        "object_name_plural": "HBAC service groups",
                         "parent_object": "",
                         "primary_key": "cn",
                         "rdn_attribute": "",
@@ -11996,7 +11994,6 @@
                                 "sudorule"
                             ],
                             "memberofindirect": [
-                                "host",
                                 "hostgroup",
                                 "hbacrule",
                                 "sudorule"
@@ -12033,8 +12030,8 @@
                             "ipahostgroup"
                         ],
                         "object_class_config": null,
-                        "object_name": "hostgroup",
-                        "object_name_plural": "hostgroups",
+                        "object_name": "host group",
+                        "object_name_plural": "host groups",
                         "parent_object": "",
                         "primary_key": "cn",
                         "rdn_attribute": "",
@@ -12120,7 +12117,7 @@
                         "aciattrs": [],
                         "attribute_members": {},
                         "bindable": false,
-                        "container_dn": "cn=SERVER15.AYOUNG.BOSTON.DEVEL.REDHAT.COM,cn=kerberos",
+                        "container_dn": "cn=IDM.LAB.BOS.REDHAT.COM,cn=kerberos",
                         "default_attributes": [
                             "krbmaxticketlife",
                             "krbmaxrenewableage"
@@ -12965,7 +12962,7 @@
                         ],
                         "attribute_members": {},
                         "bindable": false,
-                        "container_dn": "cn=SERVER15.AYOUNG.BOSTON.DEVEL.REDHAT.COM,cn=kerberos",
+                        "container_dn": "cn=IDM.LAB.BOS.REDHAT.COM,cn=kerberos",
                         "default_attributes": [
                             "cn",
                             "cospriority",
@@ -13415,10 +13412,10 @@
                         ],
                         "name": "selfservice",
                         "object_name": [
-                            "selfservice"
+                            "self service permission"
                         ],
                         "object_name_plural": [
-                            "selfservice"
+                            "self service permissions"
                         ],
                         "primary_key": "aciname",
                         "takes_params": [
@@ -13673,8 +13670,8 @@
                             "ipasudocmd"
                         ],
                         "object_class_config": null,
-                        "object_name": "sudocmd",
-                        "object_name_plural": "sudocmds",
+                        "object_name": "sudo command",
+                        "object_name_plural": "sudo commands",
                         "parent_object": "",
                         "primary_key": "sudocmd",
                         "rdn_attribute": "",
@@ -13802,8 +13799,8 @@
                             "ipasudocmdgrp"
                         ],
                         "object_class_config": null,
-                        "object_name": "sudocmdgroup",
-                        "object_name_plural": "sudocmdgroups",
+                        "object_name": "sudo command group",
+                        "object_name_plural": "sudo command groups",
                         "parent_object": "",
                         "primary_key": "cn",
                         "rdn_attribute": "",
@@ -14044,8 +14041,8 @@
                             "ipasudorule"
                         ],
                         "object_class_config": null,
-                        "object_name": "Sudo Rule",
-                        "object_name_plural": "Sudo Rules",
+                        "object_name": "sudo rule",
+                        "object_name_plural": "sudo rules",
                         "parent_object": "",
                         "primary_key": "cn",
                         "rdn_attribute": "ipauniqueid",
@@ -15815,10 +15812,10 @@
                         },
                         "user": {
                             "account": "Account Settings",
-                            "account_status": "Account status",
+                            "account_status": "Account Status",
                             "activate": "Activate",
-                            "activation_link": "Click to ${action}",
                             "activation_confirmation": "Are you sure you want to ${action} the user?<br/>The change will take effect immediately.",
+                            "activation_link": "Click to ${action}",
                             "active": "Active",
                             "contact": "Contact Settings",
                             "deactivate": "Deactivate",
@@ -15908,9 +15905,6 @@
                         "krbprincipalname": [
                             "admin@SERVER15.AYOUNG.BOSTON.DEVEL.REDHAT.COM"
                         ],
-                        "krbpwdpolicyreference": [
-                            "cn=admins,cn=SERVER15.AYOUNG.BOSTON.DEVEL.REDHAT.COM,cn=kerberos,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com"
-                        ],
                         "loginshell": [
                             "/bin/bash"
                         ],
@@ -16026,4 +16020,4 @@
             }
         ]
     }
-}
+}
\ No newline at end of file
diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py
index 2e9991317..3465c3746 100644
--- a/ipalib/plugins/baseldap.py
+++ b/ipalib/plugins/baseldap.py
@@ -348,7 +348,7 @@ class LDAPObject(Object):
                 for ldap_obj_name in self.attribute_members[attr]:
                     ldap_obj = self.api.Object[ldap_obj_name]
                     if member.find(ldap_obj.container_dn) > 0:
-                        new_attr = '%s_%s' % (attr, ldap_obj.object_name)
+                        new_attr = '%s_%s' % (attr, ldap_obj.name)
                         entry_attrs.setdefault(new_attr, []).append(
                             ldap_obj.get_primary_key_from_dn(member)
                         )
diff --git a/ipalib/plugins/hbacsvc.py b/ipalib/plugins/hbacsvc.py
index df877a605..c2f2532e7 100644
--- a/ipalib/plugins/hbacsvc.py
+++ b/ipalib/plugins/hbacsvc.py
@@ -52,8 +52,8 @@ class hbacsvc(LDAPObject):
     HBAC Service object.
     """
     container_dn = api.env.container_hbacservice
-    object_name = 'hbacsvc'
-    object_name_plural = 'hbacsvcs'
+    object_name = 'HBAC service'
+    object_name_plural = 'HBAC services'
     object_class = [ 'ipaobject', 'ipahbacservice' ]
     default_attributes = ['cn', 'description', 'memberindirect',]
     uuid_attribute = 'ipauniqueid'
diff --git a/ipalib/plugins/hbacsvcgroup.py b/ipalib/plugins/hbacsvcgroup.py
index 4823a8b37..356bae43f 100644
--- a/ipalib/plugins/hbacsvcgroup.py
+++ b/ipalib/plugins/hbacsvcgroup.py
@@ -52,8 +52,8 @@ class hbacsvcgroup(LDAPObject):
     HBAC service group object.
     """
     container_dn = api.env.container_hbacservicegroup
-    object_name = 'hbacsvcgroup'
-    object_name_plural = 'hbacsvcgroups'
+    object_name = 'HBAC service group'
+    object_name_plural = 'HBAC service groups'
     object_class = ['ipaobject', 'ipahbacservicegroup']
     default_attributes = [ 'cn', 'description', 'member' ]
     uuid_attribute = 'ipauniqueid'
diff --git a/ipalib/plugins/hostgroup.py b/ipalib/plugins/hostgroup.py
index c5b96056b..6683c49c4 100644
--- a/ipalib/plugins/hostgroup.py
+++ b/ipalib/plugins/hostgroup.py
@@ -56,8 +56,8 @@ class hostgroup(LDAPObject):
     Hostgroup object.
     """
     container_dn = api.env.container_hostgroup
-    object_name = 'hostgroup'
-    object_name_plural = 'hostgroups'
+    object_name = 'host group'
+    object_name_plural = 'host groups'
     object_class = ['ipaobject', 'ipahostgroup']
     default_attributes = ['cn', 'description', 'member', 'memberof',
         'memberindirect', 'memberofindirect',
diff --git a/ipalib/plugins/selfservice.py b/ipalib/plugins/selfservice.py
index 8154d2da8..55aa7c1de 100644
--- a/ipalib/plugins/selfservice.py
+++ b/ipalib/plugins/selfservice.py
@@ -70,8 +70,8 @@ class selfservice(Object):
     """
 
     bindable = False
-    object_name = 'selfservice',
-    object_name_plural = 'selfservice',
+    object_name = 'self service permission',
+    object_name_plural = 'self service permissions',
     label = _('Self Service Permissions')
     label_singular = _('self service permission')
 
diff --git a/ipalib/plugins/sudocmd.py b/ipalib/plugins/sudocmd.py
index a3f3beb0d..800ab2409 100644
--- a/ipalib/plugins/sudocmd.py
+++ b/ipalib/plugins/sudocmd.py
@@ -47,8 +47,8 @@ class sudocmd(LDAPObject):
     Sudo Command object.
     """
     container_dn = api.env.container_sudocmd
-    object_name = 'sudocmd'
-    object_name_plural = 'sudocmds'
+    object_name = 'sudo command'
+    object_name_plural = 'sudo commands'
     object_class = ['ipaobject', 'ipasudocmd']
     # object_class_config = 'ipahostobjectclasses'
     search_attributes = [
diff --git a/ipalib/plugins/sudocmdgroup.py b/ipalib/plugins/sudocmdgroup.py
index 49b172ea2..bee417a90 100644
--- a/ipalib/plugins/sudocmdgroup.py
+++ b/ipalib/plugins/sudocmdgroup.py
@@ -51,8 +51,8 @@ class sudocmdgroup(LDAPObject):
     Sudo Group object.
     """
     container_dn = api.env.container_sudocmdgroup
-    object_name = 'sudocmdgroup'
-    object_name_plural = 'sudocmdgroups'
+    object_name = 'sudo command group'
+    object_name_plural = 'sudo command groups'
     object_class = ['ipaobject', 'ipasudocmdgrp']
     default_attributes = [
         'cn', 'description', 'member',
diff --git a/ipalib/plugins/sudorule.py b/ipalib/plugins/sudorule.py
index a85e943f8..f595727df 100644
--- a/ipalib/plugins/sudorule.py
+++ b/ipalib/plugins/sudorule.py
@@ -45,8 +45,8 @@ class sudorule(LDAPObject):
     Sudo Rule management
     """
     container_dn = api.env.container_sudorule
-    object_name = 'Sudo Rule'
-    object_name_plural = 'Sudo Rules'
+    object_name = 'sudo rule'
+    object_name_plural = 'sudo rules'
     object_class = ['ipaassociation', 'ipasudorule']
     default_attributes = [
         'cn', 'ipaenabledflag',