Refactored class names to method name only