Merge "Fix enum name and typo"