rename related name on a Bill field
fix a few missing imports