Update: change variable names