Remove tenant_id and use tenant_name instead of removed tenant_id