Refactor: rename Name to Atom