Fixed tenant name check, which is updated because the tenant
standardization has changed.