Merge "Tenant name changed to be consistent with CSIT."