Rename group_x to group and role_x to role

Change-Id: I0e31772684dd48147c561c4768507e6d1140b216