Improve some names

I need to do a *lot* of work in this area and this code needs to be really
really fucking clean first.