Fixes #5186: Rename role properties