Fix mismatching variable names