Fixed company name and vat -> tax