Fixed class name issues