Fixed variables name mangling issues