Better naming for some vars
Change README.md due to some changes in the vars names