fix method and class names according to style guide