Merge "Fix typo and inconsistency"