Little cleanups on names and things.