Renaming and cleaning

This commit includes a lot of variables renaming, and some
cleaning. It should make the difference between related data
next / previous and node next / previous clear. It also fix
one or two bugs.