Change variable names
Fix list