Fixes  #5185: Rename Roles properties