Refactored property names to be consistent with the naming