Renames

I hope these names make it more obvious what's going on in the classes concerned, and it'll drive out further refactors.

Also removed some evil comments.