Changes to variables names