Changes some variable names to be more informative