Varname fix