fixed variables names