Changed ext to use Tenant name istead of ID