Change the role names in DML files to be in singular form
Merge pull request #1 from smmf/review/feature/generated-revamp

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