1606 | Subhas/Kavitha | Fix duplicate/renamed fields