Fix for conflicting member names