fix variable names
Merge branch 'master' of github.com:gem-sw/GEMCode