Changed class name, fixed doctests