Change the variables with the same standard as the rest of the project