Refactored bill property names
Solved merge conflicts