neighbor: Simplifications & Renamings