Rename some properties to increase code readability