N1Kv: change TENANT_ID to TENANT so the variable name is consistent.