Fix typo
Fix typos  for class names
Merge pull request #1108
Merge pull request #1108 in master