Correct class names and method names