Refactor: consistent naming