Renamed several things and removed a few

Up to now, all the changes have been formal.
I haven't changed any functionality or the interface.
In the next commits I'll start changing that.