Fix Class Name
Fix typos