Merge "Fix inconsistent naming and indentation."