Better chapter titles.
Changed name of class.