Refactored class names to standard book naming convention.