Revert "use org name instead of org label on roles"

This reverts commit fbe39cd589cd9c635ec4761d77d14ef000e024a8.