Just small changes

Renamings, pretty much.