Properly adapt to role name renaming

Authored by jbbgameich on Mar 28 2020, 5:54 PM.