Fix bug in neighbour matrix.
Rename some traits.