Fix typo in class name and fix internals.
Fix typo in class name and fix internals.