Clean up names and doc comments.