Fixed typo "Statment"=>"Statement", and shorten some classes' name.