Fixing names of the variable names