Fixed another typo.
Changed the name to something more apt.
More name updates.
Spacing and tweaks.