update to tenant and token strings