Refactor: rename classes and methods