Changed names in ch. 2

Also updated readme