Update variables names