Modified variables names