Change the role names in DML files to be in singular form