refactor: rename some classes