Refactor class and method names