Fixed variables names with leading underscore