changed from tenant.id to tenantId property based on ION-1992 changes