fix methods and class name