972953 - Name roles with the satellite org name instead of org id.  Handle org renames as well