Replaced some properties' names for better understanding