renamed tenants to organizations