Renamed classes and methods for consistency, updated PDF