Merge "Rename and fix comments and typo."