Refactored some properties names.