Feature/consistent naming

With regards to #57, it is possibly an easier upgrade if we rename everything first, which is probably an easy one-off search-and-replace.

What do you folks think? We could do a small release with this step first, so that everything is prepared for #57 and possibly other things down the line.