Fixes  #5185: Rename Roles properties
Merge pull request #567 from VinceMacBuche/bug_5185/Rename_properties

Fixes  #5185: Rename Roles properties