Merge "Fix typo in class name"