Fix: Change variable names accordingly