rename invoice- to bill-classes