Complete the removal of plurals from role names