Caught a few more tems to change so the terminology matches more appropiately to Ruby vs. Python.