A lot of classes renaming

Now that the new API has been decided upon, first start by renaming existing
classes.