Fixed variable names used