bug 1010: Fixed variable names