Updated variables names