fix companyId and companyName => globalId and globalName