Some minor renaming and doc comments.