Refactored bill property names