Some renaming and comments.