Refactor: handle naming only with Named