Tightening up a few things: names, mostly.