Fixed names of variables