Updated references to Neighbor.java