Some bad Class name fixed