Fixed variables names