Merge "Fix typo in comment about class name"