Add separate targets for compilation of c and go sources
Perform variable renaming refactoring