fixes to the genpact merge
fix some spelling and naming issues, some how this was lost before
Merge branch 'master' into eda