Fixed a few spelling typos.
Renamed some things that were hindering my tab completion. :)