Corrections to id-code synthesis
Name refactoring