Bug 10046: Standardize terms used in invoices