Updated to use short role name instead