Refactored bill property names
Merge branch 'dev'