Use the right variable names