Invoice naming changes
Small changes to make Shepard happy