Fixed variable name problems