Corrected class names
Corrected class names and indent
changed class name