Refactor: consistent naming/logging