Refactored bill property names
Merge branch 'bill_property_refactoring'