Use tenant_id instead of keystone_id everywhere