Fixing some of the names of the classes and methods.