renamed tenants to organizations or projects