Fixed variable name conversion bug