re #435 : Code cleanup
re #435 : Change 'role_name' to 'role'.