Fixed class name case mismatches