Merge pull request #2416 from jkczyz/2023-07-invoice-rename