Fix billing and shipping name, add company in 940 outline.