Avoid identifier violation by fixing struct names.