cherrio fixes, varName format changed