Fix class name error (part 1)
Fix class name error (part 2)