Organization, Team and Role Mapping from SAML using AD groups

I’m mapping membership of AD groups to Organizations, Teams and Roles.

What I am seeing is that the AD group name is used as the Organization name. Is there a way to make an alias as the group name is not userfriendly

{
  "remove": true,
  "remove_admins": false,
  "saml_attr": "Groups"
}
{
  "remove": true,
  "saml_attr": "Groups",
  "team_org_map": [
    {
      "team": "AD_AWX_Admins",
      "team_alias": "Administrators",
      "organization": "Default"
    },
    {
      "team": "AD_AWX_ORG1_TEAM",
      "team_alias": "ORG1_TEAM",
      "organization": "AD_AWX_ORG1"
    }
  ]
}

What I also see is that the SAML User Flags Attribute Mapping is not working:

{
  "is_superuser_attr": "Groups",
  "is_superuser_role": [
    "is_superuser"
  ],
  "is_superuser_value": [
    "AD_AWX_Admins"
  ]
}

Accounts in that group are not getting admin rights, additionally organization Default, team adminstrators doesn’t appear